Changeset 1f7cb3a in mainline for kernel/arch/amd64/src

Timestamp:

2009-02-14T20:14:38Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

74bcf5e

Parents:

6c1f763

Message:

Get rid of CONFIG_DEBUG_ALLREGS.

Location:

kernel/arch/amd64/src

Files:

• asm_utils.S (modified) (4 diffs)
• interrupt.c (modified) (1 diff)

kernel/arch/amd64/src/asm_utils.S

@@ -27 +27 @@
 #
 
-#define IREGISTER_SPACE 120
-
-#define IOFFSET_RAX 0x0
-#define IOFFSET_RBX 0x8
-#define IOFFSET_RCX 0x10
-#define IOFFSET_RDX 0x18
-#define IOFFSET_RSI 0x20
-#define IOFFSET_RDI 0x28
-#define IOFFSET_R8 0x30
-#define IOFFSET_R9 0x38
-#define IOFFSET_R10 0x40
-#define IOFFSET_R11 0x48
-#define IOFFSET_R12 0x50
-#define IOFFSET_R13 0x58
-#define IOFFSET_R14 0x60
-#define IOFFSET_R15 0x68
-#define IOFFSET_RBP 0x70
+#define IREGISTER_SPACE 72 
+
+#define IOFFSET_RAX     0x0
+#define IOFFSET_RCX     0x8
+#define IOFFSET_RDX     0x10
+#define IOFFSET_RSI     0x18
+#define IOFFSET_RDI     0x20
+#define IOFFSET_R8      0x28
+#define IOFFSET_R9      0x30
+#define IOFFSET_R10     0x38
+#define IOFFSET_R11     0x40
 
 #  Mask for interrupts 0 - 31 (bits 0 - 31) where 0 means that int has no error word
@@ -174 +168 @@
         ret             
 
-# Push all general purpose registers on stack except %rbp, %rsp
+# Push all volatile general purpose registers on stack
 .macro save_all_gpr
         movq %rax, IOFFSET_RAX(%rsp)
@@ -185 +179 @@
         movq %r10, IOFFSET_R10(%rsp)
         movq %r11, IOFFSET_R11(%rsp)
-#ifdef CONFIG_DEBUG_ALLREGS     
-        movq %rbx, IOFFSET_RBX(%rsp)
-        movq %rbp, IOFFSET_RBP(%rsp)
-        movq %r12, IOFFSET_R12(%rsp)
-        movq %r13, IOFFSET_R13(%rsp)
-        movq %r14, IOFFSET_R14(%rsp)
-        movq %r15, IOFFSET_R15(%rsp)
-#endif
 .endm
 
@@ -205 +191 @@
         movq IOFFSET_R10(%rsp), %r10
         movq IOFFSET_R11(%rsp), %r11
-#ifdef CONFIG_DEBUG_ALLREGS     
-        movq IOFFSET_RBX(%rsp), %rbx
-        movq IOFFSET_RBP(%rsp), %rbp
-        movq IOFFSET_R12(%rsp), %r12
-        movq IOFFSET_R13(%rsp), %r13
-        movq IOFFSET_R14(%rsp), %r14
-        movq IOFFSET_R15(%rsp), %r15
-#endif
 .endm
 
-#ifdef CONFIG_DEBUG_ALLREGS
-# define INTERRUPT_ALIGN 256
-#else
-# define INTERRUPT_ALIGN 128
-#endif
+#define INTERRUPT_ALIGN 128
         
 ## Declare interrupt handlers

kernel/arch/amd64/src/interrupt.c

@@ -81 +81 @@
         printf("%%r9=%#llx, %%r10=%#llx, %%r11=%#llx\n", istate->r9,
             istate->r10, istate->r11);
-#ifdef CONFIG_DEBUG_ALLREGS     
-        printf("%%r12=%#llx, %%r13=%#llx, %%r14=%#llx\n", istate->r12,
-            istate->r13, istate->r14);
-        printf("%%r15=%#llx, %%rbx=%#llx, %%rbp=%#llx\n", istate->r15,
-            istate->rbx, &istate->rbp);
-#endif
         printf("%%rsp=%#llx\n", &istate->stack[0]);
 }