From 4cb22710d42a425b811fab622ced8ec622858116 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Wed, 8 Mar 2017 15:19:02 +0100 Subject: [PATCH] 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 Reviewed-by: Andrew Cooper --- xen/include/public/arch-x86/xen-x86_32.h | 2 +- xen/include/public/arch-x86/xen-x86_64.h | 6 +++--- xen/include/public/arch-x86/xen.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/include/public/arch-x86/xen-x86_32.h b/xen/include/public/arch-x86/xen-x86_32.h index 0eab9c786e..aa388b7f32 100644 --- 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 0c00525433..6e74cb30ee 100644 --- 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 73c829ae3f..8a9ba7982b 100644 --- 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" -- 2.30.2