From f215b98f74ccae39e5fc6f10722739dc0bbd72aa Mon Sep 17 00:00:00 2001 From: "Justin C. Miller" Date: Sat, 20 May 2023 13:07:40 -0700 Subject: [PATCH] [panic] Fix display of r14 & r15 in panic display The register outputs for r14 and r15 when panic printed out any set of CPU registers was incorrectly reusing r12 & r13 instead. --- src/kernel/panic.serial/display.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kernel/panic.serial/display.cpp b/src/kernel/panic.serial/display.cpp index c7b148a..75300f1 100644 --- a/src/kernel/panic.serial/display.cpp +++ b/src/kernel/panic.serial/display.cpp @@ -111,14 +111,14 @@ print_cpu_state(serial_port &out, const cpu_state ®s) print_reg(out, "rdi", regs.rdi, "0;37"); print_reg(out, "rcx", regs.rcx, "0;37"); print_reg(out, "r10", regs.r10, "0;37"); - print_reg(out, "r14", regs.r12, "0;37"); + print_reg(out, "r14", regs.r14, "0;37"); out.write("\n"); // Row 4 print_reg(out, "rsi", regs.rdi, "0;37"); print_reg(out, "rdx", regs.rcx, "0;37"); print_reg(out, "r11", regs.r11, "0;37"); - print_reg(out, "r15", regs.r13, "0;37"); + print_reg(out, "r15", regs.r15, "0;37"); out.write("\n"); // Row 4