From 4292369d5c80afe71479228e79969855f449f1c3 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Sun, 15 Sep 2019 15:10:05 +0200 Subject: Abstracted ASM files/functions --- src/boot.asm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'src/boot.asm') diff --git a/src/boot.asm b/src/boot.asm index 5e6c812..681bf10 100644 --- a/src/boot.asm +++ b/src/boot.asm @@ -20,7 +20,7 @@ mboot: dd MULTIBOOT_HEADER_MAGIC dd MULTIBOOT_HEADER_FLAGS dd MULTIBOOT_CHECKSUM - + ; AOUT kludge dd mboot dd code @@ -34,24 +34,14 @@ stublet: call kernel_main jmp $ -; GDT flush function -global gdt_flush -extern gp -gdt_flush: - lgdt [gp] - mov ax, 0x10 ; Data segment offset of GDT - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax - jmp 0x08:flush2 ; Code segment offset -flush2: - ret ; Returns to C code +%include "src/gdt/gdt.asm" %include "src/interrupts/idt.asm" + %include "src/interrupts/isr.asm" +%include "src/interrupts/irq.asm" + ; Store the stack SECTION .bss resb 8192 ; Reserve 8KiB -- cgit v1.2.3