From ce139b3aaa3da99a2fff43ce1578014daa5f4b2c Mon Sep 17 00:00:00 2001
From: pointer-to-bios <pointer-to-bios@outlook.com>
Date: Sun, 3 Dec 2023 17:45:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=AADebug?=
 =?UTF-8?q?=E4=BB=A3=E4=BB=B7=E6=9C=80=E5=B0=8F=E7=9A=84=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/kernel/arch/x86_64/entry32.s | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/kernel/arch/x86_64/entry32.s b/src/kernel/arch/x86_64/entry32.s
index 8f1cd51..d18cf9f 100644
--- a/src/kernel/arch/x86_64/entry32.s
+++ b/src/kernel/arch/x86_64/entry32.s
@@ -35,16 +35,14 @@ init32:
     loop init32_loop0
 
     ; 加载GDTR和段寄存器
-    db 0x66
-    lgdt [0x104028]
-    jmp after_lgdt
-    after_lgdt:
     mov ax, 0x10
     mov ds, ax
-    ; mov es, ax
+    ; mov ss, ax
+    mov es, ax
     mov fs, ax
     mov gs, ax
-    mov ss, ax
+    db 0x66
+    lgdt [0x104028]
 
     ; 打开PAE
     mov eax, cr4
@@ -96,14 +94,3 @@ gdt_end:
 gdt_ptr:
     dw  gdt_end - gdt - 1
     dq  gdt
-
-    ; 临时的32位分段
-gdt32:
-    dq 0
-    dq 0x00cf9a000000ffff
-    dq 0x00cf92000000ffff
-gdt32_end:
-
-gdt32_ptr:
-    dw gdt32_end - gdt32_end - 1
-    dd gdt32