diff options
| author | AlmuHS <almuhs@github.com> | 2019-05-20 16:23:55 +0200 |
|---|---|---|
| committer | AlmuHS <almuhs@github.com> | 2019-05-20 16:23:55 +0200 |
| commit | 5505a49d8f0479de6309f86a8a4448d4afafd67e (patch) | |
| tree | d416424a37b3ab48de3559780755839fb658e71c | |
| parent | 07527728ff3afe44109f7c5a9e40979ef856266e (diff) | |
wip: enable pagging from assembly (not finished)
| -rw-r--r-- | i386/i386/cpuboot.S | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/i386/i386/cpuboot.S b/i386/i386/cpuboot.S index 7ebd76f2..f074654f 100644 --- a/i386/i386/cpuboot.S +++ b/i386/i386/cpuboot.S @@ -91,20 +91,29 @@ _apboot: #if PAE //set_cr3((unsigned)_kvtophys(kernel_pmap->pdpbase)); movl %cr3, %eax - movl %eax, _kvtophys(kernel_pmap->pdpbase) + movl kernel_pmap->pdpbase - KERNELBASE, %eax movl %eax, %cr3 #ifndef MACH_HYP - if (!CPU_HAS_FEATURE(CPU_FEATURE_PAE)) - panic("CPU doesn't have support for PAE."); - //set_cr4(get_cr4() | CR4_PAE); + //if (!CPU_HAS_FEATURE(CPU_FEATURE_PAE)) + bt %cr4, $CPU_FEATURE_PAE + jc setpae + jnc nopae + +setpae: movl %cr4, %eax orl CR4_PAE, %eax movl %eax, %cr4 +nopae: + nop #endif /* MACH_HYP */ #else - set_cr3((unsigned)_kvtophys(kernel_page_dir)); + //set_cr3((unsigned)_kvtophys(kernel_page_dir)); + movl %cr3, %eax + movl kernel_page_dir - KERNELBASE, %eax + movl %eax, %cr3 + #endif /* PAE */ #ifndef MACH_HYP /* Turn paging on. @@ -115,19 +124,30 @@ _apboot: movl %cr0, %eax orl CR0_PG, %eax orl CR0_WP, %eax - movl %eax, %cr0 + movl %eax, %cr0 //set_cr0(get_cr0() & ~(CR0_CD | CR0_NW)); movl %cr0, %eax - andl ~(CR0_CD | CR0_NW), %eax + movl $0, %edx + movl $CR0_CD, %edx + orl $CR0_NW, %edx + not %edx + mov %edx, %eax movl %eax, %cr0 - if (CPU_HAS_FEATURE(CPU_FEATURE_PGE)) + //if (CPU_HAS_FEATURE(CPU_FEATURE_PGE)) + bt %cr4, $CPU_FEATURE_PGE + jc setpge + jnc nopge + + setpge: //set_cr4(get_cr4() | CR4_PGE); movl %cr4, %eax orl CR4_PGE, %eax mov %eax, %cr4 + nopge: + nop #endif /* MACH_HYP */ @@ -175,4 +195,4 @@ apbootend: .globl dummyf dummyf: -ret
\ No newline at end of file +ret |