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

Timestamp:

Mar 28, 2018, 2:40:29 PM (6 years ago)

Author:

alain

Message:

Fix various bugs

File:

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

trunk/kernel/mm/vmm.c

@@ -673 +673 @@
 #endif
 
+#if (CONFIG_DEBUG_VMM_DESTROY & 1 )
+vmm_display( process , true );
+#endif
+
     // get pointer on local VMM
     vmm_t  * vmm = &process->vmm;
@@ -690 +694 @@
         vseg    = GET_PTR( vseg_xp );
 
-        // unmap rand release physical pages if required)
+#if( CONFIG_DEBUG_VMM_DESTROY & 1 )
+if( CONFIG_DEBUG_VMM_DESTROY < cycle )
+printk("\n[DBG] %s : %s / vpn_base %x / vpn_size %d\n",
+__FUNCTION__ , vseg_type_str( vseg->type ), vseg->vpn_base, vseg->vpn_size );
+#endif
+
+        // unmap and release physical pages 
         vmm_unmap_vseg( process , vseg );
 
@@ -1120 +1130 @@
         if( attr & GPT_MAPPED )  // entry is mapped
         { 
+
+#if( CONFIG_DEBUG_VMM_UNMAP_VSEG & 1 )
+if( CONFIG_DEBUG_VMM_UNMAP_VSEG < cycle )
+printk("- vpn %x / ppn %x\n" , vpn , ppn );
+#endif
+
             // check small page
             assert( (attr & GPT_SMALL) , __FUNCTION__ ,
@@ -1140 +1156 @@
                 // FIXME lock the physical page
 
-                // get extended pointer on pending forks counter
-                forks_xp = XPTR( page_cxy , &page_ptr->forks );
-
                 // get pending forks counter
-                count = hal_remote_lw( forks_xp );
+                count = hal_remote_lw( XPTR( page_cxy , &page_ptr->forks ) );
                 
                 if( count )  // decrement pending forks counter
                 {
+                    forks_xp = XPTR( page_cxy , &page_ptr->forks );
                     hal_remote_atomic_add( forks_xp , -1 );
                 }