wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4317 from SparkiDev/math_x86_asm_fix

Browse Source 
Maths x86 asm: change asm snippets to get compiling
This commit is contained in:
David Garske
2021-08-20 13:42:15 -07:00
committed by GitHub
parent e7ef48d2b7 fa8f23284d
commit 26cf17e602
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
wolfcrypt/src/asm.c
View File

@@ -698,33 +698,39 @@ __asm__( \
#define SQRADD(i, j) \ #define SQRADD(i, j) \
__asm__( \ __asm__( \
"movl %6,%%eax \n\t" \ "movl %3,%%eax \n\t" \
"mull %%eax \n\t" \ "mull %%eax \n\t" \
"addl %%eax,%0 \n\t" \ "addl %%eax,%0 \n\t" \
"adcl %%edx,%1 \n\t" \ "adcl %%edx,%1 \n\t" \
"adcl $0,%2 \n\t" \ "adcl $0,%2 \n\t" \
:"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i) :"%eax","%edx","cc"); :"+rm"(c0), "+rm"(c1), "+rm"(c2) \
: "m"(i) \
:"%eax","%edx","cc");
#define SQRADD2(i, j) \ #define SQRADD2(i, j) \
__asm__( \ __asm__( \
"movl %6,%%eax \n\t" \ "movl %3,%%eax \n\t" \
"mull %7 \n\t" \ "mull %4 \n\t" \
"addl %%eax,%0 \n\t" \ "addl %%eax,%0 \n\t" \
"adcl %%edx,%1 \n\t" \ "adcl %%edx,%1 \n\t" \
"adcl $0,%2 \n\t" \ "adcl $0,%2 \n\t" \
"addl %%eax,%0 \n\t" \ "addl %%eax,%0 \n\t" \
"adcl %%edx,%1 \n\t" \ "adcl %%edx,%1 \n\t" \
"adcl $0,%2 \n\t" \ "adcl $0,%2 \n\t" \
:"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j) :"%eax","%edx", "cc"); :"+rm"(c0), "+rm"(c1), "+rm"(c2) \
: "m"(i), "m"(j) \
:"%eax","%edx", "cc");
#define SQRADDSC(i, j) \ #define SQRADDSC(i, j) \
__asm__( \ __asm__( \
"movl %3,%%eax \n\t" \ "movl %3,%%eax \n\t" \
"mull %4 \n\t" \ "mull %4 \n\t" \
"movl %%eax,%0 \n\t" \ "movl %%eax,%0 \n\t" \
"movl %%edx,%1 \n\t" \ "movl %%edx,%1 \n\t" \
"xorl %2,%2 \n\t" \ "xorl %2,%2 \n\t" \
:"=r"(sc0), "=r"(sc1), "=r"(sc2): "g"(i), "g"(j) :"%eax","%edx","cc"); :"=r"(sc0), "=r"(sc1), "=r"(sc2) \
: "g"(i), "g"(j) \
:"%eax","%edx","cc");
#define SQRADDAC(i, j) \ #define SQRADDAC(i, j) \
__asm__( \ __asm__( \
@@ -733,7 +739,9 @@ __asm__( \
"addl %%eax,%0 \n\t" \ "addl %%eax,%0 \n\t" \
"adcl %%edx,%1 \n\t" \ "adcl %%edx,%1 \n\t" \
"adcl $0,%2 \n\t" \ "adcl $0,%2 \n\t" \
:"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%eax","%edx","cc"); :"=r"(sc0), "=r"(sc1), "=r"(sc2) \
: "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) \
:"%eax","%edx","cc");
#define SQRADDDB \ #define SQRADDDB \
__asm__( \ __asm__( \
@@ -743,7 +751,10 @@ __asm__( \
"addl %6,%0 \n\t" \ "addl %6,%0 \n\t" \
"adcl %7,%1 \n\t" \ "adcl %7,%1 \n\t" \
"adcl %8,%2 \n\t" \ "adcl %8,%2 \n\t" \
:"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "cc"); :"=r"(c0), "=r"(c1), "=r"(c2) \
: "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), \
"r"(sc2) \
: "cc");
#elif defined(TFM_X86_64) #elif defined(TFM_X86_64)
/* x86-64 optimized */ /* x86-64 optimized */

6
wolfcrypt/src/sp_int.c
View File

@@ -477,7 +477,7 @@ static WC_INLINE sp_int_digit sp_div_word(sp_int_digit hi, sp_int_digit lo,
"addl %%eax, %[l] \n\t" \ "addl %%eax, %[l] \n\t" \
"adcl %%edx, %[h] \n\t" \ "adcl %%edx, %[h] \n\t" \
"adcl $0 , %[o] \n\t" \ "adcl $0 , %[o] \n\t" \
: [l] "+r" (vl), [h] "+r" (vh), [o] "+r" (vo) \ : [l] "+rm" (vl), [h] "+rm" (vh), [o] "+rm" (vo) \
: [a] "r" (va), [b] "r" (vb) \ : [a] "r" (va), [b] "r" (vb) \
: "eax", "edx", "cc" \ : "eax", "edx", "cc" \
) )
@@ -503,7 +503,7 @@ static WC_INLINE sp_int_digit sp_div_word(sp_int_digit hi, sp_int_digit lo,
"addl %%eax, %[l] \n\t" \ "addl %%eax, %[l] \n\t" \
"adcl %%edx, %[h] \n\t" \ "adcl %%edx, %[h] \n\t" \
"adcl $0 , %[o] \n\t" \ "adcl $0 , %[o] \n\t" \
: [l] "+r" (vl), [h] "+r" (vh), [o] "+r" (vo) \ : [l] "+rm" (vl), [h] "+rm" (vh), [o] "+rm" (vo) \
: [a] "r" (va), [b] "r" (vb) \ : [a] "r" (va), [b] "r" (vb) \
: "eax", "edx", "cc" \ : "eax", "edx", "cc" \
) )
@@ -542,7 +542,7 @@ static WC_INLINE sp_int_digit sp_div_word(sp_int_digit hi, sp_int_digit lo,
"addl %%eax, %[l] \n\t" \ "addl %%eax, %[l] \n\t" \
"adcl %%edx, %[h] \n\t" \ "adcl %%edx, %[h] \n\t" \
"adcl $0 , %[o] \n\t" \ "adcl $0 , %[o] \n\t" \
: [l] "+r" (vl), [h] "+r" (vh), [o] "+r" (vo) \ : [l] "+rm" (vl), [h] "+rm" (vh), [o] "+rm" (vo) \
: [a] "m" (va) \ : [a] "m" (va) \
: "eax", "edx", "cc" \ : "eax", "edx", "cc" \
) )