From 874f046af8a68551ae55eb4ed11b5d796f110f77 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sat, 13 Aug 2016 18:58:31 -0600
Subject: [PATCH] WIP: IDT in rust
---
x86/startup-x86_64.asm | 14 +++-----------
x86/vesa.asm | 4 ++--
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/x86/startup-x86_64.asm b/x86/startup-x86_64.asm
index 8dd738d..05b7021 100644
--- a/x86/startup-x86_64.asm
+++ b/x86/startup-x86_64.asm
@@ -67,21 +67,13 @@ long_mode:
mov gs, rax
mov ss, rax
- ; load long mode IDT
- lidt [idtr]
-
mov rsp, 0x800000 - 128
- mov rax, gdt.tss
- ltr ax
-
;rust init
+ xor rax, rax
mov eax, [kernel_base + 0x18]
- mov [interrupts.handler], rax
- mov rax, gdtr
- mov rbx, idtr
- mov rcx, tss
- int 0xFF
+ mov rbx, gdtr
+ jmp rax
.lp:
sti
hlt
diff --git a/x86/vesa.asm b/x86/vesa.asm
index 8dadf2a..cb22221 100644
--- a/x86/vesa.asm
+++ b/x86/vesa.asm
@@ -183,8 +183,8 @@ vesa:
.minx dw 640
.miny dw 480
.required:
-.requiredx dw 0 ;1024 ;USE THESE WITH CAUTION
-.requiredy dw 0 ;768
+.requiredx dw 1024 ;USE THESE WITH CAUTION
+.requiredy dw 768
.requiredmode dw 0
.noedidmsg db "EDID not supported.",10,13,0
--
GitLab