Changeset 315 for trunk/kernel/mm/vseg.c

Timestamp:

Aug 3, 2017, 10:15:18 AM (6 years ago)

Author:

alain

Message:

Redefine the fuctions ppm_base2page() / ppm_page2base() / ppm_page2ppn() / ppm_ppn2page() / ppm_base2ppn() / ppm_ppn2base(),
to use explicitely extended pointers.

File:

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

trunk/kernel/mm/vseg.c

@@ -92 +92 @@
                 vpn_t         vpn_size,
                         uint32_t      type,
-                cxy_t         cxy,
-                fdid_t        fdid,
-                        uint32_t      offset )
+                cxy_t         cxy )
 {
     vseg->type      = type;
@@ -101 +99 @@
     vseg->vpn_base  = vpn_base;
         vseg->vpn_size  = vpn_size;
-        vseg->mapper    = XPTR_NULL;
-        vseg->fdid      = fdid;
-        vseg->offset    = offset;
+        vseg->mapper_xp = XPTR_NULL;
     vseg->cxy       = cxy;
 
@@ -171 +167 @@
         hal_core_sleep();
     }
-}
+
+}  // end vseg_init()
 
 //////////////////////////////////////////
@@ -182 +179 @@
 
     // initialize vseg with remote_read access
-    vseg->type     =           hal_remote_lw ( XPTR( cxy , &ptr->type     ) );
-    vseg->min      = (intptr_t)hal_remote_lpt( XPTR( cxy , &ptr->min      ) );
-    vseg->max      = (intptr_t)hal_remote_lpt( XPTR( cxy , &ptr->max      ) );
-    vseg->vpn_base =           hal_remote_lw ( XPTR( cxy , &ptr->vpn_base ) );
-    vseg->vpn_size =           hal_remote_lw ( XPTR( cxy , &ptr->vpn_size ) );
-    vseg->flags    =           hal_remote_lw ( XPTR( cxy , &ptr->flags    ) );
-        vseg->mapper   = (xptr_t)  hal_remote_lwd( XPTR( cxy , &ptr->mapper   ) );
-
-    if( vseg->type == VSEG_TYPE_FILE )
-    {
-        vseg->fdid   = hal_remote_lw( XPTR( cxy , &ptr->fdid   ) );
-        vseg->offset = hal_remote_lw( XPTR( cxy , &ptr->offset ) );
-    }
-    else
-    {
-        vseg->fdid   = 0;
-        vseg->offset = 0;
-    }
+    vseg->type       =           hal_remote_lw ( XPTR( cxy , &ptr->type      ) );
+    vseg->min        = (intptr_t)hal_remote_lpt( XPTR( cxy , &ptr->min       ) );
+    vseg->max        = (intptr_t)hal_remote_lpt( XPTR( cxy , &ptr->max       ) );
+    vseg->vpn_base   =           hal_remote_lw ( XPTR( cxy , &ptr->vpn_base  ) );
+    vseg->vpn_size   =           hal_remote_lw ( XPTR( cxy , &ptr->vpn_size  ) );
+    vseg->flags      =           hal_remote_lw ( XPTR( cxy , &ptr->flags     ) );
+        vseg->mapper_xp  = (xptr_t)  hal_remote_lwd( XPTR( cxy , &ptr->mapper_xp ) );
 }