Changeset 443 for trunk/hal

Timestamp:

May 16, 2018, 4:15:22 PM (7 years ago)

Author:

alain

Message:

Fix few bugs whike debugging the sort multi-thread application.

Location:

trunk/hal/tsar_mips32/core

Files:

• hal_gpt.c (modified) (12 diffs)
• hal_ppm.c (modified) (2 diffs)

trunk/hal/tsar_mips32/core/hal_gpt.c

@@ -132 +132 @@
     xptr_t     page_xp;
 
-#if DEBUG_GPT_ACCESS
+#if DEBUG_HAL_GPT_CREATE
 uint32_t cycle = (uint32_t)hal_get_cycles;
-if( DEBUG_GPT_ACCESS < cycle )
+if( DEBUG_HAL_GPT_CREATE < cycle )
 printk("\n[DBG] %s : thread %x enter / cycle %d\n", 
 __FUNCTION__, CURRENT_THREAD, cycle );
@@ -161 +161 @@
         gpt->ppn  = ppm_page2ppn( page_xp );
 
-#if DEBUG_GPT_ACCESS
+#if DEBUG_HAL_GPT_CREATE
 cycle = (uint32_t)hal_get_cycles;
-if( DEBUG_GPT_ACCESS < cycle )
+if( DEBUG_HAL_GPT_CREATE < cycle )
 printk("\n[DBG] %s : thread %x exit / cycle %d\n", 
 __FUNCTION__, CURRENT_THREAD, cycle );
@@ -186 +186 @@
         kmem_req_t   req;
     bool_t       is_ref;
+
+#if DEBUG_HAL_GPT_DESTROY
+uint32_t cycle = (uint32_t)hal_get_cycles;
+if( DEBUG_HAL_GPT_DESTROY < cycle )
+printk("\n[DBG] %s : thread %x enter / cycle %d\n", 
+__FUNCTION__, CURRENT_THREAD, cycle );
+#endif
 
     // get pointer on calling process
@@ -252 +259 @@
     req.ptr  = GET_PTR( ppm_base2page( XPTR(local_cxy , pt1 ) ) );
     kmem_free( &req );
+
+#if DEBUG_HAL_GPT_DESTROY
+cycle = (uint32_t)hal_get_cycles;
+if( DEBUG_HAL_GPT_DESTROY < cycle )
+printk("\n[DBG] %s : thread %x exit / cycle %d\n", 
+__FUNCTION__, CURRENT_THREAD, cycle );
+#endif
 
 } // end hal_gpt_destroy()
@@ -340 +354 @@
     uint32_t            tsar_attr;           // PTE attributes for TSAR MMU
 
-#if DEBUG_GPT_ACCESS
+#if DEBUG_HAL_GPT_ACCESS
 uint32_t cycle = (uint32_t)hal_get_cycles;
-if( DEBUG_GPT_ACCESS < cycle )
+if( DEBUG_HAL_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 +371 @@
     tsar_attr = gpt2tsar( attr );
 
-#if (DEBUG_GPT_ACCESS & 1)
-if( DEBUG_GPT_ACCESS < cycle )
+#if (DEBUG_HAL_GPT_ACCESS & 1)
+if( DEBUG_HAL_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 +406 @@
         pte1 = *pte1_ptr;
         
-#if (DEBUG_GPT_ACCESS & 1)
-if( DEBUG_GPT_ACCESS < cycle )
+#if (DEBUG_HAL_GPT_ACCESS & 1)
+if( DEBUG_HAL_GPT_ACCESS < cycle )
 printk("\n[DBG] %s : thread %x / vpn %x / current_pte1 %x\n", 
 __FUNCTION__, CURRENT_THREAD, vpn, pte1 );
@@ -437 +451 @@
             pt2     = (uint32_t *)GET_PTR( ppm_ppn2base( pt2_ppn ) );
 
-#if (DEBUG_GPT_ACCESS & 1)
-if( DEBUG_GPT_ACCESS < cycle )
+#if (DEBUG_HAL_GPT_ACCESS & 1)
+if( DEBUG_HAL_GPT_ACCESS < cycle )
 printk("\n[DBG] %s : thread %x / vpn %x / pte1 %x / &pt2 %x\n", 
 __FUNCTION__, CURRENT_THREAD, vpn, pte1, pt2 );
@@ -452 +466 @@
         hal_fence();
 
-#if DEBUG_GPT_ACCESS
+#if DEBUG_HAL_GPT_ACCESS
 cycle = (uint32_t)hal_get_cycles;
-if( DEBUG_GPT_ACCESS < cycle )
+if( DEBUG_HAL_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 +776 @@
     ppn_t        dst_pt2_ppn;
 
-#if DEBUG_GPT_ACCESS
+#if DEBUG_HAL_GPT_ACCESS
 uint32_t cycle = (uint32_t)hal_get_cycles;
-if( DEBUG_GPT_ACCESS < cycle )
+if( DEBUG_HAL_GPT_ACCESS < cycle )
 printk("\n[DBG] %s : thread %x enter / vpn %x / cycle %d\n", 
 __FUNCTION__, CURRENT_THREAD, vpn, cycle );
@@ -853 +867 @@
             *ppn    = src_pte2_ppn;
         
-#if DEBUG_GPT_ACCESS
+#if DEBUG_HAL_GPT_ACCESS
 cycle = (uint32_t)hal_get_cycles;
-if( DEBUG_GPT_ACCESS < cycle )
+if( DEBUG_HAL_GPT_ACCESS < cycle )
 printk("\n[DBG] %s : thread %x exit / copy done for vpn %x / cycle %d\n", 
 __FUNCTION__, CURRENT_THREAD, vpn, cycle );
@@ -870 +884 @@
     *ppn    = 0;
    
-#if DEBUG_GPT_ACCESS
+#if DEBUG_HAL_GPT_ACCESS
 cycle = (uint32_t)hal_get_cycles;
-if( DEBUG_GPT_ACCESS < cycle )
+if( DEBUG_HAL_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_ppm.c

@@ -101 +101 @@
         }
 
-// printk("\n@@@ in %s : reserved = %d / total = %d\n", __FUNCTION__, reserved_pages, pages_nr );
-
         // - set PG_RESERVED flag for reserved pages (kernel code & pages_tbl[])
         // - release all other pages to populate the free lists
@@ -115 +113 @@
                 // TODO optimisation : decompose this enormous set of small pages
                 // to several sets of big pages with various order values [AG]
-
-// if( (i < (reserved_pages+10)) || (i > (pages_nr-5)) ) ppm_print();
-
         }
 
-// assert( false , __FUNCTION__ , "PMM init completed\n");
- 
         // check consistency
         return ppm_assert_order( ppm );