| Message ID | 09082f8f-5c1a-43c9-9b84-19d832e0849d@suse.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | x86emul: replace _BYTES_PER_LONG | expand |
On 31/03/2025 4:52 pm, Jan Beulich wrote: > We can now easily use __SIZEOF_LONG__ instead. For this to also work in > the test harness, move hvmloader's STR() to common-macros.h. > > Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
On Mon, Mar 31, 2025 at 05:52:27PM +0200, Jan Beulich wrote: > We can now easily use __SIZEOF_LONG__ instead. For this to also work in > the test harness, move hvmloader's STR() to common-macros.h. > > Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Anthony PERARD <anthony.perard@vates.tech> > Quite likely libxl{,u}_internal.h's STRINGIFY() could then also be > replaced. Sounds good. It seems the different between STR() and TOSTRING() is that a comma can be use as well with STR, so not really a useful difference. Thanks,
--- a/xen/arch/x86/x86_emulate/private.h +++ b/xen/arch/x86/x86_emulate/private.h @@ -633,11 +633,9 @@ amd_like(const struct x86_emulate_ctxt * #if defined(__x86_64__) #define _LO32 "k" /* force 32-bit operand */ #define _STK "%%rsp" /* stack pointer */ -#define _BYTES_PER_LONG "8" #elif defined(__i386__) #define _LO32 "" /* force 32-bit operand */ #define _STK "%%esp" /* stack pointer */ -#define _BYTES_PER_LONG "4" #endif /* Before executing instruction: restore necessary bits in EFLAGS. */ @@ -651,7 +649,7 @@ amd_like(const struct x86_emulate_ctxt * "pushf; " \ "notl %"_LO32 _tmp"; " \ "andl %"_LO32 _tmp",("_STK"); " \ -"andl %"_LO32 _tmp",2*"_BYTES_PER_LONG"("_STK"); " \ +"andl %"_LO32 _tmp", 2 * " STR(__SIZEOF_LONG__) "("_STK"); " \ "pop %"_tmp"; " \ "orl %"_LO32 _tmp",("_STK"); " \ "popf; " \ --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -21,9 +21,6 @@ enum { /* Cause xs_wire.h to give us xsd_errors[]. */ #define EINVAL EINVAL -#define __STR(...) #__VA_ARGS__ -#define STR(...) __STR(__VA_ARGS__) - /* GDT selector values. */ #define SEL_CODE16 0x0008 #define SEL_DATA16 0x0010 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -88,6 +88,9 @@ (type *)((char *)mptr__ - offsetof(type, member)); \ }) +#define __STR(...) #__VA_ARGS__ +#define STR(...) __STR(__VA_ARGS__) + #define __AC(X, Y) (X ## Y) #define _AC(X, Y) __AC(X, Y)
We can now easily use __SIZEOF_LONG__ instead. For this to also work in the test harness, move hvmloader's STR() to common-macros.h. Signed-off-by: Jan Beulich <jbeulich@suse.com> --- Quite likely libxl{,u}_internal.h's STRINGIFY() could then also be replaced.