Changeset 160 for soft/giet_vm/sys

Timestamp:

Jun 12, 2012, 4:21:27 PM (12 years ago)

Author:

karaoui

Message:

giet-vm new version

Location:

soft/giet_vm/sys

Files:

• common.c (modified) (2 diffs)
• common.h (modified) (2 diffs)
• ctx_handler.c (modified) (2 diffs)
• drivers.c (modified) (2 diffs)
• init.c (added)
• irq_handler.c (modified) (1 diff)
• sys.ld (modified) (5 diffs)
• sys_handler.c (modified) (6 diffs)
• sys_handler.h (modified) (1 diff)
• task_init.S (added)

soft/giet_vm/sys/common.c

@@ -9 +9 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include <mapping_info.h>
 #include <common.h>
 #include <drivers.h>
@@ -216 +215 @@
 }
 /////////////////////////////////////////////////////////////////////////////
-mapping_task_t* _get_task_base( mapping_header_t* header )
-{
-    return   (mapping_task_t*)    ((char*)header +
+mapping_vobj_t* _get_vobj_base( mapping_header_t* header )
+{
+    return   (mapping_vobj_t*)   ((char*)header +
                                   MAPPING_HEADER_SIZE +
                                   MAPPING_CLUSTER_SIZE*header->clusters +
                                   MAPPING_PSEG_SIZE*header->psegs +
                                   MAPPING_VSPACE_SIZE*header->vspaces +
+                                  MAPPING_VSEG_SIZE*header->vsegs );
+}
+/////////////////////////////////////////////////////////////////////////////
+mapping_task_t* _get_task_base( mapping_header_t* header )
+{
+    return   (mapping_task_t*)    ((char*)header +
+                                  MAPPING_HEADER_SIZE +
+                                  MAPPING_CLUSTER_SIZE*header->clusters +
+                                  MAPPING_PSEG_SIZE*header->psegs +
+                                  MAPPING_VSPACE_SIZE*header->vspaces +
+                                  MAPPING_VOBJ_SIZE*header->vobjs +
                                   MAPPING_VSEG_SIZE*header->vsegs);
 }
 
+

soft/giet_vm/sys/common.h

@@ -24 +24 @@
 extern _ld_symbol_t seg_fb_base;
 extern _ld_symbol_t seg_ioc_base;
-extern _ld_symbol_t seg_boot_mapping_base;
+extern _ld_symbol_t seg_mapping_base;
 extern _ld_symbol_t seg_kernel_pt_base;
 
@@ -49 +49 @@
 mapping_vspace_t*   _get_vspace_base( mapping_header_t* header );
 mapping_vseg_t*     _get_vseg_base( mapping_header_t* header );
+mapping_vobj_t*     _get_vobj_base( mapping_header_t* header );
 mapping_task_t*     _get_task_base( mapping_header_t* header );
 

soft/giet_vm/sys/ctx_handler.c

@@ -31 +31 @@
 
 #include <giet_config.h>
-#include <ctx_handler.h>
-#include <sys_handler.h>
 #include <drivers.h>
 #include <common.h>
+#include <ctx_handler.h>
+#include <mapping_info.h>
+#include <sys_handler.h>
 
 extern void _task_switch(unsigned int *, unsigned int *);
@@ -71 +72 @@
     // return if only one task  */
     if ( tasks <= 1) return;
-
+ 
     // compute the task context base address for the current task
     curr_task_id = _scheduler[proc_id].current;
     curr_context = &(_scheduler[proc_id].context[curr_task_id][0]);
-
+    
     // select the next task using a round-robin scheduling policy
     next_task_id = (curr_task_id + 1) % tasks;

soft/giet_vm/sys/drivers.c

@@ -5 +5 @@
 // Copyright (c) UPMC-LIP6
 ///////////////////////////////////////////////////////////////////////////////////
-// The vers.c and drivers.h files are part ot the GIET nano kernel.
+// The drivers.c and drivers.h files are part ot the GIET nano kernel.
 // They contains the drivers for the peripherals available in the SoCLib library:
 // - vci_multi_tty
@@ -204 +204 @@
 
     proc_id = _procid();
+    
     task_id = _scheduler[proc_id].current;
     tty_id  = _scheduler[proc_id].context[task_id][CTX_TTY_ID];

soft/giet_vm/sys/irq_handler.c

@@ -45 +45 @@
     int interrupt_index;
     _isr_func_t isr;
+
+    // interrupt vector initialisation
+
 
     /* retrieves the highest priority active interrupt index */

soft/giet_vm/sys/sys.ld

@@ -2 +2 @@
 * Definition of the base address for all virtual segments
 *****************************************************************************/
-
-/* The vsegs used in the boot phase must respect identity mapping:
-   physical address = virtual address */
-
-seg_boot_code_base      = 0xBFC00000;   /* boot code */
-seg_boot_stack_base     = 0xBFC08000;   /* boot temporary stack */ 
-seg_boot_mapping_base   = 0xBFC0C000;   /* boot mapping_info */
 
 /* The vsegs used by the system are replicated in all virtual spaces 
@@ -16 +9 @@
 seg_kernel_data_base    = 0x80010000;   /* system cacheable data */
 seg_kernel_uncdata_base = 0x80020000;   /* system uncacheable data */
-seg_kernel_pt_base      = 0x80030000;   /* system page table */ 
+seg_kernel_init_base    = 0x80030000;   /* system page table */ 
 
-/* The peripherals base addresses are referenced by the software drivers and
+
+/* The peripherals base addresses are referenced by the software drivers and    \
    must be defined, even if the peripherals are not used in the architecture */
 
@@ -29 +23 @@
 seg_icu_base            = 0x9F000000;   /* ICU device */
 
+/*****************************************/
+seg_mapping_base        = 0xBFC0C000;   /* boot mapping_info */
+
 /*
  * Grouping sections into segments for system code and data
@@ -35 +32 @@
 SECTIONS
 {
-    . = seg_boot_code_base;
-    seg_boot_code : 
-    {
-        *(.boot)
-    }
     . = seg_kernel_code_base;
     seg_kernel_code : 
@@ -69 +61 @@
         *(.unckdata)
     }
-    . = seg_kernel_pt_base;
-    seg_kernel_pt : 
+
+    . = seg_kernel_init_base;
+    seg_kernel_init : 
     {
-        *(.ptab)
+        *(.kinitentry)
+        *(.kinit)
     }
 }

soft/giet_vm/sys/sys_handler.c

@@ -12 +12 @@
 
 #include <sys_handler.h>
-#include <boot_handler.h>
+//#include <boot_handler.h>
 #include <drivers.h>
 #include <ctx_handler.h>
@@ -49 +49 @@
     &_sys_ukn,          /* 0x18 */
     &_sys_ukn,          /* 0x19 */
-    &_mwmr_base,        /* 0x1A */
+    &_vobj_get_vbase,   /* 0x1A */
     &_sys_ukn,          /* 0x1B */
     &_sys_ukn,          /* 0x1C */
@@ -117 +117 @@
                             unsigned int*       buffer)
 {
-    mapping_header_t*   header  = (mapping_header_t*)&seg_boot_mapping_base;
+    mapping_header_t*   header  = (mapping_header_t*)&seg_mapping_base;
     mapping_cluster_t*  cluster = _get_cluster_base( header );
 
@@ -131 +131 @@
 }
 /////////////////////////////////////////////////////////////////////////////
-// _mwmr_base()
-// returns in buffer argument the base address of the MWMR channel
-// identified by the (vspace_name / channel_name) couple.
+// _vobj_get_base()
+// returns 0: success, else: failed.
+// give access to the base address of a vobj identified by the (vspace_name / channel_name ) couple.
+// The "type" argument is here for checking purpose.
 /////////////////////////////////////////////////////////////////////////////
-unsigned int _mwmr_base( char* vspace_name,
-                         char* channel_name,
-                         unsigned int* buffer )
+unsigned int _vobj_get_vbase( char* vspace_name, char* vobj_name,
+                        unsigned vobj_type, unsigned int* vobj_buffer)
 {
-    mapping_header_t* header = (mapping_header_t*)&seg_boot_mapping_base;
+    mapping_header_t* header = (mapping_header_t*)&seg_mapping_base;
     mapping_vspace_t* vspace = _get_vspace_base( header );
-    mapping_vseg_t*   vseg   = _get_vseg_base( header );
+    mapping_vobj_t*    vobj  = _get_vobj_base( header );
 
     unsigned int    vspace_id;
-    unsigned int    vseg_id;
+    unsigned int    vobj_id;
+        
 
     // scan vspaces 
@@ -151 +152 @@
         if ( _strncmp( vspace[vspace_id].name, vspace_name, 31) == 0 )
         {
-            // scan vsegs
-            for ( vseg_id = vspace[vspace_id].vseg_offset ; 
-                  vseg_id < (vspace[vspace_id].vseg_offset + vspace[vspace_id].vsegs) ;
-                  vseg_id++ )
+            // scan vobjs
+            for(vobj_id= vspace[vspace_id].vobj_offset; vobj_id < (vspace[vspace_id].vobj_offset + vspace[vspace_id].vobjs); vobj_id++)
             {
-                if ( _strncmp( vseg[vseg_id].name, channel_name, 31) == 0 )
+
+                if ( _strncmp( vobj[vobj_id].name, vobj_name, 31) == 0 )
                 {
-                    *buffer = vseg[vseg_id].vbase;
+                    if(vobj[vobj_id].type != vobj_type)
+                        return -1;//wrong type
+
+                    *vobj_buffer = (unsigned int)vobj[vobj_id].vaddr;
                     return 0;
                 }
@@ -165 +168 @@
     }
     // not found !!!
-    return 1;
+    return -2;
 }
 

soft/giet_vm/sys/sys_handler.h

@@ -30 +30 @@
                                unsigned int* buffer );
 
-unsigned int    _mwmr_base( char* vspace_name,
-                            char* channel_name,
-                            unsigned int* buffer);
-
+unsigned int _vobj_get_vbase( char* vspace_name, char* vobj_name,
+                        unsigned vobj_type, unsigned int* vobj_buffer);
 #endif