Changeset 4bf0926e in mainline for kernel/arch/amd64/src/boot/multiboot2.S

Timestamp:

2016-09-01T22:14:30Z (8 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2c2d54a

Parents:

8b6aa39

Message:

amd64: resurrect optional support for the 'large' memory model ('kernel' memory model stays the default)

File:

• kernel/arch/amd64/src/boot/multiboot2.S (modified) (1 diff)

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

@@ -253 +253 @@
         movl multiboot_eax, %edi
         movl multiboot_ebx, %esi
-        callq amd64_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 */