Changeset 232 for soft/giet_vm/xml/xml_driver.c

Timestamp:

Mar 5, 2013, 4:00:09 PM (11 years ago)

Author:

meunier

Message:

Ajout du malloc dans le Giet.

File:

• soft/giet_vm/xml/xml_driver.c (modified) (2 diffs)

soft/giet_vm/xml/xml_driver.c

@@ -271 +271 @@
                     port_id < coproc[coproc_id].port_offset + coproc[coproc_id].ports;
                     port_id++) {
-                unsigned int vobj_id = cp_port[port_id].vobjlocid + vspace[cp_port[port_id].vspaceid].vobj_offset; 
+                unsigned int vobj_id = cp_port[port_id].mwmr_vobjid + vspace[cp_port[port_id].vspaceid].vobj_offset; 
                 fprintf(fpout, "             <port direction = \"%s\" ",  port_direction[cp_port[port_id].direction]);
                 fprintf(fpout, " vspacename = \"%s\" ", vspace[cp_port[port_id].vspaceid].name);
@@ -353 +353 @@
                 task_id < (vspace[vspace_id].task_offset + vspace[vspace_id].tasks);
                 task_id++) {
-            unsigned int vobj_id = task[task_id].vobjlocid + vspace[vspace_id].vobj_offset; 
+            unsigned int stack_vobj_id = task[task_id].stack_vobjid + vspace[vspace_id].vobj_offset; 
+            unsigned int heap_vobj_id = task[task_id].heap_vobjid + vspace[vspace_id].vobj_offset; 
 
             fprintf(fpout, "            <task name = \"%s\" ", task[task_id].name);
             fprintf(fpout, "clusterid = \"%d\" ", task[task_id].clusterid);
             fprintf(fpout, "proclocid = \"%d\" ", task[task_id].proclocid);
-            fprintf(fpout, "stackname = \"%s\" ", vobj[vobj_id].name);
+            fprintf(fpout, "stackname = \"%s\" ", vobj[stack_vobj_id].name);
+            if (heap_vobj_id != -1) {
+                fprintf(fpout, "heapname = \"%s\" ", vobj[heap_vobj_id].name);
+            }
             fprintf(fpout, "startid = \"%d\" ", task[task_id].startid);
             fprintf(fpout, "usetty = \"%d\" ", task[task_id].use_tty);