From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 18 Aug 2019 01:11:55 +0000 (+0100)
Subject: base/asm-common.h: Hoist the `_DECOR_mem_...' definitions.
X-Git-Tag: 2.5.0~14^2~18
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/005cd27719d942b9f3ea294bdeebc5716dcf829f

base/asm-common.h: Hoist the `_DECOR_mem_...' definitions.

In particular, the various `_DECOR_mumble_...' groups go above the
special `..._r' suffix.
---

diff --git a/base/asm-common.h b/base/asm-common.h
index 4fe72431..7d465791 100644
--- a/base/asm-common.h
+++ b/base/asm-common.h
@@ -279,6 +279,13 @@ name:
 #  define _DECOR_rn_r(reg) reg
 #endif
 
+#define _DECOR_mem_b(addr) byte ptr addr
+#define _DECOR_mem_w(addr) word ptr addr
+#define _DECOR_mem_d(addr) dword ptr addr
+#if CPUFAM_AMD64
+#  define _DECOR_mem_q(addr) qword ptr addr
+#endif
+
 #if CPUFAM_X86
 #  define _DECOR_abcd_r(reg) e##reg##x
 #  define _DECOR_xp_r(reg) e##reg
@@ -290,13 +297,6 @@ name:
 #  define _DECOR_ip_r(reg) r##reg
 #endif
 
-#define _DECOR_mem_b(addr) byte ptr addr
-#define _DECOR_mem_w(addr) word ptr addr
-#define _DECOR_mem_d(addr) dword ptr addr
-#if CPUFAM_AMD64
-#  define _DECOR_mem_q(addr) qword ptr addr
-#endif
-
 // R_r(decor) applies decoration decor to register r, which is an internal
 // register name.  The internal register names are: `ip', `a', `b', `c', `d',
 // `si', `di', `bp', `sp', `r8'--`r15'.