From 77be93c2013675a28993e427e4753ca40b43f08f Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Sun, 15 Feb 2015 14:50:20 +0100 Subject: [PATCH] fix compile errors --- src/mul/fp_mul_comba.c | 4 +++- src/sqr/fp_sqr_comba.c | 2 +- src/sqr/fp_sqr_comba_generic.c | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/mul/fp_mul_comba.c b/src/mul/fp_mul_comba.c index 1bec1e1..ea95443 100644 --- a/src/mul/fp_mul_comba.c +++ b/src/mul/fp_mul_comba.c @@ -349,7 +349,9 @@ void fp_mul_comba(fp_int *A, fp_int *B, fp_int *C) /* execute loop */ COMBA_FORWARD; for (iz = 0; iz < iy; ++iz) { - MULADD(*tmpx++, *tmpy--); + fp_digit _tmpx = *tmpx++; + fp_digit _tmpy = *tmpy--; + MULADD(_tmpx, _tmpy); } /* store term */ diff --git a/src/sqr/fp_sqr_comba.c b/src/sqr/fp_sqr_comba.c index 9a63b4f..49525be 100644 --- a/src/sqr/fp_sqr_comba.c +++ b/src/sqr/fp_sqr_comba.c @@ -109,7 +109,7 @@ asm( \ "addq %%rax,%0 \n\t" \ "adcq %%rdx,%1 \n\t" \ "adcq $0,%2 \n\t" \ - :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i) :"%rax","%rdx","cc"); + :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "x"(i) :"%rax","%rdx","cc"); #define SQRADD2(i, j) \ asm( \ diff --git a/src/sqr/fp_sqr_comba_generic.c b/src/sqr/fp_sqr_comba_generic.c index c5d1618..168bd9d 100644 --- a/src/sqr/fp_sqr_comba_generic.c +++ b/src/sqr/fp_sqr_comba_generic.c @@ -68,12 +68,15 @@ void fp_sqr_comba(fp_int *A, fp_int *B) /* execute loop */ for (iz = 0; iz < iy; iz++) { - SQRADD2(*tmpx++, *tmpy--); + fp_digit _tmpx = *tmpx++; + fp_digit _tmpy = *tmpy--; + SQRADD2(_tmpx, _tmpy); } /* even columns have the square term in them */ if ((ix&1) == 0) { - SQRADD(A->dp[ix>>1], A->dp[ix>>1]); + fp_digit _a_dp = A->dp[ix>>1]; + SQRADD(_a_dp, A->dp[ix>>1]); } /* store it */