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

Timestamp:

Apr 10, 2019, 10:09:39 AM (5 years ago)

Author:

alain

Message:

Fix a bug in the vmm_remove_vseg() function: the physical pages
associated to an user DATA vseg were released to the kernel when
the target process descriptor was in the reference cluster.
This physical pages release should be done only when the page
forks counter value is zero.
All other modifications are cosmetic.

File:

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

trunk/hal/tsar_mips32/core/hal_exception.c

@@ -189 +189 @@
     if( CURRENT_THREAD->type != THREAD_USER )
     {
-        printk("\n[KERNEL PANIC] in %s : illegal thread type %s\n",
+        printk("\n[PANIC] in %s : illegal thread type %s\n",
         __FUNCTION__, thread_type_str(CURRENT_THREAD->type) );
 
@@ -250 +250 @@
             else if( error == EXCP_USER_ERROR )      // illegal vaddr
             {
-                printk("\n[USER ERROR] in %s : thread[%x,%x] on core[%x,%x] / cycle %d\n"
+                printk("\n[ERROR] in %s : thread[%x,%x] on core[%x,%x] / cycle %d\n"
                 "  %s : epc %x / badvaddr %x / is_ins %d\n",
                 __FUNCTION__, this->process->pid, this->trdid, local_cxy,
@@ -260 +260 @@
             else  // error == EXCP_KERNEL_PANIC  
             {
-                printk("\n[KERNEL PANIC] in %s : thread[%x,%x] on core[%x,%x] / cycle %d\n"
+                printk("\n[PANIC] in %s : thread[%x,%x] on core[%x,%x] / cycle %d\n"
                 "  %s : epc %x / badvaddr %x / is_ins %d\n",
                 __FUNCTION__, this->process->pid, this->trdid, local_cxy,
@@ -272 +272 @@
         case MMU_READ_PRIVILEGE_VIOLATION:   // illegal 
         {
-            printk("\n[USER ERROR] in %s : thread[%x,%x] on core[%x,%x] / cycle %d\n"
+            printk("\n[ERROR] in %s : thread[%x,%x] on core[%x,%x] / cycle %d\n"
             "  %s : epc %x / badvaddr %x / is_ins %d\n",
             __FUNCTION__, this->process->pid, this->trdid, local_cxy,
@@ -299 +299 @@
             else if( error == EXCP_USER_ERROR )  // illegal write access
             {
-                    printk("\n[USER ERROR] in %s : thread[%x,%x] on core[%x,%x] / cycle %d\n"
+                    printk("\n[ERROR] in %s : thread[%x,%x] on core[%x,%x] / cycle %d\n"
                     "  %s : epc %x / badvaddr %x / is_ins %d\n",
                     __FUNCTION__, this->process->pid, this->trdid, local_cxy,
@@ -309 +309 @@
             else   // error == EXCP_KERNEL_PANIC
             {
-                printk("\n[KERNEL PANIC] in %s : thread[%x,%x] on core[%x,%x] / cycle %d\n"
+                printk("\n[PANIC] in %s : thread[%x,%x] on core[%x,%x] / cycle %d\n"
                 "  %s : epc %x / badvaddr %x / is_ins %d\n",
                 __FUNCTION__, this->process->pid, this->trdid, local_cxy,
@@ -320 +320 @@
         case MMU_READ_EXEC_VIOLATION:        // user error
         {
-            printk("\n[USER ERROR] in %s : thread[%x,%x] on core[%x,%x] / cycle %d\n"
+            printk("\n[ERROR] in %s : thread[%x,%x] on core[%x,%x] / cycle %d\n"
             "  %s : epc %x / badvaddr %x / is_ins %d\n",
             __FUNCTION__, this->process->pid, this->trdid, local_cxy,
@@ -330 +330 @@
         default:                             // this is a kernel error    
         {
-            printk("\n[KERNEL PANIC] in %s : thread[%x,%x] on core[%x,%x] / cycle %d\n"
+            printk("\n[PANIC] in %s : thread[%x,%x] on core[%x,%x] / cycle %d\n"
             "  %s : epc %x / badvaddr %x / is_ins %d\n",
             __FUNCTION__, this->process->pid, this->trdid, local_cxy,
@@ -346 +346 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 // @ this     : pointer on faulty thread descriptor.
-// @ error    : EXCP_USER_ERROR or EXCP_KERNEL_PANIC
-//////////////////////////////////////////////////////////////////////////////////////////
-static void hal_exception_dump( thread_t * this,
-                                error_t    error )
+//////////////////////////////////////////////////////////////////////////////////////////
+static void hal_exception_dump( thread_t * this )
 {
     core_t    * core    = this->core;
@@ -366 +364 @@
     remote_busylock_acquire( lock_xp );
 
-    if( error == EXCP_USER_ERROR )
-    {
-        nolock_printk("\n=== USER ERROR / thread(%x,%x) / core[%d] / cycle %d ===\n",
-        process->pid, this->trdid, core->lid, (uint32_t)hal_get_cycles() );
-    }
-    else
-    {
-        nolock_printk("\n=== KERNEL PANIC / thread(%x,%x) / core[%d] / cycle %d ===\n",
-        process->pid, this->trdid, core->lid, (uint32_t)hal_get_cycles() );
-    }
+    nolock_printk("\n=== thread(%x,%x) / core[%d] / cycle %d ===\n",
+    process->pid, this->trdid, core->lid, (uint32_t)hal_get_cycles() );
 
         nolock_printk("busylocks = %d / blocked_vector = %X / flags = %X\n\n",
@@ -507 +497 @@
         if( error == EXCP_USER_ERROR )          //  user error => kill user process
         {
-        hal_exception_dump( this , error );
+        hal_exception_dump( this );
 
         sys_exit( EXIT_FAILURE );
@@ -513 +503 @@
     else if( error == EXCP_KERNEL_PANIC )   // kernel error => kernel panic
     {
-        hal_exception_dump( this , error );
+        hal_exception_dump( this );
 
         hal_core_sleep();