Changeset 619 for trunk/hal/tsar_mips32/core

Timestamp:

Feb 12, 2019, 1:15:47 PM (5 years ago)

Author:

alain

Message:

1) Fix a bug in KSH : after the "load" command,

the [ksh] prompt is now printed after completion
of the loaded application.

2) Fix a bug in vmm_handle_cow() : the copy-on-write

use now a hal_remote_memcpy() to replicate the page content.

Location:

trunk/hal/tsar_mips32/core

Files:

• hal_exception.c (modified) (6 diffs)
• hal_special.c (modified) (5 diffs)

trunk/hal/tsar_mips32/core/hal_exception.c

@@ -219 +219 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_HAL_EXCEPTIONS < cycle )
-printk("\n[%s] thread[%x,%x] on core [%x,%x] enter / is_ins %d / %s / vaddr %x / cycle %d\n",
+printk("\n[%s] thread[%x,%x] on core [%x,%x] enter\n  is_ins %d / %s / vaddr %x / cycle %d\n",
 __FUNCTION__, process->pid, this->trdid, local_cxy, this->core->lid,
 is_ins, hal_mmu_exception_str(excp_code), bad_vaddr, cycle);
@@ -242 +242 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_HAL_EXCEPTIONS < cycle )
-printk("\n[%s] thread[%x,%x] on core [%x,%x] exit / page-fault handled for vaddr = %x\n",
+printk("\n[%s] thread[%x,%x] on core [%x,%x] exit\n  page-fault handled for vaddr = %x\n",
 __FUNCTION__, process->pid, this->trdid, local_cxy, this->core->lid, bad_vaddr );
 #endif
@@ -342 +342 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// This static function prints on the kernel terminal the saved context (core registers)
+// This function prints on the kernel terminal the saved context (core registers)
 // and the thread state of a faulty thread.
 //////////////////////////////////////////////////////////////////////////////////////////
 // @ this     : pointer on faulty thread descriptor.
-// @ uzone    : pointer on register array.
 // @ error    : EXCP_USER_ERROR or EXCP_KERNEL_PANIC
 //////////////////////////////////////////////////////////////////////////////////////////
 static void hal_exception_dump( thread_t * this,
-                                reg_t    * uzone,
                                 error_t    error )
 {
     core_t    * core    = this->core;
     process_t * process = this->process;
+    reg_t     * uzone   = this->uzone_current;
 
     // get pointers on TXT0 chdev
@@ -399 +398 @@
         uzone[UZ_S0], uzone[UZ_S1], uzone[UZ_S2], uzone[UZ_S3], uzone[UZ_S4] );
   
-    nolock_printk("s5_21   %X  s6_22   %X  s7_23  %X  s8_24  %X  ra_25  %X\n",
+    nolock_printk("s5_21   %X  s6_22   %X  s7_23  %X  t8_24  %X  t9_25  %X\n",
         uzone[UZ_S5], uzone[UZ_S6], uzone[UZ_S7], uzone[UZ_T8], uzone[UZ_T9] );
 
@@ -508 +507 @@
         if( error == EXCP_USER_ERROR )          //  user error => kill user process
         {
-        hal_exception_dump( this , uzone , error );
+        hal_exception_dump( this , error );
 
         sys_exit( EXIT_FAILURE );
@@ -514 +513 @@
     else if( error == EXCP_KERNEL_PANIC )   // kernel error => kernel panic
     {
-        hal_exception_dump( this , uzone , error );
+        hal_exception_dump( this , error );
 
         hal_core_sleep();

trunk/hal/tsar_mips32/core/hal_special.c

@@ -25 +25 @@
 #include <hal_kernel_types.h>
 #include <hal_special.h>
+#include <hal_exception.h>
 #include <core.h>
 #include <thread.h>
@@ -145 +146 @@
 }
 
-//////////////////////////////
-uint32_t hal_get_stack( void )
+///////////////////////////
+uint32_t hal_get_sp( void )
 {
         register uint32_t sp;
@@ -155 +156 @@
 }
 
-////////////////////////////////////////
-uint32_t hal_set_stack( void * new_val )
+/////////////////////////////////////
+uint32_t hal_set_sp( void * new_val )
 {
         register uint32_t sp;
@@ -168 +169 @@
 }
 
+///////////////////////////
+uint32_t hal_get_ra( void )
+{
+        register uint32_t ra;
+  
+        asm volatile ("or    %0,   $0,   $31" : "=&r" (ra));
+  
+        return ra;
+}
+
 //////////////////////////////////
 uint32_t hal_get_bad_vaddr( void )
@@ -216 +227 @@
 void hal_core_sleep( void )
 {
+    thread_t * this = CURRENT_THREAD;
+
+    printk("\n*** thread[%x,%x] on core[%x,%d]/n"
+           "  sr = %X / sp = %X / ra = %X\n",
+           this->process->pid, this->trdid, local_cxy, this->core->lid,  
+           hal_get_sr(), hal_get_sp(), hal_get_ra() );
+
         while( 1 ) asm volatile ("nop");
 }