X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/43ea7558955ca453d4687c62d12efcb585124e8a..aac19f0d10e3e1a41ddb5ca3fdbdaab97d2d439d:/symm/rijndael-arm-crypto.S

diff --git a/symm/rijndael-arm-crypto.S b/symm/rijndael-arm-crypto.S
index 5ca516e3..8a5484c8 100644
--- a/symm/rijndael-arm-crypto.S
+++ b/symm/rijndael-arm-crypto.S
@@ -30,8 +30,8 @@
 #include "config.h"
 #include "asm-common.h"
 
-	.globl	F(abort)
-	.globl	F(rijndael_rcon)
+	.extern	F(abort)
+	.extern	F(rijndael_rcon)
 
 ///--------------------------------------------------------------------------
 /// Main code.
@@ -70,7 +70,7 @@ FUNC(rijndael_setup_arm_crypto)
 	//	r2 = pointer to key material
 	//	r3 = key size in words
 
-	stmfd	sp!, {r4-r9, r14}
+	pushreg	r4-r9, r14
 
 	// The initial round key material is taken directly from the input
 	// key, so copy it over.  Unfortunately, the key material is not
@@ -104,7 +104,7 @@ FUNC(rijndael_setup_arm_crypto)
 	mla	r2, r1, r7, r1		// total key size in words
 	leaextq	r5, rijndael_rcon	// round constants
 	sub	r8, r2, r3		// minus what we've copied already
-	veor	q1, q1			// all-zero register for the key
+	vmov.i32 q1, #0			// all-zero register for the key
 	add	r8, r9, r8, lsl #2	// limit of the key buffer
 	mov	r12, #0			// position in current cycle
 
@@ -128,7 +128,6 @@ FUNC(rijndael_setup_arm_crypto)
 	// First word of the cycle.  Byte substitution, rotation, and round
 	// constant.
 1:	ldrb	r14, [r5], #1		// next round constant
-	ldr	r6, [r9, -r3, lsl #2]
 	vdup.32	q0, r4
 	aese.8	q0, q1			// effectively, just SubBytes
 	vmov.32	r4, d0[0]
@@ -209,11 +208,14 @@ FUNC(rijndael_setup_arm_crypto)
 	bl	endswap_block
 
 	// All done.
-9:	ldmfd	sp!, {r4-r9, pc}
+9:	popreg	r4-r9, pc
 
-endswap_block:
+ENDFUNC
+
+INTFUNC(endswap_block)
 	// End-swap R2 words starting at R1.  R1 is clobbered; R2 is not.
 	// It's OK to work in 16-byte chunks.
+
 	mov	r4, r2
 0:	vldmia	r1, {d0, d1}
 	vrev32.8 q0, q0