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

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)

File:

• kernel/arch/amd64/src/context.S (modified) (2 diffs)

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)