From e6c6a1677affffced4a1b9bb315a595c8bd7f266 Mon Sep 17 00:00:00 2001 From: apio Date: Tue, 20 Sep 2022 19:56:43 +0200 Subject: [PATCH] Rename "SavedContext" to "Context" Seemed like a more appropriate name. --- kernel/include/interrupts/{SavedContext.h => Context.h} | 2 +- kernel/include/interrupts/IRQ.h | 4 ++-- kernel/include/interrupts/Interrupts.h | 4 ++-- kernel/src/interrupts/Entry.cpp | 4 ++-- kernel/src/interrupts/IRQ.cpp | 2 +- kernel/src/interrupts/Interrupts.cpp | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename kernel/include/interrupts/{SavedContext.h => Context.h} (93%) diff --git a/kernel/include/interrupts/SavedContext.h b/kernel/include/interrupts/Context.h similarity index 93% rename from kernel/include/interrupts/SavedContext.h rename to kernel/include/interrupts/Context.h index 3b2af66f..e54b2b34 100644 --- a/kernel/include/interrupts/SavedContext.h +++ b/kernel/include/interrupts/Context.h @@ -1,7 +1,7 @@ #pragma once #include -struct SavedContext +struct Context { uint64_t cr2; uint64_t ds; diff --git a/kernel/include/interrupts/IRQ.h b/kernel/include/interrupts/IRQ.h index 441f6d64..a61540ce 100644 --- a/kernel/include/interrupts/IRQ.h +++ b/kernel/include/interrupts/IRQ.h @@ -1,7 +1,7 @@ #pragma once -#include "SavedContext.h" +#include "Context.h" namespace IRQ { - void interrupt_handler(SavedContext* context); + void interrupt_handler(Context* context); } \ No newline at end of file diff --git a/kernel/include/interrupts/Interrupts.h b/kernel/include/interrupts/Interrupts.h index d70ce395..c87edbf0 100644 --- a/kernel/include/interrupts/Interrupts.h +++ b/kernel/include/interrupts/Interrupts.h @@ -1,5 +1,5 @@ #pragma once -#include "interrupts/SavedContext.h" +#include "interrupts/Context.h" namespace Interrupts { @@ -7,5 +7,5 @@ namespace Interrupts void disable(); bool is_in_handler(); - void return_from_handler(SavedContext* context); + void return_from_handler(Context* context); } \ No newline at end of file diff --git a/kernel/src/interrupts/Entry.cpp b/kernel/src/interrupts/Entry.cpp index 6f24af31..aefdbff5 100644 --- a/kernel/src/interrupts/Entry.cpp +++ b/kernel/src/interrupts/Entry.cpp @@ -1,15 +1,15 @@ #define MODULE "isr" #include "assert.h" +#include "interrupts/Context.h" #include "interrupts/IRQ.h" #include "interrupts/Interrupts.h" -#include "interrupts/SavedContext.h" #include "log/Log.h" #include "panic/hang.h" #include "std/stdio.h" #include "trace/StackTracer.h" -extern "C" void common_handler(SavedContext* context) +extern "C" void common_handler(Context* context) { ASSERT(Interrupts::is_in_handler()); if (context->number >= 0x20 && context->number < 0x30) diff --git a/kernel/src/interrupts/IRQ.cpp b/kernel/src/interrupts/IRQ.cpp index c372ee09..366b1b8e 100644 --- a/kernel/src/interrupts/IRQ.cpp +++ b/kernel/src/interrupts/IRQ.cpp @@ -8,7 +8,7 @@ #include "scheduling/PIT.h" #include "std/stdio.h" -void IRQ::interrupt_handler(SavedContext* context) +void IRQ::interrupt_handler(Context* context) { switch (context->irq_number) { diff --git a/kernel/src/interrupts/Interrupts.cpp b/kernel/src/interrupts/Interrupts.cpp index 4a4dfa98..e4b72fbb 100644 --- a/kernel/src/interrupts/Interrupts.cpp +++ b/kernel/src/interrupts/Interrupts.cpp @@ -16,7 +16,7 @@ bool Interrupts::is_in_handler() return __is_in_interrupt_handler; } -void Interrupts::return_from_handler(SavedContext* context) +void Interrupts::return_from_handler(Context* context) { asm volatile("mov %0, %%rsp\n" "jmp _asm_interrupt_exit"