| /trunk/kernel/arch/amd64/include/interrupt.h |
|---|
| 71,7 → 71,6 |
| /** This is passed to interrupt handlers */ |
| typedef struct { |
| uint64_t rax; |
| uint64_t rbx; |
| uint64_t rcx; |
| uint64_t rdx; |
| uint64_t rsi; |
| 80,11 → 79,6 |
| uint64_t r9; |
| uint64_t r10; |
| uint64_t r11; |
| uint64_t r12; |
| uint64_t r13; |
| uint64_t r14; |
| uint64_t r15; |
| uint64_t rbp; |
| uint64_t error_word; |
| uint64_t rip; |
| uint64_t cs; |
| /trunk/kernel/arch/amd64/src/asm_utils.S |
|---|
| 26,23 → 26,17 |
| # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| # |
| #define IREGISTER_SPACE 120 |
| #define IREGISTER_SPACE 72 |
| #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 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 |
| # and 1 means interrupt with error word |
| 173,7 → 167,7 |
| rdmsr |
| 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) |
| movq %rcx, IOFFSET_RCX(%rsp) |
| 184,14 → 178,6 |
| movq %r9, IOFFSET_R9(%rsp) |
| 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 |
| .macro restore_all_gpr |
| 204,21 → 190,9 |
| movq IOFFSET_R9(%rsp), %r9 |
| 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 |
| # |
| /trunk/kernel/arch/amd64/src/interrupt.c |
|---|
| 80,12 → 80,6 |
| istate->rdi, istate->r8); |
| 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]); |
| } |
| /trunk/kernel/arch/mips32/include/context_offset.h |
|---|
| 76,26 → 76,17 |
| #define EOFFSET_T5 0x30 |
| #define EOFFSET_T6 0x34 |
| #define EOFFSET_T7 0x38 |
| #define EOFFSET_S0 0x3c |
| #define EOFFSET_S1 0x40 |
| #define EOFFSET_S2 0x44 |
| #define EOFFSET_S3 0x48 |
| #define EOFFSET_S4 0x4c |
| #define EOFFSET_S5 0x50 |
| #define EOFFSET_S6 0x54 |
| #define EOFFSET_S7 0x58 |
| #define EOFFSET_T8 0x5c |
| #define EOFFSET_T9 0x60 |
| #define EOFFSET_GP 0x64 |
| #define EOFFSET_SP 0x68 |
| #define EOFFSET_S8 0x6c |
| #define EOFFSET_RA 0x70 |
| #define EOFFSET_LO 0x74 |
| #define EOFFSET_HI 0x78 |
| #define EOFFSET_STATUS 0x7c |
| #define EOFFSET_EPC 0x80 |
| #define EOFFSET_K1 0x84 |
| #define REGISTER_SPACE 136 |
| #define EOFFSET_T8 0x3c |
| #define EOFFSET_T9 0x40 |
| #define EOFFSET_GP 0x44 |
| #define EOFFSET_SP 0x48 |
| #define EOFFSET_RA 0x4c |
| #define EOFFSET_LO 0x50 |
| #define EOFFSET_HI 0x54 |
| #define EOFFSET_STATUS 0x58 |
| #define EOFFSET_EPC 0x5c |
| #define EOFFSET_K1 0x60 |
| #define REGISTER_SPACE 100 |
| #ifdef __ASM__ |
| /trunk/kernel/arch/mips32/include/exception.h |
|---|
| 73,19 → 73,10 |
| uint32_t t5; |
| uint32_t t6; |
| uint32_t t7; |
| uint32_t s0; |
| uint32_t s1; |
| uint32_t s2; |
| uint32_t s3; |
| uint32_t s4; |
| uint32_t s5; |
| uint32_t s6; |
| uint32_t s7; |
| uint32_t t8; |
| uint32_t t9; |
| uint32_t gp; |
| uint32_t sp; |
| uint32_t s8; |
| uint32_t ra; |
| uint32_t lo; |
| /trunk/kernel/arch/mips32/src/start.S |
|---|
| 75,18 → 75,6 |
| mfhi $at |
| sw $at, EOFFSET_HI(\r) |
| #ifdef CONFIG_DEBUG_ALLREGS |
| sw $s0, EOFFSET_S0(\r) |
| sw $s1, EOFFSET_S1(\r) |
| sw $s2, EOFFSET_S2(\r) |
| sw $s3, EOFFSET_S3(\r) |
| sw $s4, EOFFSET_S4(\r) |
| sw $s5, EOFFSET_S5(\r) |
| sw $s6, EOFFSET_S6(\r) |
| sw $s7, EOFFSET_S7(\r) |
| sw $s8, EOFFSET_S8(\r) |
| #endif |
| sw $gp, EOFFSET_GP(\r) |
| sw $ra, EOFFSET_RA(\r) |
| sw $k1, EOFFSET_K1(\r) |
| 132,17 → 120,6 |
| lw $t8, EOFFSET_T8(\r) |
| lw $t9, EOFFSET_T9(\r) |
| #ifdef CONFIG_DEBUG_ALLREGS |
| lw $s0, EOFFSET_S0(\r) |
| lw $s1, EOFFSET_S1(\r) |
| lw $s2, EOFFSET_S2(\r) |
| lw $s3, EOFFSET_S3(\r) |
| lw $s4, EOFFSET_S4(\r) |
| lw $s5, EOFFSET_S5(\r) |
| lw $s6, EOFFSET_S6(\r) |
| lw $s7, EOFFSET_S7(\r) |
| lw $s8, EOFFSET_S8(\r) |
| #endif |
| lw $gp, EOFFSET_GP(\r) |
| lw $ra, EOFFSET_RA(\r) |
| lw $k1, EOFFSET_K1(\r) |
| /trunk/kernel/arch/ia32/include/interrupt.h |
|---|
| 72,10 → 72,6 |
| uint32_t eax; |
| uint32_t ecx; |
| uint32_t edx; |
| uint32_t esi; |
| uint32_t edi; |
| uint32_t ebp; |
| uint32_t ebx; |
| uint32_t gs; |
| uint32_t fs; |
| /trunk/kernel/arch/ia32/src/asm.S |
|---|
| 268,14 → 268,6 |
| pushl %fs |
| pushl %gs |
| #ifdef CONFIG_DEBUG_ALLREGS |
| pushl %ebx |
| pushl %ebp |
| pushl %edi |
| pushl %esi |
| #else |
| subl $16, %esp |
| #endif |
| pushl %edx |
| pushl %ecx |
| pushl %eax |
| 297,14 → 289,6 |
| popl %eax |
| popl %ecx |
| popl %edx |
| #ifdef CONFIG_DEBUG_ALLREGS |
| popl %esi |
| popl %edi |
| popl %ebp |
| popl %ebx |
| #else |
| addl $16, %esp |
| #endif |
| popl %gs |
| popl %fs |
| /trunk/kernel/arch/ia32/src/interrupt.c |
|---|
| 77,9 → 77,6 |
| printf("ERROR_WORD=%#lx\n", istate->error_word); |
| printf("%%cs=%#lx,flags=%#lx\n", istate->cs, istate->eflags); |
| printf("%%eax=%#lx, %%ecx=%#lx, %%edx=%#lx, %%esp=%p\n", istate->eax, istate->ecx, istate->edx, &istate->stack[0]); |
| #ifdef CONFIG_DEBUG_ALLREGS |
| printf("%%esi=%#lx, %%edi=%#lx, %%ebp=%#lx, %%ebx=%#lx\n", istate->esi, istate->edi, istate->ebp, istate->ebx); |
| #endif |
| printf("stack: %#lx, %#lx, %#lx, %#lx\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]); |
| printf(" %#lx, %#lx, %#lx, %#lx\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]); |
| } |
| /trunk/HelenOS.config |
|---|
| 334,9 → 334,6 |
| % Watchpoint on rewriting AS with zero |
| ! [CONFIG_DEBUG=y&(PLATFORM=amd64|PLATFORM=ia32)] CONFIG_DEBUG_AS_WATCHPOINT (y/n) |
| % Save all interrupt registers |
| ! [CONFIG_DEBUG=y&(PLATFORM=amd64|PLATFORM=mips32|PLATFORM=ia32)] CONFIG_DEBUG_ALLREGS (y/n) |
| % Compile kernel tests |
| ! CONFIG_TEST (y/n) |