* x86/machine.m4 (LREG, HREG): Moved macros here, from...

* x86/aes.m4: ...here.

Rev: nettle/x86/aes.m4:1.7
Rev: nettle/x86/machine.m4:1.2

diff --git a/x86/aes.m4 b/x86/aes.m4
index cf89d30d23944747b719f1b535e4c6615cac6490..3507e8569dd4698a2b5b25e7ef62a8bbd03d67f2 100644 (file)
--- a/x86/aes.m4
+++ b/x86/aes.m4
@@ -1,16 +1,3 @@
-dnl LREG(reg) gives the 8-bit register corresponding to the given 32-bit register.
-define(<LREG>,<ifelse(
-       $1, %eax, %al,
-       $1, %ebx, %bl,
-       $1, %ecx, %cl,
-       $1, %edx, %dl)>)dnl
-
-define(<HREG>,<ifelse(
-       $1, %eax, %ah,
-       $1, %ebx, %bh,
-       $1, %ecx, %ch,
-       $1, %edx, %dh)>)dnl
-
 dnl AES_LOAD(a, b, c, d, src, key)
 dnl Loads the next block of data from src, and add the subkey pointed
 dnl to by key.

diff --git a/x86/machine.m4 b/x86/machine.m4
index 887bf3b3a7a9fe849a05add58040e938733e0bf0..38bee36625e8956ef1bbd0de795a09c947e347c4 100644 (file)
--- a/x86/machine.m4
+++ b/x86/machine.m4
@@ -1,3 +1,16 @@
 C OFFSET(i)
 C Expands to 4*i, or to the empty string if i is zero
 define(<OFFSET>, <ifelse($1,0,,eval(4*$1))>)
+
+dnl LREG(reg) gives the 8-bit register corresponding to the given 32-bit register.
+define(<LREG>,<ifelse(
+       $1, %eax, %al,
+       $1, %ebx, %bl,
+       $1, %ecx, %cl,
+       $1, %edx, %dl)>)dnl
+
+define(<HREG>,<ifelse(
+       $1, %eax, %ah,
+       $1, %ebx, %bh,
+       $1, %ecx, %ch,
+       $1, %edx, %dh)>)dnl