From 71b165d2d4215c1556b62231d127a233225360ee Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 14 Mar 2016 13:02:56 +0100 Subject: [PATCH] x86emul: fix 32-bit test build Commit 5644ce0142 ("x86emul: relax asm() constraints") introduced a 64-bit only instruction suffix, which breaks running the emulator test on a 32-bit system. Mirror __OS (and _OP for completeness) to the test wrapper source file. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- tools/tests/x86_emulator/x86_emulate.c | 9 +++++++++ xen/arch/x86/x86_emulate/x86_emulate.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/tests/x86_emulator/x86_emulate.c b/tools/tests/x86_emulator/x86_emulate.c index f5b450d2a0..5d7fae43e7 100644 --- a/tools/tests/x86_emulator/x86_emulate.c +++ b/tools/tests/x86_emulator/x86_emulate.c @@ -18,6 +18,15 @@ typedef bool bool_t; #define __packed __attribute__((packed)) +/* For generic assembly code: use macros to define operation/operand sizes. */ +#ifdef __i386__ +# define __OS "l" /* Operation Suffix */ +# define __OP "e" /* Operand Prefix */ +#else +# define __OS "q" /* Operation Suffix */ +# define __OP "r" /* Operand Prefix */ +#endif + #include "x86_emulate/x86_emulate.h" #define get_stub(stb) ((void *)((stb).addr = (uintptr_t)(stb).buf)) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 07fdaeb7ce..10a2959690 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -853,7 +853,7 @@ static bool_t div_dbl(unsigned long u[2], unsigned long v) { if ( (v == 0) || (u[1] >= v) ) return 1; - asm ( "divq %2" : "+a" (u[0]), "+d" (u[1]) : "rm" (v) ); + asm ( "div"__OS" %2" : "+a" (u[0]), "+d" (u[1]) : "rm" (v) ); return 0; } -- 2.30.2