Changeset a175a67 in mainline

Timestamp:

2006-06-06T17:10:25Z (18 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

732fd3c

Parents:

afc12d0

Message:

itanium faulting task kill

Location:

arch/ia64

Files:

• include/interrupt.h (modified) (1 diff)
• src/interrupt.c (modified) (2 diffs)
• src/mm/tlb.c (modified) (7 diffs)

arch/ia64/include/interrupt.h

@@ -121 +121 @@
 static inline int istate_from_uspace(istate_t *istate)
 {
-        panic("TODO: istate_from_uspace not yet implemented");
-        return 0;
+        return (istate->cr_iip)<0xe000000000000000ULL;
 }
 

arch/ia64/src/interrupt.c

@@ -225 +225 @@
 void universal_handler(__u64 vector, istate_t *istate)
 {
+        fault_if_from_uspace(istate,"Interruption: %#hx (%s)\n",(__u16) vector, vector_to_string(vector));
         dump_interrupted_context(istate);
         panic("Interruption: %#hx (%s)\n", (__u16) vector, vector_to_string(vector));
@@ -268 +269 @@
                 return;
         }
+        return;
         panic("not implemented\n");
         /* TODO */

arch/ia64/src/mm/tlb.c

@@ -46 +46 @@
 #include <print.h>
 #include <arch.h>
+#include <interrupt.h>
 
 /** Invalidate all TLB entries. */
@@ -453 +454 @@
                 page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
+                        fault_if_from_uspace(istate,"Page fault at %P",va);
                         panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
                 }
@@ -499 +501 @@
                 page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
+                        fault_if_from_uspace(istate,"Page fault at %P",va);
                         panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
                 }
@@ -544 +547 @@
         } else {
                 if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
+                        fault_if_from_uspace(istate,"Page fault at %P",va);
                         panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
                         t->d = true;
@@ -580 +584 @@
         } else {
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
+                        fault_if_from_uspace(istate,"Page fault at %P",va);
                         panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
                         t->a = true;
@@ -616 +621 @@
         } else {
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
+                        fault_if_from_uspace(istate,"Page fault at %P",va);
                         panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
                         t->a = true;
@@ -657 +663 @@
                 page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
+                        fault_if_from_uspace(istate,"Page fault at %P",va);
                         panic("%s: va=%p, rid=%d\n", __FUNCTION__, va, rid);
                 }