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

Timestamp:

Jul 21, 2017, 7:36:08 AM (7 years ago)

Author:

alain

Message:

Fix several bugs in VFS.

File:

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

trunk/kernel/mm/mapper.c

@@ -169 +169 @@
         if ( page == NULL )   // missing page => create it and load it from file system
         {
-            mapper_dmsg("\n[INFO] %s : missing page => load from FS\n", __FUNCTION__ );
+            mapper_dmsg("\n[INFO] %s : missing page => load from device\n", __FUNCTION__ );
 
             // allocate one page from PPM
@@ -298 +298 @@
 }  // end mapper_release_page()
 
-/////////////////////////////////////////
-error_t mapper_move( mapper_t  *  mapper,
-                     bool_t       to_buffer,
-                     uint32_t     file_offset,
-                     void      *  buffer,
-                     uint32_t     size )
+////////////////////////////////////////////////
+error_t mapper_move_buffer( mapper_t  *  mapper,
+                            bool_t       to_buffer,
+                            bool_t       is_user,
+                            uint32_t     file_offset,
+                            void      *  buffer,
+                            uint32_t     size )
 {
     uint32_t   page_offset;    // first byte to move to/from a mapper page
@@ -313 +314 @@
     uint8_t  * buf_ptr;        // current buffer  address
  
-    mapper_dmsg("\n[INFO] %s : enter / to_buf = %d / buffer = %x\n",
+    mapper_dmsg("\n[INFO] %s : enters / to_buf = %d / buffer = %x\n",
                 __FUNCTION__ , to_buffer , buffer );
 
@@ -339 +340 @@
         else                       page_count = CONFIG_PPM_PAGE_SIZE;
 
+        mapper_dmsg("\n[INFO] %s : index = %d / offset = %d / count = %d\n",
+                    __FUNCTION__ , index , page_offset , page_count );
+
         // get page descriptor
         page = mapper_get_page( mapper , index );
@@ -350 +354 @@
         buf_ptr = (uint8_t *)buffer + done;
 
+        mapper_dmsg("\n[INFO] %s : index = %d / buf_ptr = %x / map_ptr = %x\n",
+                    __FUNCTION__ , index , buf_ptr , map_ptr );
+
         // move fragment
         if( to_buffer )
         {
-            hal_copy_to_uspace( buf_ptr , map_ptr , page_count );
-        }
-        else
+            if( is_user ) hal_copy_to_uspace( buf_ptr , map_ptr , page_count );
+            else          memcpy( buf_ptr , map_ptr , page_count );
+        }
+        else                 
         {
             page_do_dirty( page );
-            hal_copy_from_uspace( map_ptr , buf_ptr , page_count );
+            if( is_user ) hal_copy_from_uspace( map_ptr , buf_ptr , page_count );
+            else          memcpy( map_ptr , buf_ptr , page_count );
         }
 
@@ -369 +378 @@
     return 0;
 
-}  // end mapper_move()
-
+}  // end mapper_move_buffer()
+