Re: [Gm2] Tru64/Alpha and Freebsd/i386

[Gaius Mulley]

Michael H Lambert <address@hidden> writes:

> Gaius,
> 
> On Tru64/Alpha, I get the failed assertions for bits 32-63.
> 
> Michael
> 

Hi Michael,

any chance you can try this patch on the Alpha?

It fixes the ppc `make gm2.paranoid' - well at least it is currently
running it,

Thanks,
Gaius



Index: gccgm2.c
===================================================================
RCS file: /usr/src/cvs/gm2/gccgm2.c,v
retrieving revision 1.120
diff -r1.120 gccgm2.c
11395a11396,11398
>   /* calculate the index from the first bit in the set */
>   tree index = gccgm2_BuildSub (gccgm2_BuildConvert (gccgm2_GetIntegerType(), 
> varel, FALSE),
>                               gccgm2_BuildConvert (gccgm2_GetIntegerType(), 
> low, FALSE), FALSE);
11401c11404
<                                                   gccgm2_BuildSetNegate 
(gccgm2_BuildLSL (gccgm2_GetWordOne(), varel, FALSE),
---
>                                                   gccgm2_BuildSetNegate 
> (gccgm2_BuildLSL (gccgm2_GetWordOne(), index, FALSE),
11406,11408d11408
<     /* calculate the index from the first bit */
<     tree index_0          = gccgm2_BuildSub (gccgm2_BuildConvert 
(gccgm2_GetIntegerType(), varel, FALSE),
<                                            gccgm2_BuildConvert 
(gccgm2_GetIntegerType(), low, FALSE), FALSE);
11410c11410
<     tree word_index       = gccgm2_BuildDivTrunc (index_0, 
gccgm2_BuildIntegerConstant (SET_WORD_SIZE), FALSE);
---
>     tree word_index       = gccgm2_BuildDivTrunc (index, 
> gccgm2_BuildIntegerConstant (SET_WORD_SIZE), FALSE);
11412c11412
<     tree offset_into_word = gccgm2_BuildModTrunc (index_0, 
gccgm2_BuildIntegerConstant (SET_WORD_SIZE), FALSE);
---
>     tree offset_into_word = gccgm2_BuildModTrunc (index, 
> gccgm2_BuildIntegerConstant (SET_WORD_SIZE), FALSE);
11475a11476,11478
>   /* calculate the index from the first bit in the set */
>   tree index = gccgm2_BuildSub (gccgm2_BuildConvert (gccgm2_GetIntegerType(), 
> varel, FALSE),
>                               gccgm2_BuildConvert (gccgm2_GetIntegerType(), 
> low, FALSE), FALSE);
11480c11483
<                                                  gccgm2_BuildLSL 
(gccgm2_GetWordOne(), varel, FALSE),
---
>                                                  gccgm2_BuildLSL 
> (gccgm2_GetWordOne(), index, FALSE),
11484,11486c11487
<     /* calculate the index from the first bit */
<     tree index_0          = gccgm2_BuildSub (gccgm2_BuildConvert 
(gccgm2_GetIntegerType(), varel, FALSE),
<                                            gccgm2_BuildConvert 
(gccgm2_GetIntegerType(), low, FALSE), FALSE);
---
> 
11488c11489
<     tree word_index       = gccgm2_BuildDivTrunc (index_0, 
gccgm2_BuildIntegerConstant (SET_WORD_SIZE), FALSE);
---
>     tree word_index       = gccgm2_BuildDivTrunc (index, 
> gccgm2_BuildIntegerConstant (SET_WORD_SIZE), FALSE);
11490c11491
<     tree offset_into_word = gccgm2_BuildModTrunc (index_0, 
gccgm2_BuildIntegerConstant (SET_WORD_SIZE), FALSE);
---
>     tree offset_into_word = gccgm2_BuildModTrunc (index, 
> gccgm2_BuildIntegerConstant (SET_WORD_SIZE), FALSE);