Commit 5b3e31bd by Alan Mishchenko

Debugging 64-bit bug in new semi-canonical form..

parent 894fc810
...@@ -71,7 +71,10 @@ inline int minTemp0_fast(word* pInOut, int iVar, int nWords, int* pDifStart) ...@@ -71,7 +71,10 @@ inline int minTemp0_fast(word* pInOut, int iVar, int nWords, int* pDifStart)
{ {
*pDifStart = i*100; *pDifStart = i*100;
while(temp == (temp & luckyMask(shiftSize*j))) while(temp == (temp & luckyMask(shiftSize*j)))
{
j++; j++;
assert( j < 100 );
}
*pDifStart += 21 - j; *pDifStart += 21 - j;
if( ((pInOut[i] & SFmask[iVar][0])) < ((pInOut[i] & SFmask[iVar][3])<<(3*blockSize)) ) if( ((pInOut[i] & SFmask[iVar][0])) < ((pInOut[i] & SFmask[iVar][3])<<(3*blockSize)) )
...@@ -102,7 +105,10 @@ inline int minTemp1_fast(word* pInOut, int iVar, int nWords, int* pDifStart) ...@@ -102,7 +105,10 @@ inline int minTemp1_fast(word* pInOut, int iVar, int nWords, int* pDifStart)
{ {
*pDifStart = i*100; *pDifStart = i*100;
while(temp == (temp & luckyMask(shiftSize*j))) while(temp == (temp & luckyMask(shiftSize*j)))
{
j++; j++;
assert( j < 100 );
}
*pDifStart += 21 - j; *pDifStart += 21 - j;
if( ((pInOut[i] & SFmask[iVar][1])<<(blockSize)) < ((pInOut[i] & SFmask[iVar][2])<<(2*blockSize)) ) if( ((pInOut[i] & SFmask[iVar][1])<<(blockSize)) < ((pInOut[i] & SFmask[iVar][2])<<(2*blockSize)) )
return 1; return 1;
...@@ -133,7 +139,10 @@ inline int minTemp2_fast(word* pInOut, int iVar, int iQ, int jQ, int nWords, int ...@@ -133,7 +139,10 @@ inline int minTemp2_fast(word* pInOut, int iVar, int iQ, int jQ, int nWords, int
{ {
*pDifStart = i*100; *pDifStart = i*100;
while(temp == (temp & luckyMask(shiftSize*j))) while(temp == (temp & luckyMask(shiftSize*j)))
{
j++; j++;
assert( j < 100 );
}
*pDifStart += 21 - j; *pDifStart += 21 - j;
if( ((pInOut[i] & SFmask[iVar][iQ])<<(iQ*blockSize)) <= ((pInOut[i] & SFmask[iVar][jQ])<<(jQ*blockSize)) ) if( ((pInOut[i] & SFmask[iVar][iQ])<<(iQ*blockSize)) <= ((pInOut[i] & SFmask[iVar][jQ])<<(jQ*blockSize)) )
return 0; return 0;
...@@ -160,7 +169,10 @@ inline int minTemp3_fast(word* pInOut, int iVar, int start, int finish, int iQ, ...@@ -160,7 +169,10 @@ inline int minTemp3_fast(word* pInOut, int iVar, int start, int finish, int iQ,
{ {
*pDifStart = i*100; *pDifStart = i*100;
while(temp == (temp & luckyMask(shiftSize*j))) while(temp == (temp & luckyMask(shiftSize*j)))
{
j++; j++;
assert( j < 100 );
}
*pDifStart += 21 - j; *pDifStart += 21 - j;
if( ((pInOut[i] & SFmask[iVar][iQ])<<(iQ*blockSize)) <= ((pInOut[i] & SFmask[iVar][jQ])<<(jQ*blockSize)) ) if( ((pInOut[i] & SFmask[iVar][iQ])<<(iQ*blockSize)) <= ((pInOut[i] & SFmask[iVar][jQ])<<(jQ*blockSize)) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment