Changeset 440 for trunk/hal/tsar_mips32/core

Timestamp:

May 3, 2018, 5:51:22 PM (7 years ago)

Author:

alain

Message:

1/ Fix a bug in the Multithreaded "sort" applicationr:
The pthread_create() arguments must be declared as global variables.
2/ The exit syscall can be called by any thread of a process..

Location:

trunk/hal/tsar_mips32/core

Files:

• hal_exception.c (modified) (7 diffs)
• hal_gpt.c (modified) (1 diff)

trunk/hal/tsar_mips32/core/hal_exception.c

@@ -34 +34 @@
 #include <core.h>
 #include <syscalls.h>
+#include <shared_syscalls.h>
 #include <remote_spinlock.h>
 #include <hal_kentry.h>
@@ -163 +164 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 // @ this     : pointer on faulty thread descriptor.
+// @ excPC    : 
 // @ is_ins   : IBE if true / DBE if false.
 // @ return EXCP_NON_FATAL / EXCP_USER_ERROR / EXCP_KERNEL_PANIC
@@ -218 +220 @@
             // try to map the unmapped PTE
             error = vmm_handle_page_fault( process, 
-                                           bad_vaddr >> CONFIG_PPM_PAGE_SHIFT );  // vpn
+                                           bad_vaddr >> CONFIG_PPM_PAGE_SHIFT,  // vpn
+                                           false );                             // not a COW
             if( error )   
             {
@@ -256 +259 @@
             {
                 // try to allocate and copy the page
-                error = vmm_handle_cow( process,
-                                        bad_vaddr >> CONFIG_PPM_PAGE_SHIFT );  
+                error = vmm_handle_page_fault( process,
+                                               bad_vaddr >> CONFIG_PPM_PAGE_SHIFT,  // vpn
+                                               true );                              // COW
                 if( error )
                 {
@@ -295 +299 @@
         default:                             // this is a kernel error => panic    
         {
-            assert( false , __FUNCTION__ , "thread %x / epc %x / %s / vaddr = %x\n",
-            this, excPC, hal_mmu_exception_str(excp_code) , bad_vaddr );
+            assert( false , __FUNCTION__ ,
+            "thread %x / core[%x,%d] / epc %x / vaddr %x / cycle %d\n",
+            this, local_cxy, this->core->lid, excPC, bad_vaddr, (uint32_t)hal_get_cycles() );
 
             return EXCP_KERNEL_PANIC;
@@ -440 +445 @@
         hal_exception_dump( this , uzone , error );
 
-        sys_kill( this->process->pid , SIGKILL );
+        sys_exit( EXIT_FAILURE );
         }
     else if( error == EXCP_KERNEL_PANIC )   // kernel error => kernel panic
@@ -447 +452 @@
 
         assert( false , __FUNCTION__ , "thread %x in process %x on core [%x,%d]",
-        this->trdid , this->process->pid , local_cxy , this->core->lid );
+        this , this->process->pid , local_cxy , this->core->lid );
     }
 

trunk/hal/tsar_mips32/core/hal_gpt.c

@@ -141 +141 @@
     // check page size
     assert( (CONFIG_PPM_PAGE_SIZE == 4096) , __FUNCTION__ ,
-    "for TSAR, the page must be 4 Kbytes\n" );
+    "for TSAR, the page size must be 4 Kbytes\n" );
 
     // allocates 2 physical pages for PT1