diff options
| author | Michael Brown | 2016-02-16 17:45:12 +0100 |
|---|---|---|
| committer | Michael Brown | 2016-02-16 20:32:32 +0100 |
| commit | 1a457e933a5e6c61fe08e1a6813f4514978b4c1d (patch) | |
| tree | 545472e02bdfa5730fd53214b653f2252a4dd11b /src/arch/i386/include/librm.h | |
| parent | [bios] Allow memmap.c to be compiled for x86_64 (diff) | |
| download | ipxe-1a457e933a5e6c61fe08e1a6813f4514978b4c1d.tar.gz ipxe-1a457e933a5e6c61fe08e1a6813f4514978b4c1d.tar.xz ipxe-1a457e933a5e6c61fe08e1a6813f4514978b4c1d.zip | |
[bios] Allow librm to be compiled for x86_64
This commit does not make librm functional for x86_64; it merely
allows it to compile without errors.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/i386/include/librm.h')
| -rw-r--r-- | src/arch/i386/include/librm.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/arch/i386/include/librm.h b/src/arch/i386/include/librm.h index a8a578a3..44d931ea 100644 --- a/src/arch/i386/include/librm.h +++ b/src/arch/i386/include/librm.h @@ -173,17 +173,24 @@ extern uint16_t __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" +#else +#define CODE_DEFAULT ".code32" +#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" \ - ".code32\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 ) \ - "pushl $1f\n\t" \ + "push $1f\n\t" \ "call real_call\n\t" \ "addl $4, %%esp\n\t" \ TEXT16_CODE ( "\n1:\n\t" \ @@ -194,8 +201,10 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size ); /* PHYS_CODE: declare a fragment of code that executes in flat physical mode */ #define PHYS_CODE( asm_code_str ) \ "call _virt_to_phys\n\t" \ + ".code32\n\t" \ asm_code_str \ - "call _phys_to_virt\n\t" + "call _phys_to_virt\n\t" \ + CODE_DEFAULT "\n\t" /** Number of interrupts */ #define NUM_INT 256 |