Changeset 315 for trunk/kernel/syscalls

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/syscalls

Files:

• sys_exec.c (modified) (3 diffs)
• sys_write.c (modified) (1 diff)

trunk/kernel/syscalls/sys_exec.c

@@ -85 +85 @@
     kmem_req_t   req;         // kmem request
     page_t     * page;        // page descriptor
+    xptr_t       base_xp;     // extended pointer on page base
     uint32_t     order;       // ln2( number of pages to store strings )
     char      ** k_pointers;  // base of kernel array of pointers
@@ -103 +104 @@
     if( page == NULL ) return ENOMEM;
 
-    k_pointers = ppm_page2vaddr( page );
+    base_xp = ppm_page2base( XPTR( local_cxy , page ) );
+    k_pointers = (char **)GET_PTR( base_xp );
 
     // allocate several physical pages to store the strings themselve
@@ -111 +113 @@
     if( page == NULL ) return ENOMEM;
 
-    k_buf_base = ppm_page2vaddr( page );
+    base_xp = ppm_page2base( XPTR( local_cxy , page ) );
+    k_buf_base = (char *)GET_PTR( base_xp );
 
     // copy the array of pointers to kernel buffer

trunk/kernel/syscalls/sys_write.c

@@ -93 +93 @@
     error = vfs_user_move( false,               // from buffer 
                            file_xp,
-                           kbuf , 
-                           nbytes );
+                           buf , 
+                           count );
 
     if( error )