Changeset 68 for trunk/kernel/mm/vmm.c

Timestamp:

Jun 27, 2017, 10:24:13 AM (7 years ago)

Author:

alain

Message:

Fix bug in kernel_init, and reduce size of remote_fifo.

File:

• trunk/kernel/mm/vmm.c (modified) (5 diffs)

trunk/kernel/mm/vmm.c

@@ -616 +616 @@
 
 
-//////////////////////////////////////////
-error_t vmm_map_vseg( vseg_t    * vseg,
-                      uint32_t    attr )
+//////////////////////////////////////////////
+error_t vmm_map_kernel_vseg( vseg_t    * vseg,
+                             uint32_t    attr )
 {
     vpn_t       vpn;        // VPN of PTE to be set
@@ -628 +628 @@
     error_t     error;
 
-    // check vseg type
+    // check vseg type : must be a kernel vseg
     uint32_t type = vseg->type;
-    if( (type != VSEG_TYPE_KCODE) && (type != VSEG_TYPE_KDATA) && (type != VSEG_TYPE_KDEV) )
-    {
-        printk("\n[PANIC] in %s : not a kernel vseg\n", __FUNCTION__ );
-        hal_core_sleep();
-    }
+    assert( ((type==VSEG_TYPE_KCODE) || (type==VSEG_TYPE_KDATA) || (type==VSEG_TYPE_KDEV)),
+            __FUNCTION__ , "not a kernel vseg\n" );
 
     // get pointer on page table
@@ -648 +645 @@
         for( vpn = vpn_min ; vpn < vpn_max ; vpn++ )
         {
+        // allocate a physical page from local PPM
             kmem_req_t req;
             req.type  = KMEM_PAGE;
@@ -782 +780 @@
 
     // this function must be called by a thread running in the reference cluster 
-    if( GET_CXY( process->ref_xp ) != local_cxy );
-    {
-        printk("\n[PANIC] in %s : not called in the reference cluster\n", __FUNCTION__ );
-        hal_core_sleep();
-    }
+    assert( (GET_CXY( process->ref_xp ) == local_cxy ) , __FUNCTION__ ,
+             " not called in the reference cluster\n" );
 
     // get VMM pointer
@@ -954 +949 @@
 }  // end vmm_v2p_translate()
 
-//////////////////////////////////////////////