logos-storage/constantine
1
0
Fork 0
mirror of https://github.com/logos-storage/constantine.git synced 2026-01-08 16:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix inline assembly comments breaking build

Browse Source
This commit is contained in:
Mamy André-Ratsimbazafy 2020-02-09 15:53:21 +01:00
parent b9a37825a3
commit 57ee2cb6bd
No known key found for this signature in database
GPG Key ID: 7B88AD1FE79492E1
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
constantine/private/word_types_internal.nim
View File

@ -30,11 +30,12 @@ func asm_x86_64_extMul(hi, lo: var uint64, a, b: uint64) {.inline.}=
# - High word in RDX # - High word in RDX
# - Low word in RAX # - Low word in RAX
# Don't forget to dereference the var hidden pointer in hi/lo
asm """ asm """
mulq %[operand] mulq %[operand]
: "=d" (`*hi`), "=a" (`*lo`) // Don't forget to dereference the var hidden pointer : "=d" (`*hi`), "=a" (`*lo`)
: "a" (`a`), [operand] "rm" (`b`) : "a" (`a`), [operand] "rm" (`b`)
: // no clobbered registers :
""" """
func unsafeExtendedPrecMul*(hi, lo: var Ct[uint64], a, b: Ct[uint64]) {.inline.}= func unsafeExtendedPrecMul*(hi, lo: var Ct[uint64], a, b: Ct[uint64]) {.inline.}=
@ -75,11 +76,16 @@ func asm_x86_64_div2n1n(q, r: var uint64, n_hi, n_lo, d: uint64) {.inline.}=
# Result # Result
# - Quotient in RAX # - Quotient in RAX
# - Remainder in RDX # - Remainder in RDX
# 1. name the register/memory "divisor"
# 2. don't forget to dereference the var hidden pointer
# 3. -
# 4. no clobbered registers beside explectly used RAX and RDX
asm """ asm """
divq %[divisor] // We name the register/memory divisor divq %[divisor]
: "=a" (`*q`), "=d" (`*r`) // Don't forget to dereference the var hidden pointer : "=a" (`*q`), "=d" (`*r`)
: "d" (`n_hi`), "a" (`n_lo`), [divisor] "rm" (`d`) : "d" (`n_hi`), "a" (`n_lo`), [divisor] "rm" (`d`)
: // no register clobbered besides explicitly used RAX and RDX :
""" """
func unsafeDiv2n1n*(q, r: var Ct[uint64], n_hi, n_lo, d: Ct[uint64]) {.inline.}= func unsafeDiv2n1n*(q, r: var Ct[uint64], n_hi, n_lo, d: Ct[uint64]) {.inline.}=

6
constantine/word_types.nim
View File

@ -126,16 +126,18 @@ func `or`*(x, y: CTBool): CTBool {.magic: "BitorI".}
template mux*[T: Ct](ctl: CTBool[T], x, y: T): T = template mux*[T: Ct](ctl: CTBool[T], x, y: T): T =
## Multiplexer / selector ## Multiplexer / selector
## Returns x if ctl == 1 ## Returns x if ctl is true
## else returns y ## else returns y
## So equivalent to ctl? x: y ## So equivalent to ctl? x: y
y xor (-T(ctl) and (x xor y)) y xor (-T(ctl) and (x xor y))
# TODO verify assembly generated # TODO verify assembly generated
# as mentionned in https://cryptocoding.net/index.php/Coding_rules # as mentioned in https://cryptocoding.net/index.php/Coding_rules
# the alternative `(x and ctl) or (y and -ctl)` # the alternative `(x and ctl) or (y and -ctl)`
# is optimized into a branch by Clang :/ # is optimized into a branch by Clang :/
# TODO: assembly fastpath for conditional mov
func noteq[T: Ct](x, y: T): CTBool[T] = func noteq[T: Ct](x, y: T): CTBool[T] =
const msb = T.sizeof * 8 - 1 const msb = T.sizeof * 8 - 1
let z = x xor y let z = x xor y