wash/mango
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86_64: panic: fix printk formatting specifiers for cpu registers

Browse Source
This commit is contained in:
max 🍓
2023-05-03 19:26:19 +01:00
parent a52571eb19
commit ad58693dfb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/x86_64/panic.c
View File

@@ -88,17 +88,17 @@ void ml_print_cpu_state(struct cpu_context *ctx)
{ {
printk("cpu state:"); printk("cpu state:");
if (ctx) { if (ctx) {
printk(" rax %016lx rbx %016lx rcx %016x", printk(" rax %016llx rbx %016llx rcx %016llx",
ctx->rax, ctx->rbx, ctx->rcx); ctx->rax, ctx->rbx, ctx->rcx);
printk(" rdx %016lx rsi %016lx rdi %016x", printk(" rdx %016llx rsi %016llx rdi %016llx",
ctx->rdx, ctx->rsi, ctx->rdi); ctx->rdx, ctx->rsi, ctx->rdi);
printk(" rsp %016lx rbp %016lx r8 %016x", printk(" rsp %016llx rbp %016llx r8 %016llx",
ctx->rsp, ctx->rbp, ctx->r8); ctx->rsp, ctx->rbp, ctx->r8);
printk(" r9 %016lx r10 %016lx r11 %016x", printk(" r9 %016llx r10 %016llx r11 %016llx",
ctx->r9, ctx->r10, ctx->r11); ctx->r9, ctx->r10, ctx->r11);
printk(" r12 %016lx r13 %016lx r14 %016x", printk(" r12 %016llx r13 %016llx r14 %016llx",
ctx->r12, ctx->r13, ctx->r14); ctx->r12, ctx->r13, ctx->r14);
printk(" r15 %016lx rip %016lx cs %04x ss %04x", printk(" r15 %016llx rip %016llx cs %04x ss %04x",
ctx->r15, ctx->rip, ctx->cs, ctx->ss); ctx->r15, ctx->rip, ctx->cs, ctx->ss);
print_rflags(ctx->rflags); print_rflags(ctx->rflags);
} }
@@ -108,8 +108,8 @@ void ml_print_cpu_state(struct cpu_context *ctx)
asm volatile("mov %%cr2, %%rax" : "=a" (cr2)); asm volatile("mov %%cr2, %%rax" : "=a" (cr2));
asm volatile("mov %%cr3, %%rax" : "=a" (cr3)); asm volatile("mov %%cr3, %%rax" : "=a" (cr3));
asm volatile("mov %%cr4, %%rax" : "=a" (cr4)); asm volatile("mov %%cr4, %%rax" : "=a" (cr4));
printk(" cr0 %016x cr2 %016x", cr0, cr2); printk(" cr0 %016llx cr2 %016llx", cr0, cr2);
printk(" cr3 %016x cr4 %016x", cr3, cr4); printk(" cr3 %016llx cr4 %016llx", cr3, cr4);
} }
void ml_print_stack_trace(struct cpu_context *ctx) void ml_print_stack_trace(struct cpu_context *ctx)