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

[prefix] Report both %esi and %ecx when opening payload fails 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/27/merge
Michael Brown 2014-08-26 14:53:46 +01:00
parent 9d21e13522
commit 8b64cc7fba
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -746,6 +746,9 @@ a20_death_message:
xorw %di, %di xorw %di, %di
movl %esi, %eax movl %esi, %eax
call print_hex_dword call print_hex_dword
call print_space
movl %ecx, %eax
call print_hex_dword
movw $payload_death_message, %si movw $payload_death_message, %si
call print_message call print_message
2: /* Halt system */ 2: /* Halt system */

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

@ -99,6 +99,7 @@ find_mem_bar:
jle 1f jle 1f
stc stc
movl $0xbabababa, %esi /* Report "No suitable BAR" */ movl $0xbabababa, %esi /* Report "No suitable BAR" */
movl rom_bar_size, %ecx
jmp 99f jmp 99f
1: movw $4, %bp 1: movw $4, %bp
@ -157,7 +158,8 @@ find_mem_bar:
call pci_write_config_dword call pci_write_config_dword
/* Locate our ROM image */ /* Locate our ROM image */
1: addr32 es cmpw $0xaa55, (%eax) 1: movl $0xaa55, %ecx /* 55aa signature */
addr32 es cmpw %cx, (%eax)
je 2f je 2f
stc stc
movl %eax, %esi /* Report failure address */ movl %eax, %esi /* Report failure address */