Changeset 4bf0926e in mainline for kernel/arch/amd64/src

Timestamp:

2016-09-01T22:14:30Z (9 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)

Location:

kernel/arch/amd64/src

Files:

• boot/multiboot.S (modified) (4 diffs)
• boot/multiboot2.S (modified) (1 diff)
• context.S (modified) (2 diffs)

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

@@ -430 +430 @@
         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
+        
         long_status $status_main
         
         /* Call main_bsp() */
-        callq main_bsp 
+#ifdef MEMORY_MODEL_large
+        movabsq $main_bsp, %rax
+        callq *%rax
+#else
+        callq main_bsp
+#endif
         
         /* Not reached */
@@ -622 +633 @@
         ptl2gen 512 7
 
+#ifdef MEMORY_MODEL_kernel
 .align 4096
 ptl_1:
@@ -638 +650 @@
         .quad ptl_2_1g + (PTL_WRITABLE | PTL_PRESENT)
 
-
 .align 4096
 SYMBOL(ptl_0)
@@ -644 +655 @@
         .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

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 */

kernel/arch/amd64/src/context.S

@@ -50 +50 @@
         movq %r14, CONTEXT_OFFSET_R14(%rdi)
         movq %r15, CONTEXT_OFFSET_R15(%rdi)
-
+        
+#ifdef MEMORY_MODEL_large
+        movabsq $vreg_ptr, %rsi
+        movq (%rsi), %rsi
+#else
         movq vreg_ptr, %rsi
+#endif
         movq %fs:VREG_TP(%rsi), %rsi
         movq %rsi, CONTEXT_OFFSET_TP(%rdi)
@@ -79 +84 @@
         movq %rdx, (%rsp)
         
-        movq CONTEXT_OFFSET_TP(%rdi), %rcx 
+        movq CONTEXT_OFFSET_TP(%rdi), %rcx
+#ifdef MEMORY_MODEL_large
+        movabsq $vreg_ptr, %rsi
+        movq (%rsi), %rsi
+#else
         movq vreg_ptr, %rsi
+#endif
         movq %rcx, %fs:VREG_TP(%rsi)