Changeset 1b03ed3 in mainline for kernel/arch/ia64/src/interrupt.c

Timestamp:

2007-11-16T16:20:45Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

454889c

Parents:

9c2fb97

Message:

Support for six syscall arguments on ia64.

—iSupis line, and those below, will be ignored—

M kernel/arch/ia64/include/interrupt.h
M kernel/arch/ia64/src/ivt.S
M kernel/arch/ia64/src/interrupt.c
M uspace/lib/libc/arch/ia64/src/syscall.S

File:

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

kernel/arch/ia64/src/interrupt.c

@@ -127 +127 @@
         
         if (vector >= VECTORS_16_BUNDLE_START)
-                return vector_names_16_bundle[(vector-VECTORS_16_BUNDLE_START)/(16*BUNDLE_SIZE)];
+                return vector_names_16_bundle[(vector -
+                    VECTORS_16_BUNDLE_START) / (16 * BUNDLE_SIZE)];
         else
-                return vector_names_64_bundle[vector/(64*BUNDLE_SIZE)];
+                return vector_names_64_bundle[vector / (64 * BUNDLE_SIZE)];
 }
 
@@ -142 +143 @@
         putchar('\n');
         printf("Interrupted context dump:\n");
-        printf("ar.bsp=%p\tar.bspstore=%p\n", istate->ar_bsp, istate->ar_bspstore);
-        printf("ar.rnat=%#018llx\tar.rsc=%#018llx\n", istate->ar_rnat, istate->ar_rsc);
-        printf("ar.ifs=%#018llx\tar.pfs=%#018llx\n", istate->ar_ifs, istate->ar_pfs);
-        printf("cr.isr=%#018llx\tcr.ipsr=%#018llx\t\n", istate->cr_isr.value, istate->cr_ipsr);
+        printf("ar.bsp=%p\tar.bspstore=%p\n", istate->ar_bsp,
+            istate->ar_bspstore);
+        printf("ar.rnat=%#018llx\tar.rsc=%#018llx\n", istate->ar_rnat,
+            istate->ar_rsc);
+        printf("ar.ifs=%#018llx\tar.pfs=%#018llx\n", istate->ar_ifs,
+            istate->ar_pfs);
+        printf("cr.isr=%#018llx\tcr.ipsr=%#018llx\t\n", istate->cr_isr.value,
+            istate->cr_ipsr);
         
-        printf("cr.iip=%#018llx, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei, iip);
+        printf("cr.iip=%#018llx, #%d\t(%s)\n", istate->cr_iip,
+            istate->cr_isr.ei, iip);
         printf("cr.iipa=%#018llx\t(%s)\n", istate->cr_iipa, iipa);
         printf("cr.ifa=%#018llx\t(%s)\n", istate->cr_ifa, ifa);
@@ -191 +197 @@
         scheduler_fpu_lazy_request();   
 #else
-        fault_if_from_uspace(istate, "Interruption: %#hx (%s)", (uint16_t) vector, vector_to_string(vector));
+        fault_if_from_uspace(istate, "Interruption: %#hx (%s)",
+            (uint16_t) vector, vector_to_string(vector));
         dump_interrupted_context(istate);
-        panic("Interruption: %#hx (%s)\n", (uint16_t) vector, vector_to_string(vector));
+        panic("Interruption: %#hx (%s)\n", (uint16_t) vector,
+            vector_to_string(vector));
 #endif
 }
@@ -214 +222 @@
         }
 
-        return syscall_handler(istate->in0, istate->in1, istate->in2, istate->in3, istate->in4);
+        return syscall_handler(istate->in0, istate->in1, istate->in2,
+            istate->in3, istate->in4, istate->in5, istate->in6);
 }
 
 void universal_handler(uint64_t vector, istate_t *istate)
 {
-        fault_if_from_uspace(istate,"Interruption: %#hx (%s)\n",(uint16_t) vector, vector_to_string(vector));
+        fault_if_from_uspace(istate, "Interruption: %#hx (%s)\n",
+            (uint16_t) vector, vector_to_string(vector));
         dump_interrupted_context(istate);
-        panic("Interruption: %#hx (%s)\n", (uint16_t) vector, vector_to_string(vector));
+        panic("Interruption: %#hx (%s)\n", (uint16_t) vector,
+            vector_to_string(vector));
 }
 
@@ -245 +256 @@
 
                 default:
-                        panic("\nUnhandled External Interrupt Vector %d\n", ivr.vector);
+                        panic("\nUnhandled External Interrupt Vector %d\n",
+                            ivr.vector);
                         break;
                 }