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

File:

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

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

@@ -27 +27 @@
  */
 
+#include <abi/asmtool.h>
 #include <arch/boot/boot.h>
 #include <arch/mm/page.h>
@@ -41 +42 @@
 
 .align 8
-.global multiboot2_image_start
 multiboot2_header_start:
         .long MULTIBOOT2_HEADER_MAGIC
@@ -49 +49 @@
         
         /* Information request tag */
+        .align 8
         tag_info_req_start:
                 .word MULTIBOOT2_TAG_INFO_REQ
@@ -61 +62 @@
         
         /* Address tag */
+        .align 8
         tag_address_start:
                 .word MULTIBOOT2_TAG_ADDRESS
@@ -72 +74 @@
         
         /* Entry address tag */
+        .align 8
         tag_entry_address_start:
                 .word MULTIBOOT2_TAG_ENTRY_ADDRESS
@@ -80 +83 @@
         
         /* Flags tag */
+        .align 8
         tag_flags_start:
                 .word MULTIBOOT2_TAG_FLAGS
@@ -89 +93 @@
 #ifdef CONFIG_FB
         /* Framebuffer tag */
+        .align 8
         tag_framebuffer_start:
                 .word MULTIBOOT2_TAG_FRAMEBUFFER
@@ -100 +105 @@
         
         /* Module alignment tag */
+        .align 8
         tag_module_align_start:
                 .word MULTIBOOT2_TAG_MODULE_ALIGN
@@ -108 +114 @@
         
         /* Tag terminator */
+        .align 8
         tag_terminator_start:
                 .word MULTIBOOT2_TAG_TERMINATOR
@@ -115 +122 @@
 multiboot2_header_end:
 
-multiboot2_image_start:
+SYMBOL(multiboot2_image_start)
         cli
         cld
@@ -202 +209 @@
         
         movl %cr4, %eax
-        btsl $5, %eax
+        orl $CR4_PAE, %eax
         movl %eax, %cr4
         
@@ -210 +217 @@
         
         /* Enable long mode */
-        movl $EFER_MSR_NUM, %ecx
+        movl $AMD_MSR_EFER, %ecx
         rdmsr                     /* read EFER */
-        btsl $AMD_LME_FLAG, %eax  /* set LME = 1 */
+        orl $AMD_LME, %eax        /* set LME = 1 */
         wrmsr
         
         /* Enable paging to activate long mode (set CR0.PG = 1) */
         movl %cr0, %eax
-        btsl $31, %eax
+        orl $CR0_PG, %eax
         movl %eax, %cr0
         
@@ -243 +250 @@
         movq %rsp, %rbp
         
-        /* Call arch_pre_main(multiboot_eax, multiboot_ebx) */
+        /* Call amd64_pre_main(multiboot_eax, multiboot_ebx) */
         movl multiboot_eax, %edi
         movl multiboot_ebx, %esi
-        callq arch_pre_main 
+        
+#ifdef MEMORY_MODEL_large
+        movabsq $amd64_pre_main, %rax
+        callq *%rax
+#else
+        callq amd64_pre_main
+#endif
         
         /* Call main_bsp() */
-        callq main_bsp 
+#ifdef MEMORY_MODEL_large
+        movabsq $main_bsp, %rax
+        callq *%rax
+#else
+        callq main_bsp
+#endif
         
         /* Not reached */