Changeset 438 for trunk/hal/tsar_mips32/core

Timestamp:

Apr 4, 2018, 2:49:02 PM (7 years ago)

Author:

alain

Message:

Fix a bug in scheduler related to RPC blocking.

Location:

trunk/hal/tsar_mips32/core

Files:

• hal_exception.c (modified) (5 diffs)
• hal_gpt.c (modified) (10 diffs)
• hal_kentry.S (modified) (2 diffs)

trunk/hal/tsar_mips32/core/hal_exception.c

@@ -201 +201 @@
     }
 
-#if CONFIG_DEBUG_HAL_EXCEPTIONS
+#if DEBUG_HAL_EXCEPTIONS
 uint32_t cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_HAL_EXCEPTIONS < cycle )
+if( DEBUG_HAL_EXCEPTIONS < cycle )
 printk("\n[DBG] %s : thread %x enter / is_ins %d / %s / vaddr %x / cycle %d\n",
 __FUNCTION__, this, is_ins, hal_mmu_exception_str(excp_code), bad_vaddr, cycle );
@@ -229 +229 @@
             {
 
-#if CONFIG_DEBUG_HAL_EXCEPTIONS
+#if DEBUG_HAL_EXCEPTIONS
 cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_HAL_EXCEPTIONS < cycle )
+if( DEBUG_HAL_EXCEPTIONS < cycle )
 printk("\n[DBG] %s : thread %x exit / page-fault handled for vaddr = %x\n",
 __FUNCTION__ , this , bad_vaddr );
@@ -268 +268 @@
                 {
 
-#if CONFIG_DEBUG_HAL_EXCEPTIONS
+#if DEBUG_HAL_EXCEPTIONS
 cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_HAL_EXCEPTIONS < cycle )
+if( DEBUG_HAL_EXCEPTIONS < cycle )
 printk("\n[DBG] %s : thread %x exit / copy-on-write handled for vaddr = %x\n",
 __FUNCTION__ , this , bad_vaddr );
@@ -390 +390 @@
     excPC          = uzone[UZ_EPC];
 
-#if CONFIG_DEBUG_HAL_EXCEPTIONS
+#if DEBUG_HAL_EXCEPTIONS
 uint32_t cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_HAL_EXCEPTIONS < cycle )
+if( DEBUG_HAL_EXCEPTIONS < 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 );
@@ -450 +450 @@
     }
 
-#if CONFIG_DEBUG_HAL_EXCEPTIONS
+#if DEBUG_HAL_EXCEPTIONS
 cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_HAL_EXCEPTIONS < cycle )
+if( DEBUG_HAL_EXCEPTIONS < 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 );

trunk/hal/tsar_mips32/core/hal_gpt.c

@@ -132 +132 @@
     xptr_t     page_xp;
 
-#if CONFIG_DEBUG_GPT_ACCESS
+#if DEBUG_GPT_ACCESS
 uint32_t cycle = (uint32_t)hal_get_cycles;
-if( CONFIG_DEBUG_GPT_ACCESS < cycle )
+if( DEBUG_GPT_ACCESS < cycle )
 printk("\n[DBG] %s : thread %x enter / cycle %d\n", 
 __FUNCTION__, CURRENT_THREAD, cycle );
@@ -161 +161 @@
         gpt->ppn  = ppm_page2ppn( page_xp );
 
-#if CONFIG_DEBUG_GPT_ACCESS
+#if DEBUG_GPT_ACCESS
 cycle = (uint32_t)hal_get_cycles;
-if( CONFIG_DEBUG_GPT_ACCESS < cycle )
+if( DEBUG_GPT_ACCESS < cycle )
 printk("\n[DBG] %s : thread %x exit / cycle %d\n", 
 __FUNCTION__, CURRENT_THREAD, cycle );
@@ -340 +340 @@
     uint32_t            tsar_attr;           // PTE attributes for TSAR MMU
 
-#if CONFIG_DEBUG_GPT_ACCESS
+#if DEBUG_GPT_ACCESS
 uint32_t cycle = (uint32_t)hal_get_cycles;
-if( CONFIG_DEBUG_GPT_ACCESS < cycle )
+if( DEBUG_GPT_ACCESS < cycle )
 printk("\n[DBG] %s : thread %x enter / vpn %x / attr %x / ppn %x / cycle %d\n", 
 __FUNCTION__, CURRENT_THREAD, vpn, attr, ppn, cycle );
@@ -357 +357 @@
     tsar_attr = gpt2tsar( attr );
 
