Changeset 514 for soft/giet_vm/giet_common/kernel_malloc.c

Timestamp:

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

Author:

alain

Message:

Remove vobj object from mapping_info.

File:

• soft/giet_vm/giet_common/kernel_malloc.c (modified) (2 diffs)

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;
         }