Rename "SavedContext" to "Context"
Seemed like a more appropriate name.
This commit is contained in:
parent
063b6345ee
commit
e6c6a1677a
@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
struct SavedContext
|
struct Context
|
||||||
{
|
{
|
||||||
uint64_t cr2;
|
uint64_t cr2;
|
||||||
uint64_t ds;
|
uint64_t ds;
|
@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include "SavedContext.h"
|
#include "Context.h"
|
||||||
|
|
||||||
namespace IRQ
|
namespace IRQ
|
||||||
{
|
{
|
||||||
void interrupt_handler(SavedContext* context);
|
void interrupt_handler(Context* context);
|
||||||
}
|
}
|
@ -1,5 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include "interrupts/SavedContext.h"
|
#include "interrupts/Context.h"
|
||||||
|
|
||||||
namespace Interrupts
|
namespace Interrupts
|
||||||
{
|
{
|
||||||
@ -7,5 +7,5 @@ namespace Interrupts
|
|||||||
void disable();
|
void disable();
|
||||||
|
|
||||||
bool is_in_handler();
|
bool is_in_handler();
|
||||||
void return_from_handler(SavedContext* context);
|
void return_from_handler(Context* context);
|
||||||
}
|
}
|
@ -1,15 +1,15 @@
|
|||||||
#define MODULE "isr"
|
#define MODULE "isr"
|
||||||
|
|
||||||
#include "assert.h"
|
#include "assert.h"
|
||||||
|
#include "interrupts/Context.h"
|
||||||
#include "interrupts/IRQ.h"
|
#include "interrupts/IRQ.h"
|
||||||
#include "interrupts/Interrupts.h"
|
#include "interrupts/Interrupts.h"
|
||||||
#include "interrupts/SavedContext.h"
|
|
||||||
#include "log/Log.h"
|
#include "log/Log.h"
|
||||||
#include "panic/hang.h"
|
#include "panic/hang.h"
|
||||||
#include "std/stdio.h"
|
#include "std/stdio.h"
|
||||||
#include "trace/StackTracer.h"
|
#include "trace/StackTracer.h"
|
||||||
|
|
||||||
extern "C" void common_handler(SavedContext* context)
|
extern "C" void common_handler(Context* context)
|
||||||
{
|
{
|
||||||
ASSERT(Interrupts::is_in_handler());
|
ASSERT(Interrupts::is_in_handler());
|
||||||
if (context->number >= 0x20 && context->number < 0x30)
|
if (context->number >= 0x20 && context->number < 0x30)
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
#include "scheduling/PIT.h"
|
#include "scheduling/PIT.h"
|
||||||
#include "std/stdio.h"
|
#include "std/stdio.h"
|
||||||
|
|
||||||
void IRQ::interrupt_handler(SavedContext* context)
|
void IRQ::interrupt_handler(Context* context)
|
||||||
{
|
{
|
||||||
switch (context->irq_number)
|
switch (context->irq_number)
|
||||||
{
|
{
|
||||||
|
@ -16,7 +16,7 @@ bool Interrupts::is_in_handler()
|
|||||||
return __is_in_interrupt_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"
|
asm volatile("mov %0, %%rsp\n"
|
||||||
"jmp _asm_interrupt_exit"
|
"jmp _asm_interrupt_exit"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user