From: Niels Möller <nisse@lysator.liu.se>
Date: Sun, 25 Jul 2010 18:23:32 +0000 (+0200)
Subject: * x86/machine.m4 (LREG, HREG): Moved macros here, from...
X-Git-Tag: nettle_2.1_release_20100725~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15f754b5034fd01b22c5492c4d2bc80727a446a1;p=thirdparty%2Fnettle.git

* 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 cf89d30d..3507e856 100644
--- 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 887bf3b3..38bee366 100644
--- 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