Changeset 61c0402 in mainline for kernel/arch/amd64/src/asm_utils.S

Timestamp:

2010-01-15T19:36:53Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

92bee46

Parents:

50f9c3a (diff), 963462af (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/src/asm_utils.S (modified) (5 diffs)

kernel/arch/amd64/src/asm_utils.S

@@ -27 +27 @@
 #
 
-#define IREGISTER_SPACE 72 
+#define IREGISTER_SPACE 80
 
 #define IOFFSET_RAX     0x0
@@ -38 +38 @@
 #define IOFFSET_R10     0x38
 #define IOFFSET_R11     0x40
+#define IOFFSET_RBP     0x48
 
 #  Mask for interrupts 0 - 31 (bits 0 - 31) where 0 means that int has no error word
@@ -179 +180 @@
         movq %r10, IOFFSET_R10(%rsp)
         movq %r11, IOFFSET_R11(%rsp)
+        movq %rbp, IOFFSET_RBP(%rsp)
 .endm
 
@@ -191 +193 @@
         movq IOFFSET_R10(%rsp), %r10
         movq IOFFSET_R11(%rsp), %r11
+        movq IOFFSET_RBP(%rsp), %rbp
 .endm
 
@@ -235 +238 @@
         cld
 
+        # Stop stack traces here
+        xorq %rbp, %rbp
+
         movq $(\i), %rdi        # %rdi - first parameter
         movq %rsp, %rsi         # %rsi - pointer to istate