From 496a3cdcd300417e24bd520a0e0e603219544a22 Mon Sep 17 00:00:00 2001 From: Timon Kruiper Date: Thu, 20 Oct 2022 17:31:23 +0200 Subject: [PATCH] Kernel/aarch64: Fix typo in RegisterState.h We are actually storing tpidr_el0, as can be seen in vector_table.S, but the RegisterState.h incorrectly had tpidr_el1. This will probably save some annoying debugging later on. --- Kernel/Arch/aarch64/RegisterState.h | 2 +- Kernel/Arch/aarch64/init.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Kernel/Arch/aarch64/RegisterState.h b/Kernel/Arch/aarch64/RegisterState.h index 92ec666a25..fd456f0306 100644 --- a/Kernel/Arch/aarch64/RegisterState.h +++ b/Kernel/Arch/aarch64/RegisterState.h @@ -17,7 +17,7 @@ struct RegisterState { u64 x[31]; // Saved general purpose registers u64 spsr_el1; // Save Processor Status Register, EL1 u64 elr_el1; // Exception Link Register, EL1 - u64 tpidr_el1; // EL0 thread ID + u64 tpidr_el0; // EL0 thread ID u64 sp_el0; // EL0 stack pointer FlatPtr userspace_sp() const { return 0; } diff --git a/Kernel/Arch/aarch64/init.cpp b/Kernel/Arch/aarch64/init.cpp index a7a477c50c..345575d11c 100644 --- a/Kernel/Arch/aarch64/init.cpp +++ b/Kernel/Arch/aarch64/init.cpp @@ -46,7 +46,7 @@ extern "C" void exception_common(Kernel::TrapFrame const* const trap_frame) // Special registers dbgln("spsr_el1: {:x}", regs->spsr_el1); dbgln("elr_el1: {:x}", regs->elr_el1); - dbgln("tpidr_el1: {:x}", regs->tpidr_el1); + dbgln("tpidr_el0: {:x}", regs->tpidr_el0); dbgln("sp_el0: {:x}", regs->sp_el0); auto esr_el1 = Kernel::Aarch64::ESR_EL1::read();