Changeset 492 for trunk/hal/tsar_mips32/core/hal_gpt.c

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.

File:

• trunk/hal/tsar_mips32/core/hal_gpt.c (modified) (6 diffs)

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");