File ipxe.0aa2e4ec963597794dd8f8b36f77f4d0cf4e03c8.p... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File ipxe.0aa2e4ec963597794dd8f8b36f77f4d0cf4e03c8.patch of Package xen (Revision 3b077056294bcb49994ea3227248b4ad)

Currently displaying revision 3b077056294bcb49994ea3227248b4ad , Show latest

From: Michael Brown <mcb30@ipxe.org>
Date: Tue, 5 Sep 2023 12:46:39 +0100
Subject: 0aa2e4ec963597794dd8f8b36f77f4d0cf4e03c8

[librm] Use explicit operand size when pushing a label address

We currently use "push $1f" within inline assembly to push the address
of the real-mode code fragment, relying on the assembler to treat this
as "pushl" for 32-bit code or "pushq" for 64-bit code.

As of binutils commit 5cc0077 ("x86: further adjust extend-to-32bit-
address conditions"), first included in binutils-2.41, this implicit
operand size is no longer calculated as expected and 64-bit builds
will fail with

Error: operand size mismatch for `push'

Fix by adding an explicit operand size to the "push" instruction.

Originally-fixed-by: Justin Cano <jstncno@gmail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/arch/x86/include/librm.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- a/src/arch/x86/include/librm.h
+++ b/src/arch/x86/include/librm.h
@@ -241,48 +241,50 @@ extern uint16_t rm_sp;
 extern uint16_t rm_ss;
 extern const uint16_t __text16 ( rm_cs );
 #define rm_cs __use_text16 ( rm_cs )
 extern const uint16_t __text16 ( rm_ds );
 #define rm_ds __use_text16 ( rm_ds )
 
 extern uint16_t copy_user_to_rm_stack ( userptr_t data, size_t size );
 extern void remove_user_from_rm_stack ( userptr_t data, size_t size );
 
 /* CODE_DEFAULT: restore default .code32/.code64 directive */
 #ifdef __x86_64__
 #define CODE_DEFAULT ".code64"
+#define STACK_DEFAULT "q"
 #else
 #define CODE_DEFAULT ".code32"
+#define STACK_DEFAULT "l"
 #endif
 
 /* TEXT16_CODE: declare a fragment of code that resides in .text16 */
 #define TEXT16_CODE( asm_code_str )			\
 	".section \".text16\", \"ax\", @progbits\n\t"	\
 	".code16\n\t"					\
 	asm_code_str "\n\t"				\
 	CODE_DEFAULT "\n\t"				\
 	".previous\n\t"
 
 /* REAL_CODE: declare a fragment of code that executes in real mode */
 #define REAL_CODE( asm_code_str )			\
-	"push $1f\n\t"					\
+	"push" STACK_DEFAULT " $1f\n\t"			\
 	"call real_call\n\t"				\
 	TEXT16_CODE ( "\n1:\n\t"			\
 		      asm_code_str			\
 		      "\n\t"				\
 		      "ret\n\t" )
 
 /* PHYS_CODE: declare a fragment of code that executes in flat physical mode */
 #define PHYS_CODE( asm_code_str )			\
-	"push $1f\n\t"					\
+	"push" STACK_DEFAULT " $1f\n\t"			\
 	"call phys_call\n\t"				\
 	".section \".text.phys\", \"ax\", @progbits\n\t"\
 	".code32\n\t"					\
 	"\n1:\n\t"					\
 	asm_code_str					\
 	"\n\t"						\
 	"ret\n\t"					\
 	CODE_DEFAULT "\n\t"				\
 	".previous\n\t"
 
 /** Number of interrupts */
 #define NUM_INT 256

Places

File ipxe.0aa2e4ec963597794dd8f8b36f77f4d0cf4e03c8.patch of Package xen (Revision 3b077056294bcb49994ea3227248b4ad)

Places