status-im/nim-stint
2
0
Fork 0
mirror of https://github.com/status-im/nim-stint.git synced 2025-02-18 01:47:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix noInit issue at runtime, pass the bitwise tests

Browse Source
This commit is contained in:
Mamy André-Ratsimbazafy 2020-06-13 17:03:50 +02:00 committed by jangko
parent 195480d58a
commit 3df7f38260
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
stint/uintops.nim
View File

@ -128,17 +128,17 @@ func `xor`*(a, b: Stuint): Stuint =
wr = wa xor wb wr = wa xor wb
result.clearExtraBits() result.clearExtraBits()
func countOnes*(a: Stuint): int {.inline.} = func countOnes*(a: Stuint): int =
result = 0 result = 0
for wa in leastToMostSig(a): for wa in leastToMostSig(a):
result += countOnes(wa) result += countOnes(wa)
func parity*(a: Stuint): int {.inline.} = func parity*(a: Stuint): int =
result = parity(a.limbs[0]) result = parity(a.limbs[0])
for i in 1 ..< a.limbs.len: for i in 1 ..< a.limbs.len:
result = result xor parity(a.limbs[i]) result = result xor parity(a.limbs[i])
func leadingZeros*(a: Stuint): int {.inline.} = func leadingZeros*(a: Stuint): int =
result = 0 result = 0
for word in mostToLeastSig(a): for word in mostToLeastSig(a):
let zeroCount = word.leadingZeros() let zeroCount = word.leadingZeros()
@ -146,7 +146,7 @@ func leadingZeros*(a: Stuint): int {.inline.} =
if zeroCount != WordBitWidth: if zeroCount != WordBitWidth:
return return
func trailingZeros*(a: Stuint): int {.inline.} = func trailingZeros*(a: Stuint): int =
result = 0 result = 0
for word in leastToMostSig(a): for word in leastToMostSig(a):
let zeroCount = word.leadingZeros() let zeroCount = word.leadingZeros()
@ -154,14 +154,17 @@ func trailingZeros*(a: Stuint): int {.inline.} =
if zeroCount != WordBitWidth: if zeroCount != WordBitWidth:
return return
func firstOne*(a: Stuint): int {.inline.} = func firstOne*(a: Stuint): int =
result = trailingZeros(a) result = trailingZeros(a)
if result == a.limbs.len * WordBitWidth: if result == a.limbs.len * WordBitWidth:
result = 0 result = 0
else: else:
result += 1 result += 1
func `shr`*(a: Stuint, k: SomeInteger): Stuint {.inline.} = {.pop.} # End noInit
{.push raises: [], inline, gcsafe.}
func `shr`*(a: Stuint, k: SomeInteger): Stuint =
## Shift right by k bits ## Shift right by k bits
if k < WordBitWidth: if k < WordBitWidth:
result.limbs.shrSmall(a.limbs, k) result.limbs.shrSmall(a.limbs, k)
@ -176,7 +179,7 @@ func `shr`*(a: Stuint, k: SomeInteger): Stuint {.inline.} =
else: else:
result.limbs.shrLarge(a.limbs, w, shift) result.limbs.shrLarge(a.limbs, w, shift)
func `shl`*(a: Stuint, k: SomeInteger): Stuint {.inline.} = func `shl`*(a: Stuint, k: SomeInteger): Stuint =
## Shift left by k bits ## Shift left by k bits
if k < WordBitWidth: if k < WordBitWidth:
result.limbs.shlSmall(a.limbs, k) result.limbs.shlSmall(a.limbs, k)
@ -194,7 +197,7 @@ func `shl`*(a: Stuint, k: SomeInteger): Stuint {.inline.} =
result.clearExtraBits() result.clearExtraBits()
{.pop.} # End inline {.pop.}
# Addsub # Addsub
# -------------------------------------------------------- # --------------------------------------------------------