Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-20 17:08:00 +02:00
Code Activity

Improvements to overflow arithmetic

Browse source
This commit is contained in:
Brian Fiete 2022-01-11 10:36:22 -05:00
parent eb375362a1
commit bf97431cdb
12 changed files with 91 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BeefLibs/corlib/src/Int32.bf
View file

@ -73,7 +73,7 @@ namespace System
}
while (valLeft < 0)
{
strChars[char8Idx] = (char8)('0' - (valLeft % 10));
strChars[char8Idx] = (char8)('0' &- (valLeft % 10));
valLeft /= 10;
char8Idx--;
}

2
BeefLibs/corlib/src/Int64.bf
View file

@ -91,7 +91,7 @@ namespace System
}
while ((valLeft < 0) || (minNumeralsLeft > 0))
{
strChars[char8Idx] = (char8)('0' - (valLeft % 10));
strChars[char8Idx] = (char8)('0' &- (valLeft % 10));
valLeft /= 10;
char8Idx--;
minNumeralsLeft--;

2
BeefLibs/corlib/src/Random.bf
View file

@ -80,7 +80,7 @@ namespace System
{
for (int32 i = 1; i < 56; i++)
{
SeedArray[i] -= SeedArray[1 + (i + 30) % 55];
SeedArray[i] &-= SeedArray[1 + (i + 30) % 55];
if (SeedArray[i] < 0) SeedArray[i] += MBIG;
}
}

24
BeefLibs/corlib/src/Security/Cryptography/MD5.bf
View file

@ -129,27 +129,27 @@ namespace System.Security.Cryptography
// The MD5 transformation for all four rounds.
mixin STEP_F(var a, var b, var c, var d, var x, var t, var s)
{
a += F!(b, c, d) + x + t;
a &+= F!(b, c, d) &+ x &+ t;
a = ((a << s) | ((a & 0xffffffff) >> (32 - s)));
a += b;
a &+= b;
}
mixin STEP_G(var a, var b, var c, var d, var x, var t, var s)
{
a += G!(b, c, d) + x + t;
a &+= G!(b, c, d) &+ x &+ t;
a = ((a << s) | ((a & 0xffffffff) >> (32 - s)));
a += b;
a &+= b;
}
mixin STEP_H(var a, var b, var c, var d, var x, var t, var s)
{
a += H!(b, c, d) + x + t;
a &+= H!(b, c, d) &+ x &+ t;
a = ((a << s) | ((a & 0xffffffff) >> (32 - s)));
a += b;
a &+= b;
}
mixin STEP_I(var a, var b, var c, var d, var x, var t, var s)
{
a += I!(b, c, d) + x + t;
a &+= I!(b, c, d) &+ x &+ t;
a = ((a << s) | ((a & 0xffffffff) >> (32 - s)));
a += b;
a &+= b;
}
// SET reads 4 input bytes in little-endian byte order and stores them
@ -249,10 +249,10 @@ namespace System.Security.Cryptography
STEP_I!(c, d, a, b, GET!(2), 0x2ad7d2bb, 15);
STEP_I!(b, c, d, a, GET!(9), 0xeb86d391, 21);
a += saved_a;
b += saved_b;
c += saved_c;
d += saved_d;
a &+= saved_a;
b &+= saved_b;
c &+= saved_c;
d &+= saved_d;
ptr += 64;
}

26
BeefLibs/corlib/src/Security/Cryptography/SHA256.bf
View file

