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

File:

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

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

@@ -29 +29 @@
  */
 
-#include <abi/asmtool.h>
 #include <arch/boot/boot.h>
 #include <arch/mm/page.h>
@@ -65 +64 @@
 
 .align 4
+.global multiboot_image_start
 multiboot_header:
         .long MULTIBOOT_HEADER_MAGIC
@@ -75 +75 @@
         .long multiboot_image_start
 
-SYMBOL(multiboot_image_start)
+multiboot_image_start:
         cli
         cld
@@ -168 +168 @@
         
         movl %cr4, %eax
-        orl $CR4_PAE, %eax
+        btsl $5, %eax
         movl %eax, %cr4
         
@@ -176 +176 @@
         
         /* Enable long mode */
-        movl $AMD_MSR_EFER, %ecx
+        movl $EFER_MSR_NUM, %ecx
         rdmsr                     /* read EFER */
-        orl $AMD_LME, %eax        /* set LME = 1 */
+        btsl $AMD_LME_FLAG, %eax  /* set LME = 1 */
         wrmsr
         
         /* Enable paging to activate long mode (set CR0.PG = 1) */
         movl %cr0, %eax
-        orl $CR0_PG, %eax
+        btsl $31, %eax
         movl %eax, %cr0
         
@@ -427 +427 @@
         long_status $status_long
         
-        /* Call amd64_pre_main(multiboot_eax, multiboot_ebx) */
+        /* Call arch_pre_main(multiboot_eax, multiboot_ebx) */
         movl multiboot_eax, %edi
         movl multiboot_ebx, %esi
-        
-#ifdef MEMORY_MODEL_large
-        movabsq $amd64_pre_main, %rax
-        callq *%rax
-#else
-        callq amd64_pre_main
-#endif
-        
+        callq arch_pre_main
+
         long_status $status_main
         
         /* Call main_bsp() */
-#ifdef MEMORY_MODEL_large
-        movabsq $main_bsp, %rax
-        callq *%rax
-#else
-        callq main_bsp
-#endif
+        callq main_bsp 
         
         /* Not reached */
@@ -633 +622 @@
         ptl2gen 512 7
 
-#ifdef MEMORY_MODEL_kernel
 .align 4096
 ptl_1:
@@ -650 +638 @@
         .quad ptl_2_1g + (PTL_WRITABLE | PTL_PRESENT)
 
-.align 4096
-SYMBOL(ptl_0)
+
+.align 4096
+.global ptl_0
+ptl_0:
         .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
         .fill 510, 8, 0
         .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
-#endif
-
-#ifdef MEMORY_MODEL_large
-.align 4096
-ptl_1:
-        /* Identity mapping for [0; 8G) */
-        .quad ptl_2_0g + (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
-
-.align 4096
-SYMBOL(ptl_0)
-        .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 255, 8, 0
-        .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
-        .fill 255, 8, 0
-#endif
 
 .section K_DATA_START, "aw", @progbits
 
-SYMBOL(bootstrap_idtr)
+.global bootstrap_idtr
+bootstrap_idtr:
         .word 0
         .long 0
 
-SYMBOL(bootstrap_gdtr)
+.global bootstrap_gdtr
+bootstrap_gdtr:
         .word GDT_SELECTOR(GDT_ITEMS)
         .long KA2PA(gdt)
 
-SYMBOL(multiboot_eax)
+.global multiboot_eax
+multiboot_eax:
         .long 0
 
-SYMBOL(multiboot_ebx)
+.global multiboot_ebx
+multiboot_ebx:
         .long 0