nathan/quark-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added some code in initialize() to test interrupts

Browse Source
This commit is contained in:
ngiddings
2021-04-15 05:49:40 -05:00
parent c5e38801f3
commit 3229f55164
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/x86/linker.ld
View File

@@ -38,5 +38,5 @@ SECTIONS
_heapLocation = 0xFFB00000; _heapLocation = 0xFFB00000;
_heapSize = 0x100000; _heapSize = 0x100000;
_kernelStart = VIRTUAL_BASE; _kernelStart = VIRTUAL_BASE;
_kernelEnd = VIRTUAL_BASE + (4096 * IMAGE_SIZE); _kernel_end = VIRTUAL_BASE + (4096 * IMAGE_SIZE);
} }

21
src/x86/quark_x86.c
View File

@@ -4,6 +4,7 @@
#include "memorymap.h" #include "memorymap.h"
#include "apic.h" #include "apic.h"
#include "interrupts.h" #include "interrupts.h"
#include "msr.h"
#include "stdio.h" #include "stdio.h"
#include "string.h" #include "string.h"
#include "module.h" #include "module.h"
@@ -11,7 +12,7 @@
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
extern int _kernelEnd; extern int _kernel_end;
struct apic_registers_t volatile *apic_registers; struct apic_registers_t volatile *apic_registers;
@@ -75,11 +76,13 @@ int initialize(void *multiboot_info)
} }
// TODO: setup IDT // TODO: setup IDT
memset(idt, 0, sizeof(struct interrupt_descriptor_t) * 256); memset(idt, 0, sizeof(struct interrupt_descriptor_t) * 256);
create_interrupt_descriptor(&idt[EXCEPTION_DIV_BY_0], (void*)isr_division_by_zero, INTERRPUT_INT32, 3); create_interrupt_descriptor(&idt[EXCEPTION_DIV_BY_0], (void*)isr_division_by_zero, INTERRPUT_INT32, 0);
create_interrupt_descriptor(&idt[EXCEPTION_GPF], (void*)isr_gp_fault, INTERRPUT_INT32, 3); create_interrupt_descriptor(&idt[EXCEPTION_GPF], (void*)isr_gp_fault, INTERRPUT_INT32, 0);
create_interrupt_descriptor(&idt[EXCEPTION_PAGE_FAULT], (void*)isr_page_fault, INTERRPUT_INT32, 3); create_interrupt_descriptor(&idt[EXCEPTION_PAGE_FAULT], (void*)isr_page_fault, INTERRPUT_INT32, 0);
create_interrupt_descriptor(&idt[EXCEPTION_DOUBLE_FAULT], (void*)isr_double_fault, INTERRPUT_INT32, 3); create_interrupt_descriptor(&idt[EXCEPTION_DOUBLE_FAULT], (void*)isr_double_fault, INTERRPUT_INT32, 0);
create_interrupt_descriptor(&idt[0x80], (void*)isr_syscall, INTERRPUT_INT32, 3); create_interrupt_descriptor(&idt[ISR_AP_START], (void*)isr_ap_start, INTERRPUT_INT32, 0);
create_interrupt_descriptor(&idt[ISR_SYSCALL], (void*)isr_syscall, INTERRPUT_INT32, 0);
lidt(idt);
// TODO: setup APIC // TODO: setup APIC
asm volatile( asm volatile(
@@ -89,5 +92,11 @@ int initialize(void *multiboot_info)
::: "al" ::: "al"
); );
apic_enable(); apic_enable();
struct msr_apic_base_t msr;
read_msr(MSR_APIC_BASE, (uint64_t*)&msr);
msr.apic_base = (size_t) &_kernel_end >> 12;
write_msr(MSR_APIC_BASE, (uint64_t*)&msr);
printf("MSR_APIC_BASE: %016x\n", *((uint32_t*)&msr));
apic_registers = (struct apic_registers_t*) (msr.apic_base << 12);
// TODO: enter first process // TODO: enter first process
} }