Changeset 514

Timestamp:

Feb 14, 2015, 5:12:16 PM (10 years ago)

Author:

alain

Message:

Remove vobj object from mapping_info.

Location:

soft/giet_vm/giet_common

Files:

• kernel_malloc.c (modified) (2 diffs)
• utils.c (modified) (7 diffs)
• utils.h (modified) (1 diff)

soft/giet_vm/giet_common/kernel_malloc.c

@@ -145 +145 @@
     mapping_header_t  * header   = (mapping_header_t *)SEG_BOOT_MAPPING_BASE;
     mapping_vseg_t    * vsegs    = _get_vseg_base(header);
-    mapping_vobj_t    * vobjs    = _get_vobj_base(header);
     mapping_pseg_t    * psegs    = _get_pseg_base(header);
     mapping_cluster_t * clusters = _get_cluster_base(header);
 
     unsigned int vseg_id;
-    unsigned int vobj_id;
     unsigned int pseg_id;
     unsigned int cluster_id;
@@ -167 +165 @@
         pseg_id    = vsegs[vseg_id].psegid;
         cluster_id = psegs[pseg_id].clusterid;
-        vobj_id    = vsegs[vseg_id].vobj_offset;
-        if ( (vobjs[vobj_id].type == VOBJ_TYPE_HEAP) &&
+        if ( (vsegs[vseg_id].type == VSEG_TYPE_HEAP) &&
              (clusters[cluster_id].x == x) && 
              (clusters[cluster_id].y == y) )
         {
             *heap_base = vsegs[vseg_id].vbase;
-            *heap_size = vobjs[vobj_id].length;
+            *heap_size = vsegs[vseg_id].length;
             return 0;
         }

soft/giet_vm/giet_common/utils.c

@@ -620 +620 @@
 }
 //////////////////////////////////////////////////////////
-mapping_vobj_t * _get_vobj_base(mapping_header_t * header) 
-{
-    return (mapping_vobj_t *) ((char *) header +
-            MAPPING_HEADER_SIZE +
-            MAPPING_CLUSTER_SIZE * X_SIZE * Y_SIZE +
-            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) 
 {
@@ -637 +627 @@
             MAPPING_PSEG_SIZE * header->psegs +
             MAPPING_VSPACE_SIZE * header->vspaces +
-            MAPPING_VOBJ_SIZE * header->vobjs +
             MAPPING_VSEG_SIZE * header->vsegs);
 }
@@ -649 +638 @@
             MAPPING_VSPACE_SIZE * header->vspaces +
             MAPPING_VSEG_SIZE * header->vsegs +
-            MAPPING_VOBJ_SIZE * header->vobjs +
             MAPPING_TASK_SIZE * header->tasks);
 }
@@ -661 +649 @@
             MAPPING_VSPACE_SIZE * header->vspaces +
             MAPPING_VSEG_SIZE * header->vsegs +
-            MAPPING_VOBJ_SIZE * header->vobjs +
             MAPPING_TASK_SIZE * header->tasks +
             MAPPING_PROC_SIZE * header->procs);
@@ -673 +660 @@
             MAPPING_PSEG_SIZE * header->psegs +
             MAPPING_VSPACE_SIZE * header->vspaces +
-            MAPPING_VOBJ_SIZE * header->vobjs +
             MAPPING_VSEG_SIZE * header->vsegs +
             MAPPING_TASK_SIZE * header->tasks +
@@ -687 +673 @@
             MAPPING_PSEG_SIZE * header->psegs +
             MAPPING_VSPACE_SIZE * header->vspaces +
-            MAPPING_VOBJ_SIZE * header->vobjs +
             MAPPING_VSEG_SIZE * header->vsegs +
             MAPPING_TASK_SIZE * header->tasks +
@@ -702 +687 @@
             MAPPING_PSEG_SIZE * header->psegs +
             MAPPING_VSPACE_SIZE * header->vspaces +
-            MAPPING_VOBJ_SIZE * header->vobjs +
             MAPPING_VSEG_SIZE * header->vsegs +
             MAPPING_TASK_SIZE * header->tasks +

soft/giet_vm/giet_common/utils.h

@@ -163 +163 @@
 extern mapping_vspace_t *   _get_vspace_base(mapping_header_t* header);
 extern mapping_vseg_t *     _get_vseg_base(mapping_header_t* header);
-extern mapping_vobj_t *     _get_vobj_base(mapping_header_t* header);
 extern mapping_task_t *     _get_task_base(mapping_header_t* header);
 extern mapping_proc_t *     _get_proc_base(mapping_header_t* header);