Changeset 425 for trunk/hal/tsar_mips32/core/hal_exception.c

Timestamp:

Jan 29, 2018, 5:57:57 PM (7 years ago)

Author:

alain

Message:

bloup

File:

• trunk/hal/tsar_mips32/core/hal_exception.c (modified) (4 diffs)

trunk/hal/tsar_mips32/core/hal_exception.c

@@ -284 +284 @@
         default:                             // this is a kernel error => panic    
         {
-            printk("\n[PANIC] in %s for thread %x : kernel exception = %x / vaddr = %x\n",
-            __FUNCTION__ , this->trdid , excp_code , bad_vaddr );
+            assert( false , __FUNCTION__ , "thread %x / excp_code = %x / vaddr = %x\n",
+            this->trdid , excp_code , bad_vaddr );
 
             return EXCP_KERNEL_PANIC;
@@ -297 +297 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 // @ this     : pointer on faulty thread descriptor.
-// @ uzone : pointer on register array.
+// @ uzone    : pointer on register array.
 // @ error    : EXCP_USER_ERROR or EXCP_KERNEL_PANIC
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -372 +372 @@
     // get pointer on faulty thread uzone
     this  = CURRENT_THREAD;
-    uzone = (uint32_t *)CURRENT_THREAD->uzone;
+    uzone = (uint32_t *)CURRENT_THREAD->uzone_current;
 
     // get 4 bits XCODE from CP0_CR register
@@ -424 +424 @@
         hal_exception_dump( this , uzone , error );
 
-        // FIXME : replace this loop by sys_kill()
-        while( 1 ) asm volatile ("nop");
-        // sys_kill( this->process->pid , SIGKILL );
+        sys_kill( this->process->pid , SIGKILL );
         }
     else if( error == EXCP_KERNEL_PANIC )   // kernel error => kernel panic
     {
         hal_exception_dump( this , uzone , error );
-        panic( "for thread %x in process %x on core [%x,%d]",
+
+        assert( false , __FUNCTION__ , "thread %x in process %x on core [%x,%d]",
         this->trdid , this->process->pid , local_cxy , this->core->lid );
     }