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

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.

File:

• trunk/kernel/mm/mapper.c (modified) (2 diffs)

trunk/kernel/mm/mapper.c

@@ -349 +349 @@
 
         // compute pointer in mapper
-        map_ptr = (uint8_t *)ppm_page2vaddr( page ) + page_offset;
+        xptr_t base_xp = ppm_page2base( XPTR( local_cxy, page ) );
+        map_ptr = (uint8_t *)GET_PTR( base_xp ) + page_offset;
 
         // compute pointer in buffer
@@ -446 +447 @@
         if ( page == NULL ) return EINVAL;
 
+        // get page base address
+        uint8_t * base = (uint8_t *)GET_PTR( XPTR( local_cxy , page ) );
+        
         // compute source and destination pointers
         if( to_buffer )
         {
-            dst_ptr = buf_ptr + done;
-            src_ptr = (uint8_t *)ppm_page2vaddr( page ) + page_offset;
+            dst_ptr = buffer_ptr + done;
+            src_ptr = base + page_offset;
         }
         else
         {
-            src_ptr = buf_ptr + done;
-            dst_ptr = (uint8_t *)ppm_page2vaddr( page ) + page_offset;
+            src_ptr = buffer_ptr + done;
+            dst_ptr = base + page_offset;
 
             page_do_dirty( page );