Changeset 901122b in mainline for arch/ia64/src/interrupt.c

Timestamp:

2006-03-09T17:40:30Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a2a46ba

Parents:

b994a60

Message:

ia64 work.
Userspace is now working.
There is an unrelated show stopper, however.

File:

• arch/ia64/src/interrupt.c (modified) (3 diffs)

arch/ia64/src/interrupt.c

@@ -41 +41 @@
 #include <symtab.h>
 #include <debug.h>
+#include <syscall/syscall.h>
+#include <print.h>
 
 #define VECTORS_64_BUNDLE       20
@@ -132 +134 @@
         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.value, pstate->cr_ips);
+        printf("cr.isr=%Q\tcr.ipsr=%Q\t\n", pstate->cr_isr.value, pstate->cr_ipsr);
         
         printf("cr.iip=%Q, #%d\t(%s)\n", pstate->cr_iip, pstate->cr_isr.ei ,iip ? iip : "?");
@@ -172 +174 @@
 }
 
-void break_instruction(__u64 vector, struct exception_regdump *pstate)
-{
-        dump_interrupted_context(pstate);
-        panic("Break Instruction\n");
+/** Handle syscall. */
+int break_instruction(__u64 vector, struct exception_regdump *pstate)
+{
+        /*
+         * Move to next instruction after BREAK.
+         */
+        if (pstate->cr_ipsr.ri == 2) {
+                pstate->cr_ipsr.ri = 0;
+                pstate->cr_iip += 16;
+        } else {
+                pstate->cr_ipsr.ri++;
+        }
+
+        if (pstate->in0 < SYSCALL_END)
+                return syscall_table[pstate->in0](pstate->in1, pstate->in2, pstate->in3);
+        else
+                panic("Undefined syscall %d", pstate->in0);
+                
+        return -1;
 }