status-im
/
nim-stint
mirror of https://github.com/status-im/nim-stint.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

nimvm workaround for primitives

This commit is contained in:
jangko 2023-06-13 08:35:35 +07:00
parent 7ce536423a
commit 8c5a96463c
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stint/private/primitives/addcarry_subborrow.nim
View File

@ -107,14 +107,14 @@ func addC*(cOut: var Carry, sum: var uint32, a, b: uint32, cIn: Carry) {.inline.
## (CarryOut, Sum) <- a + b + CarryIn ## (CarryOut, Sum) <- a + b + CarryIn
when nimvm: when nimvm:
let dblPrec = uint64(cIn) + uint64(a) + uint64(b) let dblPrec = uint64(cIn) + uint64(a) + uint64(b)
sum = (uint32)(dblPrec) sum = uint32(dblPrec and uint32.high)
cOut = Carry(dblPrec shr 32) cOut = Carry(dblPrec shr 32)
else: else:
when X86: when X86:
cOut = addcarry_u32(cIn, a, b, sum) cOut = addcarry_u32(cIn, a, b, sum)
else: else:
let dblPrec = uint64(cIn) + uint64(a) + uint64(b) let dblPrec = uint64(cIn) + uint64(a) + uint64(b)
sum = (uint32)(dblPrec) sum = uint32(dblPrec)
cOut = Carry(dblPrec shr 32) cOut = Carry(dblPrec shr 32)
func subB*(bOut: var Borrow, diff: var uint32, a, b: uint32, bIn: Borrow) {.inline.} = func subB*(bOut: var Borrow, diff: var uint32, a, b: uint32, bIn: Borrow) {.inline.} =
@ -122,7 +122,7 @@ func subB*(bOut: var Borrow, diff: var uint32, a, b: uint32, bIn: Borrow) {.inli
## (BorrowOut, Diff) <- a - b - borrowIn ## (BorrowOut, Diff) <- a - b - borrowIn
when nimvm: when nimvm:
let dblPrec = uint64(a) - uint64(b) - uint64(bIn) let dblPrec = uint64(a) - uint64(b) - uint64(bIn)
diff = (uint32)(dblPrec) diff = uint32(dblPrec and uint32.high)
# On borrow the high word will be 0b1111...1111 and needs to be masked # On borrow the high word will be 0b1111...1111 and needs to be masked
bOut = Borrow((dblPrec shr 32) and 1) bOut = Borrow((dblPrec shr 32) and 1)
else: else:
@ -130,7 +130,7 @@ func subB*(bOut: var Borrow, diff: var uint32, a, b: uint32, bIn: Borrow) {.inli
bOut = subborrow_u32(bIn, a, b, diff) bOut = subborrow_u32(bIn, a, b, diff)
else: else:
let dblPrec = uint64(a) - uint64(b) - uint64(bIn) let dblPrec = uint64(a) - uint64(b) - uint64(bIn)
diff = (uint32)(dblPrec) diff = uint32(dblPrec)
# On borrow the high word will be 0b1111...1111 and needs to be masked # On borrow the high word will be 0b1111...1111 and needs to be masked
bOut = Borrow((dblPrec shr 32) and 1) bOut = Borrow((dblPrec shr 32) and 1)

9
stint/private/primitives/extended_precision.nim
View File

@ -41,6 +41,9 @@ func mul*(hi, lo: var uint32, a, b: uint32) {.inline.} =
## Extended precision multiplication ## Extended precision multiplication
## (hi, lo) <- a*b ## (hi, lo) <- a*b
let dblPrec = uint64(a) * uint64(b) let dblPrec = uint64(a) * uint64(b)
when nimvm:
lo = uint32(dblPrec and uint32.high)
else:
lo = uint32(dblPrec) lo = uint32(dblPrec)
hi = uint32(dblPrec shr 32) hi = uint32(dblPrec shr 32)
@ -51,6 +54,9 @@ func muladd1*(hi, lo: var uint32, a, b, c: uint32) {.inline.} =
## Note: 0xFFFFFFFF² -> (hi: 0xFFFFFFFE, lo: 0x00000001) ## Note: 0xFFFFFFFF² -> (hi: 0xFFFFFFFE, lo: 0x00000001)
## so adding any c cannot overflow ## so adding any c cannot overflow
let dblPrec = uint64(a) * uint64(b) + uint64(c) let dblPrec = uint64(a) * uint64(b) + uint64(c)
when nimvm:
lo = uint32(dblPrec and uint32.high)
else:
lo = uint32(dblPrec) lo = uint32(dblPrec)
hi = uint32(dblPrec shr 32) hi = uint32(dblPrec shr 32)
@ -63,6 +69,9 @@ func muladd2*(hi, lo: var uint32, a, b, c1, c2: uint32) {.inline.}=
## so adding 0xFFFFFFFF leads to (hi: 0xFFFFFFFF, lo: 0x00000000) ## so adding 0xFFFFFFFF leads to (hi: 0xFFFFFFFF, lo: 0x00000000)
## and we have enough space to add again 0xFFFFFFFF without overflowing ## and we have enough space to add again 0xFFFFFFFF without overflowing
let dblPrec = uint64(a) * uint64(b) + uint64(c1) + uint64(c2) let dblPrec = uint64(a) * uint64(b) + uint64(c1) + uint64(c2)
when nimvm:
lo = uint32(dblPrec and uint32.high)
else:
lo = uint32(dblPrec) lo = uint32(dblPrec)
hi = uint32(dblPrec shr 32) hi = uint32(dblPrec shr 32)