key/key-io.c: Add low-level `key_mergeline' and `key_extractline' functions.

[catacomb] / symm / chacha-x86ish-sse2.S

diff --git a/symm/chacha-x86ish-sse2.S b/symm/chacha-x86ish-sse2.S
index 77047eb..3fb623a 100644 (file)
--- a/symm/chacha-x86ish-sse2.S
+++ b/symm/chacha-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(chacha_core_x86ish_avx)
        .arch   .avx
        vzeroupper
@@ -69,7 +69,7 @@ FUNC(chacha_core_x86ish_sse2)
 #  define SAVE3 [esp]
 
        pushreg ebp
-       setfp   ebp
+       setfp
        sub     esp, 16
        mov     IN, [ebp + 12]
        mov     OUT, [ebp + 16]