kernel/Makefile

@@ -10,7 +10,7 @@ LDSCRIPT        = make/$(ARCH)/linker.ld
 
 CFLAGS          ?= -Og -g
 CFLAGS          := $(CFLAGS) $(ARCH_CFLAGS) \
-                   -Wall -Wextra -pedantic -std=gnu11 -I../ext -Isrc -fPIE -mno-red-zone
+                   -Wall -Wextra -pedantic -std=gnu11 -I../ext -Isrc -fPIE
 LDFLAGS         := $(LDFLAGS) -T $(LDSCRIPT) 
 
 

kernel/src/arch/x86_64/entry-stivale2.c

@@ -4,7 +4,6 @@
 
 #include <arch/x86/stivale2-parse.h>
 #include <arch/x86_64/gdt.h>
-#include <arch/x86_64/interrupt.h>
 #include <print/print.h>
 
 #include <main.h>
@@ -47,7 +46,6 @@ void stivale2_main(struct stivale2_struct *info) {
     loadgdt();
     print_gdt();
 
-    setup_ints();
+    asmpanic();
-
     kmain();
 }

kernel/src/arch/x86_64/idt.c

@@ -1,26 +0,0 @@
-#include "idt.h"
-
-struct IDTInfo {
-    uint16_t size;
-    uint64_t offset;
-} __attribute__((packed));
-
-struct IDTDescr IDT[256];
-static struct IDTInfo idt_info;
-
-void set_idt_ent(uint8_t index, uint64_t offset, uint8_t ist, uint8_t min_priv_level, enum GateType type) {
-    IDT[index].offset_1 = offset & 0xFFFF;
-    IDT[index].offset_2 = (offset >> 16) & 0xFFFF;
-    IDT[index].offset_3 = (offset >> 32) & 0xFFFFFFFF;
-    IDT[index].ist = ist;
-    IDT[index].selector = 8; // assume for now that it's always in-kernel
-    IDT[index].zero = 0;
-    IDT[index].type_attr = type | (min_priv_level << 5) | 0x80;
-}
-
-void* get_idt_fn(uint8_t index) {
-    struct IDTDescr* i = &IDT[index];
-    return (uintptr_t)( ((uint64_t)i->offset_3 << 32) | ((uint64_t)i->offset_2 << 16) | (uint64_t)i->offset_1);
-}
-
-void clear_idt_ent(uint8_t index);

kernel/src/arch/x86_64/idt.h

@@ -1,22 +0,0 @@
-#include <stdint.h>
-
-struct IDTDescr {
-   uint16_t offset_1; // offset bits 0..15
-   uint16_t selector; // a code segment selector in GDT or LDT
-   uint8_t ist;       // bits 0..2 holds Interrupt Stack Table offset, rest of bits zero.
-   uint8_t type_attr; // type and attributes
-   uint16_t offset_2; // offset bits 16..31
-   uint32_t offset_3; // offset bits 32..63
-   uint32_t zero;     // reserved
-};
-
-enum GateType {
-    CALL64 = 0xC,
-    INT64  = 0xE,
-    TRAP64 = 0xF,
-};
-
-void init_idt();
-void set_idt_ent(uint8_t index, uint64_t offset, uint8_t ist, uint8_t min_priv_level, enum GateType type);
-void* get_idt_fn(uint8_t index);
-void clear_idt_ent(uint8_t index);

kernel/src/arch/x86_64/idt.nasm

@@ -1,20 +0,0 @@
-extern IDT;
-
-section .rodata
-align 8
-idtpointer:
-    dw (256*16) - 1
-    dq IDT
-
-section .text
-global init_idt
-init_idt:
-    lidt [idtpointer]
-    ret
-
-global isr_wrapper
-extern interrupt_handler
-align 8
-isr_wrapper:
-    call interrupt_handler
-    iretq

kernel/src/arch/x86_64/info.c

@@ -1,2 +1,3 @@
- const char *arch = "x86_64";
+ extern char archval;
+ const char *arch = &archval;
 

kernel/src/arch/x86_64/info.nasm

@@ -0,0 +1,8 @@
+%include "arch/x86_64/panic.nasminc"
+
+global archval
+archval db "x86_64-nasm", 0
+
+global asmpanic
+asmpanic:
+    PANIC "asmpanic"

kernel/src/arch/x86_64/interrupt.c

@@ -1,39 +0,0 @@
-#include <stdint.h>
-
-#include "idt.h"
-#include "interrupt.h"
-
-typedef uint64_t uword_t;
-
-extern void isr_wrapper();
-
-struct interrupt_frame
-{
-    uword_t ip;
-    uword_t cs;
-    uword_t flags;
-    uword_t sp;
-    uword_t ss;
-};
- 
-void interrupt_handler()
-{
-    printf("interrupted\n");
-    // panic("ee");
-}
-
-
-void setup_ints() {
-    set_idt_ent(0x80, (uint64_t)&isr_wrapper, 0, 0, INT64);
-    init_idt();
-
-    typedef void (*MyFunctionType)(void);
-    MyFunctionType handler_0x80 = get_idt_fn(0x80);
-    printf("interrupt handler: %x\n", handler_0x80);
-    // interrupt_handler(0);
-    
-
-    __asm__ volatile("int $0x80");
-
-    printf("interrupt handled!\n");
-}

kernel/src/arch/x86_64/interrupt.h

@@ -1 +0,0 @@
-void setup_ints();