diff options
| author | Fabian Imhof <fabian.imhof@ost.ch> | 2024-10-26 08:47:26 +0000 |
|---|---|---|
| committer | Fabian Imhof <fabian.imhof@ost.ch> | 2024-10-26 08:47:26 +0000 |
| commit | bca36b0c10fcae447c90e211e83987fea28eecdc (patch) | |
| tree | 3fa0395bbe35bcba5462a94d8ff63e3abd8d8246 /arch/x86_64/src/boot | |
| parent | 886c5e5ce7d1e6dd80d3782d5cf66bf474a6cddb (diff) | |
| download | teachos-bca36b0c10fcae447c90e211e83987fea28eecdc.tar.xz teachos-bca36b0c10fcae447c90e211e83987fea28eecdc.zip | |
wip
Diffstat (limited to 'arch/x86_64/src/boot')
| -rw-r--r-- | arch/x86_64/src/boot/boot.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86_64/src/boot/boot.s b/arch/x86_64/src/boot/boot.s index 7d6b322..6ed1e0a 100644 --- a/arch/x86_64/src/boot/boot.s +++ b/arch/x86_64/src/boot/boot.s @@ -24,11 +24,11 @@ .global page_map_level_4 page_map_level_4: .skip 512 * 8 -.global page_map_level_3_low -page_map_level_3_low: .skip 512 * 8 +.global page_map_level_3 +page_map_level_3: .skip 512 * 8 -.global page_map_level_2_low -page_map_level_2_low: .skip 512 * 8 +.global page_map_level_2 +page_map_level_2: .skip 512 * 8 /** * Reserve some space for the Multiboot 2 information pointer. @@ -318,14 +318,14 @@ enable_sse: */ prepare_page_maps: /* Add an entry to the PML4, pointing to the low PML3 */ - mov $page_map_level_3_low, %eax + mov $page_map_level_3, %eax or $0x3, %eax mov %eax, (page_map_level_4 + ((0x0000000000100000 >> 39) & 0x1ff) * 8) /* Add an entry to the low PML3, pointing to the low PML2 */ - mov $page_map_level_2_low, %eax + mov $page_map_level_2, %eax or $0x3, %eax - mov %eax, (page_map_level_3_low + ((0x0000000000100000 >> 30) & 0x1ff) * 8) + mov %eax, (page_map_level_3 + ((0x0000000000100000 >> 30) & 0x1ff) * 8) xor %ecx, %ecx @@ -337,7 +337,7 @@ prepare_page_maps: mov $(1 << 21), %eax mul %ecx or $((1 << 0) | (1 << 1) | (1 << 7)), %eax - mov %eax, page_map_level_2_low(,%ecx,8) + mov %eax, page_map_level_2(,%ecx,8) inc %ecx cmp %esi, %ecx |