Changeset 492 for trunk/kernel/mm/vmm.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/kernel/mm/vmm.c (modified) (10 diffs)

trunk/kernel/mm/vmm.c

@@ -79 +79 @@
 
     assert( ((CONFIG_VMM_KENTRY_SIZE + CONFIG_VMM_ARGS_SIZE + CONFIG_VMM_ENVS_SIZE) 
-            <= CONFIG_VMM_ELF_BASE) , __FUNCTION__ , "UTILS zone too small\n" );
-
-    assert( (CONFIG_THREAD_MAX_PER_CLUSTER <= 32) , __FUNCTION__ ,
+            <= CONFIG_VMM_ELF_BASE) , "UTILS zone too small\n" );
+
+    assert( (CONFIG_THREAD_MAX_PER_CLUSTER <= 32) ,
             "no more than 32 threads per cluster for a single process\n");
 
     assert( ((CONFIG_VMM_STACK_SIZE * CONFIG_THREAD_MAX_PER_CLUSTER) <=
-             (CONFIG_VMM_VSPACE_SIZE - CONFIG_VMM_STACK_BASE)) , __FUNCTION__ ,
+             (CONFIG_VMM_VSPACE_SIZE - CONFIG_VMM_STACK_BASE)) ,
              "STACK zone too small\n");
 
@@ -274 +274 @@
 
     // check cluster is reference
-    assert( (GET_CXY( process->ref_xp ) == local_cxy) , __FUNCTION__,
+    assert( (GET_CXY( process->ref_xp ) == local_cxy) ,
     "not called in reference cluster\n");
 
@@ -346 +346 @@
 
     // check cluster is reference
-    assert( (GET_CXY( process->ref_xp ) == local_cxy) , __FUNCTION__,
+    assert( (GET_CXY( process->ref_xp ) == local_cxy) ,
     "local cluster is not process reference cluster\n");
 
@@ -386 +386 @@
             vseg     = GET_PTR( vseg_xp );
 
-            assert( (GET_CXY( vseg_xp ) == local_cxy) , __FUNCTION__,
+            assert( (GET_CXY( vseg_xp ) == local_cxy) ,
             "all vsegs in reference VSL must be local\n" );
 
@@ -1112 +1112 @@
 
             // check small page
-            assert( (attr & GPT_SMALL) , __FUNCTION__ ,
+            assert( (attr & GPT_SMALL) ,
             "an user vseg must use small pages" );
 
@@ -1380 +1380 @@
     uint32_t     flags = vseg->flags;
 
-    assert( ( type != VSEG_TYPE_FILE ) , __FUNCTION__ , "illegal vseg type\n" );
+    assert( ( type != VSEG_TYPE_FILE ) , "illegal vseg type\n" );
 
     if( flags & VSEG_DISTRIB )    // distributed => cxy depends on vpn LSB
@@ -1448 +1448 @@
         xptr_t mapper_xp = vseg->mapper_xp;
 
-        assert( (mapper_xp != XPTR_NULL), __FUNCTION__,
+        assert( (mapper_xp != XPTR_NULL),
         "mapper not defined for a FILE vseg\n" );
         
@@ -1486 +1486 @@
             xptr_t     mapper_xp = vseg->mapper_xp;
 
-            assert( (mapper_xp != XPTR_NULL), __FUNCTION__,
+            assert( (mapper_xp != XPTR_NULL),
             "mapper not defined for a CODE or DATA vseg\n" );
         
@@ -1655 +1655 @@
 
     // vseg has been checked by the vmm_handle_page_fault() function
-    assert( (vseg != NULL) , __FUNCTION__,
-    "vseg undefined / vpn %x / thread %x in process %x / core[%x,%d] / cycle %d\n", 
-    vpn, this->trdid, process->pid, local_cxy, this->core->lid,
-    (uint32_t)hal_get_cycles() );
+    assert( (vseg != NULL) , "vseg undefined / vpn %x\n");
 
     if( cow )  //////////////// copy_on_write request //////////////////////
@@ -1669 +1666 @@
         hal_gpt_get_pte( &vmm->gpt , vpn , &old_attr , &old_ppn );
 
-        assert( (old_attr & GPT_MAPPED), __FUNCTION__,
-        "PTE unmapped for a COW exception / vpn %x / thread %x in process %x / cycle %d\n",
-        vpn, this, process->pid, (uint32_t)hal_get_cycles() );
+        assert( (old_attr & GPT_MAPPED),
+          "PTE unmapped for a COW exception / vpn %x\n" );
 
 #if( DEBUG_VMM_GET_PTE & 1 )