Changes in kernel/arch/amd64/src/boot/multiboot.S [17af882:f66c203d] in mainline

File:

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

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

@@ -428 +428 @@
         
         /* Call arch_pre_main(multiboot_eax, multiboot_ebx) */
+        xorq %rdi, %rdi
         movl multiboot_eax, %edi
+        xorq %rsi, %rsi
         movl multiboot_ebx, %esi
-        callq arch_pre_main
-
+        
+        movabsq $arch_pre_main, %rax
+        callq *%rax
+        
         long_status $status_main
         
         /* Call main_bsp() */
-        callq main_bsp 
+        movabsq $main_bsp, %rax
+        call *%rax
         
         /* Not reached */
@@ -633 +638 @@
         .quad ptl_2_6g + (PTL_WRITABLE | PTL_PRESENT)
         .quad ptl_2_7g + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 502, 8, 0
-        /* Mapping of [0; 2G) at -2G */
-        .quad ptl_2_0g + (PTL_WRITABLE | PTL_PRESENT)
-        .quad ptl_2_1g + (PTL_WRITABLE | PTL_PRESENT)
-
+        .fill 504, 8, 0
 
 .align 4096
@@ -643 +644 @@
 ptl_0:
         .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 510, 8, 0
+        .fill 255, 8, 0
         .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
+        .fill 255, 8, 0
 
 .section K_DATA_START, "aw", @progbits