@ -142,7 +142,7 @@ namespace System.Security.Cryptography
for (i = 0, j = 0; i < 16; ++i, j += 4)
m[i] = ((uint32)mData[j] << 24) | ((uint32)mData[j + 1] << 16) | ((uint32)mData[j + 2] << 8) | ((uint32)mData[j + 3]);
for ( ; i < 64; ++i)
m[i] = SIG1!(m[i - 2]) + m[i - 7] + SIG0!(m[i - 15]) + m[i - 16];
m[i] = SIG1!(m[i - 2]) &+ m[i - 7] &+ SIG0!(m[i - 15]) &+ m[i - 16];
a = mState[0];
b = mState[1];
@ -155,26 +155,26 @@ namespace System.Security.Cryptography
for (i = 0; i < 64; ++i)
{
t1 = h + EP1!(e) + CH!(e,f,g) + k[i] + m[i];
t2 = EP0!(a) + MAJ!(a,b,c);
t1 = h &+ EP1!(e) &+ CH!(e,f,g) &+ k[i] &+ m[i];
t2 = EP0!(a) &+ MAJ!(a,b,c);
h = g;
g = f;
f = e;
e = d + t1;
e = d &+ t1;
d = c;
c = b;
b = a;
a = t1 + t2;
a = t1 &+ t2;
}
mState[0] += a;
mState[1] += b;
mState[2] += c;
mState[3] += d;
mState[4] += e;
mState[5] += f;
mState[6] += g;
mState[7] += h;
mState[0] &+= a;
mState[1] &+= b;
mState[2] &+= c;
mState[3] &+= d;
mState[4] &+= e;
mState[5] &+= f;
mState[6] &+= g;
mState[7] &+= h;
}
public void Update(Span<uint8> data)

16
BeefLibs/corlib/src/String.bf
View file

@ -397,14 +397,14 @@ namespace System
let intSize = sizeof(int);
while (charsLeft >= intSize)
{
hash = (hash ^ *((int*)curPtr)) + (hash * 16777619);
hash = (hash ^ *((int*)curPtr)) &+ (hash &* 16777619);
charsLeft -= intSize;
curPtr += intSize;
}
while (charsLeft > 1)
{
hash = ((hash ^ (int)*curPtr) << 5) - hash;
hash = ((hash ^ (int)*curPtr) << 5) &- hash;
charsLeft--;
curPtr++;
}
@ -1774,8 +1774,8 @@ namespace System
//Contract.Assert((char8A | char8B) <= 0x7F, "strings have to be ASCII");
// uppercase both chars - notice that we need just one compare per char
if ((uint32)(charA - 'a') <= (uint32)('z' - 'a')) charA -= 0x20;
if ((uint32)(charB - 'a') <= (uint32)('z' - 'a')) charB -= 0x20;
if ((uint32)(charA &- 'a') <= (uint32)('z' - 'a')) charA -= 0x20;
if ((uint32)(charB &- 'a') <= (uint32)('z' - 'a')) charB -= 0x20;
//Return the (case-insensitive) difference between them.
if (charA != charB)
@ -1807,8 +1807,8 @@ namespace System
//Contract.Assert((char8A | char8B) <= 0x7F, "strings have to be ASCII");
// uppercase both chars - notice that we need just one compare per char
if ((uint32)(charA - 'a') <= (uint32)('z' - 'a')) charA -= 0x20;
if ((uint32)(charB - 'a') <= (uint32)('z' - 'a')) charB -= 0x20;
if ((uint32)(charA &- 'a') <= (uint32)('z' - 'a')) charA -= 0x20;
if ((uint32)(charB &- 'a') <= (uint32)('z' - 'a')) charB -= 0x20;
//Return the (case-insensitive) difference between them.
if (charA != charB)
@ -1835,8 +1835,8 @@ namespace System
//Contract.Assert((char8A | char8B) <= 0x7F, "strings have to be ASCII");
// uppercase both chars - notice that we need just one compare per char
if ((uint32)(charA - 'a') <= (uint32)('z' - 'a')) charA -= 0x20;
if ((uint32)(charB - 'a') <= (uint32)('z' - 'a')) charB -= 0x20;
if ((uint32)(charA &- 'a') <= (uint32)('z' - 'a')) charA -= 0x20;
if ((uint32)(charB &- 'a') <= (uint32)('z' - 'a')) charB -= 0x20;
//Return the (case-insensitive) difference between them.
if (charA != charB)