Changeset 25d7709 in mainline for arch/amd64/src/interrupt.c

Timestamp:

2006-03-13T20:08:16Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

631ca4d

Parents:

45d6add

Message:

Nicer ia32 interrupt handlers and structures holding interrupted context data.
Unify the name holding interrupted context data on all architectures to be istate.

File:

• arch/amd64/src/interrupt.c (modified) (6 diffs)

arch/amd64/src/interrupt.c

@@ -43 +43 @@
 #include <proc/thread.h>
 
-/*
-static void messy_stack_trace(__native *stack)
-{
-        __native *upper_limit = (__native *)(((__native)get_stack_base()) + STACK_SIZE);
-        char *symbol;
-
-        printf("Stack contents: ");
-        while (stack < upper_limit) {
-                symbol = get_symtab_entry((__address)*stack);
-                if (symbol)
-                        printf("%s, ", symbol);
-                stack++;
-        }
-        printf("\n");
-}
-*/
-
-static void print_info_errcode(int n, struct interrupt_context *ctx)
+static void print_info_errcode(int n, istate_t *istate)
 {
         char *symbol;
-        __u64 *x = &ctx->stack[0];
+        __u64 *x = &istate->stack[0];
 
         if (!(symbol=get_symtab_entry(x[1])))
@@ -69 +52 @@
 
         printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n",n,__FUNCTION__);
-        printf("%%rip: %Q (%s)\n",ctx->stack[1],symbol);
-        printf("ERROR_WORD=%Q\n", ctx->stack[0]);
-        printf("%%rcs=%Q,flags=%Q, %%cr0=%Q\n", ctx->stack[2], 
-               ctx->stack[3],read_cr0());
-        printf("%%rax=%Q, %%rbx=%Q, %%rcx=%Q\n",ctx->rax,ctx->rbx,ctx->rcx);
-        printf("%%rdx=%Q, %%rsi=%Q, %%rdi=%Q\n",ctx->rdx,ctx->rsi,ctx->rdi);
-        printf("%%r8 =%Q, %%r9 =%Q, %%r10=%Q\n",ctx->r8,ctx->r9,ctx->r10);
-        printf("%%r11=%Q, %%r12=%Q, %%r13=%Q\n",ctx->r11,ctx->r12,ctx->r13);
-        printf("%%r14=%Q, %%r15=%Q, %%rsp=%Q\n",ctx->r14,ctx->r15,&ctx->stack[0]);
-        printf("%%rbp=%Q\n",ctx->rbp);
+        printf("%%rip: %Q (%s)\n",istate->stack[1],symbol);
+        printf("ERROR_WORD=%Q\n", istate->stack[0]);
+        printf("%%rcs=%Q,flags=%Q, %%cr0=%Q\n", istate->stack[2], 
+               istate->stack[3],read_cr0());
+        printf("%%rax=%Q, %%rbx=%Q, %%rcx=%Q\n",istate->rax,istate->rbx,istate->rcx);
+        printf("%%rdx=%Q, %%rsi=%Q, %%rdi=%Q\n",istate->rdx,istate->rsi,istate->rdi);
+        printf("%%r8 =%Q, %%r9 =%Q, %%r10=%Q\n",istate->r8,istate->r9,istate->r10);
+        printf("%%r11=%Q, %%r12=%Q, %%r13=%Q\n",istate->r11,istate->r12,istate->r13);
+        printf("%%r14=%Q, %%r15=%Q, %%rsp=%Q\n",istate->r14,istate->r15,&istate->stack[0]);
+        printf("%%rbp=%Q\n",istate->rbp);
         printf("stack: %Q, %Q, %Q\n", x[5], x[6], x[7]);
         printf("       %Q, %Q, %Q\n", x[8], x[9], x[10]);
         printf("       %Q, %Q, %Q\n", x[11], x[12], x[13]);
         printf("       %Q, %Q, %Q\n", x[14], x[15], x[16]);
-//      messy_stack_trace(&x[5]);
 }
 
@@ -94 +76 @@
 void (* eoi_function)(void) = NULL;
 
-void null_interrupt(int n, struct interrupt_context *ctx)
+void null_interrupt(int n, istate_t *istate)
 {
         printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n",n,__FUNCTION__); \
-        printf("stack: %X, %X, %X, %X\n", ctx->stack[0], ctx->stack[1],
-               ctx->stack[2], ctx->stack[3]);
+        printf("stack: %X, %X, %X, %X\n", istate->stack[0], istate->stack[1],
+               istate->stack[2], istate->stack[3]);
         panic("unserviced interrupt\n");
 }
 
-void gp_fault(int n, void *stack)
+void gp_fault(int n, istate_t *istate)
 {
-        print_info_errcode(n,stack);
+        print_info_errcode(n, istate);
         panic("general protection fault\n");
 }
 
-void ss_fault(int n, void *stack)
+void ss_fault(int n, istate_t *istate)
 {
-        print_info_errcode(n,stack);
+        print_info_errcode(n, istate);
         panic("stack fault\n");
 }
 
 
-void nm_fault(int n, void *stack)
+void nm_fault(int n, istate_t *istate)
 {
 #ifdef CONFIG_FPU_LAZY     
@@ -124 +106 @@
 }
 
-void page_fault(int n, struct interrupt_context *ctx)
+void page_fault(int n, istate_t *istate)
 {
         __address page;
@@ -130 +112 @@
         page = read_cr2();
         if (!as_page_fault(page)) {
-                print_info_errcode(n,ctx);
+                print_info_errcode(n, istate);
                 printf("Page fault address: %Q\n", page);
                 panic("page fault\n");
@@ -136 +118 @@
 }
 
-void tlb_shootdown_ipi(int n, void *stack)
+void tlb_shootdown_ipi(int n, istate_t *istate)
 {
         trap_virtual_eoi();