adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86: fix early-BUG message

Browse source 
The .asciz directive takes any number of strings, but each one is zero-
terminated, and string pasting is not done as in C. That results in only the
first line being output.

Replace .asciz with multiple .ascii directives and terminate with .asciz.

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Vegard Nossum 2008-04-25 21:02:34 +02:00 committed by Ingo Molnar
parent b4cdc4300d
commit 575ca7351b
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
arch/x86/kernel/head_32.S
View file

@ -656,15 +656,16 @@ int_msg:
.asciz "Unknown interrupt or fault at EIP %p %p %p\n" .asciz "Unknown interrupt or fault at EIP %p %p %p\n"
fault_msg: fault_msg:
.asciz \ /* fault info: */
/* fault info: */ "BUG: Int %d: CR2 %p\n" \ .ascii "BUG: Int %d: CR2 %p\n"
/* pusha regs: */ " EDI %p ESI %p EBP %p ESP %p\n" \ /* pusha regs: */
" EBX %p EDX %p ECX %p EAX %p\n" \ .ascii " EDI %p ESI %p EBP %p ESP %p\n"
/* fault frame: */ " err %p EIP %p CS %p flg %p\n" \ .ascii " EBX %p EDX %p ECX %p EAX %p\n"
\ /* fault frame: */
"Stack: %p %p %p %p %p %p %p %p\n" \ .ascii " err %p EIP %p CS %p flg %p\n"
" %p %p %p %p %p %p %p %p\n" \ .ascii "Stack: %p %p %p %p %p %p %p %p\n"
" %p %p %p %p %p %p %p %p\n" .ascii " %p %p %p %p %p %p %p %p\n"
.asciz " %p %p %p %p %p %p %p %p\n"
#include "../../x86/xen/xen-head.S" #include "../../x86/xen/xen-head.S"