x86: drop underscore prefixed 32-bit register names

Now that all underscore prefixed instances have been replaced, this
concludes the register renaming project.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/include/public/arch-x86/xen-x86_32.h b/xen/include/public/arch-x86/xen-x86_32.h
index 0eab9c786eb8da8bb7494aae807eb88f38cbdd09..aa388b7f32887594480734cef49ba02b7202a85c 100644 (file)
--- a/xen/include/public/arch-x86/xen-x86_32.h
+++ b/xen/include/public/arch-x86/xen-x86_32.h
@@ -114,7 +114,7 @@
 #elif defined(__XEN__) || defined(__XEN_TOOLS__)
 /* Anonymous unions include all permissible names (e.g., al/ah/ax/eax). */
 #define __DECL_REG_LO8(which) union { \
-    uint32_t e ## which ## x, _e ## which ## x; \
+    uint32_t e ## which ## x; \
     uint16_t which ## x; \
     struct { \
         uint8_t which ## l; \

diff --git a/xen/include/public/arch-x86/xen-x86_64.h b/xen/include/public/arch-x86/xen-x86_64.h
index 0c00525433a546de2c728f539bb41726455e2ee5..6e74cb30ee1ded1797b62197544d88ca5e98ecc7 100644 (file)
--- a/xen/include/public/arch-x86/xen-x86_64.h
+++ b/xen/include/public/arch-x86/xen-x86_64.h
@@ -134,7 +134,7 @@ struct iret_context {
 /* Anonymous unions include all permissible names (e.g., al/ah/ax/eax/rax). */
 #define __DECL_REG_LOHI(which) union { \
     uint64_t r ## which ## x; \
-    uint32_t e ## which ## x, _e ## which ## x; \
+    uint32_t e ## which ## x; \
     uint16_t which ## x; \
     struct { \
         uint8_t which ## l; \
@@ -143,13 +143,13 @@ struct iret_context {
 }
 #define __DECL_REG_LO8(name) union { \
     uint64_t r ## name; \
-    uint32_t e ## name, _e ## name; \
+    uint32_t e ## name; \
     uint16_t name; \
     uint8_t name ## l; \
 }
 #define __DECL_REG_LO16(name) union { \
     uint64_t r ## name; \
-    uint32_t e ## name, _e ## name; \
+    uint32_t e ## name; \
     uint16_t name; \
 }
 #define __DECL_REG_HI(num) union { \

diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h
index 73c829ae3fba50370bb28c14e4de85f7024e1859..8a9ba7982bf0de9137e546fbdfcd5dde054962a0 100644 (file)
--- a/xen/include/public/arch-x86/xen.h
+++ b/xen/include/public/arch-x86/xen.h
@@ -58,15 +58,15 @@
 
 #if defined(__i386__)
 # ifdef __XEN__
-__DeFiNe__ __DECL_REG_LO8(which) uint32_t _e ## which ## x
-__DeFiNe__ __DECL_REG_LO16(name) union { uint32_t e ## name, _e ## name; }
+__DeFiNe__ __DECL_REG_LO8(which) uint32_t e ## which ## x
+__DeFiNe__ __DECL_REG_LO16(name) union { uint32_t e ## name; }
 # endif
 #include "xen-x86_32.h"
 # ifdef __XEN__
 __UnDeF__ __DECL_REG_LO8
 __UnDeF__ __DECL_REG_LO16
-__DeFiNe__ __DECL_REG_LO8(which) _e ## which ## x
-__DeFiNe__ __DECL_REG_LO16(name) _e ## name
+__DeFiNe__ __DECL_REG_LO8(which) e ## which ## x
+__DeFiNe__ __DECL_REG_LO16(name) e ## name
 # endif
 #elif defined(__x86_64__)
 #include "xen-x86_64.h"