key/key-io.c: Add low-level `key_mergeline' and `key_extractline' functions.
[catacomb] / symm / salsa20-x86ish-sse2.S
index ad4e322..5dc9c17 100644 (file)
 /// 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
@@ -69,7 +69,7 @@ FUNC(salsa20_core_x86ish_sse2)
 #  define SAVE3 [esp + 16]
 
        pushreg ebp
-       setfp   ebp
+       setfp
        sub     esp, 32
        mov     IN, [ebp + 12]
        mov     OUT, [ebp + 16]
@@ -305,7 +305,7 @@ FUNC(salsa20_core_x86ish_sse2)
 #endif
 #if CPUFAM_AMD64 && ABI_WIN
        rstrxmm xmm6, 0
-       rsrrxmm xmm7, 16
+       rstrxmm xmm7, 16
        stfree  64 + 8
 #endif