freya/corn
1
0
Fork 0
mirror of https://git.stationery.faith/corn/corn.git synced 2024-11-22 05:52:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

things

Browse source
This commit is contained in:
Freya Murphy 2024-01-29 18:05:26 -05:00
parent 5726080194
commit 36d7dad070
Signed by: freya
GPG key ID: 744AB800E383AE52
4 changed files with 50 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/arch/amd64/boot.S
View file

@ -135,6 +135,11 @@ start:
bits 64 bits 64
code64: code64:
mov dx, 16
mov ds, dx
mov ss, dx
pop rdi pop rdi
call amd64_shim call amd64_shim
mov rdi, rax mov rdi, rax

36
src/arch/amd64/idt.S
View file

@ -1,15 +1,49 @@
extern idt_exception_handler extern idt_exception_handler
global isr_stub_table global isr_stub_table
%macro PUSHALL 0
push rbx
push rcx
push rdx
push rsi
push rdi
push r8
push r9
push r10
push r11
push r12
push r13
push r14
push r15
%endmacro
%macro POPALL 0
pop r15
pop r14
pop r13
pop r12
pop r11
pop r10
pop r9
pop r8
pop rdi
pop rsi
pop rdx
pop rcx
pop rbx
%endmacro
; call the exception handler with the interrupt number ; call the exception handler with the interrupt number
; args: interrupt number ; args: interrupt number
%macro ISRException 1 %macro ISRException 1
align 8 align 8
isr_stub_%+%1: isr_stub_%+%1:
PUSHALL
cld cld
mov rdi, %1 mov rdi, %1
mov rsi, 0 mov rsi, 0
call idt_exception_handler call idt_exception_handler
POPALL
iretq iretq
%endmacro %endmacro
@ -19,10 +53,12 @@ isr_stub_%+%1:
%macro ISRExceptionCode 1 %macro ISRExceptionCode 1
align 8 align 8
isr_stub_%+%1: isr_stub_%+%1:
PUSHALL
cld cld
mov rdi, %1 mov rdi, %1
pop rsi pop rsi
call idt_exception_handler call idt_exception_handler
POPALL
iretq iretq
%endmacro %endmacro

7
src/arch/amd64/idt.c
View file

@ -20,7 +20,7 @@ struct idt_entry {
struct idtr { struct idtr {
uint16_t size; uint16_t size;
void *address; uint64_t address;
} __attribute__((packed)); } __attribute__((packed));
// interrupt gate // interrupt gate
@ -47,7 +47,7 @@ extern void *isr_stub_table[];
// initialize and load the IDT // initialize and load the IDT
void idt_init(void) { void idt_init(void) {
// initialize idtr // initialize idtr
idtr.address = &idt; idtr.address = (uint64_t)&idt;
idtr.size = (uint16_t)sizeof(struct idt_entry) * IDT_SIZE - 1; idtr.size = (uint16_t)sizeof(struct idt_entry) * IDT_SIZE - 1;
// initialize idt // initialize idt
@ -63,14 +63,13 @@ void idt_init(void) {
entry->flags = PRESENT | RING0 | gate_type; entry->flags = PRESENT | RING0 | gate_type;
entry->isr_low = isr & 0xffff; entry->isr_low = isr & 0xffff;
entry->isr_mid = (isr >> 16) & 0xffff; entry->isr_mid = (isr >> 16) & 0xffff;
entry->isr_high = isr >> 32; entry->isr_high = (isr >> 32) & 0xffffffff;
entry->reserved = 0; entry->reserved = 0;
} }
__asm__ volatile ("lidt %0" : : "m"(idtr)); __asm__ volatile ("lidt %0" : : "m"(idtr));
} }
// Intel manual vol 3 ch 6.3.1 // Intel manual vol 3 ch 6.3.1
char *EXCEPTIONS[] = { char *EXCEPTIONS[] = {
"Exception 0x00 Divide Error", "Exception 0x00 Divide Error",

1
src/memory/physalloc.c
View file

@ -182,7 +182,6 @@ void memory_init(struct memory_map *map) {
//HACK: terrible hack bad bad bad bad //HACK: terrible hack bad bad bad bad
long bitmap_size = bitmap_pages * PAGE_SIZE; long bitmap_size = bitmap_pages * PAGE_SIZE;
bitmap = (uint64_t *) page_align(kaddr(kernel_end)); bitmap = (uint64_t *) page_align(kaddr(kernel_end));
char buf[20];
long page_area_size = segment_count * sizeof(struct memory_area); long page_area_size = segment_count * sizeof(struct memory_area);
char *page_area_addr = (char *)bitmap + bitmap_size; char *page_area_addr = (char *)bitmap + bitmap_size;