Fixes to 64-bit port, now working on physical memory allocation

[tpg/acess2.git] / Kernel / arch / x86_64 / start32.asm

diff --git a/Kernel/arch/x86_64/start32.asm b/Kernel/arch/x86_64/start32.asm
index 6f3c9a7..7983d2c 100644 (file)
--- a/Kernel/arch/x86_64/start32.asm
+++ b/Kernel/arch/x86_64/start32.asm
@@ -32,6 +32,9 @@ mboot:
 [section .text]
 [global start]
 start:
+       mov [gMultibootMagic - KERNEL_BASE], eax
+       mov [gMultibootPtr - KERNEL_BASE], ebx
+
        ; Check for Long Mode support
        mov eax, 0x80000000
        cpuid
@@ -85,17 +88,23 @@ start:
 [global gGDT]
 gGDT:
        dd      0,0
-       dd      0x00000000, 0x00209800  ; 0x08: 64-bit Code
-       dd      0x00000000, 0x00009000  ; 0x10: 64-bit Data
-       dd      0x00000000, 0x00209800  ; 0x18: 64-bit User Code
-       dd      0x00000000, 0x00209000  ; 0x20: 64-bit User Data
-       dd      0x00000000, 0x00209800  ; 0x38: 32-bit User Code
-       dd      0x00000000, 0x00209000  ; 0x30: 32-bit User Data
+       dd      0x00000000, 0x00209A00  ; 0x08: 64-bit Code
+       dd      0x00000000, 0x00009200  ; 0x10: 64-bit Data
+       dd      0x00000000, 0x0020FA00  ; 0x18: 64-bit User Code
+       dd      0x00000000, 0x0000F200  ; 0x20: 64-bit User Data
+       dd      0x00000000, 0x0040FA00  ; 0x38: 32-bit User Code
+       dd      0x00000000, 0x0040F200  ; 0x30: 32-bit User Data
        times MAX_CPUS  dd      0, 0, 0, 0      ; 0x38+16*n: TSS 0
 gGDTPtr:
        dw      $-gGDT-1
        dd      gGDT-KERNEL_BASE
        dd      0
+[global gMultibootPtr]
+[global gMultibootMagic]
+gMultibootMagic:
+       dd      0
+gMultibootPtr:
+       dd      0
 
 [section .padata]
 [global gInitialPML4]