Changeset 8fb1bf82 in mainline for kernel/arch/amd64/include/context_offset.h

Timestamp:

2010-11-25T13:42:50Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/amd64/include/context_offset.h (modified) (3 diffs)

kernel/arch/amd64/include/context_offset.h

@@ -30 +30 @@
 #define KERN_amd64_CONTEXT_OFFSET_H_
 
-#define OFFSET_SP  0x0
-#define OFFSET_PC  0x8
-#define OFFSET_RBX 0x10
-#define OFFSET_RBP 0x18
-#define OFFSET_R12 0x20
-#define OFFSET_R13 0x28
-#define OFFSET_R14 0x30
-#define OFFSET_R15 0x38
+#define OFFSET_SP   0x00
+#define OFFSET_PC   0x08
+#define OFFSET_RBX  0x10
+#define OFFSET_RBP  0x18
+#define OFFSET_R12  0x20
+#define OFFSET_R13  0x28
+#define OFFSET_R14  0x30
+#define OFFSET_R15  0x38
 
 #ifdef KERNEL
-# define OFFSET_IPL 0x40
+        #define OFFSET_IPL  0x40
 #else
-# define OFFSET_TLS 0x40
+        #define OFFSET_TLS  0x40
 #endif
 
 #ifdef __ASM__
 
-# ctx: address of the structure with saved context 
+# ctx: address of the structure with saved context
 # pc: return address
 .macro CONTEXT_SAVE_ARCH_CORE ctx:req pc:req
@@ -61 +61 @@
 .endm
 
-# ctx: address of the structure with saved context 
+# ctx: address of the structure with saved context
 .macro CONTEXT_RESTORE_ARCH_CORE ctx:req pc:req
         movq OFFSET_R15(\ctx), %r15
@@ -68 +68 @@
         movq OFFSET_R12(\ctx), %r12
         movq OFFSET_RBP(\ctx), %rbp
-        movq OFFSET_RBX(\ctx), %rbx     
+        movq OFFSET_RBX(\ctx), %rbx
         
         movq OFFSET_SP(\ctx), %rsp   # ctx->sp -> %rsp