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

Timestamp:

Nov 20, 2020, 12:30:31 AM (4 years ago)

Author:

alain

Message:

Mainly cosmetic.

File:

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

trunk/hal/tsar_mips32/core/hal_gpt.c

@@ -152 +152 @@
 
 // check page size
-assert( (CONFIG_PPM_PAGE_SIZE == 4096) , "the TSAR page size must be 4 Kbytes\n" );
+assert( __FUNCTION__, (CONFIG_PPM_PAGE_SIZE == 4096) , "the TSAR page size must be 4 Kbytes\n" );
 
     // allocates 2 physical pages for PT1
@@ -423 +423 @@
  
 // check PTE1 : only small and mapped pages can be locked
-assert( (pte1 & (TSAR_PTE_SMALL | TSAR_PTE_MAPPED)) , "cannot lock a big or unmapped page\n");
+assert( __FUNCTION__, (pte1 & (TSAR_PTE_SMALL | TSAR_PTE_MAPPED)) , "cannot lock a big or unmapped page\n");
 
 #if DEBUG_HAL_GPT_LOCK_PTE 
@@ -537 +537 @@
     pte1 = hal_remote_l32( pte1_xp );
 
-assert( ((pte1 & TSAR_PTE_MAPPED) != 0),
+assert( __FUNCTION__, ((pte1 & TSAR_PTE_MAPPED) != 0),
 "PTE1 for vpn %x in cluster %x is unmapped / pte1 = %x\n", vpn, gpt_cxy, pte1 );
 
-assert( ((pte1 & TSAR_PTE_SMALL ) != 0),
+assert( __FUNCTION__, ((pte1 & TSAR_PTE_SMALL ) != 0),
 "PTE1 for vpn %x in cluster %x is not small / pte1 = %x\n", vpn, gpt_cxy, pte1 );
 
@@ -553 +553 @@
     pte2_attr = hal_remote_l32( pte2_xp );
 
-assert( ((pte2_attr & TSAR_PTE_LOCKED) != 0),
+assert( __FUNCTION__, ((pte2_attr & TSAR_PTE_LOCKED) != 0),
 "PTE2 for vpn %x in cluster %x is unlocked / pte2_attr = %x\n", vpn, gpt_cxy, pte2_attr );
 
@@ -630 +630 @@
 
 // check PT1 entry not mapped
-assert( (pte1 == 0) , "try to set a big page in an already mapped PTE1\n" );
+assert( __FUNCTION__, (pte1 == 0) , "try to set a big page in an already mapped PTE1\n" );
 
 // check VPN aligned
-assert( (ix2 == 0) , "illegal vpn for a big page\n" );
+assert( __FUNCTION__, (ix2 == 0) , "illegal vpn for a big page\n" );
 
 // check PPN aligned
-assert( ((ppn & 0x1FF) == 0) , "illegal ppn for a big page\n" );
+assert( __FUNCTION__, ((ppn & 0x1FF) == 0) , "illegal ppn for a big page\n" );
 
         // set the PTE1 value in PT1
@@ -654 +654 @@
 
 // PTE1 must be mapped because PTE2 must be locked
-assert( (pte1 & TSAR_PTE_MAPPED),
+assert( __FUNCTION__, (pte1 & TSAR_PTE_MAPPED),
 "PTE1 for vpn %x in cluster %x must be mapped / pte1 = %x\n", vpn, gpt_cxy, pte1 );
 
@@ -669 +669 @@
 
 // PTE2 must be locked
-assert( (pte2_attr & TSAR_PTE_LOCKED),
+assert( __FUNCTION__, (pte2_attr & TSAR_PTE_LOCKED),
 "PTE2 for vpn %x in cluster %x must be locked / pte2_attr = %x\n", vpn, gpt_cxy, pte2_attr );
  
@@ -894 +894 @@
 
     // check src_pt1 and dst_pt1 existence
-    assert( (src_pt1 != NULL) , "src_pt1 does not exist\n");
-    assert( (dst_pt1 != NULL) , "dst_pt1 does not exist\n");
+    assert( __FUNCTION__, (src_pt1 != NULL) , "src_pt1 does not exist\n");
+    assert( __FUNCTION__, (dst_pt1 != NULL) , "dst_pt1 does not exist\n");
 
     // compute SRC indexes
@@ -1143 +1143 @@
 
 // check MAPPED, SMALL, and not LOCKED in attr argument
-assert( ((attr & GPT_MAPPED) != 0), "attribute MAPPED must be set in new attributes\n" );
-assert( ((attr & GPT_SMALL ) != 0), "attribute SMALL  must be set in new attributes\n" );
-assert( ((attr & GPT_LOCKED) == 0), "attribute LOCKED must not be set in new attributes\n" );
+assert( __FUNCTION__, ((attr & GPT_MAPPED) != 0), "attribute MAPPED must be set in new attributes\n" );
+assert( __FUNCTION__, ((attr & GPT_SMALL ) != 0), "attribute SMALL  must be set in new attributes\n" );
+assert( __FUNCTION__, ((attr & GPT_LOCKED) == 0), "attribute LOCKED must not be set in new attributes\n" );
 
     // get cluster and local pointer on remote GPT
@@ -1162 +1162 @@
 
 // check MAPPED and SMALL in target PTE1
-assert( ((pte1 & TSAR_PTE_MAPPED) != 0), "attribute MAPPED must be set in target PTE1\n" );
-assert( ((pte1 & TSAR_PTE_SMALL ) != 0), "attribute SMALL  must be set in target PTE1\n" );
+assert( __FUNCTION__, ((pte1 & TSAR_PTE_MAPPED) != 0), "attribute MAPPED must be set in target PTE1\n" );
+assert( __FUNCTION__, ((pte1 & TSAR_PTE_SMALL ) != 0), "attribute SMALL  must be set in target PTE1\n" );
 
     // get PT2 base 
@@ -1175 +1175 @@
     
 // check MAPPED in target PTE2
-assert( ((hal_remote_l32(pte2_attr_xp) & TSAR_PTE_MAPPED) != 0),
+assert( __FUNCTION__, ((hal_remote_l32(pte2_attr_xp) & TSAR_PTE_MAPPED) != 0),
 "attribute MAPPED must be set in target PTE2\n" );