Changeset 759 for soft

Timestamp:

Jan 18, 2016, 4:57:13 PM (8 years ago)

Author:

alain

Message:

Introduce 4 new FAT related system calls:

• giet_fat_pread()
• giet_fat_fprintf()
• giet_fat_map()
• giet_fat_unmap()

Location:

soft/giet_vm/giet_libs

Files:

• stdio.c (modified) (4 diffs)
• stdio.h (modified) (4 diffs)

soft/giet_vm/giet_libs/stdio.c

@@ -992 +992 @@
                      (unsigned int)buffer,
                      count,
-                     0 );      // no physical addressing required
+                     0 );
+}
+
+///////////////////////////////////////
+int giet_fat_pread( unsigned int fd_id,     
+                    void*        buffer, 
+                    unsigned int count,  
+                    unsigned int offset )  
+{
+    return sys_call( SYSCALL_FAT_PREAD,
+                     fd_id,
+                     (unsigned int)buffer,
+                     count,
+                     offset ); 
 }
 
@@ -1004 +1017 @@
                      (unsigned int)buffer,
                      count,
-                     0 );      // no physical addressing required
+                     0 ); 
 }
 
@@ -1083 +1096 @@
 
     va_start( args, format );
+
     count = xprintf( stream, 4096, format, &args ); 
     va_end( args );
 
-    if ( count == 0xFFFFFFFF ) giet_pthread_exit("illegal format in giet_fat_fprintf()");
+    if ( count == 0xFFFFFFFF ) giet_pthread_exit("error in giet_fat_fprintf()");
 
     return sys_call( SYSCALL_FAT_WRITE, 
@@ -1093 +1107 @@
                      count,
                      0 );      // no physical addressing required
+}
+
+/////////////////////////////////////////
+void* giet_fat_mmap( void*         vaddr,        // MAP_FIXED not supported
+                     unsigned int  length,
+                     unsigned int  prot,
+                     unsigned int  flags,
+                     unsigned int  fd_id,
+                     unsigned int  offset )
+{
+    if ( flags & MAP_FIXED )     giet_pthread_exit("error in giet_fat_mmap()");
+    if ( flags & MAP_PRIVATE )   giet_pthread_exit("error in giet_fat_mmap()");
+    if ( flags & MAP_ANONYMOUS ) giet_pthread_exit("error in giet_fat_mmap()");
+    if ( length & 0xFFF )        giet_pthread_exit("error in giet_fat_mmap()");
+    if ( offset & 0xFFF )        giet_pthread_exit("error in giet_fat_mmap()");
+
+    return (void*)sys_call( SYSCALL_FAT_MMAP,
+                            fd_id,
+                            length>>12,
+                            offset>>12,
+                            prot );
 }
 

soft/giet_vm/giet_libs/stdio.h

@@ -65 +65 @@
 #define SYSCALL_FAT_CLOSEDIR         0x2A
 #define SYSCALL_FAT_READDIR          0x2B
-//                                   0x2C
-//                                   0x2D
-//                                   0x2E
+#define SYSCALL_FAT_PREAD            0x2C
+#define SYSCALL_FAT_MMAP             0x2D
+#define SYSCALL_FAT_MUNMAP           0x2E
 //                                   0x2F
 
@@ -127 +127 @@
 #define THREAD_CMD_RESUME       1
 #define THREAD_CMD_CONTEXT      2
+
+////////////////////////////////////////////////////////////////////////////
+// Flags and protection values for the giet_fat_mmap() syscall
+// These define must be synchronized with values in the sys_handler.h file
+////////////////////////////////////////////////////////////////////////////
+
+#define MAP_ANONYMOUS           0x01
+#define MAP_FILE                0x02
+#define MAP_FIXED               0x04
+#define MAP_PRIVATE             0x08
+#define MAP_SHARED              0x10
+
+#define MAP_PROT_READ           0x1
+#define MAP_PROT_WRITE          0x2
+#define MAP_PROT_EXEC           0x4
 
 ////////////////////////////////////////////////////////////////////////////
@@ -364 +379 @@
                           unsigned int count );
 
+extern int giet_fat_pread( unsigned int fd_id,
+                           void*        buffer,
+                           unsigned int count,
+                           unsigned int offset );
+ 
 extern int giet_fat_write( unsigned int fd,
                            void*        buffer,
@@ -389 +409 @@
 extern int giet_fat_fprintf( unsigned int  fd_id,
                              char*         format, ... );
+
+extern void* giet_fat_mmap( void*         vaddr,
+                            unsigned int  length,
+                            unsigned int  prot,
+                            unsigned int  flags,
+                            unsigned int  fd_id,
+                            unsigned int  offset );
+
+extern int giet_fat_munmap( void*         vaddr,
+                            unsigned int  length );
 
 //////////////////////////////////////////////////////////////////////////