Kernel/arm7 - Fiddling, still having issues with VMM

[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 0178bdd..6ee9262 100644 (file)
--- a/Kernel/arch/x86_64/start32.asm
+++ b/Kernel/arch/x86_64/start32.asm
@@ -42,7 +42,7 @@ start:
        cmp eax, 0x80000001     ; Compare the A-register with 0x80000001.
        mov eax, 0x80000001
        cpuid
-    jb .not64bitCapable
+       jb .not64bitCapable
        test edx, 1<<29
        jz .not64bitCapable
 
@@ -89,6 +89,7 @@ start:
 
 [section .data]
 [global gGDT]
+[global gGDTPtr]
 gGDT:
        dd      0,0
        dd      0x00000000, 0x00209A00  ; 0x08: 64-bit Code
@@ -113,7 +114,7 @@ gMultibootPtr:
 [global gInitialPML4]
 gInitialPML4:  ; Covers 256 TiB (Full 48-bit Virtual Address Space)
        dd      gInitialPDP - KERNEL_BASE + 3, 0        ; Identity Map Low 4Mb
-       times 512-1-4 dq        0
+       times 512-4-1 dq        0
        dd      gInitialPML4 - KERNEL_BASE + 3, 0       ; Fractal Mapping
        dq      0
        dq      0
@@ -125,7 +126,8 @@ gInitialPDP:        ; Covers 512 GiB
 
 gHighPDP:      ; Covers 512 GiB
        times 510       dq      0
-       dq      0 + 0x143       ; 1 GiB Page from zero
+       ;dq     0 + 0x143       ; 1 GiB Page from zero
+       dd      gInitialPD - KERNEL_BASE + 3, 0
        dq      0
 
 gInitialPD:    ; Covers 1 GiB