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

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/i386/prefix/libprefix.S b/src/arch/i386/prefix/libprefix.S
index aae07354ff02bb16e8c70b61b97d3fa607a714ea..7c1ece791b54cd45987b0c57e1cd6611a56e7955 100644 (file)
--- a/src/arch/i386/prefix/libprefix.S
+++ b/src/arch/i386/prefix/libprefix.S
@@ -746,6 +746,9 @@ a20_death_message:
        xorw    %di, %di
        movl    %esi, %eax
        call    print_hex_dword
+       call    print_space
+       movl    %ecx, %eax
+       call    print_hex_dword
        movw    $payload_death_message, %si
        call    print_message
 2:     /* Halt system */

diff --git a/src/arch/i386/prefix/mromprefix.S b/src/arch/i386/prefix/mromprefix.S
index c4e4ca06fbea01ce93701f16001b585e3e940256..97ddd591e887f10077b84cfea644f04ced0d771a 100644 (file)
--- a/src/arch/i386/prefix/mromprefix.S
+++ b/src/arch/i386/prefix/mromprefix.S
@@ -99,6 +99,7 @@ find_mem_bar:
        jle     1f
        stc
        movl    $0xbabababa, %esi       /* Report "No suitable BAR" */
+       movl    rom_bar_size, %ecx
        jmp     99f
 1:     movw    $4, %bp
 
@@ -157,7 +158,8 @@ find_mem_bar:
        call    pci_write_config_dword
 
        /* Locate our ROM image */
-1:     addr32 es cmpw $0xaa55, (%eax)
+1:     movl    $0xaa55, %ecx           /* 55aa signature */
+       addr32 es cmpw %cx, (%eax)
        je      2f
        stc
        movl    %eax, %esi              /* Report failure address */