Changeset 2ccd275 in mainline for arch/ia64/src

Timestamp:

2005-11-09T14:23:05Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

802bb95

Parents:

b183865e

Message:

Changes in build system.
For .S targets, always do -DASM.
Remove unnecessary #define ASM from various *.S files.
At the end of build, generate disassembler dump for kernel.raw.

ia64 work.
Better General Exception handler.

Location:

arch/ia64/src

Files:

• interrupt.c (modified) (4 diffs)
• ivt.S (modified) (4 diffs)

arch/ia64/src/interrupt.c

@@ -106 +106 @@
 
 static char *vector_to_string(__u16 vector);
-static void dump_stack(struct exception_regdump *pstate);
+static void dump_interrupted_context(struct exception_regdump *pstate);
 
 char *vector_to_string(__u16 vector)
@@ -118 +118 @@
 }
 
-void dump_stack(struct exception_regdump *pstate)
+void dump_interrupted_context(struct exception_regdump *pstate)
 {
         char *ifa, *iipa, *iip;
@@ -127 +127 @@
 
         putchar('\n');
+        printf("Interrupted context dump:\n");
         printf("ar.bsp=%P\tar.bspstore=%P\n", pstate->ar_bsp, pstate->ar_bspstore);
         printf("ar.rnat=%Q\tar.rsc=%Q\n", pstate->ar_rnat, pstate->ar_rsc);
         printf("ar.ifs=%Q\tar.pfs=%Q\n", pstate->ar_ifs, pstate->ar_pfs);
-        printf("cr.isr=%Q\tcr.ips=%Q\t\n", pstate->cr_isr, pstate->cr_ips);
+        printf("cr.isr=%Q\tcr.ips=%Q\t\n", pstate->cr_isr.value, pstate->cr_ips);
         
-        printf("cr.iip=%Q (%s)\n", pstate->cr_iip, iip ? iip : "?");
-        printf("cr.iipa=%Q (%s)\n", pstate->cr_iipa, iipa ? iipa : "?");
-        printf("cr.ifa=%Q (%s)\n", pstate->cr_ifa, ifa ? ifa : "?");
+        printf("cr.iip=%Q, #%d\t(%s)\n", pstate->cr_iip, pstate->cr_isr.ei ,iip ? iip : "?");
+        printf("cr.iipa=%Q\t(%s)\n", pstate->cr_iipa, iipa ? iipa : "?");
+        printf("cr.ifa=%Q\t(%s)\n", pstate->cr_ifa, ifa ? ifa : "?");
 }
 
 void general_exception(__u64 vector, struct exception_regdump *pstate)
 {
-        dump_stack(pstate);
-        panic("General Exception\n");
+        char *desc = "";
+
+        dump_interrupted_context(pstate);
+
+        switch (pstate->cr_isr.ge_code) {
+            case GE_ILLEGALOP:
+                desc = "Illegal Operation fault";
+                break;
+            case GE_PRIVOP:
+                desc = "Privileged Operation fault";
+                break;
+            case GE_PRIVREG:
+                desc = "Privileged Register fault";
+                break;
+            case GE_RESREGFLD:
+                desc = "Reserved Register/Field fault";
+                break;
+            case GE_DISBLDISTRAN:
+                desc = "Disabled Instruction Set Transition fault";
+                break;
+            case GE_ILLEGALDEP:
+                desc = "Illegal Dependency fault";
+                break;
+            default:
+                desc = "unknown";
+                break;
+        }
+
+        panic("General Exception (%s)\n", desc);
 }
 
 void break_instruction(__u64 vector, struct exception_regdump *pstate)
 {
-        dump_stack(pstate);
+        dump_interrupted_context(pstate);
         panic("Break Instruction\n");
 }
@@ -151 +179 @@
 void universal_handler(__u64 vector, struct exception_regdump *pstate)
 {
-        dump_stack(pstate);
+        dump_interrupted_context(pstate);
         panic("Interruption: %W (%s)\n", (__u16) vector, vector_to_string(vector));
 }

arch/ia64/src/ivt.S

@@ -1 +1 @@
 #
 # Copyright (C) 2005 Jakub Vana
+# Copyright (C) 2005 Jakub Jermar
 # All rights reserved.
 #
@@ -28 +29 @@
 
 #include <arch/stack.h>
+#include <arch/register.h>
 
 #define STACK_ITEMS             12
@@ -190 +192 @@
 
     /* 6. switch to bank 1 and reenable PSR.ic */
-        ssm 0x2000
+        ssm PSR_IC_MASK
         bsw.1 ;;
         srlz.d
@@ -308 +310 @@
         
     /* 15. disable PSR.ic and switch to bank 0 */
-        rsm 0x2000
+        rsm PSR_IC_MASK
         bsw.0 ;;
         srlz.d