Changeset 516 for soft/giet_vm

Timestamp:

Feb 14, 2015, 5:17:00 PM (10 years ago)

Author:

alain

Message:

Remove the vobj object from the mapping_info,
and remove global segment seg_unckdata.

Location:

soft/giet_vm/giet_kernel

Files:

• kernel.ld (modified) (1 diff)
• sys_handler.c (modified) (8 diffs)
• sys_handler.h (modified) (1 diff)

soft/giet_vm/giet_kernel/kernel.ld

@@ -25 +25 @@
     }
 
-    . = kernel_uncdata_vbase;
-    seg_kernel_uncdata : 
-    {
-        *(.unckdata)
-    }
-
     . = kernel_init_vbase;
     seg_kernel_init : 

soft/giet_vm/giet_kernel/sys_handler.c

@@ -146 +146 @@
     &_sys_ukn,              /* 0x18 */   
     &_context_switch,       /* 0x19 */
-    &_sys_vobj_get_vbase,   /* 0x1A */
-    &_sys_vobj_get_length,  /* 0x1B */
+    &_sys_vseg_get_vbase,   /* 0x1A */
+    &_sys_vseg_get_length,  /* 0x1B */
     &_sys_xy_from_ptr,      /* 0x1C */
     &_sys_ukn,              /* 0x1D */
@@ -1354 +1354 @@
 
 ///////////////////////////////////////////////////////
