Changeset 315 for trunk/kernel/kern

Timestamp:

Aug 3, 2017, 10:15:18 AM (7 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.

Location:

trunk/kernel/kern

Files:

• rpc.c (modified) (2 diffs)
• thread.c (modified) (2 diffs)

trunk/kernel/kern/rpc.c

@@ -1404 +1404 @@
         user_buffer = (void *)(intptr_t)hal_remote_lwd( XPTR( client_cxy , &desc->args[4] ) );
 
-        error = mapper_move_user_buffer( mapper,
-                                         to_buffer,
-                                         file_offset,
-                                         user_buffer,
-                                         size );
+        error = mapper_move_user( mapper,
+                                  to_buffer,
+                                  file_offset,
+                                  user_buffer,
+                                  size );
     }
     else
@@ -1414 +1414 @@
         kern_buffer = (xptr_t)hal_remote_lwd( XPTR( client_cxy , &desc->args[4] ) );
 
-        error = mapper_move_user_buffer( mapper,
-                                         to_buffer,
-                                         file_offset,
-                                         kern_buffer,
-                                         size );
+        error = mapper_move_kernel( mapper,
+                                    to_buffer,
+                                    file_offset,
+                                    kern_buffer,
+                                    size );
     }
 

trunk/kernel/kern/thread.c

@@ -82 +82 @@
         page      = kmem_alloc( &req );
 
+        if( page == NULL ) return NULL;
+
     // return pointer on new thread descriptor
-        if( page == NULL ) return NULL;
-    else               return (thread_t *)ppm_page2vaddr( page );
-}
+    xptr_t base_xp = ppm_page2base( XPTR(local_cxy , page ) );
+    return (thread_t *)GET_PTR( base_xp );
+
+}  // end thread_alloc()
+  
 
 /////////////////////////////////////////////////////////////////////////////////////
@@ -100 +104 @@
     kmem_req_t   req;
 
+    xptr_t base_xp = ppm_base2page( XPTR(local_cxy , thread ) );
+
     req.type  = KMEM_PAGE;
-    req.ptr   = ppm_vaddr2page( thread );
+    req.ptr   = GET_PTR( base_xp );
     kmem_free( &req );
 }