narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[prefix] Allow prefix to specify an arbitrary maximum address for relocation 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/5/head
Michael Brown 2011-11-11 23:20:28 +00:00
parent 6c5f1a342b
commit 24226472b2
5 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/arch/i386/core/relocate.c
View File

@ -42,7 +42,7 @@ extern char _etextdata[];
*/ */
__asmcall void relocate ( struct i386_all_regs *ix86 ) { __asmcall void relocate ( struct i386_all_regs *ix86 ) {
struct memory_map memmap; struct memory_map memmap;
unsigned long start, end, size, padded_size; unsigned long start, end, size, padded_size, max;
unsigned long new_start, new_end; unsigned long new_start, new_end;
unsigned i; unsigned i;
@ -57,6 +57,13 @@ __asmcall void relocate ( struct i386_all_regs *ix86 ) {
"...need %lx bytes for %d-byte alignment\n", "...need %lx bytes for %d-byte alignment\n",
start, end, padded_size, max_align ); start, end, padded_size, max_align );
/* Determine maximum usable address */
max = MAX_ADDR;
if ( ix86->regs.ebp && ( ix86->regs.ebp < max ) ) {
max = ix86->regs.ebp;
DBG ( "Limiting relocation to [0,%lx)\n", max );
}
/* Walk through the memory map and find the highest address /* Walk through the memory map and find the highest address
* below 4GB that iPXE will fit into. * below 4GB that iPXE will fit into.
*/ */
@ -67,18 +74,18 @@ __asmcall void relocate ( struct i386_all_regs *ix86 ) {
DBG ( "Considering [%llx,%llx)\n", region->start, region->end); DBG ( "Considering [%llx,%llx)\n", region->start, region->end);
/* Truncate block to MAX_ADDR. This will be less than /* Truncate block to maximum address. This will be
* 4GB, which means that we can get away with using * less than 4GB, which means that we can get away
* just 32-bit arithmetic after this stage. * with using just 32-bit arithmetic after this stage.
*/ */
if ( region->start > MAX_ADDR ) { if ( region->start > max ) {
DBG ( "...starts after MAX_ADDR=%lx\n", MAX_ADDR ); DBG ( "...starts after max=%lx\n", max );
continue; continue;
} }
r_start = region->start; r_start = region->start;
if ( region->end > MAX_ADDR ) { if ( region->end > max ) {
DBG ( "...end truncated to MAX_ADDR=%lx\n", MAX_ADDR ); DBG ( "...end truncated to max=%lx\n", max );
r_end = MAX_ADDR; r_end = max;
} else { } else {
r_end = region->end; r_end = region->end;
} }

2
src/arch/i386/prefix/exeprefix.S
View File

@ -113,7 +113,7 @@ _exe_start:
call alloc_basemem call alloc_basemem
xorl %esi, %esi xorl %esi, %esi
movl $EXE_DECOMPRESS_ADDRESS, %edi movl $EXE_DECOMPRESS_ADDRESS, %edi
clc xorl %ebp, %ebp
call install_prealloc call install_prealloc
/* Set up real-mode stack */ /* Set up real-mode stack */

18
src/arch/i386/prefix/libprefix.S
View File

@ -326,7 +326,6 @@ process_bytes:
#ifndef KEEP_IT_REAL #ifndef KEEP_IT_REAL
/* Preserve registers */ /* Preserve registers */
pushfw
pushl %eax pushl %eax
pushl %ebp pushl %ebp
@ -397,7 +396,6 @@ process_bytes:
/* Restore registers and return */ /* Restore registers and return */
popl %ebp popl %ebp
popl %eax popl %eax
popfw
ret ret
#else /* KEEP_IT_REAL */ #else /* KEEP_IT_REAL */
@ -614,17 +612,19 @@ install:
/* Preserve registers */ /* Preserve registers */
pushl %esi pushl %esi
pushl %edi pushl %edi
pushl %ebp
/* Allocate space for .text16 and .data16 */ /* Allocate space for .text16 and .data16 */
call alloc_basemem call alloc_basemem
/* Image source = %cs:0000 */ /* Image source = %cs:0000 */
xorl %esi, %esi xorl %esi, %esi
/* Image destination = default */ /* Image destination = default */
xorl %edi, %edi xorl %edi, %edi
/* Allow relocation */ /* Allow arbitrary relocation */
clc xorl %ebp, %ebp
/* Install text and data segments */ /* Install text and data segments */
call install_prealloc call install_prealloc
/* Restore registers and return */ /* Restore registers and return */
popl %ebp
popl %edi popl %edi
popl %esi popl %esi
ret ret
@ -640,7 +640,7 @@ install:
* %bx : .data16 segment address * %bx : .data16 segment address
* %esi : Image source physical address (or zero for %cs:0000) * %esi : Image source physical address (or zero for %cs:0000)
* %edi : Decompression temporary area physical address (or zero for default) * %edi : Decompression temporary area physical address (or zero for default)
* CF set : Avoid relocating to top of memory * %ebp : Maximum end address for relocation (or zero for no maximum)
* Corrupts: * Corrupts:
* none * none
**************************************************************************** ****************************************************************************
@ -655,7 +655,6 @@ install_prealloc:
pushw %ds pushw %ds
pushw %es pushw %es
cld /* Sanity: clear the direction flag asap */ cld /* Sanity: clear the direction flag asap */
pushfw
/* Set up %ds for (read-only) access to .prefix */ /* Set up %ds for (read-only) access to .prefix */
pushw %cs pushw %cs
@ -791,11 +790,6 @@ payload_death_message:
movw %ax, (init_librm_vector+2) movw %ax, (init_librm_vector+2)
lcall *init_librm_vector lcall *init_librm_vector
/* Skip relocation if CF was set on entry */
popfw
pushfw
jc skip_relocate
/* Call relocate() to determine target address for relocation. /* Call relocate() to determine target address for relocation.
* relocate() will return with %esi, %edi and %ecx set up * relocate() will return with %esi, %edi and %ecx set up
* ready for the copy to the new location. * ready for the copy to the new location.
@ -818,7 +812,6 @@ payload_death_message:
/* Initialise librm at new location */ /* Initialise librm at new location */
progress " init_librm\n" progress " init_librm\n"
lcall *init_librm_vector lcall *init_librm_vector
skip_relocate:
#endif #endif
/* Close access to payload */ /* Close access to payload */
@ -827,7 +820,6 @@ skip_relocate:
lcall *close_payload_vector lcall *close_payload_vector
/* Restore registers */ /* Restore registers */
popfw
popw %es popw %es
popw %ds popw %ds
popal popal

22
src/arch/i386/prefix/romprefix.S
View File

@ -414,7 +414,7 @@ no_pmm:
* picked up by the initial shell prompt, and we will drop * picked up by the initial shell prompt, and we will drop
* into a shell. * into a shell.
*/ */
stc /* Inhibit relocation */ movl $0xa0000, %ebp /* Inhibit relocation during POST */
pushw %cs pushw %cs
call exec call exec
2: 2:
@ -614,7 +614,7 @@ decompress_to:
* Called by the PnP BIOS when it wants to boot us. * Called by the PnP BIOS when it wants to boot us.
*/ */
bev_entry: bev_entry:
clc /* Allow relocation */ xorl %ebp, %ebp /* Allow relocation */
pushw %cs pushw %cs
call exec call exec
lret lret
@ -649,7 +649,7 @@ int19_entry:
/* Leave keypress in buffer and start iPXE. The keypress will /* Leave keypress in buffer and start iPXE. The keypress will
* cause the usual initial Ctrl-B prompt to be skipped. * cause the usual initial Ctrl-B prompt to be skipped.
*/ */
clc /* Allow relocation */ xorl %ebp, %ebp /* Allow relocation */
pushw %cs pushw %cs
call exec call exec
1: /* Try to call original INT 19 vector */ 1: /* Try to call original INT 19 vector */
@ -681,9 +681,6 @@ exec: /* Set %ds = %cs */
pushw %cs pushw %cs
popw %ds popw %ds
/* Preserve state of CF */
lahf
/* Print message as soon as possible */ /* Print message as soon as possible */
movw $prodstr, %si movw $prodstr, %si
xorw %di, %di xorw %di, %di
@ -693,8 +690,8 @@ exec: /* Set %ds = %cs */
/* Store magic word on BIOS stack and remember BIOS %ss:sp */ /* Store magic word on BIOS stack and remember BIOS %ss:sp */
pushl $STACK_MAGIC pushl $STACK_MAGIC
movw %ss, %dx movw %ss, %cx
movw %sp, %bp movw %sp, %dx
/* Obtain a reasonably-sized temporary stack */ /* Obtain a reasonably-sized temporary stack */
xorw %bx, %bx xorw %bx, %bx
@ -702,10 +699,7 @@ exec: /* Set %ds = %cs */
movw $0x7c00, %sp movw $0x7c00, %sp
/* Install iPXE */ /* Install iPXE */
sahf
pushfw
call alloc_basemem call alloc_basemem
popfw
movl image_source, %esi movl image_source, %esi
movl decompress_to, %edi movl decompress_to, %edi
call install_prealloc call install_prealloc
@ -728,14 +722,14 @@ exec: /* Set %ds = %cs */
pushl $main pushl $main
pushw %cs pushw %cs
call prot_call call prot_call
popl %ecx /* discard */ popl %eax /* discard */
/* Uninstall iPXE */ /* Uninstall iPXE */
call uninstall call uninstall
/* Restore BIOS stack */ /* Restore BIOS stack */
movw %dx, %ss movw %cx, %ss
movw %bp, %sp movw %dx, %sp
/* Check magic word on BIOS stack */ /* Check magic word on BIOS stack */
popl %eax popl %eax

4
src/arch/i386/prefix/undiloader.S
View File

@ -14,6 +14,7 @@ undiloader:
/* Save registers */ /* Save registers */
pushl %esi pushl %esi
pushl %edi pushl %edi
pushl %ebp
pushw %ds pushw %ds
pushw %es pushw %es
pushw %bx pushw %bx
@ -30,7 +31,7 @@ undiloader:
movw %es:14(%di), %ax movw %es:14(%di), %ax
movl image_source, %esi movl image_source, %esi
movl decompress_to, %edi movl decompress_to, %edi
clc /* Allow relocation */ xorl %ebp, %ebp /* Allow relocation */
call install_prealloc call install_prealloc
popw %di popw %di
/* Call UNDI loader C code */ /* Call UNDI loader C code */
@ -46,6 +47,7 @@ undiloader:
popw %bx popw %bx
popw %es popw %es
popw %ds popw %ds
popl %ebp
popl %edi popl %edi
popl %esi popl %esi
lret lret