Changeset 707 for soft/giet_vm/giet_fat32

Timestamp:

Aug 24, 2015, 5:08:30 PM (9 years ago)

Author:

guerin

Message:

fix kill/exec

• introduce physical_memcpy for fat_read
• don't defer task exec
• load writable segments in exec syscall

Location:

soft/giet_vm/giet_fat32

Files:

• fat32.c (modified) (4 diffs)
• fat32.h (modified) (2 diffs)

soft/giet_vm/giet_fat32/fat32.c

@@ -3174 +3174 @@
 //   GIET_FAT32_IO_ERROR
 /////////////////////////////////////////////////////////////////////////////////
-int _fat_read( unsigned int fd_id,     // file descriptor index
-               void*        buffer,    // destination buffer
-               unsigned int count )    // number of bytes to read
+int _fat_read( unsigned int fd_id,          // file descriptor index
+               paddr_t buffer,              // destination buffer
+               unsigned int count,          // number of bytes to read
+               unsigned int phys )          // use physical_memcpy
 {
     // checking FAT initialized
@@ -3266 +3267 @@
         unsigned char*  source;
         unsigned int    nbytes;
-        unsigned char*  dest = (unsigned char*)buffer + done;
+
         if ( (cluster_id == first_cluster_id) && (cluster_id == last_cluster_id) )
         {
@@ -3289 +3290 @@
 
         // move data
-        memcpy( dest , source , nbytes );
+        if ( !phys )
+        {
+            void* dest = (void*)(unsigned int)buffer + done;
+
+            memcpy( dest, source, nbytes );
+        }
+        else
+        {
+            unsigned int flags;
+            paddr_t pdest = buffer + done;
+            paddr_t psource  = _v2p_translate( (unsigned int)source, &flags );
+
+            _physical_memcpy( pdest, psource, nbytes );
+        }
+
         done = done + nbytes;
     }
@@ -4266 +4281 @@
     while ( 1 )
     {
-        if ( _fat_read( fd_id, &buf, sizeof(buf) ) != sizeof(buf) )
+        if ( _fat_read( fd_id, (unsigned int)&buf, sizeof(buf), 0 ) != sizeof(buf) )
         {
             _printf("\n[FAT ERROR] _fat_readdir(): can't read entry\n" );

soft/giet_vm/giet_fat32/fat32.h

@@ -12 +12 @@
 #include "giet_config.h"
 #include "kernel_locks.h"
+#include "mapping_info.h"
 
 /*************** Partition Boot Sector Format **********************************/
@@ -225 +226 @@
 
 extern int _fat_read( unsigned int fd_id,                  // file descriptor  
-                      void*        buffer,                 // destination buffer
-                      unsigned int count );                // number of bytes
+                      paddr_t buffer,                      // destination buffer
+                      unsigned int count,                  // number of bytes
+                      unsigned int phys );                 // use physical_memcpy
 
 extern int _fat_write( unsigned int fd_id,                 // file descriptor