Changeset 97b64c9 in mainline

Timestamp:

2006-03-15T12:29:52Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f8973c00

Parents:

8965838e

Message:

Fix bug in ia32 interrupt handlers.
Handlers for interrupts greater than 31 wrapped the shift around and thus failed to correctly identify
the need to emulate error word.

Files:

• arch/ia32/src/asm.S (modified) (1 diff)
• arch/ia32/src/interrupt.c (modified) (1 diff)
• generic/src/mm/tlb.c (modified) (1 diff)

arch/ia32/src/asm.S

@@ -81 +81 @@
         push %eax
 
-        # Test if this is interrupt with error word or not
-        movl $(1<<\i), %eax
+        /*
+         * Test if this is interrupt with error word or not.
+         * Be careful about width of the shift.
+         */
+        .iflt \i-32
+                movl $(1<<\i), %eax
+        .else
+                movl $0, %eax
+        .endif
         andl $ERROR_WORD_INTERRUPT_LIST,%eax
 

arch/ia32/src/interrupt.c

@@ -50 +50 @@
 void (* eoi_function)(void) = NULL;
 
-#define PRINT_INFO_ERRCODE(istate) do { \
-        char *symbol = get_symtab_entry(istate->eip); \
-        if (!symbol) \
-                symbol = ""; \
-        printf("----------------EXCEPTION OCCURED----------------\n"); \
-        printf("%%eip: %X (%s)\n",istate->eip,symbol); \
-        printf("ERROR_WORD=%X\n", istate->error_word); \
-        printf("%%cs=%X,flags=%X\n", istate->cs, istate->eflags); \
-        printf("%%eax=%X, %%ebx=%X, %%ecx=%X, %%edx=%X\n",\
-               istate->eax,istate->ebx,istate->ecx,istate->edx); \
-        printf("%%esi=%X, %%edi=%X, %%ebp=%X, %%esp=%X\n",\
-               istate->esi,istate->edi,istate->ebp,istate->esp); \
-        printf("stack: %X, %X, %X, %X\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]); \
-        printf("       %X, %X, %X, %X\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]); \
-} while(0)
+static void PRINT_INFO_ERRCODE(istate_t *istate)
+{
+        char *symbol = get_symtab_entry(istate->eip);
+
+        if (!symbol)
+                symbol = "";
+
+        if (CPU)
+                printf("----------------EXCEPTION OCCURED (cpu%d)----------------\n", CPU->id);
+        else
+                printf("----------------EXCEPTION OCCURED----------------\n");
+                
+        printf("%%eip: %X (%s)\n",istate->eip,symbol);
+        printf("ERROR_WORD=%X\n", istate->error_word);
+        printf("%%cs=%X,flags=%X\n", istate->cs, istate->eflags);
+        printf("%%eax=%X, %%ebx=%X, %%ecx=%X, %%edx=%X\n",  istate->eax,istate->ebx,istate->ecx,istate->edx);
+        printf("%%esi=%X, %%edi=%X, %%ebp=%X, %%esp=%X\n",  istate->esi,istate->edi,istate->ebp,istate->esp);
+        printf("stack: %X, %X, %X, %X\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
+        printf("       %X, %X, %X, %X\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
+}
 
 void null_interrupt(int n, istate_t *istate)

generic/src/mm/tlb.c

@@ -133 +133 @@
         int i;
         
+        ASSERT(CPU);
+        
         CPU->tlb_active = 0;
         spinlock_lock(&tlblock);