Changeset 324 for soft

Timestamp:

Jun 10, 2014, 2:20:55 PM (10 years ago)

Author:

alain

Message:

heu...

Location:

soft/giet_vm/giet_common

Files:

• utils.c (modified) (4 diffs)
• utils.h (modified) (2 diffs)

soft/giet_vm/giet_common/utils.c

@@ -12 +12 @@
 
 #include <giet_config.h>
+#include <hard_config.h>
 #include <mapping_info.h>
 #include <utils.h>
@@ -890 +891 @@
 
 ///////////////////////////////////////////////////////////////////////////////////
-// This function returns the information associated to a heap (size and vaddr)
+// This function returns the information associated to a heap : size and vaddr.
 // It uses the global task index (CTX_GTID_ID, unique for each giet task) and the
 // vspace index (CTX_VSID_ID) defined in the task context. 
@@ -897 +898 @@
                          unsigned int* size ) 
 {
-    mapping_header_t * header  = (mapping_header_t *) (&seg_boot_mapping_base);
+    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);
 
     unsigned int taskid        = _get_context_slot(CTX_GTID_ID);
-    unsigned int vspaceid      = _get_context_slot(CTX_VSID_ID);
-
-    int heap_local_vobjid      = tasks[taskid].heap_vobjid;
-    if (heap_local_vobjid != -1) 
-    {
-        unsigned int vobjheapid = heap_local_vobjid + vspaces[vspaceid].vobj_offset;
-        *vaddr                  = vobjs[vobjheapid].vaddr;
-        *size                   = vobjs[vobjheapid].length;
-        return 0;
+
+    int vobj_id = tasks[taskid].heap_vobj_id;
+    if (vobj_id != -1) 
+    {
+        *vaddr                  = vobjs[vobj_id].vaddr;
+        *size                   = vobjs[vobj_id].length;
     }
     else 
@@ -917 +914 @@
         *vaddr = 0;
         *size = 0;
-        return 0;
-    }
+    }
+    return 0;
 }
 

soft/giet_vm/giet_common/utils.h

@@ -17 +17 @@
 #include <giet_config.h>
 
+//////////////////////////////////////////////////////////////////////////////////
+// NULL pointer definition
+//////////////////////////////////////////////////////////////////////////////////
+
+#define NULL (void *)0
+
 ///////////////////////////////////////////////////////////////////////////////////
 // For retrieving base addresses defined in seg.ld file.
@@ -23 +29 @@
 typedef struct _ld_symbol_s _ld_symbol_t;
 
-// non replicated peripherals
-extern _ld_symbol_t seg_iob_base;
-extern _ld_symbol_t seg_nic_base;
-extern _ld_symbol_t seg_cma_base;
-extern _ld_symbol_t seg_tty_base;
-extern _ld_symbol_t seg_fbf_base;
-extern _ld_symbol_t seg_pic_base;
-extern _ld_symbol_t seg_ioc_base;
-extern _ld_symbol_t seg_sim_base;
-
-// replicated peripherals
-extern _ld_symbol_t seg_icu_base;
-extern _ld_symbol_t seg_xcu_base;
-extern _ld_symbol_t seg_tim_base;
-extern _ld_symbol_t seg_dma_base;
-extern _ld_symbol_t seg_mmc_base;
-
-// for replicated peripherals
-extern _ld_symbol_t vseg_cluster_increment;
-
-// boot and kernel segments base addresses & sizes
-extern _ld_symbol_t seg_boot_code_base;
-extern _ld_symbol_t seg_boot_code_size;
-
-extern _ld_symbol_t seg_boot_data_base;
-extern _ld_symbol_t seg_boot_data_size;
-
-extern _ld_symbol_t seg_boot_stack_base;
-extern _ld_symbol_t seg_boot_stack_size;
-
-extern _ld_symbol_t seg_boot_mapping_base;
-extern _ld_symbol_t seg_boot_mapping_size;
-
-extern _ld_symbol_t seg_boot_buffer_base;
-extern _ld_symbol_t seg_boot_buffer_size;
-
-extern _ld_symbol_t seg_kernel_code_base;
-extern _ld_symbol_t seg_kernel_code_size;
-
-extern _ld_symbol_t seg_kernel_data_base;
-extern _ld_symbol_t seg_kernel_data_size;
-
-extern _ld_symbol_t seg_kernel_uncdata_base;
-extern _ld_symbol_t seg_kernel_uncdata_size;
-
-extern _ld_symbol_t seg_kernel_init_base;
-extern _ld_symbol_t seg_kernel_init_size;
-
-extern _ld_symbol_t seg_ram_disk_base;
-extern _ld_symbol_t seg_ram_disk_size;
-
-extern _ld_symbol_t seg_reset_code_base;
-extern _ld_symbol_t seg_reset_code_size;
+// boot segments vbase addresses & sizes
+extern _ld_symbol_t boot_code_vbase;
+extern _ld_symbol_t boot_code_size;
+
+extern _ld_symbol_t boot_data_vbase;
+extern _ld_symbol_t boot_data_size;
+
+extern _ld_symbol_t boot_stack_vbase;
+extern _ld_symbol_t boot_stack_size;
+
+extern _ld_symbol_t boot_mapping_vbase;
+extern _ld_symbol_t boot_mapping_size;
+
+extern _ld_symbol_t boot_buffer_vbase;
+extern _ld_symbol_t boot_buffer_size;
+
+// kernel segments vbase addresses & sizes
+extern _ld_symbol_t kernel_code_vbase;
+extern _ld_symbol_t kernel_code_size;
+
+extern _ld_symbol_t kernel_data_vbase;
+extern _ld_symbol_t kernel_data_size;
+
+extern _ld_symbol_t kernel_uncdata_vbase;
+extern _ld_symbol_t kernel_uncdata_size;
+
+extern _ld_symbol_t kernel_init_vbase;
+extern _ld_symbol_t kernel_init_size;
 
 ///////////////////////////////////////////////////////////////////////////////////