Changes in kernel/arch/amd64/src/boot/boot.S [64f6ef04:304342e] in mainline

File:

• kernel/arch/amd64/src/boot/boot.S (modified) (5 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
-        
-        movabsq $arch_pre_main, %rax
-        callq *%rax
+        call arch_pre_main
         
         # create the first stack frame
         pushq $0
         movq %rsp, %rbp
-        
-        movabsq $main_bsp, %rax
-        call *%rax
+
+        call main_bsp
         
         # not reached
@@ -259 +256 @@
 #
 # Macro for generating initial page table contents.
-# @param cnt Number of entries to generate. Must be multiple of 8.
+# @param cnt Number of entries to generat. Must be multiple of 8.
 # @param g   Number of GB that will be added to the mapping.
 #
-.macro ptl2gen cnt g
-        .if \cnt
-                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)
-                .quad ((\cnt - 6) * 0x200000) + (\g * 1024 * 1024 * 1024) | (PTL_WRITABLE | PTL_PRESENT | PTL_2MB_PAGE)
-                .quad ((\cnt - 5) * 0x200000) + (\g * 1024 * 1024 * 1024) | (PTL_WRITABLE | PTL_PRESENT | PTL_2MB_PAGE)
-                .quad ((\cnt - 4) * 0x200000) + (\g * 1024 * 1024 * 1024) | (PTL_WRITABLE | PTL_PRESENT | PTL_2MB_PAGE)
-                .quad ((\cnt - 3) * 0x200000) + (\g * 1024 * 1024 * 1024) | (PTL_WRITABLE | PTL_PRESENT | PTL_2MB_PAGE)
-                .quad ((\cnt - 2) * 0x200000) + (\g * 1024 * 1024 * 1024) | (PTL_WRITABLE | PTL_PRESENT | PTL_2MB_PAGE)
-                .quad ((\cnt - 1) * 0x200000) + (\g * 1024 * 1024 * 1024) | (PTL_WRITABLE | PTL_PRESENT | PTL_2MB_PAGE)
-        .endif
+.macro ptl2gen cnt g 
+.if \cnt
+        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)
+        .quad ((\cnt - 6) * 0x200000) + (\g * 1024 * 1024 * 1024) | (PTL_WRITABLE | PTL_PRESENT | PTL_2MB_PAGE)
+        .quad ((\cnt - 5) * 0x200000) + (\g * 1024 * 1024 * 1024) | (PTL_WRITABLE | PTL_PRESENT | PTL_2MB_PAGE)
+        .quad ((\cnt - 4) * 0x200000) + (\g * 1024 * 1024 * 1024) | (PTL_WRITABLE | PTL_PRESENT | PTL_2MB_PAGE)
+        .quad ((\cnt - 3) * 0x200000) + (\g * 1024 * 1024 * 1024) | (PTL_WRITABLE | PTL_PRESENT | PTL_2MB_PAGE)
+        .quad ((\cnt - 2) * 0x200000) + (\g * 1024 * 1024 * 1024) | (PTL_WRITABLE | PTL_PRESENT | PTL_2MB_PAGE)
+        .quad ((\cnt - 1) * 0x200000) + (\g * 1024 * 1024 * 1024) | (PTL_WRITABLE | PTL_PRESENT | PTL_2MB_PAGE)
+.endif
 .endm
 
-# Page table for pages in the 1st gigabyte.
-.align 4096
-ptl_2_0g:
+# Page table for pages in the first gigabyte.
+.align 4096
+.global ptl_2_0g
+ptl_2_0g:       
         ptl2gen 512 0
 
-# Page table for pages in the 2nd gigabyte.
-.align 4096
+# Page table for pages in the second gigabyte.
+.align 4096
+.global ptl_2_1g
 ptl_2_1g:
         ptl2gen 512 1
 
-# Page table for pages in the 3rd gigabyte.
-.align 4096
+# Page table for pages in the third gigabyte.
+.align 4096
+.global ptl_2_2g
 ptl_2_2g:
         ptl2gen 512 2
 
-# Page table for pages in the 4th gigabyte.
-.align 4096
+# Page table for pages in the fourth gigabyte.
+.align 4096
+.global ptl_2_3g
 ptl_2_3g:
         ptl2gen 512 3
 
-# Page table for pages in the 5th gigabyte.
-.align 4096
-ptl_2_4g:
-        ptl2gen 512 3
-
-# Page table for pages in the 6th gigabyte.
-.align 4096
-ptl_2_5g:
-        ptl2gen 512 3
-
-# Page table for pages in the 7th gigabyte.
-.align 4096
-ptl_2_6g:
-        ptl2gen 512 3
-
-# Page table for pages in the 8th gigabyte.
-.align 4096
-ptl_2_7g:
-        ptl2gen 512 3
-
-.align 4096
+.align 4096
+.global ptl_1
 ptl_1:
-        # Identity mapping for [0; 8G)
+        # 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)
-        .quad ptl_2_4g + (PTL_WRITABLE | PTL_PRESENT)
-        .quad ptl_2_5g + (PTL_WRITABLE | PTL_PRESENT)
-        .quad ptl_2_6g + (PTL_WRITABLE | PTL_PRESENT)
-        .quad ptl_2_7g + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 504, 8, 0
+        .fill 506, 8, 0
+        # Mapping of [0; 1G) at -2G
+        .quad ptl_2_0g + (PTL_WRITABLE | PTL_PRESENT)
+        .fill 1, 8, 0
 
 .align 4096
@@ -333 +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 255, 8, 0
+        .fill 254,8,0
+        .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
 
 .section K_DATA_START, "aw", @progbits
@@ -351 +333 @@
 
 extended_cpuid_msg:
-        .asciz "Error: Extended CPUID not supported -- CPU is not 64-bit. System halted."
+        .asciz "Extended CPUID not supported. System halted."
 long_mode_msg:
-        .asciz "Error: 64-bit long mode not supported. System halted."
+        .asciz "64 bit long mode not supported. System halted."
 noexecute_msg:
-        .asciz "Error: No-execute pages not supported. System halted."
+        .asciz "No-execute pages not supported. System halted."
 fx_msg:
-        .asciz "Error: FXSAVE/FXRESTORE instructions not supported. System halted."
+        .asciz "FXSAVE/FXRESTORE instructions not supported. System halted."
 sse2_msg:
-        .asciz "Error: SSE2 instructions not supported. System halted."
+        .asciz "SSE2 instructions not supported. System halted."