justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-10 00:14:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Use uintptr_t instead of addr_t

Browse Source 
They're never actually going to change independently, and it's also
brining in kutil headers more places than they should be.
This commit is contained in:
Justin C. Miller
2018-09-20 09:37:30 -07:00
parent a9d72b8102
commit cef0a71bce
20 changed files with 108 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/kernel/interrupts.cpp
View File

@@ -1,6 +1,5 @@
#include <stdint.h>
#include "kutil/memory.h"
#include "apic.h"
#include "console.h"
#include "cpu.h"
@@ -19,9 +18,9 @@ static const uint16_t PIC2 = 0xa0;
extern "C" {
void _halt();
addr_t isr_handler(addr_t, cpu_state);
addr_t irq_handler(addr_t, cpu_state);
addr_t syscall_handler(addr_t, cpu_state);
uintptr_t isr_handler(uintptr_t, cpu_state);
uintptr_t irq_handler(uintptr_t, cpu_state);
uintptr_t syscall_handler(uintptr_t, cpu_state);
#define ISR(i, name) extern void name ();
#define EISR(i, name) extern void name ();
@@ -105,8 +104,8 @@ interrupts_init()
log::info(logs::boot, "Interrupts enabled.");
}
addr_t
isr_handler(addr_t return_rsp, cpu_state regs)
uintptr_t
isr_handler(uintptr_t return_rsp, cpu_state regs)
{
console *cons = console::get();
@@ -251,8 +250,8 @@ isr_handler(addr_t return_rsp, cpu_state regs)
return return_rsp;
}
addr_t
irq_handler(addr_t return_rsp, cpu_state regs)
uintptr_t
irq_handler(uintptr_t return_rsp, cpu_state regs)
{
console *cons = console::get();
uint8_t irq = get_irq(regs.interrupt);
@@ -269,8 +268,8 @@ irq_handler(addr_t return_rsp, cpu_state regs)
return return_rsp;
}
addr_t
syscall_handler(addr_t return_rsp, cpu_state regs)
uintptr_t
syscall_handler(uintptr_t return_rsp, cpu_state regs)
{
return syscall_dispatch(return_rsp, regs);
}