X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/925ff94a516478164fdd01d53332637455e0074d..bd6d65e32b835551677456bf286d09ced6859882:/symm/salsa20-x86ish-sse2.S

diff --git a/symm/salsa20-x86ish-sse2.S b/symm/salsa20-x86ish-sse2.S
index 06ba3d2c..26bab892 100644
--- a/symm/salsa20-x86ish-sse2.S
+++ b/symm/salsa20-x86ish-sse2.S
@@ -25,16 +25,16 @@
 /// MA 02111-1307, USA.
 
 ///--------------------------------------------------------------------------
-/// External definitions.
+/// Preliminaries.
 
 #include "config.h"
 #include "asm-common.h"
 
+	.text
+
 ///--------------------------------------------------------------------------
 /// Main code.
 
-	.text
-
 FUNC(salsa20_core_x86ish_avx)
 	.arch	.avx
 	vzeroupper
@@ -65,16 +65,16 @@ FUNC(salsa20_core_x86ish_sse2)
 #  define OUT edx
 #  define SAVE0 xmm6
 #  define SAVE1 xmm7
-#  define SAVE2 [esp + 0]
-#  define SAVE3 [esp + 16]
-
-	pushreg	ebp
-	setfp	ebp
-	sub	esp, 32
-	mov	IN, [ebp + 12]
-	mov	OUT, [ebp + 16]
-	and	esp, ~15
-	mov	NR, [ebp + 8]
+#  define SAVE2 [SP + 0]
+#  define SAVE3 [SP + 16]
+
+	pushreg	BP
+	setfp
+	stalloc	32
+	mov	IN, [BP + 12]
+	mov	OUT, [BP + 16]
+	and	SP, ~15
+	mov	NR, [BP + 8]
 #endif
 
 #if CPUFAM_AMD64 && ABI_SYSV
@@ -107,8 +107,8 @@ FUNC(salsa20_core_x86ish_sse2)
 #  define OUT r8
 #  define SAVE0 xmm6
 #  define SAVE1 xmm7
-#  define SAVE2 [rsp + 32]
-#  define SAVE3 [rsp + 48]
+#  define SAVE2 [SP + 32]
+#  define SAVE3 [SP + 48]
 
 	stalloc	64 + 8
 	savexmm	xmm6, 0
@@ -301,7 +301,7 @@ FUNC(salsa20_core_x86ish_sse2)
 	// Tidy things up.
 #if CPUFAM_X86
 	dropfp
-	popreg	ebp
+	popreg	BP
 #endif
 #if CPUFAM_AMD64 && ABI_WIN
 	rstrxmm	xmm6, 0