Have a small reformatting session.

[catacomb] / symm / rijndael-x86ish-aesni.S

diff --git a/symm/rijndael-x86ish-aesni.S b/symm/rijndael-x86ish-aesni.S
index 91fcc35228999ce4b8a21fcc48f5ca33625de400..520a72e4a21c8c43e26a7910242b7c04eb8d4514 100644 (file)
--- a/symm/rijndael-x86ish-aesni.S
+++ b/symm/rijndael-x86ish-aesni.S
@@ -30,9 +30,6 @@
 #include "config.h"
 #include "asm-common.h"
 
-///--------------------------------------------------------------------------
-/// External definitions.
-
        .globl  F(abort)
        .globl  F(rijndael_rcon)
 
@@ -48,7 +45,7 @@
 /// Main code.
 
        .arch   .aes
-       .section .text
+       .text
 
 /// The AESNI instructions implement a little-endian version of AES, but
 /// Catacomb's internal interface presents as big-endian so as to work better
@@ -197,7 +194,7 @@ FUNC(rijndael_setup_x86ish_aesni)
 
        // Find the round constants.
        ldgot   ecx
-       leaext  RCON, rijndael_rcon, ecx
+       leaext  RCON, F(rijndael_rcon), ecx
 
        // Prepare for the main loop.
        lea     SI, [CTX + w]
@@ -431,8 +428,8 @@ ENDFUNC
 ///--------------------------------------------------------------------------
 /// Encrypting and decrypting blocks.
 
-       .macro  encdec op, aes, koff
-FUNC(rijndael_\op\()_x86ish_aesni)
+.macro encdec  op, aes, koff
+  FUNC(rijndael_\op\()_x86ish_aesni)
 
        // Find the magic endianness-swapping table.
        ldgot   ecx
@@ -569,8 +566,8 @@ FUNC(rijndael_\op\()_x86ish_aesni)
 #undef DST
 #undef NR
 
-ENDFUNC
-       .endm
+  ENDFUNC
+.endm
 
        encdec  eblk, aesenc, w
        encdec  dblk, aesdec, wi