Changeset a1f60f3 in mainline for kernel/arch/amd64/src/boot/boot.S

Timestamp:

2010-06-27T23:04:20Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

64f6ef04

Parents:

33dac7d

Message:

move from "kernel" memory model to "large" memory model
get rid of the extra identity mapping of the physical memory at -2 GB

File:

• kernel/arch/amd64/src/boot/boot.S (modified) (6 diffs)

kernel/arch/amd64/src/boot/boot.S

@@ -31 +31 @@
 #include <arch/boot/boot.h>
 #include <arch/boot/memmap.h>
-#include <arch/mm/page.h>       
+#include <arch/mm/page.h>
 #include <arch/mm/ptl.h>
 #include <arch/pm.h>
@@ -172 +172 @@
         xorq %rsi, %rsi
         movl grub_ebx, %esi
-        call arch_pre_main
+        
+        movabsq $arch_pre_main, %rax
+        callq *%rax
         
         # create the first stack frame
         pushq $0
         movq %rsp, %rbp
-
-        call main_bsp
+        
+        movabsq $main_bsp, %rax
+        call *%rax
         
         # not reached
@@ -256 +259 @@
 #
 # Macro for generating initial page table contents.
-# @param cnt Number of entries to generat. Must be multiple of 8.
+# @param cnt Number of entries to generate. Must be multiple of 8.
 # @param g   Number of GB that will be added to the mapping.
 #
-.macro ptl2gen cnt g 
+.macro ptl2gen cnt g
 .if \cnt
-        ptl2gen "\cnt - 8" \g 
+        ptl2gen "\cnt - 8" \g
         .quad ((\cnt - 8) * 0x200000) + (\g * 1024 * 1024 * 1024) | (PTL_WRITABLE | PTL_PRESENT | PTL_2MB_PAGE)
         .quad ((\cnt - 7) * 0x200000) + (\g * 1024 * 1024 * 1024) | (PTL_WRITABLE | PTL_PRESENT | PTL_2MB_PAGE)
@@ -276 +279 @@
 .align 4096
 .global ptl_2_0g
-ptl_2_0g:       
+ptl_2_0g:
         ptl2gen 512 0
 
@@ -302 +305 @@
         # Identity mapping for [0; 4G)
         .quad ptl_2_0g + (PTL_WRITABLE | PTL_PRESENT)
-        .quad ptl_2_1g + (PTL_WRITABLE | PTL_PRESENT) 
+        .quad ptl_2_1g + (PTL_WRITABLE | PTL_PRESENT)
         .quad ptl_2_2g + (PTL_WRITABLE | PTL_PRESENT)
         .quad ptl_2_3g + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 506, 8, 0
-        # Mapping of [0; 1G) at -2G
-        .quad ptl_2_0g + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 1, 8, 0
+        .fill 508, 8, 0
 
 .align 4096
@@ -314 +314 @@
 ptl_0:
         .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 255,8,0
+        .fill 255, 8, 0
         .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 254,8,0
-        .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
+        .fill 255, 8, 0
 
 .section K_DATA_START, "aw", @progbits