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

Timestamp:

Mar 28, 2018, 2:40:29 PM (6 years ago)

Author:

alain

Message:

Fix various bugs

File:

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

trunk/hal/tsar_mips32/core/hal_exception.c

@@ -154 +154 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// This function is called when an MMU exception has been detected. 
+// This function is called when an MMU exception has been detected (IBE / DBE). 
 // It get the relevant exception arguments from the MMU.
 // It signal a fatal error in case of illegal access. In case of page unmapped
@@ -167 +167 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 error_t hal_mmu_exception( thread_t * this,
+                           uint32_t   excPC,
                            bool_t     is_ins ) 
 {
@@ -294 +295 @@
         default:                             // this is a kernel error => panic    
         {
-            assert( false , __FUNCTION__ , "thread %x / excp_code = %x / vaddr = %x\n",
-            this->trdid , excp_code , bad_vaddr );
+            assert( false , __FUNCTION__ , "thread %x / epc %x / %s / vaddr = %x\n",
+            this, excPC, hal_mmu_exception_str(excp_code) , bad_vaddr );
 
             return EXCP_KERNEL_PANIC;
@@ -379 +380 @@
         error_t      error;
         uint32_t     excCode;                  // 4 bits XCODE from CP0_CR
+        uint32_t     excPC;                    // fauty instruction address
 
     // get pointer on faulty thread uzone
@@ -384 +386 @@
     uzone = (uint32_t *)CURRENT_THREAD->uzone_current;
 
-    // get 4 bits XCODE from CP0_CR register
+    // get XCODE and EPC from UZONE
         excCode        = (uzone[UZ_CR] >> 2) & 0xF;
+    excPC          = uzone[UZ_EPC];
 
 #if CONFIG_DEBUG_HAL_EXCEPTIONS
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( CONFIG_DEBUG_HAL_EXCEPTIONS < cycle )
-printk("\n[DBG] %s : thread %x on core[%x,%d] enter / process %x / xcode %x / cycle %d\n",
-__FUNCTION__, this, local_cxy, this->core->lid, this->process->pid, excCode, cycle );
+printk("\n[DBG] %s : thread %x enter / core[%x,%d] / pid %x / epc %x / xcode %x / cycle %d\n",
+__FUNCTION__, this, local_cxy, this->core->lid, this->process->pid, excPC, excCode, cycle );
 #endif
 
@@ -398 +401 @@
         case XCODE_DBE:     // can be non fatal
         {
-                    error = hal_mmu_exception( this , false );  // data MMU exception
+                    error = hal_mmu_exception( this , excPC , false );  // data MMU exception
             break;
         }
             case XCODE_IBE:     // can be non fatal
         {
-                    error = hal_mmu_exception( this , true );   // ins MMU exception
+                    error = hal_mmu_exception( this , excPC , true );   // ins MMU exception
                     break;
         }
@@ -450 +453 @@
 cycle = (uint32_t)hal_get_cycles();
 if( CONFIG_DEBUG_HAL_EXCEPTIONS < cycle )
-printk("\n[DBG] %s : thread %x on core[%x,%d] exit / process %x / xcode %x / cycle %d\n",
-__FUNCTION__, this, local_cxy, this->core->lid, this->process->pid, excCode, cycle );
+printk("\n[DBG] %s : thread %x exit / core[%x,%d] / pid %x / epc %x / xcode %x / cycle %d\n",
+__FUNCTION__, this, local_cxy, this->core->lid, this->process->pid, excPC, excCode, cycle );
 #endif