diff options
| author | Andy Polyakov <appro@openssl.org> | 2011-11-05 13:57:02 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2011-11-05 13:57:02 +0000 |
| commit | 04c80626369227c139eff7d1c4bfb4597659c775 (patch) | |
| tree | 31df17d275fda1e75ca366a0667b412bf5105e0b | |
| parent | 6fcc2bbce88a4b5338c62df12d8adae82597f97d (diff) | |
armv4cpuid.S, armv4-gf2m.pl: make newest code compilable by older assembler [from HEAD].
| -rw-r--r-- | crypto/armv4cpuid.S | 12 | ||||
| -rw-r--r-- | crypto/bn/asm/armv4-gf2m.pl | 34 |
2 files changed, 23 insertions, 23 deletions
diff --git a/crypto/armv4cpuid.S b/crypto/armv4cpuid.S index c9102ca2a5..2d618deaa4 100644 --- a/crypto/armv4cpuid.S +++ b/crypto/armv4cpuid.S @@ -44,7 +44,7 @@ OPENSSL_atomic_add: bne .Lspin ldr r2,[r4] - add r2,r5 + add r2,r2,r5 str r2,[r4] str r0,[r6] @ release spinlock ldmia sp!,{r4-r6,lr} @@ -59,26 +59,26 @@ OPENSSL_atomic_add: OPENSSL_cleanse: eor ip,ip,ip cmp r1,#7 - subhs r1,#4 + subhs r1,r1,#4 bhs .Lot cmp r1,#0 beq .Lcleanse_done .Little: strb ip,[r0],#1 - subs r1,#1 + subs r1,r1,#1 bhi .Little b .Lcleanse_done .Lot: tst r0,#3 beq .Laligned strb ip,[r0],#1 - sub r1,#1 + sub r1,r1,#1 b .Lot .Laligned: str ip,[r0],#4 - subs r1,#4 + subs r1,r1,#4 bhs .Laligned - adds r1,#4 + adds r1,r1,#4 bne .Little .Lcleanse_done: tst lr,#1 diff --git a/crypto/bn/asm/armv4-gf2m.pl b/crypto/bn/asm/armv4-gf2m.pl index 9928dae872..c52e0b75b5 100644 --- a/crypto/bn/asm/armv4-gf2m.pl +++ b/crypto/bn/asm/armv4-gf2m.pl @@ -218,38 +218,38 @@ $code.=<<___; mov $b,r3 @ $b=b1 ldr r3,[sp,#32] @ load b0 mov $mask,#7<<2 - sub sp,#32 @ allocate tab[8] + sub sp,sp,#32 @ allocate tab[8] bl mul_1x1_ialu @ a1·b1 str $lo,[$ret,#8] str $hi,[$ret,#12] - eor $b,r3 @ flip b0 and b1 - eor $a,r2 @ flip a0 and a1 - eor r3,$b - eor r2,$a - eor $b,r3 - eor $a,r2 + eor $b,$b,r3 @ flip b0 and b1 + eor $a,$a,r2 @ flip a0 and a1 + eor r3,r3,$b + eor r2,r2,$a + eor $b,$b,r3 + eor $a,$a,r2 bl mul_1x1_ialu @ a0·b0 str $lo,[$ret] str $hi,[$ret,#4] - eor $a,r2 - eor $b,r3 + eor $a,$a,r2 + eor $b,$b,r3 bl mul_1x1_ialu @ (a1+a0)·(b1+b0) ___ @r=map("r$_",(6..9)); $code.=<<___; ldmia $ret,{@r[0]-@r[3]} - eor $lo,$hi - eor $hi,@r[1] - eor $lo,@r[0] - eor $hi,@r[2] - eor $lo,@r[3] - eor $hi,@r[3] + eor $lo,$lo,$hi + eor $hi,$hi,@r[1] + eor $lo,$lo,@r[0] + eor $hi,$hi,@r[2] + eor $lo,$lo,@r[3] + eor $hi,$hi,@r[3] str $hi,[$ret,#8] - eor $lo,$hi - add sp,#32 @ destroy tab[8] + eor $lo,$lo,$hi + add sp,sp,#32 @ destroy tab[8] str $lo,[$ret,#4] #if __ARM_ARCH__>=5 |