Switch to non-logarithmic ALIGN macro.

6 files changed, 9 insertions, 12 deletions

diff --git a/x86/aes-decrypt-internal.asm b/x86/aes-decrypt-internal.asm
index c19853ff..64e59283 100644
--- a/x86/aes-decrypt-internal.asm
+++ b/x86/aes-decrypt-internal.asm
@@ -1,4 +1,3 @@
-C -*- mode: asm; asm-comment-char: ?C; -*-  
 C nettle, low-level cryptographics library
 C 
 C Copyright (C) 2001, 2002, 2005 Rafael R. Sevilla, Niels Möller
@@ -61,7 +60,7 @@ C %edi is a temporary, often used as an accumulator.
 	C	       unsigned length, uint8_t *dst,
 	C	       uint8_t *src)
 	.text
-	ALIGN(4)
+	ALIGN(16)
 PROLOGUE(_nettle_aes_decrypt)
 	C save all registers that need to be saved
 	pushl	%ebx		C  20(%esp)
@@ -94,7 +93,7 @@ PROLOGUE(_nettle_aes_decrypt)
 
 	addl	$16,KEY		C  point to next key
 	movl	KEY,FRAME_KEY
-	ALIGN(4)
+	ALIGN(16)
 .Lround_loop:
 	AES_ROUND(T, SA,SD,SC,SB, TMP, KEY)
 	movl	TMP, TA
diff --git a/x86/aes-encrypt-internal.asm b/x86/aes-encrypt-internal.asm
index fc7d2c40..9fe32fc5 100644
--- a/x86/aes-encrypt-internal.asm
+++ b/x86/aes-encrypt-internal.asm
@@ -1,4 +1,3 @@
-C -*- mode: asm; asm-comment-char: ?C; -*-  
 C nettle, low-level cryptographics library
 C 
 C Copyright (C) 2001, 2002, 2005 Rafael R. Sevilla, Niels Möller
@@ -61,7 +60,7 @@ C %edi is a temporary, often used as an accumulator.
 	C	       unsigned length, uint8_t *dst,
 	C	       uint8_t *src)
 	.text
-	ALIGN(4)
+	ALIGN(16)
 PROLOGUE(_nettle_aes_encrypt)
 	C save all registers that need to be saved
 	pushl	%ebx		C  20(%esp)
@@ -94,7 +93,7 @@ PROLOGUE(_nettle_aes_encrypt)
 
 	addl	$16,KEY		C  point to next key
 	movl	KEY,FRAME_KEY
-	ALIGN(4)
+	ALIGN(16)
 .Lround_loop:
 	AES_ROUND(T, SA,SB,SC,SD, TMP, KEY)
 	movl	TMP, TA
diff --git a/x86/arcfour-crypt.asm b/x86/arcfour-crypt.asm
index 842ae4a5..89ee7c9e 100644
--- a/x86/arcfour-crypt.asm
+++ b/x86/arcfour-crypt.asm
@@ -23,7 +23,7 @@ C MA 02111-1301, USA.
 	C               unsigned length, uint8_t *dst,
 	C               const uint8_t *src)
 	.text
-	ALIGN(4)
+	ALIGN(16)
 PROLOGUE(nettle_arcfour_crypt)
 	C save all registers that need to be saved
 	pushl	%ebx		C  12(%esp)
@@ -63,7 +63,7 @@ C Register usage:
 	sarl	$1, %edx
 	jc	.Lloop_odd
 	
-	ALIGN(4)
+	ALIGN(16)
 .Lloop:
 	movb	(%ebp, %eax), %cl	C  si.
 	addb    %cl, %bl
diff --git a/x86/camellia-crypt-internal.asm b/x86/camellia-crypt-internal.asm
index e8d892d3..7766220e 100644
--- a/x86/camellia-crypt-internal.asm
+++ b/x86/camellia-crypt-internal.asm
@@ -1,4 +1,3 @@
-C -*- mode: asm; asm-comment-char: ?C; -*-  
 C nettle, low-level cryptographics library
 C 
 C Copyright (C) 2010, Niels Möller
@@ -142,7 +141,7 @@ define(<FLINV>, <
 	C	          unsigned length, uint8_t *dst,
 	C	          uint8_t *src)
 	.text
-	ALIGN(4)
+	ALIGN(16)
 PROLOGUE(_nettle_camellia_crypt)
 	C save all registers that need to be saved
 	pushl	%ebx		C  32(%esp)
diff --git a/x86/md5-compress.asm b/x86/md5-compress.asm
index 1bdada79..ac0cd900 100644
--- a/x86/md5-compress.asm
+++ b/x86/md5-compress.asm
@@ -68,7 +68,7 @@ define(<ROUND>,<
 	C _nettle_md5_compress(uint32_t *state, uint8_t *data)
 	
 	.text
-	ALIGN(4)
+	ALIGN(16)
 PROLOGUE(_nettle_md5_compress)
 	C save all registers that need to be saved
 
diff --git a/x86/sha1-compress.asm b/x86/sha1-compress.asm
index afb8d8c5..777615dc 100644
--- a/x86/sha1-compress.asm
+++ b/x86/sha1-compress.asm
@@ -160,7 +160,7 @@ PROLOGUE(_nettle_sha1_compress)
 
 	C Loop-mixed to 520 cycles (for the complete function call) on
 	C AMD K7.
-ALIGN(5)
+ALIGN(32)
 	mov	88(%esp), T2
 	mov	OFFSET(2)(T2), %ecx
 	mov	OFFSET(0)(T2), %eax