Changeset 492 for trunk/hal/tsar_mips32/core

Timestamp:

Aug 22, 2018, 11:55:48 PM (6 years ago)

Author:

viala@…

Message:

Refactoring assert calling to conform with new assert macro.

Made with this command for the general case.
find ./kernel/ hal/ -name "*.c" | xargs sed -i -e '/assert(/ s/,[ ]*FUNCTION[ ]*,/,/'

And some done by hand.

Location:

trunk/hal/tsar_mips32/core

Files:

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

trunk/hal/tsar_mips32/core/hal_context.c

@@ -119 +119 @@
 error_t hal_cpu_context_alloc( thread_t * thread )
 {
-    assert( (sizeof(hal_cpu_context_t) <= CONFIG_CPU_CTX_SIZE) , __FUNCTION__ ,
+    assert( (sizeof(hal_cpu_context_t) <= CONFIG_CPU_CTX_SIZE) ,
     "illegal CPU context size" );
 
@@ -146 +146 @@
     hal_cpu_context_t * context = (hal_cpu_context_t *)thread->cpu_context;
 
-    assert( (context != NULL ), __FUNCTION__, "CPU context not allocated" );
+    assert( (context != NULL ), "CPU context not allocated" );
 
     // initialisation depends on thread type
@@ -235 +235 @@
     else                           // current == child thread
     {
-        assert( (current == child_ptr) , __FUNCTION__ , "current = %x / child = %x\n");
+        assert( (current == child_ptr) , "current = %x / child = %x\n");
     }
 }  // end hal_cpu_context_fork()
@@ -300 +300 @@
 error_t hal_fpu_context_alloc( thread_t * thread )
 {
-    assert( (sizeof(hal_fpu_context_t) <= CONFIG_FPU_CTX_SIZE) , __FUNCTION__ ,
+    assert( (sizeof(hal_fpu_context_t) <= CONFIG_FPU_CTX_SIZE) ,
     "illegal CPU context size" );
 
@@ -322 +322 @@
     hal_fpu_context_t * context = thread->fpu_context;
 
-    assert( (context != NULL) , __FUNCTION__ , "fpu context not allocated" ); 
+    assert( (context != NULL) , "fpu context not allocated" );
 
     memset( context , 0 , sizeof(hal_fpu_context_t) );
@@ -331 +331 @@
                            thread_t * src )
 {
-    assert( (src != NULL) , __FUNCTION__ , "src thread pointer is NULL\n"); 
-    assert( (dst != NULL) , __FUNCTION__ , "dst thread pointer is NULL\n"); 
+    assert( (src != NULL) , "src thread pointer is NULL\n");
+    assert( (dst != NULL) , "dst thread pointer is NULL\n");
 
     // get fpu context pointers

trunk/hal/tsar_mips32/core/hal_drivers.c

@@ -49 +49 @@
                            uint32_t   impl )
 {
-        assert( (impl == IMPL_TXT_TTY), __FUNCTION__ , "bad implementation" );
+        assert( (impl == IMPL_TXT_TTY), "bad implementation" );
 
         soclib_tty_init( txt );
@@ -62 +62 @@
                            uint32_t   impl )
 {
-    assert( (impl == IMPL_PIC_SCL), __FUNCTION__, "bad implementation" );
+    assert( (impl == IMPL_PIC_SCL), "bad implementation" );
 
         soclib_pic_init( pic );
@@ -85 +85 @@
                            uint32_t   impl )
 {
-        assert( (impl == IMPL_IOB_TSR), __FUNCTION__ , "bad implementation" );
+        assert( (impl == IMPL_IOB_TSR), "bad implementation" );
 
         soclib_iob_init( iob );
@@ -116 +116 @@
     else 
     {
-                assert( false , __FUNCTION__ , "undefined IOC device implementation" );
+                assert( false , "undefined IOC device implementation" );
         }
 }
@@ -128 +128 @@
                            uint32_t   impl )
 {
-        assert( (impl == IMPL_MMC_TSR), __FUNCTION__ , "bad implementation" );
+        assert( (impl == IMPL_MMC_TSR), "bad implementation" );
  
     soclib_mmc_init( mmc );
@@ -141 +141 @@
                            uint32_t   impl )
 {
-        assert( (impl == IMPL_NIC_CBF), __FUNCTION__ , "bad implementation" );
+        assert( (impl == IMPL_NIC_CBF), "bad implementation" );
  
     soclib_nic_init( nic );
@@ -154 +154 @@
                            uint32_t   impl )
 {
-        assert( (impl == IMPL_DMA_SCL), __FUNCTION__ , "bad implementation" );
+        assert( (impl == IMPL_DMA_SCL), "bad implementation" );
  
     soclib_dma_init( dma );

trunk/hal/tsar_mips32/core/hal_exception.c

@@ -500 +500 @@
         hal_exception_dump( this , uzone , error );
 
-        assert( false , __FUNCTION__ , "core[%x,%d] blocked\n", local_cxy, this->core->lid );
+        assert( false , "Exception raised kernel panic see information below.\n" );
     }
 

trunk/hal/tsar_mips32/core/hal_gpt.c

@@ -140 +140 @@
 
     // check page size
-    assert( (CONFIG_PPM_PAGE_SIZE == 4096) , __FUNCTION__ ,
+    assert( (CONFIG_PPM_PAGE_SIZE == 4096) ,
     "for TSAR, the page size must be 4 Kbytes\n" );
 
@@ -283 +283 @@
     vpn_t      vpn;
 
-    assert( (process != NULL) , __FUNCTION__ , "NULL process pointer\n");
+    assert( (process != NULL) , "NULL process pointer\n");
 
     // get pointer on gpt
@@ -387 +387 @@
         pte1 = *pte1_ptr;
 
-        assert( (pte1 == 0) , __FUNCTION__ ,
+        assert( (pte1 == 0) ,
                 "try to set a big page in a mapped PT1 entry / PT1[%d] = %x\n", ix1 , pte1 );
       
@@ -441 +441 @@
         {
             // This valid entry must be a PTD1
-            assert( (pte1 & TSAR_MMU_SMALL) , __FUNCTION__ ,
+            assert( (pte1 & TSAR_MMU_SMALL) ,
             "try to set a small page in a big PT1 entry / PT1[%d] = %x\n", ix1 , pte1 );
 
@@ -792 +792 @@
 
     // check src_pt1 and dst_pt1 existence
-    assert( (src_pt1 != NULL) , __FUNCTION__ , "src_pt1 does not exist\n");
-    assert( (dst_pt1 != NULL) , __FUNCTION__ , "dst_pt1 does not exist\n");
+    assert( (src_pt1 != NULL) , "src_pt1 does not exist\n");
+    assert( (dst_pt1 != NULL) , "dst_pt1 does not exist\n");
 
     ix1 = TSAR_MMU_IX1_FROM_VPN( vpn );
@@ -1010 +1010 @@
             pt2     = (uint32_t*)GET_PTR( ppm_ppn2base( pt2_ppn ) );
 
-            assert( (GET_CXY( ppm_ppn2base( pt2_ppn ) ) == gpt_cxy ), __FUNCTION__,
+            assert( (GET_CXY( ppm_ppn2base( pt2_ppn ) ) == gpt_cxy ),
             "PT2 and PT1 must be in the same cluster\n");