david/ipxe
david/ipxe
Archived
1
0
Fork 0
Code

[pxeprefix] Merge common code between !PXE and PXENV+

Browse Source 
The parsing of the !PXE and PXENV+ structures share a fair bit of
code; merge the common code to save a few bytes.

Signed-off-by: Michael Brown <mcb30@etherboot.org>
This commit is contained in:
H. Peter Anvin 2009-03-01 20:56:26 -08:00 committed by Michael Brown
parent ec24672db7
commit f3d09b5c79
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/arch/i386/prefix/pxeprefix.S
View File

@ -105,20 +105,13 @@ have_pxenv:
/* Record entry point and UNDI segments */
pushl %es:0x0a(%bx) /* Entry point */
popl entry_segoff
pushw %es:0x24(%bx) /* UNDI code segment */
pushw %es:0x26(%bx) /* UNDI code size */
popl undi_code_segoff
pushw %es:0x20(%bx) /* UNDI data segment */
pushw %es:0x22(%bx) /* UNDI data size */
popl undi_data_segoff
/* Print "PXENV+ at <address>" */
movw $10f, %si
call print_message
call print_segoff
movb $( ',' ), %al
call print_character
jmp check_have_stack
.section ".prefix.data", "aw", @progbits
10: .asciz " PXENV+ at "
@ -129,19 +122,13 @@ have_ppxe:
movw %es, ppxe_segment
pushl %es:0x10(%bx) /* Entry point */
popl entry_segoff
pushw %es:0x30(%bx) /* UNDI code segment */
pushw %es:0x36(%bx) /* UNDI code size */
popl undi_code_segoff
pushw %es:0x28(%bx) /* UNDI data segment */
pushw %es:0x2e(%bx) /* UNDI data size */
popl undi_data_segoff
/* Print "!PXE at <address>" */
movw $10f, %si
call print_message
call print_segoff
movb $( ',' ), %al
call print_character
jmp check_have_stack
.section ".prefix.data", "aw", @progbits
10: .asciz " !PXE at "
@ -201,6 +188,17 @@ memory_scan_common:
*****************************************************************************
*/
check_have_stack:
/* Save common values pushed onto the stack */
popl undi_data_segoff
popl undi_code_segoff
popl entry_segoff
/* Print have !PXE/PXENV+ message; structure pointer in %es:%bx */
call print_message
call print_segoff
movb $( ',' ), %al
call print_character
/* Check for entry point */
movl entry_segoff, %eax
testl %eax, %eax