-#if (CONFIG_DEBUG_GPT_ACCESS & 1)
-if( CONFIG_DEBUG_GPT_ACCESS < cycle )
+#if (DEBUG_GPT_ACCESS & 1)
+if( DEBUG_GPT_ACCESS < cycle )
 printk("\n[DBG] %s : thread %x / vpn %x / &pt1 %x / tsar_attr %x\n", 
 __FUNCTION__, CURRENT_THREAD, vpn, pt1, tsar_attr );
@@ -392 +392 @@
         pte1 = *pte1_ptr;
         
-#if (CONFIG_DEBUG_GPT_ACCESS & 1)
-if( CONFIG_DEBUG_GPT_ACCESS < cycle )
+#if (DEBUG_GPT_ACCESS & 1)
+if( DEBUG_GPT_ACCESS < cycle )
 printk("\n[DBG] %s : thread %x / vpn %x / current_pte1 %x\n", 
 __FUNCTION__, CURRENT_THREAD, vpn, pte1 );
@@ -437 +437 @@
             pt2     = (uint32_t *)GET_PTR( ppm_ppn2base( pt2_ppn ) );
 
-#if (CONFIG_DEBUG_GPT_ACCESS & 1)
-if( CONFIG_DEBUG_GPT_ACCESS < cycle )
+#if (DEBUG_GPT_ACCESS & 1)
+if( DEBUG_GPT_ACCESS < cycle )
 printk("\n[DBG] %s : thread %x / vpn %x / pte1 %x / &pt2 %x\n", 
 __FUNCTION__, CURRENT_THREAD, vpn, pte1, pt2 );
@@ -452 +452 @@
         hal_fence();
 
-#if CONFIG_DEBUG_GPT_ACCESS
+#if DEBUG_GPT_ACCESS
 cycle = (uint32_t)hal_get_cycles;
-if( CONFIG_DEBUG_GPT_ACCESS < cycle )
+if( DEBUG_GPT_ACCESS < cycle )
 printk("\n[DBG] %s : thread %x exit / vpn %x / pte2_attr %x / pte2_ppn %x / cycle %d\n", 
 __FUNCTION__, CURRENT_THREAD, vpn, pt2[2 * ix2], pt2[2 * ix2 + 1], cycle );
@@ -762 +762 @@
     ppn_t        dst_pt2_ppn;
 
-#if CONFIG_DEBUG_GPT_ACCESS
+#if DEBUG_GPT_ACCESS
 uint32_t cycle = (uint32_t)hal_get_cycles;
-if( CONFIG_DEBUG_GPT_ACCESS < cycle )
+if( DEBUG_GPT_ACCESS < cycle )
 printk("\n[DBG] %s : thread %x enter / vpn %x / cycle %d\n", 
 __FUNCTION__, CURRENT_THREAD, vpn, cycle );
@@ -853 +853 @@
             *ppn    = src_pte2_ppn;
         
-#if CONFIG_DEBUG_GPT_ACCESS
+#if DEBUG_GPT_ACCESS
 cycle = (uint32_t)hal_get_cycles;
-if( CONFIG_DEBUG_GPT_ACCESS < cycle )
+if( DEBUG_GPT_ACCESS < cycle )
 printk("\n[DBG] %s : thread %x exit / copy done for vpn %x / cycle %d\n", 
 __FUNCTION__, CURRENT_THREAD, vpn, cycle );
@@ -870 +870 @@
     *ppn    = 0;
    
-#if CONFIG_DEBUG_GPT_ACCESS
+#if DEBUG_GPT_ACCESS
 cycle = (uint32_t)hal_get_cycles;
-if( CONFIG_DEBUG_GPT_ACCESS < cycle )
+if( DEBUG_GPT_ACCESS < cycle )
 printk("\n[DBG] %s : thread %x exit / nothing done for vpn %x / cycle %d\n", 
 __FUNCTION__, CURRENT_THREAD, vpn, cycle );

trunk/hal/tsar_mips32/core/hal_kentry.S

@@ -200 +200 @@
         mtc0    $3,         $12                         # set new c0_sr 
 
-#--------------------------
-#if CONFIG_DEBUG_HAL_KENTRY 
+#--------------------
+#if DEBUG_HAL_KENTRY 
 
     # display "enter" message
@@ -349 +349 @@
     sw      $5,    8($4)                # current uzone pointer <= previous
 
-#--------------------------
-#if CONFIG_DEBUG_HAL_KENTRY
+#-------------------
+#if DEBUG_HAL_KENTRY
 
     # display "exit" message