Browse Source

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

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 10 years ago
parent
commit
8b64cc7fba
2 changed files with 6 additions and 1 deletions
  1. 3
    0
      src/arch/i386/prefix/libprefix.S
  2. 3
    1
      src/arch/i386/prefix/mromprefix.S

+ 3
- 0
src/arch/i386/prefix/libprefix.S View File

746
 	xorw	%di, %di
746
 	xorw	%di, %di
747
 	movl	%esi, %eax
747
 	movl	%esi, %eax
748
 	call	print_hex_dword
748
 	call	print_hex_dword
749
+	call	print_space
750
+	movl	%ecx, %eax
751
+	call	print_hex_dword
749
 	movw	$payload_death_message, %si
752
 	movw	$payload_death_message, %si
750
 	call	print_message
753
 	call	print_message
751
 2:	/* Halt system */
754
 2:	/* Halt system */

+ 3
- 1
src/arch/i386/prefix/mromprefix.S View File

99
 	jle	1f
99
 	jle	1f
100
 	stc
100
 	stc
101
 	movl	$0xbabababa, %esi	/* Report "No suitable BAR" */
101
 	movl	$0xbabababa, %esi	/* Report "No suitable BAR" */
102
+	movl	rom_bar_size, %ecx
102
 	jmp	99f
103
 	jmp	99f
103
 1:	movw	$4, %bp
104
 1:	movw	$4, %bp
104
 
105
 
157
 	call	pci_write_config_dword
158
 	call	pci_write_config_dword
158
 
159
 
159
 	/* Locate our ROM image */
160
 	/* Locate our ROM image */
160
-1:	addr32 es cmpw $0xaa55, (%eax)
161
+1:	movl	$0xaa55, %ecx		/* 55aa signature */
162
+	addr32 es cmpw %cx, (%eax)
161
 	je	2f
163
 	je	2f
162
 	stc
164
 	stc
163
 	movl	%eax, %esi		/* Report failure address */
165
 	movl	%eax, %esi		/* Report failure address */

Loading…
Cancel
Save