mirror of https://github.com/ipxe/ipxe.git
Prevent hundreds of errors from "make symcheck". The prefix exit path
mechanism has changed anyway, and so must be rewritten, but at least doing this makes the output of "make symcheck" more legible.pull/1/head
parent
d94cb57143
commit
698f86f25a
|
@ -87,7 +87,6 @@
|
||||||
.arch i386
|
.arch i386
|
||||||
.org 0
|
.org 0
|
||||||
.section ".prefix", "ax", @progbits
|
.section ".prefix", "ax", @progbits
|
||||||
.globl _prefix
|
|
||||||
_prefix:
|
_prefix:
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -572,10 +571,8 @@ bImage_gdt_48:
|
||||||
.long bImage_gdt_48 - setup_code # gdt base (filled in later)
|
.long bImage_gdt_48 - setup_code # gdt base (filled in later)
|
||||||
|
|
||||||
.section ".text16", "ax", @progbits
|
.section ".text16", "ax", @progbits
|
||||||
.globl prefix_exit
|
|
||||||
prefix_exit:
|
prefix_exit:
|
||||||
int $0x19 /* should try to boot machine */
|
int $0x19 /* should try to boot machine */
|
||||||
.globl prefix_exit_end
|
|
||||||
prefix_exit_end:
|
prefix_exit_end:
|
||||||
.previous
|
.previous
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
.code16
|
.code16
|
||||||
.arch i386
|
.arch i386
|
||||||
.section ".prefix", "ax", @progbits
|
.section ".prefix", "ax", @progbits
|
||||||
.globl _prefix
|
|
||||||
|
|
||||||
/* Cheat a little with the relocations: .COM files are loaded at 0x100 */
|
/* Cheat a little with the relocations: .COM files are loaded at 0x100 */
|
||||||
_prefix:
|
_prefix:
|
||||||
|
@ -34,11 +33,9 @@ _prefix:
|
||||||
lret
|
lret
|
||||||
|
|
||||||
.section ".text16", "ax", @progbits
|
.section ".text16", "ax", @progbits
|
||||||
.globl prefix_exit
|
|
||||||
prefix_exit:
|
prefix_exit:
|
||||||
movw $0x4c00,%ax /* return to DOS */
|
movw $0x4c00,%ax /* return to DOS */
|
||||||
int $0x21 /* reach this on Quit */
|
int $0x21 /* reach this on Quit */
|
||||||
.globl prefix_exit_end
|
|
||||||
prefix_exit_end:
|
prefix_exit_end:
|
||||||
.previous
|
.previous
|
||||||
|
|
||||||
|
|
|
@ -88,9 +88,7 @@ elf_note_end:
|
||||||
|
|
||||||
/* Dummy routines to satisfy the build */
|
/* Dummy routines to satisfy the build */
|
||||||
.section ".text16", "ax", @progbits
|
.section ".text16", "ax", @progbits
|
||||||
.globl prefix_exit
|
|
||||||
prefix_exit:
|
prefix_exit:
|
||||||
|
|
||||||
.globl prefix_exit_end
|
|
||||||
prefix_exit_end:
|
prefix_exit_end:
|
||||||
.previous
|
.previous
|
||||||
|
|
|
@ -88,9 +88,7 @@ elf_note_end:
|
||||||
|
|
||||||
/* Dummy routines to satisfy the build */
|
/* Dummy routines to satisfy the build */
|
||||||
.section ".text16", "ax", @progbits
|
.section ".text16", "ax", @progbits
|
||||||
.globl prefix_exit
|
|
||||||
prefix_exit:
|
prefix_exit:
|
||||||
|
|
||||||
.globl prefix_exit_end
|
|
||||||
prefix_exit_end:
|
prefix_exit_end:
|
||||||
.previous
|
.previous
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
.code16
|
.code16
|
||||||
.arch i386
|
.arch i386
|
||||||
.section ".prefix", "ax", @progbits
|
.section ".prefix", "ax", @progbits
|
||||||
.globl _prefix
|
|
||||||
|
|
||||||
_prefix:
|
_prefix:
|
||||||
.byte 'M', 'Z'
|
.byte 'M', 'Z'
|
||||||
|
@ -29,11 +28,9 @@ _prefix:
|
||||||
.short 0 /* fill */
|
.short 0 /* fill */
|
||||||
|
|
||||||
.section ".text16", "ax", @progbits
|
.section ".text16", "ax", @progbits
|
||||||
.globl prefix_exit
|
|
||||||
prefix_exit:
|
prefix_exit:
|
||||||
movw $0x4c00,%ax /* return to DOS */
|
movw $0x4c00,%ax /* return to DOS */
|
||||||
int $0x21 /* reach this on Quit */
|
int $0x21 /* reach this on Quit */
|
||||||
.globl prefix_exit_end
|
|
||||||
prefix_exit_end:
|
prefix_exit_end:
|
||||||
.previous
|
.previous
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,6 @@
|
||||||
.arch i386
|
.arch i386
|
||||||
.org 0
|
.org 0
|
||||||
.section ".prefix", "ax", @progbits
|
.section ".prefix", "ax", @progbits
|
||||||
.globl _prefix
|
|
||||||
_prefix:
|
_prefix:
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -128,10 +127,8 @@ setup_code:
|
||||||
ljmp $(SYSSEG-(PREFIXSIZE/16)), $_start
|
ljmp $(SYSSEG-(PREFIXSIZE/16)), $_start
|
||||||
|
|
||||||
.section ".text16", "ax", @progbits
|
.section ".text16", "ax", @progbits
|
||||||
.globl prefix_exit
|
|
||||||
prefix_exit:
|
prefix_exit:
|
||||||
int $0x19 /* should try to boot machine */
|
int $0x19 /* should try to boot machine */
|
||||||
.globl prefix_exit_end
|
|
||||||
prefix_exit_end:
|
prefix_exit_end:
|
||||||
.previous
|
.previous
|
||||||
|
|
||||||
|
|
|
@ -155,9 +155,7 @@ _gdt_end:
|
||||||
|
|
||||||
/* Dummy routines to satisfy the build */
|
/* Dummy routines to satisfy the build */
|
||||||
.section ".text16", "ax", @progbits
|
.section ".text16", "ax", @progbits
|
||||||
.globl prefix_exit
|
|
||||||
prefix_exit:
|
prefix_exit:
|
||||||
|
|
||||||
.globl prefix_exit_end
|
|
||||||
prefix_exit_end:
|
prefix_exit_end:
|
||||||
.previous
|
.previous
|
||||||
|
|
|
@ -155,9 +155,7 @@ _gdt_end:
|
||||||
|
|
||||||
/* Dummy routines to satisfy the build */
|
/* Dummy routines to satisfy the build */
|
||||||
.section ".text16", "ax", @progbits
|
.section ".text16", "ax", @progbits
|
||||||
.globl prefix_exit
|
|
||||||
prefix_exit:
|
prefix_exit:
|
||||||
|
|
||||||
.globl prefix_exit_end
|
|
||||||
prefix_exit_end:
|
prefix_exit_end:
|
||||||
.previous
|
.previous
|
||||||
|
|
|
@ -4,13 +4,10 @@
|
||||||
|
|
||||||
.section ".prefix", "ax", @progbits
|
.section ".prefix", "ax", @progbits
|
||||||
.code16
|
.code16
|
||||||
.globl _prefix
|
|
||||||
_prefix:
|
_prefix:
|
||||||
|
|
||||||
.section ".text16", "ax", @progbits
|
.section ".text16", "ax", @progbits
|
||||||
.globl prefix_exit
|
|
||||||
prefix_exit:
|
prefix_exit:
|
||||||
|
|
||||||
.globl prefix_exit_end
|
|
||||||
prefix_exit_end:
|
prefix_exit_end:
|
||||||
.previous
|
.previous
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
.arch i386
|
.arch i386
|
||||||
.org 0
|
.org 0
|
||||||
.section ".prefix", "ax", @progbits
|
.section ".prefix", "ax", @progbits
|
||||||
.globl _prefix
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* Entry point: set cs, ds, bp, print welcome message
|
* Entry point: set cs, ds, bp, print welcome message
|
||||||
*****************************************************************************
|
*****************************************************************************
|
||||||
|
@ -237,7 +236,6 @@ run_etherboot:
|
||||||
jmp _start /* Run Etherboot */
|
jmp _start /* Run Etherboot */
|
||||||
|
|
||||||
.section ".text16", "ax", @progbits
|
.section ".text16", "ax", @progbits
|
||||||
.globl prefix_exit
|
|
||||||
prefix_exit:
|
prefix_exit:
|
||||||
pushw %cs /* Set %ds, %bp for access to text */
|
pushw %cs /* Set %ds, %bp for access to text */
|
||||||
popw %ds
|
popw %ds
|
||||||
|
@ -273,7 +271,6 @@ print_exit_message:
|
||||||
int $0x10
|
int $0x10
|
||||||
jmp 1b
|
jmp 1b
|
||||||
2: ret
|
2: ret
|
||||||
.globl prefix_exit_end
|
|
||||||
prefix_exit_end:
|
prefix_exit_end:
|
||||||
.previous
|
.previous
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,6 @@
|
||||||
.arch i386
|
.arch i386
|
||||||
.org 0
|
.org 0
|
||||||
.section ".prefix", "ax", @progbits
|
.section ".prefix", "ax", @progbits
|
||||||
.globl _prefix
|
|
||||||
_prefix:
|
_prefix:
|
||||||
.word 0xAA55 /* BIOS extension signature */
|
.word 0xAA55 /* BIOS extension signature */
|
||||||
size: .byte 0 /* number of 512 byte blocks */
|
size: .byte 0 /* number of 512 byte blocks */
|
||||||
|
@ -254,7 +253,6 @@ invoke:
|
||||||
|
|
||||||
|
|
||||||
.section ".text16", "ax", @progbits
|
.section ".text16", "ax", @progbits
|
||||||
.globl prefix_exit
|
|
||||||
prefix_exit:
|
prefix_exit:
|
||||||
popw %ax /* padding */
|
popw %ax /* padding */
|
||||||
popw %ax /* %ax = exit code */
|
popw %ax /* %ax = exit code */
|
||||||
|
@ -269,7 +267,6 @@ prefix_exit:
|
||||||
int $BOOT_INT /* Try original vector */
|
int $BOOT_INT /* Try original vector */
|
||||||
2: /* Exit via int $0x18 */
|
2: /* Exit via int $0x18 */
|
||||||
int $0x18 /* As per BIOS Boot Spec, next dev */
|
int $0x18 /* As per BIOS Boot Spec, next dev */
|
||||||
.globl prefix_exit_end
|
|
||||||
prefix_exit_end:
|
prefix_exit_end:
|
||||||
.previous
|
.previous
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue