Page MenuHomeFreeBSD
Files F146957678

D40583.id123365.diff
No OneTemporary
Actions

D40583.id123365.diff
View Options

diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c
--- a/sys/arm64/arm64/trap.c
+++ b/sys/arm64/arm64/trap.c
@@ -213,7 +213,7 @@
if (!lower) {
print_registers(frame);
print_gp_register("far", far);
- printf(" esr: %16lx\n", esr);
+ printf(" esr: %#16lx\n", esr);
panic("Misaligned access from kernel space!");
}
@@ -328,7 +328,7 @@
if (td->td_md.md_spinlock_count != 0) {
print_registers(frame);
print_gp_register("far", far);
- printf(" esr: %.16lx\n", esr);
+ printf(" esr: %#.16lx\n", esr);
panic("data abort with spinlock held (spinlock count %d != 0)",
td->td_md.md_spinlock_count);
}
@@ -337,7 +337,7 @@
WARN_GIANTOK, NULL, "Kernel page fault") != 0) {
print_registers(frame);
print_gp_register("far", far);
- printf(" esr: %16lx\n", esr);
+ printf(" esr: %#16lx\n", esr);
panic("data abort in critical section or under mutex");
}
@@ -378,7 +378,7 @@
printf("Fatal data abort:\n");
print_registers(frame);
print_gp_register("far", far);
- printf(" esr: %16lx\n", esr);
+ printf(" esr: %#16lx\n", esr);
#ifdef KDB
if (debugger_on_trap) {
@@ -390,7 +390,7 @@
return;
}
#endif
- panic("vm_fault failed: %lx error %d",
+ panic("vm_fault failed: %#lx error %d",
frame->tf_elr, error);
}
}
@@ -409,14 +409,14 @@
db_expr_t offset;
#endif
- printf(" %s: %16lx", name, value);
+ printf(" %s: %#16lx", name, value);
#if defined(DDB)
/* If this looks like a kernel address try to find the symbol */
if (value >= VM_MIN_KERNEL_ADDRESS) {
sym = db_search_symbol(value, DB_STGY_ANY, &offset);
if (sym != C_DB_SYM_NULL) {
db_symbol_values(sym, &sym_name, &sym_value);
- printf(" (%s + %lx)", sym_name, offset);
+ printf(" (%s + %#lx)", sym_name, offset);
}
}
#endif
@@ -434,10 +434,10 @@
reg);
print_gp_register(name, frame->tf_x[reg]);
}
- printf(" sp: %16lx\n", frame->tf_sp);
+ printf(" sp: %#16lx\n", frame->tf_sp);
print_gp_register(" lr", frame->tf_lr);
print_gp_register("elr", frame->tf_elr);
- printf("spsr: %16lx\n", frame->tf_spsr);
+ printf("spsr: %#16lx\n", frame->tf_spsr);
}
#ifdef VFP
@@ -485,8 +485,8 @@
#endif
CTR4(KTR_TRAP,
- "do_el1_sync: curthread: %p, esr %lx, elr: %lx, frame: %p", td,
- esr, frame->tf_elr, frame);
+ "do_el1_sync: curthread: %p, esr %#lx, elr: %#lx, frame: %p",
+ td, esr, frame->tf_elr, frame);
/*
* Enable debug exceptions if we aren't already handling one. They will
@@ -506,7 +506,7 @@
#endif
{
print_registers(frame);
- printf(" esr: %16lx\n", esr);
+ printf(" esr: %#16lx\n", esr);
panic("VFP exception in the kernel");
}
break;
@@ -519,8 +519,8 @@
} else {
print_registers(frame);
print_gp_register("far", far);
- printf(" esr: %16lx\n", esr);
- panic("Unhandled EL1 %s abort: %x",
+ printf(" esr: %#16lx\n", esr);
+ panic("Unhandled EL1 %s abort: %#x",
exception == EXCP_INSN_ABORT ? "instruction" :
"data", dfsc);
}
@@ -558,13 +558,13 @@
break;
print_registers(frame);
print_gp_register("far", far);
- panic("Undefined instruction: %08x",
+ panic("Undefined instruction: %#08x",
*(uint32_t *)frame->tf_elr);
break;
default:
print_registers(frame);
print_gp_register("far", far);
- panic("Unknown kernel exception %x esr_el1 %lx", exception,
+ panic("Unknown kernel exception %#x esr_el1 %#lx", exception,
esr);
}
}
@@ -579,7 +579,7 @@
/* Check we have a sane environment when entering from userland */
KASSERT((uintptr_t)get_pcpu() >= VM_MIN_KERNEL_ADDRESS,
- ("Invalid pcpu address from userland: %p (tpidr %lx)",
+ ("Invalid pcpu address from userland: %p (tpidr %#lx)",
get_pcpu(), READ_SPECIALREG(tpidr_el1)));
kasan_mark(frame, sizeof(*frame), sizeof(*frame), 0);
@@ -599,8 +599,8 @@
intr_enable();
CTR4(KTR_TRAP,
- "do_el0_sync: curthread: %p, esr %lx, elr: %lx, frame: %p", td, esr,
- frame->tf_elr, frame);
+ "do_el0_sync: curthread: %p, esr %#lx, elr: %#lx, frame: %p",
+ td, esr, frame->tf_elr, frame);
switch (exception) {
case EXCP_FP_SIMD:
@@ -637,8 +637,8 @@
else {
print_registers(frame);
print_gp_register("far", far);
- printf(" esr: %16lx\n", esr);
- panic("Unhandled EL0 %s abort: %x",
+ printf(" esr: %#16lx\n", esr);
+ panic("Unhandled EL0 %s abort: %#x",
exception == EXCP_INSN_ABORT_L ? "instruction" :
"data", dfsc);
}
@@ -730,7 +730,7 @@
print_registers(frame);
print_gp_register("far", far);
- printf(" esr: %16lx\n", esr);
+ printf(" esr: %#16lx\n", esr);
panic("Unhandled System Error");
}
@@ -745,6 +745,6 @@
print_registers(frame);
print_gp_register("far", far);
- printf(" esr: %16lx\n", esr);
+ printf(" esr: %#16lx\n", esr);
panic("Unhandled exception");
}

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 8, 3:10 AM (10 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29366890
Default Alt Text
D40583.id123365.diff (4 KB)

Event Timeline