-int _sys_vobj_get_vbase( char*             vspace_name, 
-                         char*             vobj_name, 
+int _sys_vseg_get_vbase( char*             vspace_name, 
+                         char*             vseg_name, 
                          unsigned int*     vbase ) 
 {
     mapping_header_t * header = (mapping_header_t *)SEG_BOOT_MAPPING_BASE;
     mapping_vspace_t * vspace = _get_vspace_base(header);
-    mapping_vobj_t * vobj     = _get_vobj_base(header);
+    mapping_vseg_t * vseg     = _get_vseg_base(header);
 
     unsigned int vspace_id;
-    unsigned int vobj_id;
+    unsigned int vseg_id;
 
     // scan vspaces 
@@ -1370 +1370 @@
         if (_strncmp( vspace[vspace_id].name, vspace_name, 31) == 0) 
         {
-            // scan vobjs
-            for (vobj_id = vspace[vspace_id].vobj_offset; 
-                 vobj_id < (vspace[vspace_id].vobj_offset + vspace[vspace_id].vobjs); 
-                 vobj_id++) 
+            // scan vsegs
+            for (vseg_id = vspace[vspace_id].vseg_offset; 
+                 vseg_id < (vspace[vspace_id].vseg_offset + vspace[vspace_id].vsegs); 
+                 vseg_id++) 
             {
-                if (_strncmp(vobj[vobj_id].name, vobj_name, 31) == 0) 
+                if (_strncmp(vseg[vseg_id].name, vseg_name, 31) == 0) 
                 {
-                    *vbase = vobj[vobj_id].vbase;
+                    *vbase = vseg[vseg_id].vbase;
                     return 0;
                 }
@@ -1387 +1387 @@
 
 /////////////////////////////////////////////////////////
-int _sys_vobj_get_length( char*         vspace_name, 
-                          char*         vobj_name,
+int _sys_vseg_get_length( char*         vspace_name, 
+                          char*         vseg_name,
                           unsigned int* length ) 
 {
     mapping_header_t * header = (mapping_header_t *)SEG_BOOT_MAPPING_BASE;
     mapping_vspace_t * vspace = _get_vspace_base(header);
-    mapping_vobj_t * vobj     = _get_vobj_base(header);
+    mapping_vseg_t * vseg     = _get_vseg_base(header);
 
     unsigned int vspace_id;
-    unsigned int vobj_id;
+    unsigned int vseg_id;
 
     // scan vspaces 
@@ -1403 +1403 @@
         if (_strncmp( vspace[vspace_id].name, vspace_name, 31) == 0) 
         {
-            // scan vobjs
-            for (vobj_id = vspace[vspace_id].vobj_offset; 
-                 vobj_id < (vspace[vspace_id].vobj_offset + vspace[vspace_id].vobjs); 
-                 vobj_id++) 
+            // scan vsegs
+            for (vseg_id = vspace[vspace_id].vseg_offset; 
+                 vseg_id < (vspace[vspace_id].vseg_offset + vspace[vspace_id].vsegs); 
+                 vseg_id++) 
             {
-                if (_strncmp(vobj[vobj_id].name, vobj_name, 31) == 0) 
+                if (_strncmp(vseg[vseg_id].name, vseg_name, 31) == 0) 
                 {
-                    *length = vobj[vobj_id].length;
+                    *length = vseg[vseg_id].length;
                     return 0;
                 }
@@ -1446 +1446 @@
 {
     mapping_header_t * header  = (mapping_header_t *)SEG_BOOT_MAPPING_BASE;
-    mapping_task_t *   tasks   = _get_task_base(header);
-    mapping_vobj_t *   vobjs   = _get_vobj_base(header);
-    mapping_vspace_t * vspaces = _get_vspace_base(header);
+    mapping_task_t *   task    = _get_task_base(header);
+    mapping_vseg_t *   vseg    = _get_vseg_base(header);
+    mapping_vspace_t * vspace  = _get_vspace_base(header);
 
     unsigned int task_id;
     unsigned int vspace_id;
-    unsigned int vobj_id = 0xFFFFFFFF;
-
-    // searching the heap vobj_id
+    unsigned int vseg_id = 0xFFFFFFFF;
+
+    // searching the heap vseg
     if ( (x < X_SIZE) && (y < Y_SIZE) )  // searching a task in cluster(x,y)
     {
@@ -1461 +1461 @@
 
         // scan all tasks in vspace
-        unsigned int min = vspaces[vspace_id].task_offset ;
-        unsigned int max = min + vspaces[vspace_id].tasks ;
+        unsigned int min = vspace[vspace_id].task_offset ;
+        unsigned int max = min + vspace[vspace_id].tasks ;
         for ( task_id = min ; task_id < max ; task_id++ )
         {
-            if ( tasks[task_id].clusterid == (x * Y_SIZE + y) )
+            if ( task[task_id].clusterid == (x * Y_SIZE + y) )
             {
-                vobj_id = tasks[task_id].heap_vobj_id;
-                if ( vobj_id != 0xFFFFFFFF ) break;
+                vseg_id = task[task_id].heap_vseg_id;
+                if ( vseg_id != 0xFFFFFFFF ) break;
             }
         }
@@ -1475 +1475 @@
     {
         task_id = _get_context_slot(CTX_GTID_ID);
-        vobj_id = tasks[task_id].heap_vobj_id;
-    }
-
-    // analysing the vobj_id
-    if ( vobj_id != 0xFFFFFFFF ) 
-    {
-        *vaddr  = vobjs[vobj_id].vbase;
-        *length = vobjs[vobj_id].length;
+        vseg_id = task[task_id].heap_vseg_id;
+    }
+
+    // analysing the vseg_id
+    if ( vseg_id != 0xFFFFFFFF ) 
+    {
+        *vaddr  = vseg[vseg_id].vbase;
+        *length = vseg[vseg_id].length;
         return 0;
     }

soft/giet_vm/giet_kernel/sys_handler.h

@@ -175 +175 @@
                        unsigned int* nprocs );
 
-int _sys_vobj_get_vbase( char*         vspace_name,
-                         char*         vobj_name,
+int _sys_vseg_get_vbase( char*         vspace_name,
+                         char*         vseg_name,
                          unsigned int* vbase );
 
-int _sys_vobj_get_length( char*         vspace_name, 
-                          char*         vobj_name,
+int _sys_vseg_get_length( char*         vspace_name, 
+                          char*         vseg_name,
                           unsigned int* length );