Changeset 232 for soft/giet_vm/boot/boot_init.c

Timestamp:

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

Author:

meunier

Message:

Ajout du malloc dans le Giet.

File:

• soft/giet_vm/boot/boot_init.c (modified) (3 diffs)

soft/giet_vm/boot/boot_init.c

@@ -1387 +1387 @@
                 //FIXME: the vspace_id should be the same for all ports: put it in the coproc?
                 unsigned int vspace_id = cp_port[cp_port_id].vspaceid;
-                unsigned int vobj_id = cp_port[cp_port_id].vobjlocid + vspace[vspace_id].vobj_offset;
+                unsigned int vobj_id = cp_port[cp_port_id].mwmr_vobjid + vspace[vspace_id].vobj_offset;
 
                 mwmr_channel_t * pmwmr = (mwmr_channel_t *) (vobj[vobj_id].paddr);
@@ -1669 +1669 @@
 
             // ctx_sp :  Get the vobj containing the stack 
-            unsigned int vobj_id = task[task_id].vobjlocid + vspace[vspace_id].vobj_offset;
+            unsigned int vobj_id = task[task_id].stack_vobjid + vspace[vspace_id].vobj_offset;
             unsigned int ctx_sp = vobj[vobj_id].vaddr + vobj[vobj_id].length;
 
@@ -1706 +1706 @@
             boot_scheduler_set_context(gpid, ltid, CTX_LTID_ID, ltid);
             boot_scheduler_set_context(gpid, ltid, CTX_VSID_ID, vspace_id);
+            boot_scheduler_set_context(gpid, ltid, CTX_GTID_ID, task_id);
             boot_scheduler_set_context(gpid, ltid, CTX_RUN_ID, 1);