Changeset b5eb1ee in mainline for arch/ia32/src

Timestamp:

2005-07-20T14:50:07Z (20 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

76857d1

Parents:

51029384

Message:

Error word support debuging and testing passed with #NM & #GP exceptions.

Location:

arch/ia32/src

Files:

• asm.S (modified) (2 diffs)
• interrupt.c (modified) (2 diffs)

arch/ia32/src/asm.S

@@ -118 +118 @@
         test $0xe0,%cl;
         jnz 0f;
+        and $0x1f,%cl;
         shl %cl,%eax;
         and $ERROR_WORD_INTERRUPT_LIST,%eax;
-        jnz 0f;
+        jz 0f;
 
         popa;
@@ -358 +359 @@
 .global utext
 utext:
+        xor %ax,%ax;
+        mov %ax,%ds;
+        mov %ax,%es;
+        mov %ax,%fs;
+        mov %ax,%gs;
 0:
 #       movl $0xdeadbeaf, %eax
-        int $48
+  int $48
+        cli;
+        sti;
         jmp 0b
         # not reached

arch/ia32/src/interrupt.c

@@ -80 +80 @@
 void gp_fault(__u8 n, __u32 stack[])
 {
-        printf("stack[0]=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]);
+        printf("ERROR_WORD=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]);
         printf("%%eax=%L, %%ebx=%L, %%ecx=%L, %%edx=%L,\n%%edi=%L, %%esi=%L, %%ebp=%L, %%esp=%L\n", stack[-2], stack[-5], stack[-3], stack[-4], stack[-9], stack[-8], stack[-1], stack);
         printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]);
-        panic("general protection fault\n");
+        //panic("general protection fault\n");
+        stack[1]++;
 }
 
 void ss_fault(__u8 n, __u32 stack[])
 {
-        printf("stack[0]=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]);
+        printf("ERROR_WORD=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]);
         printf("%%eax=%L, %%ebx=%L, %%ecx=%L, %%edx=%L,\n%%edi=%L, %%esi=%L, %%ebp=%L, %%esp=%L\n", stack[-2], stack[-5], stack[-3], stack[-4], stack[-9], stack[-8], stack[-1], stack);
         printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]);
@@ -112 +113 @@
 {
         printf("page fault address: %X\n", read_cr2());
-        printf("stack[0]=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]);
+        printf("ERROR_WORD=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]);
         printf("%%eax=%L, %%ebx=%L, %%ecx=%L, %%edx=%L,\n%%edi=%L, %%esi=%L, %%ebp=%L, %%esp=%L\n", stack[-2], stack[-5], stack[-3], stack[-4], stack[-9], stack[-8], stack[-1], stack);
         printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]);