Changeset 768 for soft

Timestamp:

Jan 20, 2016, 10:15:22 AM (8 years ago)

Author:

alain

Message:

Use the giet_fat_mmap() syscall to implement the cat command.

Location:

soft/giet_vm/applications/shell

Files:

• shell.c (modified) (5 diffs)
• shell.py (modified) (2 diffs)

soft/giet_vm/applications/shell/shell.c

@@ -314 +314 @@
     }
 
-    unsigned int     x,y,p;   // processor coordinates
+    unsigned int     x,y,p;          // processor coordinates
     unsigned int     fd;             // file descriptor
     fat_file_info_t  info;           // file info
     unsigned int     size;           // buffer size (file_size + 1)
-    unsigned int     len;            // number of read bytes from file
-    char*            buf;            // temporary buffer
+    unsigned int     bytes;          // number of bytes to be mapped  
+    char*            buf = NULL;     // temporary buffer
 
     // get processor coordinates 
@@ -325 +325 @@
     
     // open the file to display   
-    fd = giet_fat_open( argv[1] , O_RDONLY );
+    fd = giet_fat_open( argv[1] , 0 );
     if (fd < 0)
     {
@@ -341 +341 @@
     size = info.size;  
 
+    // extend size to 4 Kbytes boundary if required
+    if ( (size+1) & 0xFFF)  bytes = (size & 0xFFFFF000) + 0x1000;
+    else                    bytes = size + 1;
+
+    // map local buffer to Cache_file
+    buf = giet_fat_mmap( NULL,
+                         bytes,
+                         MAP_PROT_READ | MAP_PROT_WRITE, 
+                         MAP_SHARED,
+                         fd,
+                         0 ); 
+    if ( buf == NULL )
+    {
+        giet_tty_printf("  error : cannot map %s\n", argv[1] );
+        goto exit;
+    }
+
+/*
     // allocate a temporary buffer for the file
     heap_init( x , y );
@@ -349 +367 @@
         goto exit;
     }
-    // load the file and set terminating '0' 
+    // load the file 
     len = giet_fat_read( fd , buf , size );
     if ( len != size )
@@ -357 +375 @@
         goto exit;
     }
+*/
+    // set terminating '0' 
     buf[size] = 0;
 
     // display the file content
-    giet_tty_printf("\n%s", buf );
+    giet_tty_printf("%s", buf );
 
 exit:
     if ( fd >= 0 )     giet_fat_close( fd );
-    if ( buf != NULL ) free( buf );
+    if ( buf != NULL ) giet_fat_munmap( buf , bytes );
 }
 

soft/giet_vm/applications/shell/shell.py

@@ -34 +34 @@
     heap_size  = 0x00001000     # 4 Kbytes 
 
+    mmap_base  = 0x70000000
+    mmap_size  = 0x10000000     # 256 Mbytes (unmapped)
+
     # create vspace
     vspace = mapping.addVspace( name = 'shell', startname = 'shell_data' , active = True )
@@ -57 +60 @@
     mapping.addVseg( vspace, 'shell_heap', heap_base, heap_size,
                      'C_WU', vtype = 'BUFFER', x = xmap , y = ymap , pseg = 'RAM',
+                     local = False )
+
+    # mmap vseg            
+    mapping.addVseg( vspace, 'shell_mmap', mmap_base, mmap_size,
+                     'C_WU', vtype = 'MMAP', x = xmap , y = ymap , pseg = 'RAM',
                      local = False )