X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ce3fe4a9e76bb35438bd25d0f4f24bd05255840..b51da37243dc16575499f4cb7729fe8bdd7fa514:/src/simix/popping_accessors.h

diff --git a/src/simix/popping_accessors.h b/src/simix/popping_accessors.h
index c694b14a63..dede08b530 100644
--- a/src/simix/popping_accessors.h
+++ b/src/simix/popping_accessors.h
@@ -13,1313 +13,1160 @@
  * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :)
  */
 
-
+#include "src/simix/popping_private.h"
 static inline sg_host_t simcall_vm_suspend__get__ind_vm(smx_simcall_t simcall) {
-  return (sg_host_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[0]);
 }
-static inline void simcall_vm_suspend__set__ind_vm(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_vm_suspend__set__ind_vm(smx_simcall_t simcall, sg_host_t arg) {
+    simgrid::simix::marshal<sg_host_t>(simcall->args[0], arg);
 }
 
 static inline sg_host_t simcall_vm_resume__get__ind_vm(smx_simcall_t simcall) {
-  return (sg_host_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[0]);
 }
-static inline void simcall_vm_resume__set__ind_vm(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_vm_resume__set__ind_vm(smx_simcall_t simcall, sg_host_t arg) {
+    simgrid::simix::marshal<sg_host_t>(simcall->args[0], arg);
 }
 
 static inline sg_host_t simcall_vm_shutdown__get__ind_vm(smx_simcall_t simcall) {
-  return (sg_host_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[0]);
 }
-static inline void simcall_vm_shutdown__set__ind_vm(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_vm_shutdown__set__ind_vm(smx_simcall_t simcall, sg_host_t arg) {
+    simgrid::simix::marshal<sg_host_t>(simcall->args[0], arg);
 }
 
 static inline sg_host_t simcall_vm_save__get__ind_vm(smx_simcall_t simcall) {
-  return (sg_host_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[0]);
 }
-static inline void simcall_vm_save__set__ind_vm(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_vm_save__set__ind_vm(smx_simcall_t simcall, sg_host_t arg) {
+    simgrid::simix::marshal<sg_host_t>(simcall->args[0], arg);
 }
 
 static inline sg_host_t simcall_vm_restore__get__ind_vm(smx_simcall_t simcall) {
-  return (sg_host_t) simcall->args[0].dp;
-}
-static inline void simcall_vm_restore__set__ind_vm(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
-}
-
-static inline const char* simcall_process_create__get__name(smx_simcall_t simcall) {
-  return  simcall->args[0].cc;
-}
-static inline void simcall_process_create__set__name(smx_simcall_t simcall, const char* arg) {
-    simcall->args[0].cc = arg;
-}
-static inline xbt_main_func_t simcall_process_create__get__code(smx_simcall_t simcall) {
-  return (xbt_main_func_t) simcall->args[1].fp;
-}
-static inline void simcall_process_create__set__code(smx_simcall_t simcall, FPtr arg) {
-    simcall->args[1].fp = arg;
-}
-static inline void* simcall_process_create__get__data(smx_simcall_t simcall) {
-  return  simcall->args[2].dp;
-}
-static inline void simcall_process_create__set__data(smx_simcall_t simcall, void* arg) {
-    simcall->args[2].dp = arg;
-}
-static inline const char* simcall_process_create__get__hostname(smx_simcall_t simcall) {
-  return  simcall->args[3].cc;
-}
-static inline void simcall_process_create__set__hostname(smx_simcall_t simcall, const char* arg) {
-    simcall->args[3].cc = arg;
-}
-static inline double simcall_process_create__get__kill_time(smx_simcall_t simcall) {
-  return  simcall->args[4].d;
-}
-static inline void simcall_process_create__set__kill_time(smx_simcall_t simcall, double arg) {
-    simcall->args[4].d = arg;
-}
-static inline int simcall_process_create__get__argc(smx_simcall_t simcall) {
-  return  simcall->args[5].i;
-}
-static inline void simcall_process_create__set__argc(smx_simcall_t simcall, int arg) {
-    simcall->args[5].i = arg;
-}
-static inline char** simcall_process_create__get__argv(smx_simcall_t simcall) {
-  return (char**) simcall->args[6].dp;
-}
-static inline void simcall_process_create__set__argv(smx_simcall_t simcall, void* arg) {
-    simcall->args[6].dp = arg;
-}
-static inline xbt_dict_t simcall_process_create__get__properties(smx_simcall_t simcall) {
-  return (xbt_dict_t) simcall->args[7].dp;
+  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[0]);
 }
-static inline void simcall_process_create__set__properties(smx_simcall_t simcall, void* arg) {
-    simcall->args[7].dp = arg;
-}
-static inline int simcall_process_create__get__auto_restart(smx_simcall_t simcall) {
-  return  simcall->args[8].i;
-}
-static inline void simcall_process_create__set__auto_restart(smx_simcall_t simcall, int arg) {
-    simcall->args[8].i = arg;
-}
-static inline void* simcall_process_create__get__result(smx_simcall_t simcall){
-    return  simcall->result.dp;
-}
-static inline void simcall_process_create__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_vm_restore__set__ind_vm(smx_simcall_t simcall, sg_host_t arg) {
+    simgrid::simix::marshal<sg_host_t>(simcall->args[0], arg);
 }
 
 static inline smx_process_t simcall_process_kill__get__process(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
 }
-static inline void simcall_process_kill__set__process(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_process_kill__set__process(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[0], arg);
 }
 
 static inline int simcall_process_killall__get__reset_pid(smx_simcall_t simcall) {
-  return  simcall->args[0].i;
+  return simgrid::simix::unmarshal<int>(simcall->args[0]);
 }
 static inline void simcall_process_killall__set__reset_pid(smx_simcall_t simcall, int arg) {
-    simcall->args[0].i = arg;
+    simgrid::simix::marshal<int>(simcall->args[0], arg);
 }
 
 static inline smx_process_t simcall_process_cleanup__get__process(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
 }
-static inline void simcall_process_cleanup__set__process(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_process_cleanup__set__process(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[0], arg);
 }
 
 static inline smx_process_t simcall_process_suspend__get__process(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
 }
-static inline void simcall_process_suspend__set__process(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_process_suspend__set__process(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[0], arg);
 }
 
 static inline smx_process_t simcall_process_resume__get__process(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
 }
-static inline void simcall_process_resume__set__process(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_process_resume__set__process(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[0], arg);
 }
 
 static inline smx_process_t simcall_process_set_host__get__process(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
 }
-static inline void simcall_process_set_host__set__process(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_process_set_host__set__process(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[0], arg);
 }
 static inline sg_host_t simcall_process_set_host__get__dest(smx_simcall_t simcall) {
-  return (sg_host_t) simcall->args[1].dp;
+  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[1]);
 }
-static inline void simcall_process_set_host__set__dest(smx_simcall_t simcall, void* arg) {
-    simcall->args[1].dp = arg;
+static inline void simcall_process_set_host__set__dest(smx_simcall_t simcall, sg_host_t arg) {
+    simgrid::simix::marshal<sg_host_t>(simcall->args[1], arg);
 }
 
 static inline smx_process_t simcall_process_is_suspended__get__process(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
 }
-static inline void simcall_process_is_suspended__set__process(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_process_is_suspended__set__process(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[0], arg);
 }
 static inline int simcall_process_is_suspended__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline void simcall_process_is_suspended__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline smx_process_t simcall_process_join__get__process(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
 }
-static inline void simcall_process_join__set__process(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_process_join__set__process(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[0], arg);
 }
 static inline double simcall_process_join__get__timeout(smx_simcall_t simcall) {
-  return  simcall->args[1].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[1]);
 }
 static inline void simcall_process_join__set__timeout(smx_simcall_t simcall, double arg) {
-    simcall->args[1].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
 static inline int simcall_process_join__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline void simcall_process_join__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline double simcall_process_sleep__get__duration(smx_simcall_t simcall) {
-  return  simcall->args[0].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[0]);
 }
 static inline void simcall_process_sleep__set__duration(smx_simcall_t simcall, double arg) {
-    simcall->args[0].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[0], arg);
 }
 static inline int simcall_process_sleep__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline void simcall_process_sleep__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline const char* simcall_execution_start__get__name(smx_simcall_t simcall) {
-  return  simcall->args[0].cc;
+  return simgrid::simix::unmarshal<const char*>(simcall->args[0]);
 }
 static inline void simcall_execution_start__set__name(smx_simcall_t simcall, const char* arg) {
-    simcall->args[0].cc = arg;
+    simgrid::simix::marshal<const char*>(simcall->args[0], arg);
 }
 static inline double simcall_execution_start__get__flops_amount(smx_simcall_t simcall) {
-  return  simcall->args[1].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[1]);
 }
 static inline void simcall_execution_start__set__flops_amount(smx_simcall_t simcall, double arg) {
-    simcall->args[1].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
 static inline double simcall_execution_start__get__priority(smx_simcall_t simcall) {
-  return  simcall->args[2].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[2]);
 }
 static inline void simcall_execution_start__set__priority(smx_simcall_t simcall, double arg) {
-    simcall->args[2].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[2], arg);
 }
 static inline double simcall_execution_start__get__bound(smx_simcall_t simcall) {
-  return  simcall->args[3].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[3]);
 }
 static inline void simcall_execution_start__set__bound(smx_simcall_t simcall, double arg) {
-    simcall->args[3].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[3], arg);
 }
 static inline unsigned long simcall_execution_start__get__affinity_mask(smx_simcall_t simcall) {
-  return  simcall->args[4].ul;
+  return simgrid::simix::unmarshal<unsigned long>(simcall->args[4]);
 }
 static inline void simcall_execution_start__set__affinity_mask(smx_simcall_t simcall, unsigned long arg) {
-    simcall->args[4].ul = arg;
+    simgrid::simix::marshal<unsigned long>(simcall->args[4], arg);
 }
 static inline smx_synchro_t simcall_execution_start__get__result(smx_simcall_t simcall){
-    return (smx_synchro_t) simcall->result.dp;
+    return simgrid::simix::unmarshal<smx_synchro_t>(simcall->result);
 }
-static inline void simcall_execution_start__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_execution_start__set__result(smx_simcall_t simcall, smx_synchro_t result){
+    simgrid::simix::marshal<smx_synchro_t>(simcall->result, result);
 }
 
 static inline const char* simcall_execution_parallel_start__get__name(smx_simcall_t simcall) {
-  return  simcall->args[0].cc;
+  return simgrid::simix::unmarshal<const char*>(simcall->args[0]);
 }
 static inline void simcall_execution_parallel_start__set__name(smx_simcall_t simcall, const char* arg) {
-    simcall->args[0].cc = arg;
+    simgrid::simix::marshal<const char*>(simcall->args[0], arg);
 }
 static inline int simcall_execution_parallel_start__get__host_nb(smx_simcall_t simcall) {
-  return  simcall->args[1].i;
+  return simgrid::simix::unmarshal<int>(simcall->args[1]);
 }
 static inline void simcall_execution_parallel_start__set__host_nb(smx_simcall_t simcall, int arg) {
-    simcall->args[1].i = arg;
+    simgrid::simix::marshal<int>(simcall->args[1], arg);
 }
 static inline sg_host_t* simcall_execution_parallel_start__get__host_list(smx_simcall_t simcall) {
-  return (sg_host_t*) simcall->args[2].dp;
+  return simgrid::simix::unmarshal<sg_host_t*>(simcall->args[2]);
 }
-static inline void simcall_execution_parallel_start__set__host_list(smx_simcall_t simcall, void* arg) {
-    simcall->args[2].dp = arg;
+static inline void simcall_execution_parallel_start__set__host_list(smx_simcall_t simcall, sg_host_t* arg) {
+    simgrid::simix::marshal<sg_host_t*>(simcall->args[2], arg);
 }
 static inline double* simcall_execution_parallel_start__get__flops_amount(smx_simcall_t simcall) {
-  return (double*) simcall->args[3].dp;
+  return simgrid::simix::unmarshal<double*>(simcall->args[3]);
 }
-static inline void simcall_execution_parallel_start__set__flops_amount(smx_simcall_t simcall, void* arg) {
-    simcall->args[3].dp = arg;
+static inline void simcall_execution_parallel_start__set__flops_amount(smx_simcall_t simcall, double* arg) {
+    simgrid::simix::marshal<double*>(simcall->args[3], arg);
 }
 static inline double* simcall_execution_parallel_start__get__bytes_amount(smx_simcall_t simcall) {
-  return (double*) simcall->args[4].dp;
+  return simgrid::simix::unmarshal<double*>(simcall->args[4]);
 }
-static inline void simcall_execution_parallel_start__set__bytes_amount(smx_simcall_t simcall, void* arg) {
-    simcall->args[4].dp = arg;
+static inline void simcall_execution_parallel_start__set__bytes_amount(smx_simcall_t simcall, double* arg) {
+    simgrid::simix::marshal<double*>(simcall->args[4], arg);
 }
 static inline double simcall_execution_parallel_start__get__amount(smx_simcall_t simcall) {
-  return  simcall->args[5].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[5]);
 }
 static inline void simcall_execution_parallel_start__set__amount(smx_simcall_t simcall, double arg) {
-    simcall->args[5].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[5], arg);
 }
 static inline double simcall_execution_parallel_start__get__rate(smx_simcall_t simcall) {
-  return  simcall->args[6].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[6]);
 }
 static inline void simcall_execution_parallel_start__set__rate(smx_simcall_t simcall, double arg) {
-    simcall->args[6].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[6], arg);
 }
 static inline smx_synchro_t simcall_execution_parallel_start__get__result(smx_simcall_t simcall){
-    return (smx_synchro_t) simcall->result.dp;
+    return simgrid::simix::unmarshal<smx_synchro_t>(simcall->result);
 }
-static inline void simcall_execution_parallel_start__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
-}
-
-static inline smx_synchro_t simcall_execution_destroy__get__execution(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
-}
-static inline void simcall_execution_destroy__set__execution(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_execution_parallel_start__set__result(smx_simcall_t simcall, smx_synchro_t result){
+    simgrid::simix::marshal<smx_synchro_t>(simcall->result, result);
 }
 
 static inline smx_synchro_t simcall_execution_cancel__get__execution(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
-}
-static inline void simcall_execution_cancel__set__execution(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
-}
-
-static inline smx_synchro_t simcall_execution_get_remains__get__execution(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
-}
-static inline void simcall_execution_get_remains__set__execution(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
-}
-static inline double simcall_execution_get_remains__get__result(smx_simcall_t simcall){
-    return  simcall->result.d;
+  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
 }
-static inline void simcall_execution_get_remains__set__result(smx_simcall_t simcall, double result){
-    simcall->result.d = result;
-}
-
-static inline smx_synchro_t simcall_execution_get_state__get__execution(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
-}
-static inline void simcall_execution_get_state__set__execution(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
-}
-static inline e_smx_state_t simcall_execution_get_state__get__result(smx_simcall_t simcall){
-    return (e_smx_state_t) simcall->result.i;
-}
-static inline void simcall_execution_get_state__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+static inline void simcall_execution_cancel__set__execution(smx_simcall_t simcall, smx_synchro_t arg) {
+    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
 }
 
 static inline smx_synchro_t simcall_execution_set_priority__get__execution(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
 }
-static inline void simcall_execution_set_priority__set__execution(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_execution_set_priority__set__execution(smx_simcall_t simcall, smx_synchro_t arg) {
+    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
 }
 static inline double simcall_execution_set_priority__get__priority(smx_simcall_t simcall) {
-  return  simcall->args[1].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[1]);
 }
 static inline void simcall_execution_set_priority__set__priority(smx_simcall_t simcall, double arg) {
-    simcall->args[1].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
 
 static inline smx_synchro_t simcall_execution_set_bound__get__execution(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
 }
-static inline void simcall_execution_set_bound__set__execution(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_execution_set_bound__set__execution(smx_simcall_t simcall, smx_synchro_t arg) {
+    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
 }
 static inline double simcall_execution_set_bound__get__bound(smx_simcall_t simcall) {
-  return  simcall->args[1].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[1]);
 }
 static inline void simcall_execution_set_bound__set__bound(smx_simcall_t simcall, double arg) {
-    simcall->args[1].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
 
 static inline smx_synchro_t simcall_execution_set_affinity__get__execution(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
 }
-static inline void simcall_execution_set_affinity__set__execution(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_execution_set_affinity__set__execution(smx_simcall_t simcall, smx_synchro_t arg) {
+    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
 }
 static inline sg_host_t simcall_execution_set_affinity__get__ws(smx_simcall_t simcall) {
-  return (sg_host_t) simcall->args[1].dp;
+  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[1]);
 }
-static inline void simcall_execution_set_affinity__set__ws(smx_simcall_t simcall, void* arg) {
-    simcall->args[1].dp = arg;
+static inline void simcall_execution_set_affinity__set__ws(smx_simcall_t simcall, sg_host_t arg) {
+    simgrid::simix::marshal<sg_host_t>(simcall->args[1], arg);
 }
 static inline unsigned long simcall_execution_set_affinity__get__mask(smx_simcall_t simcall) {
-  return  simcall->args[2].ul;
+  return simgrid::simix::unmarshal<unsigned long>(simcall->args[2]);
 }
 static inline void simcall_execution_set_affinity__set__mask(smx_simcall_t simcall, unsigned long arg) {
-    simcall->args[2].ul = arg;
+    simgrid::simix::marshal<unsigned long>(simcall->args[2], arg);
 }
 
 static inline smx_synchro_t simcall_execution_wait__get__execution(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
 }
-static inline void simcall_execution_wait__set__execution(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_execution_wait__set__execution(smx_simcall_t simcall, smx_synchro_t arg) {
+    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
 }
 static inline int simcall_execution_wait__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline void simcall_execution_wait__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline smx_process_t simcall_process_on_exit__get__process(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
 }
-static inline void simcall_process_on_exit__set__process(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_process_on_exit__set__process(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[0], arg);
 }
 static inline int_f_pvoid_pvoid_t simcall_process_on_exit__get__fun(smx_simcall_t simcall) {
-  return (int_f_pvoid_pvoid_t) simcall->args[1].fp;
+  return simgrid::simix::unmarshal<int_f_pvoid_pvoid_t>(simcall->args[1]);
 }
-static inline void simcall_process_on_exit__set__fun(smx_simcall_t simcall, FPtr arg) {
-    simcall->args[1].fp = arg;
+static inline void simcall_process_on_exit__set__fun(smx_simcall_t simcall, int_f_pvoid_pvoid_t arg) {
+    simgrid::simix::marshal<int_f_pvoid_pvoid_t>(simcall->args[1], arg);
 }
 static inline void* simcall_process_on_exit__get__data(smx_simcall_t simcall) {
-  return  simcall->args[2].dp;
+  return simgrid::simix::unmarshal<void*>(simcall->args[2]);
 }
 static inline void simcall_process_on_exit__set__data(smx_simcall_t simcall, void* arg) {
-    simcall->args[2].dp = arg;
+    simgrid::simix::marshal<void*>(simcall->args[2], arg);
 }
 
 static inline smx_process_t simcall_process_auto_restart_set__get__process(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
 }
-static inline void simcall_process_auto_restart_set__set__process(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_process_auto_restart_set__set__process(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[0], arg);
 }
 static inline int simcall_process_auto_restart_set__get__auto_restart(smx_simcall_t simcall) {
-  return  simcall->args[1].i;
+  return simgrid::simix::unmarshal<int>(simcall->args[1]);
 }
 static inline void simcall_process_auto_restart_set__set__auto_restart(smx_simcall_t simcall, int arg) {
-    simcall->args[1].i = arg;
+    simgrid::simix::marshal<int>(simcall->args[1], arg);
 }
 
 static inline smx_process_t simcall_process_restart__get__process(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
 }
-static inline void simcall_process_restart__set__process(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_process_restart__set__process(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[0], arg);
 }
 static inline smx_process_t simcall_process_restart__get__result(smx_simcall_t simcall){
-    return (smx_process_t) simcall->result.dp;
+    return simgrid::simix::unmarshal<smx_process_t>(simcall->result);
 }
-static inline void simcall_process_restart__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_process_restart__set__result(smx_simcall_t simcall, smx_process_t result){
+    simgrid::simix::marshal<smx_process_t>(simcall->result, result);
 }
 
 static inline const char* simcall_mbox_create__get__name(smx_simcall_t simcall) {
-  return  simcall->args[0].cc;
+  return simgrid::simix::unmarshal<const char*>(simcall->args[0]);
 }
 static inline void simcall_mbox_create__set__name(smx_simcall_t simcall, const char* arg) {
-    simcall->args[0].cc = arg;
+    simgrid::simix::marshal<const char*>(simcall->args[0], arg);
 }
 static inline smx_mailbox_t simcall_mbox_create__get__result(smx_simcall_t simcall){
-    return (smx_mailbox_t) simcall->result.dp;
-}
-static inline void simcall_mbox_create__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+    return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->result);
 }
-
-static inline smx_mailbox_t simcall_mbox_get_head__get__mbox(smx_simcall_t simcall) {
-  return (smx_mailbox_t) simcall->args[0].dp;
-}
-static inline void simcall_mbox_get_head__set__mbox(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
-}
-static inline smx_synchro_t simcall_mbox_get_head__get__result(smx_simcall_t simcall){
-    return (smx_synchro_t) simcall->result.dp;
-}
-static inline void simcall_mbox_get_head__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_mbox_create__set__result(smx_simcall_t simcall, smx_mailbox_t result){
+    simgrid::simix::marshal<smx_mailbox_t>(simcall->result, result);
 }
 
 static inline smx_mailbox_t simcall_mbox_set_receiver__get__mbox(smx_simcall_t simcall) {
-  return (smx_mailbox_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[0]);
 }
-static inline void simcall_mbox_set_receiver__set__mbox(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_mbox_set_receiver__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg) {
+    simgrid::simix::marshal<smx_mailbox_t>(simcall->args[0], arg);
 }
 static inline smx_process_t simcall_mbox_set_receiver__get__receiver(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[1].dp;
-}
-static inline void simcall_mbox_set_receiver__set__receiver(smx_simcall_t simcall, void* arg) {
-    simcall->args[1].dp = arg;
-}
-
-static inline smx_mailbox_t simcall_mbox_get_receiver__get__mbox(smx_simcall_t simcall) {
-  return (smx_mailbox_t) simcall->args[0].dp;
-}
-static inline void simcall_mbox_get_receiver__set__mbox(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
-}
-static inline smx_process_t simcall_mbox_get_receiver__get__result(smx_simcall_t simcall){
-    return (smx_process_t) simcall->result.dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[1]);
 }
-static inline void simcall_mbox_get_receiver__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_mbox_set_receiver__set__receiver(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[1], arg);
 }
 
 static inline smx_mailbox_t simcall_comm_iprobe__get__mbox(smx_simcall_t simcall) {
-  return (smx_mailbox_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[0]);
 }
-static inline void simcall_comm_iprobe__set__mbox(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_comm_iprobe__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg) {
+    simgrid::simix::marshal<smx_mailbox_t>(simcall->args[0], arg);
 }
 static inline int simcall_comm_iprobe__get__type(smx_simcall_t simcall) {
-  return  simcall->args[1].i;
+  return simgrid::simix::unmarshal<int>(simcall->args[1]);
 }
 static inline void simcall_comm_iprobe__set__type(smx_simcall_t simcall, int arg) {
-    simcall->args[1].i = arg;
+    simgrid::simix::marshal<int>(simcall->args[1], arg);
 }
 static inline int simcall_comm_iprobe__get__src(smx_simcall_t simcall) {
-  return  simcall->args[2].i;
+  return simgrid::simix::unmarshal<int>(simcall->args[2]);
 }
 static inline void simcall_comm_iprobe__set__src(smx_simcall_t simcall, int arg) {
-    simcall->args[2].i = arg;
+    simgrid::simix::marshal<int>(simcall->args[2], arg);
 }
 static inline int simcall_comm_iprobe__get__tag(smx_simcall_t simcall) {
-  return  simcall->args[3].i;
+  return simgrid::simix::unmarshal<int>(simcall->args[3]);
 }
 static inline void simcall_comm_iprobe__set__tag(smx_simcall_t simcall, int arg) {
-    simcall->args[3].i = arg;
+    simgrid::simix::marshal<int>(simcall->args[3], arg);
 }
 static inline simix_match_func_t simcall_comm_iprobe__get__match_fun(smx_simcall_t simcall) {
-  return (simix_match_func_t) simcall->args[4].fp;
+  return simgrid::simix::unmarshal<simix_match_func_t>(simcall->args[4]);
 }
-static inline void simcall_comm_iprobe__set__match_fun(smx_simcall_t simcall, FPtr arg) {
-    simcall->args[4].fp = arg;
+static inline void simcall_comm_iprobe__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg) {
+    simgrid::simix::marshal<simix_match_func_t>(simcall->args[4], arg);
 }
 static inline void* simcall_comm_iprobe__get__data(smx_simcall_t simcall) {
-  return  simcall->args[5].dp;
+  return simgrid::simix::unmarshal<void*>(simcall->args[5]);
 }
 static inline void simcall_comm_iprobe__set__data(smx_simcall_t simcall, void* arg) {
-    simcall->args[5].dp = arg;
+    simgrid::simix::marshal<void*>(simcall->args[5], arg);
 }
 static inline smx_synchro_t simcall_comm_iprobe__get__result(smx_simcall_t simcall){
-    return (smx_synchro_t) simcall->result.dp;
+    return simgrid::simix::unmarshal<smx_synchro_t>(simcall->result);
 }
-static inline void simcall_comm_iprobe__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_comm_iprobe__set__result(smx_simcall_t simcall, smx_synchro_t result){
+    simgrid::simix::marshal<smx_synchro_t>(simcall->result, result);
 }
 
 static inline smx_process_t simcall_comm_send__get__sender(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
 }
-static inline void simcall_comm_send__set__sender(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_comm_send__set__sender(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[0], arg);
 }
 static inline smx_mailbox_t simcall_comm_send__get__mbox(smx_simcall_t simcall) {
-  return (smx_mailbox_t) simcall->args[1].dp;
+  return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[1]);
 }
-static inline void simcall_comm_send__set__mbox(smx_simcall_t simcall, void* arg) {
-    simcall->args[1].dp = arg;
+static inline void simcall_comm_send__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg) {
+    simgrid::simix::marshal<smx_mailbox_t>(simcall->args[1], arg);
 }
 static inline double simcall_comm_send__get__task_size(smx_simcall_t simcall) {
-  return  simcall->args[2].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[2]);
 }
 static inline void simcall_comm_send__set__task_size(smx_simcall_t simcall, double arg) {
-    simcall->args[2].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[2], arg);
 }
 static inline double simcall_comm_send__get__rate(smx_simcall_t simcall) {
-  return  simcall->args[3].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[3]);
 }
 static inline void simcall_comm_send__set__rate(smx_simcall_t simcall, double arg) {
-    simcall->args[3].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[3], arg);
 }
 static inline void* simcall_comm_send__get__src_buff(smx_simcall_t simcall) {
-  return  simcall->args[4].dp;
+  return simgrid::simix::unmarshal<void*>(simcall->args[4]);
 }
 static inline void simcall_comm_send__set__src_buff(smx_simcall_t simcall, void* arg) {
-    simcall->args[4].dp = arg;
+    simgrid::simix::marshal<void*>(simcall->args[4], arg);
 }
 static inline size_t simcall_comm_send__get__src_buff_size(smx_simcall_t simcall) {
-  return  simcall->args[5].sz;
+  return simgrid::simix::unmarshal<size_t>(simcall->args[5]);
 }
 static inline void simcall_comm_send__set__src_buff_size(smx_simcall_t simcall, size_t arg) {
-    simcall->args[5].sz = arg;
+    simgrid::simix::marshal<size_t>(simcall->args[5], arg);
 }
 static inline simix_match_func_t simcall_comm_send__get__match_fun(smx_simcall_t simcall) {
-  return (simix_match_func_t) simcall->args[6].fp;
+  return simgrid::simix::unmarshal<simix_match_func_t>(simcall->args[6]);
 }
-static inline void simcall_comm_send__set__match_fun(smx_simcall_t simcall, FPtr arg) {
-    simcall->args[6].fp = arg;
+static inline void simcall_comm_send__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg) {
+    simgrid::simix::marshal<simix_match_func_t>(simcall->args[6], arg);
 }
 static inline simix_copy_data_func_t simcall_comm_send__get__copy_data_fun(smx_simcall_t simcall) {
-  return (simix_copy_data_func_t) simcall->args[7].fp;
+  return simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall->args[7]);
 }
-static inline void simcall_comm_send__set__copy_data_fun(smx_simcall_t simcall, FPtr arg) {
-    simcall->args[7].fp = arg;
+static inline void simcall_comm_send__set__copy_data_fun(smx_simcall_t simcall, simix_copy_data_func_t arg) {
+    simgrid::simix::marshal<simix_copy_data_func_t>(simcall->args[7], arg);
 }
 static inline void* simcall_comm_send__get__data(smx_simcall_t simcall) {
-  return  simcall->args[8].dp;
+  return simgrid::simix::unmarshal<void*>(simcall->args[8]);
 }
 static inline void simcall_comm_send__set__data(smx_simcall_t simcall, void* arg) {
-    simcall->args[8].dp = arg;
+    simgrid::simix::marshal<void*>(simcall->args[8], arg);
 }
 static inline double simcall_comm_send__get__timeout(smx_simcall_t simcall) {
-  return  simcall->args[9].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[9]);
 }
 static inline void simcall_comm_send__set__timeout(smx_simcall_t simcall, double arg) {
-    simcall->args[9].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[9], arg);
 }
 
 static inline smx_process_t simcall_comm_isend__get__sender(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
 }
-static inline void simcall_comm_isend__set__sender(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_comm_isend__set__sender(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[0], arg);
 }
 static inline smx_mailbox_t simcall_comm_isend__get__mbox(smx_simcall_t simcall) {
-  return (smx_mailbox_t) simcall->args[1].dp;
+  return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[1]);
 }
-static inline void simcall_comm_isend__set__mbox(smx_simcall_t simcall, void* arg) {
-    simcall->args[1].dp = arg;
+static inline void simcall_comm_isend__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg) {
+    simgrid::simix::marshal<smx_mailbox_t>(simcall->args[1], arg);
 }
 static inline double simcall_comm_isend__get__task_size(smx_simcall_t simcall) {
-  return  simcall->args[2].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[2]);
 }
 static inline void simcall_comm_isend__set__task_size(smx_simcall_t simcall, double arg) {
-    simcall->args[2].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[2], arg);
 }
 static inline double simcall_comm_isend__get__rate(smx_simcall_t simcall) {
-  return  simcall->args[3].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[3]);
 }
 static inline void simcall_comm_isend__set__rate(smx_simcall_t simcall, double arg) {
-    simcall->args[3].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[3], arg);
 }
 static inline void* simcall_comm_isend__get__src_buff(smx_simcall_t simcall) {
-  return  simcall->args[4].dp;
+  return simgrid::simix::unmarshal<void*>(simcall->args[4]);
 }
 static inline void simcall_comm_isend__set__src_buff(smx_simcall_t simcall, void* arg) {
-    simcall->args[4].dp = arg;
+    simgrid::simix::marshal<void*>(simcall->args[4], arg);
 }
 static inline size_t simcall_comm_isend__get__src_buff_size(smx_simcall_t simcall) {
-  return  simcall->args[5].sz;
+  return simgrid::simix::unmarshal<size_t>(simcall->args[5]);
 }
 static inline void simcall_comm_isend__set__src_buff_size(smx_simcall_t simcall, size_t arg) {
-    simcall->args[5].sz = arg;
+    simgrid::simix::marshal<size_t>(simcall->args[5], arg);
 }
 static inline simix_match_func_t simcall_comm_isend__get__match_fun(smx_simcall_t simcall) {
-  return (simix_match_func_t) simcall->args[6].fp;
+  return simgrid::simix::unmarshal<simix_match_func_t>(simcall->args[6]);
 }
-static inline void simcall_comm_isend__set__match_fun(smx_simcall_t simcall, FPtr arg) {
-    simcall->args[6].fp = arg;
+static inline void simcall_comm_isend__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg) {
+    simgrid::simix::marshal<simix_match_func_t>(simcall->args[6], arg);
 }
 static inline simix_clean_func_t simcall_comm_isend__get__clean_fun(smx_simcall_t simcall) {
-  return (simix_clean_func_t) simcall->args[7].fp;
+  return simgrid::simix::unmarshal<simix_clean_func_t>(simcall->args[7]);
 }
-static inline void simcall_comm_isend__set__clean_fun(smx_simcall_t simcall, FPtr arg) {
-    simcall->args[7].fp = arg;
+static inline void simcall_comm_isend__set__clean_fun(smx_simcall_t simcall, simix_clean_func_t arg) {
+    simgrid::simix::marshal<simix_clean_func_t>(simcall->args[7], arg);
 }
 static inline simix_copy_data_func_t simcall_comm_isend__get__copy_data_fun(smx_simcall_t simcall) {
-  return (simix_copy_data_func_t) simcall->args[8].fp;
+  return simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall->args[8]);
 }
-static inline void simcall_comm_isend__set__copy_data_fun(smx_simcall_t simcall, FPtr arg) {
-    simcall->args[8].fp = arg;
+static inline void simcall_comm_isend__set__copy_data_fun(smx_simcall_t simcall, simix_copy_data_func_t arg) {
+    simgrid::simix::marshal<simix_copy_data_func_t>(simcall->args[8], arg);
 }
 static inline void* simcall_comm_isend__get__data(smx_simcall_t simcall) {
-  return  simcall->args[9].dp;
+  return simgrid::simix::unmarshal<void*>(simcall->args[9]);
 }
 static inline void simcall_comm_isend__set__data(smx_simcall_t simcall, void* arg) {
-    simcall->args[9].dp = arg;
+    simgrid::simix::marshal<void*>(simcall->args[9], arg);
 }
 static inline int simcall_comm_isend__get__detached(smx_simcall_t simcall) {
-  return  simcall->args[10].i;
+  return simgrid::simix::unmarshal<int>(simcall->args[10]);
 }
 static inline void simcall_comm_isend__set__detached(smx_simcall_t simcall, int arg) {
-    simcall->args[10].i = arg;
+    simgrid::simix::marshal<int>(simcall->args[10], arg);
 }
 static inline smx_synchro_t simcall_comm_isend__get__result(smx_simcall_t simcall){
-    return (smx_synchro_t) simcall->result.dp;
+    return simgrid::simix::unmarshal<smx_synchro_t>(simcall->result);
 }
-static inline void simcall_comm_isend__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_comm_isend__set__result(smx_simcall_t simcall, smx_synchro_t result){
+    simgrid::simix::marshal<smx_synchro_t>(simcall->result, result);
 }
 
 static inline smx_process_t simcall_comm_recv__get__receiver(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
 }
-static inline void simcall_comm_recv__set__receiver(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_comm_recv__set__receiver(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[0], arg);
 }
 static inline smx_mailbox_t simcall_comm_recv__get__mbox(smx_simcall_t simcall) {
-  return (smx_mailbox_t) simcall->args[1].dp;
+  return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[1]);
 }
-static inline void simcall_comm_recv__set__mbox(smx_simcall_t simcall, void* arg) {
-    simcall->args[1].dp = arg;
+static inline void simcall_comm_recv__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg) {
+    simgrid::simix::marshal<smx_mailbox_t>(simcall->args[1], arg);
 }
 static inline void* simcall_comm_recv__get__dst_buff(smx_simcall_t simcall) {
-  return  simcall->args[2].dp;
+  return simgrid::simix::unmarshal<void*>(simcall->args[2]);
 }
 static inline void simcall_comm_recv__set__dst_buff(smx_simcall_t simcall, void* arg) {
-    simcall->args[2].dp = arg;
+    simgrid::simix::marshal<void*>(simcall->args[2], arg);
 }
 static inline size_t* simcall_comm_recv__get__dst_buff_size(smx_simcall_t simcall) {
-  return (size_t*) simcall->args[3].dp;
+  return simgrid::simix::unmarshal<size_t*>(simcall->args[3]);
 }
-static inline void simcall_comm_recv__set__dst_buff_size(smx_simcall_t simcall, void* arg) {
-    simcall->args[3].dp = arg;
+static inline void simcall_comm_recv__set__dst_buff_size(smx_simcall_t simcall, size_t* arg) {
+    simgrid::simix::marshal<size_t*>(simcall->args[3], arg);
 }
 static inline simix_match_func_t simcall_comm_recv__get__match_fun(smx_simcall_t simcall) {
-  return (simix_match_func_t) simcall->args[4].fp;
+  return simgrid::simix::unmarshal<simix_match_func_t>(simcall->args[4]);
 }
-static inline void simcall_comm_recv__set__match_fun(smx_simcall_t simcall, FPtr arg) {
-    simcall->args[4].fp = arg;
+static inline void simcall_comm_recv__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg) {
+    simgrid::simix::marshal<simix_match_func_t>(simcall->args[4], arg);
 }
 static inline simix_copy_data_func_t simcall_comm_recv__get__copy_data_fun(smx_simcall_t simcall) {
-  return (simix_copy_data_func_t) simcall->args[5].fp;
+  return simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall->args[5]);
 }
-static inline void simcall_comm_recv__set__copy_data_fun(smx_simcall_t simcall, FPtr arg) {
-    simcall->args[5].fp = arg;
+static inline void simcall_comm_recv__set__copy_data_fun(smx_simcall_t simcall, simix_copy_data_func_t arg) {
+    simgrid::simix::marshal<simix_copy_data_func_t>(simcall->args[5], arg);
 }
 static inline void* simcall_comm_recv__get__data(smx_simcall_t simcall) {
-  return  simcall->args[6].dp;
+  return simgrid::simix::unmarshal<void*>(simcall->args[6]);
 }
 static inline void simcall_comm_recv__set__data(smx_simcall_t simcall, void* arg) {
-    simcall->args[6].dp = arg;
+    simgrid::simix::marshal<void*>(simcall->args[6], arg);
 }
 static inline double simcall_comm_recv__get__timeout(smx_simcall_t simcall) {
-  return  simcall->args[7].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[7]);
 }
 static inline void simcall_comm_recv__set__timeout(smx_simcall_t simcall, double arg) {
-    simcall->args[7].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[7], arg);
 }
 static inline double simcall_comm_recv__get__rate(smx_simcall_t simcall) {
-  return  simcall->args[8].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[8]);
 }
 static inline void simcall_comm_recv__set__rate(smx_simcall_t simcall, double arg) {
-    simcall->args[8].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[8], arg);
 }
 
 static inline smx_process_t simcall_comm_irecv__get__receiver(smx_simcall_t simcall) {
-  return (smx_process_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_process_t>(simcall->args[0]);
 }
-static inline void simcall_comm_irecv__set__receiver(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_comm_irecv__set__receiver(smx_simcall_t simcall, smx_process_t arg) {
+    simgrid::simix::marshal<smx_process_t>(simcall->args[0], arg);
 }
 static inline smx_mailbox_t simcall_comm_irecv__get__mbox(smx_simcall_t simcall) {
-  return (smx_mailbox_t) simcall->args[1].dp;
+  return simgrid::simix::unmarshal<smx_mailbox_t>(simcall->args[1]);
 }
-static inline void simcall_comm_irecv__set__mbox(smx_simcall_t simcall, void* arg) {
-    simcall->args[1].dp = arg;
+static inline void simcall_comm_irecv__set__mbox(smx_simcall_t simcall, smx_mailbox_t arg) {
+    simgrid::simix::marshal<smx_mailbox_t>(simcall->args[1], arg);
 }
 static inline void* simcall_comm_irecv__get__dst_buff(smx_simcall_t simcall) {
-  return  simcall->args[2].dp;
+  return simgrid::simix::unmarshal<void*>(simcall->args[2]);
 }
 static inline void simcall_comm_irecv__set__dst_buff(smx_simcall_t simcall, void* arg) {
-    simcall->args[2].dp = arg;
+    simgrid::simix::marshal<void*>(simcall->args[2], arg);
 }
 static inline size_t* simcall_comm_irecv__get__dst_buff_size(smx_simcall_t simcall) {
-  return (size_t*) simcall->args[3].dp;
+  return simgrid::simix::unmarshal<size_t*>(simcall->args[3]);
 }
-static inline void simcall_comm_irecv__set__dst_buff_size(smx_simcall_t simcall, void* arg) {
-    simcall->args[3].dp = arg;
+static inline void simcall_comm_irecv__set__dst_buff_size(smx_simcall_t simcall, size_t* arg) {
+    simgrid::simix::marshal<size_t*>(simcall->args[3], arg);
 }
 static inline simix_match_func_t simcall_comm_irecv__get__match_fun(smx_simcall_t simcall) {
-  return (simix_match_func_t) simcall->args[4].fp;
+  return simgrid::simix::unmarshal<simix_match_func_t>(simcall->args[4]);
 }
-static inline void simcall_comm_irecv__set__match_fun(smx_simcall_t simcall, FPtr arg) {
-    simcall->args[4].fp = arg;
+static inline void simcall_comm_irecv__set__match_fun(smx_simcall_t simcall, simix_match_func_t arg) {
+    simgrid::simix::marshal<simix_match_func_t>(simcall->args[4], arg);
 }
 static inline simix_copy_data_func_t simcall_comm_irecv__get__copy_data_fun(smx_simcall_t simcall) {
-  return (simix_copy_data_func_t) simcall->args[5].fp;
+  return simgrid::simix::unmarshal<simix_copy_data_func_t>(simcall->args[5]);
 }
-static inline void simcall_comm_irecv__set__copy_data_fun(smx_simcall_t simcall, FPtr arg) {
-    simcall->args[5].fp = arg;
+static inline void simcall_comm_irecv__set__copy_data_fun(smx_simcall_t simcall, simix_copy_data_func_t arg) {
+    simgrid::simix::marshal<simix_copy_data_func_t>(simcall->args[5], arg);
 }
 static inline void* simcall_comm_irecv__get__data(smx_simcall_t simcall) {
-  return  simcall->args[6].dp;
+  return simgrid::simix::unmarshal<void*>(simcall->args[6]);
 }
 static inline void simcall_comm_irecv__set__data(smx_simcall_t simcall, void* arg) {
-    simcall->args[6].dp = arg;
+    simgrid::simix::marshal<void*>(simcall->args[6], arg);
 }
 static inline double simcall_comm_irecv__get__rate(smx_simcall_t simcall) {
-  return  simcall->args[7].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[7]);
 }
 static inline void simcall_comm_irecv__set__rate(smx_simcall_t simcall, double arg) {
-    simcall->args[7].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[7], arg);
 }
 static inline smx_synchro_t simcall_comm_irecv__get__result(smx_simcall_t simcall){
-    return (smx_synchro_t) simcall->result.dp;
+    return simgrid::simix::unmarshal<smx_synchro_t>(simcall->result);
 }
-static inline void simcall_comm_irecv__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_comm_irecv__set__result(smx_simcall_t simcall, smx_synchro_t result){
+    simgrid::simix::marshal<smx_synchro_t>(simcall->result, result);
 }
 
 static inline xbt_dynar_t simcall_comm_waitany__get__comms(smx_simcall_t simcall) {
-  return (xbt_dynar_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<xbt_dynar_t>(simcall->args[0]);
 }
-static inline void simcall_comm_waitany__set__comms(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_comm_waitany__set__comms(smx_simcall_t simcall, xbt_dynar_t arg) {
+    simgrid::simix::marshal<xbt_dynar_t>(simcall->args[0], arg);
+}
+static inline double simcall_comm_waitany__get__timeout(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<double>(simcall->args[1]);
+}
+static inline void simcall_comm_waitany__set__timeout(smx_simcall_t simcall, double arg) {
+    simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
 static inline int simcall_comm_waitany__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline void simcall_comm_waitany__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline smx_synchro_t simcall_comm_wait__get__comm(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
 }
-static inline void simcall_comm_wait__set__comm(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_comm_wait__set__comm(smx_simcall_t simcall, smx_synchro_t arg) {
+    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
 }
 static inline double simcall_comm_wait__get__timeout(smx_simcall_t simcall) {
-  return  simcall->args[1].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[1]);
 }
 static inline void simcall_comm_wait__set__timeout(smx_simcall_t simcall, double arg) {
-    simcall->args[1].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
 
 static inline smx_synchro_t simcall_comm_test__get__comm(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
 }
-static inline void simcall_comm_test__set__comm(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_comm_test__set__comm(smx_simcall_t simcall, smx_synchro_t arg) {
+    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
 }
 static inline int simcall_comm_test__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline void simcall_comm_test__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
-}
-
-static inline xbt_dynar_t simcall_comm_testany__get__comms(smx_simcall_t simcall) {
-  return (xbt_dynar_t) simcall->args[0].dp;
-}
-static inline void simcall_comm_testany__set__comms(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
-}
-static inline int simcall_comm_testany__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
-}
-static inline void simcall_comm_testany__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
-static inline smx_synchro_t simcall_comm_get_src_data__get__comm(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
+static inline smx_synchro_t* simcall_comm_testany__get__comms(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<smx_synchro_t*>(simcall->args[0]);
 }
-static inline void simcall_comm_get_src_data__set__comm(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_comm_testany__set__comms(smx_simcall_t simcall, smx_synchro_t* arg) {
+    simgrid::simix::marshal<smx_synchro_t*>(simcall->args[0], arg);
 }
-static inline void* simcall_comm_get_src_data__get__result(smx_simcall_t simcall){
-    return  simcall->result.dp;
+static inline size_t simcall_comm_testany__get__count(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<size_t>(simcall->args[1]);
 }
-static inline void simcall_comm_get_src_data__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_comm_testany__set__count(smx_simcall_t simcall, size_t arg) {
+    simgrid::simix::marshal<size_t>(simcall->args[1], arg);
 }
-
-static inline smx_synchro_t simcall_comm_get_dst_data__get__comm(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
-}
-static inline void simcall_comm_get_dst_data__set__comm(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
-}
-static inline void* simcall_comm_get_dst_data__get__result(smx_simcall_t simcall){
-    return  simcall->result.dp;
-}
-static inline void simcall_comm_get_dst_data__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
-}
-
-static inline smx_synchro_t simcall_comm_get_src_proc__get__comm(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
-}
-static inline void simcall_comm_get_src_proc__set__comm(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
-}
-static inline smx_process_t simcall_comm_get_src_proc__get__result(smx_simcall_t simcall){
-    return (smx_process_t) simcall->result.dp;
-}
-static inline void simcall_comm_get_src_proc__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
-}
-
-static inline smx_synchro_t simcall_comm_get_dst_proc__get__comm(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
-}
-static inline void simcall_comm_get_dst_proc__set__comm(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
-}
-static inline smx_process_t simcall_comm_get_dst_proc__get__result(smx_simcall_t simcall){
-    return (smx_process_t) simcall->result.dp;
+static inline int simcall_comm_testany__get__result(smx_simcall_t simcall){
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
-static inline void simcall_comm_get_dst_proc__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_comm_testany__set__result(smx_simcall_t simcall, int result){
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline smx_mutex_t simcall_mutex_init__get__result(smx_simcall_t simcall){
-    return (smx_mutex_t) simcall->result.dp;
+    return simgrid::simix::unmarshal<smx_mutex_t>(simcall->result);
 }
-static inline void simcall_mutex_init__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_mutex_init__set__result(smx_simcall_t simcall, smx_mutex_t result){
+    simgrid::simix::marshal<smx_mutex_t>(simcall->result, result);
 }
 
 static inline smx_mutex_t simcall_mutex_lock__get__mutex(smx_simcall_t simcall) {
-  return (smx_mutex_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[0]);
 }
-static inline void simcall_mutex_lock__set__mutex(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_mutex_lock__set__mutex(smx_simcall_t simcall, smx_mutex_t arg) {
+    simgrid::simix::marshal<smx_mutex_t>(simcall->args[0], arg);
 }
 
 static inline smx_mutex_t simcall_mutex_trylock__get__mutex(smx_simcall_t simcall) {
-  return (smx_mutex_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[0]);
 }
-static inline void simcall_mutex_trylock__set__mutex(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_mutex_trylock__set__mutex(smx_simcall_t simcall, smx_mutex_t arg) {
+    simgrid::simix::marshal<smx_mutex_t>(simcall->args[0], arg);
 }
 static inline int simcall_mutex_trylock__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline void simcall_mutex_trylock__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline smx_mutex_t simcall_mutex_unlock__get__mutex(smx_simcall_t simcall) {
-  return (smx_mutex_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[0]);
 }
-static inline void simcall_mutex_unlock__set__mutex(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_mutex_unlock__set__mutex(smx_simcall_t simcall, smx_mutex_t arg) {
+    simgrid::simix::marshal<smx_mutex_t>(simcall->args[0], arg);
 }
 
 static inline smx_cond_t simcall_cond_init__get__result(smx_simcall_t simcall){
-    return (smx_cond_t) simcall->result.dp;
+    return simgrid::simix::unmarshal<smx_cond_t>(simcall->result);
 }
-static inline void simcall_cond_init__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_cond_init__set__result(smx_simcall_t simcall, smx_cond_t result){
+    simgrid::simix::marshal<smx_cond_t>(simcall->result, result);
 }
 
 static inline smx_cond_t simcall_cond_signal__get__cond(smx_simcall_t simcall) {
-  return (smx_cond_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]);
 }
-static inline void simcall_cond_signal__set__cond(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_cond_signal__set__cond(smx_simcall_t simcall, smx_cond_t arg) {
+    simgrid::simix::marshal<smx_cond_t>(simcall->args[0], arg);
 }
 
 static inline smx_cond_t simcall_cond_wait__get__cond(smx_simcall_t simcall) {
-  return (smx_cond_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]);
 }
-static inline void simcall_cond_wait__set__cond(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_cond_wait__set__cond(smx_simcall_t simcall, smx_cond_t arg) {
+    simgrid::simix::marshal<smx_cond_t>(simcall->args[0], arg);
 }
 static inline smx_mutex_t simcall_cond_wait__get__mutex(smx_simcall_t simcall) {
-  return (smx_mutex_t) simcall->args[1].dp;
+  return simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[1]);
 }
-static inline void simcall_cond_wait__set__mutex(smx_simcall_t simcall, void* arg) {
-    simcall->args[1].dp = arg;
+static inline void simcall_cond_wait__set__mutex(smx_simcall_t simcall, smx_mutex_t arg) {
+    simgrid::simix::marshal<smx_mutex_t>(simcall->args[1], arg);
 }
 
 static inline smx_cond_t simcall_cond_wait_timeout__get__cond(smx_simcall_t simcall) {
-  return (smx_cond_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]);
 }
-static inline void simcall_cond_wait_timeout__set__cond(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_cond_wait_timeout__set__cond(smx_simcall_t simcall, smx_cond_t arg) {
+    simgrid::simix::marshal<smx_cond_t>(simcall->args[0], arg);
 }
 static inline smx_mutex_t simcall_cond_wait_timeout__get__mutex(smx_simcall_t simcall) {
-  return (smx_mutex_t) simcall->args[1].dp;
+  return simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[1]);
 }
-static inline void simcall_cond_wait_timeout__set__mutex(smx_simcall_t simcall, void* arg) {
-    simcall->args[1].dp = arg;
+static inline void simcall_cond_wait_timeout__set__mutex(smx_simcall_t simcall, smx_mutex_t arg) {
+    simgrid::simix::marshal<smx_mutex_t>(simcall->args[1], arg);
 }
 static inline double simcall_cond_wait_timeout__get__timeout(smx_simcall_t simcall) {
-  return  simcall->args[2].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[2]);
 }
 static inline void simcall_cond_wait_timeout__set__timeout(smx_simcall_t simcall, double arg) {
-    simcall->args[2].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[2], arg);
 }
 
 static inline smx_cond_t simcall_cond_broadcast__get__cond(smx_simcall_t simcall) {
-  return (smx_cond_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]);
 }
-static inline void simcall_cond_broadcast__set__cond(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_cond_broadcast__set__cond(smx_simcall_t simcall, smx_cond_t arg) {
+    simgrid::simix::marshal<smx_cond_t>(simcall->args[0], arg);
 }
 
 static inline unsigned int simcall_sem_init__get__capacity(smx_simcall_t simcall) {
-  return  simcall->args[0].ui;
+  return simgrid::simix::unmarshal<unsigned int>(simcall->args[0]);
 }
 static inline void simcall_sem_init__set__capacity(smx_simcall_t simcall, unsigned int arg) {
-    simcall->args[0].ui = arg;
+    simgrid::simix::marshal<unsigned int>(simcall->args[0], arg);
 }
 static inline smx_sem_t simcall_sem_init__get__result(smx_simcall_t simcall){
-    return (smx_sem_t) simcall->result.dp;
+    return simgrid::simix::unmarshal<smx_sem_t>(simcall->result);
 }
-static inline void simcall_sem_init__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_sem_init__set__result(smx_simcall_t simcall, smx_sem_t result){
+    simgrid::simix::marshal<smx_sem_t>(simcall->result, result);
 }
 
 static inline smx_sem_t simcall_sem_release__get__sem(smx_simcall_t simcall) {
-  return (smx_sem_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_sem_t>(simcall->args[0]);
 }
-static inline void simcall_sem_release__set__sem(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_sem_release__set__sem(smx_simcall_t simcall, smx_sem_t arg) {
+    simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
 }
 
 static inline smx_sem_t simcall_sem_would_block__get__sem(smx_simcall_t simcall) {
-  return (smx_sem_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_sem_t>(simcall->args[0]);
 }
-static inline void simcall_sem_would_block__set__sem(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_sem_would_block__set__sem(smx_simcall_t simcall, smx_sem_t arg) {
+    simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
 }
 static inline int simcall_sem_would_block__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline void simcall_sem_would_block__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline smx_sem_t simcall_sem_acquire__get__sem(smx_simcall_t simcall) {
-  return (smx_sem_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_sem_t>(simcall->args[0]);
 }
-static inline void simcall_sem_acquire__set__sem(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_sem_acquire__set__sem(smx_simcall_t simcall, smx_sem_t arg) {
+    simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
 }
 
 static inline smx_sem_t simcall_sem_acquire_timeout__get__sem(smx_simcall_t simcall) {
-  return (smx_sem_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_sem_t>(simcall->args[0]);
 }
-static inline void simcall_sem_acquire_timeout__set__sem(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_sem_acquire_timeout__set__sem(smx_simcall_t simcall, smx_sem_t arg) {
+    simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
 }
 static inline double simcall_sem_acquire_timeout__get__timeout(smx_simcall_t simcall) {
-  return  simcall->args[1].d;
+  return simgrid::simix::unmarshal<double>(simcall->args[1]);
 }
 static inline void simcall_sem_acquire_timeout__set__timeout(smx_simcall_t simcall, double arg) {
-    simcall->args[1].d = arg;
+    simgrid::simix::marshal<double>(simcall->args[1], arg);
 }
 
 static inline smx_sem_t simcall_sem_get_capacity__get__sem(smx_simcall_t simcall) {
-  return (smx_sem_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_sem_t>(simcall->args[0]);
 }
-static inline void simcall_sem_get_capacity__set__sem(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_sem_get_capacity__set__sem(smx_simcall_t simcall, smx_sem_t arg) {
+    simgrid::simix::marshal<smx_sem_t>(simcall->args[0], arg);
 }
 static inline int simcall_sem_get_capacity__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline void simcall_sem_get_capacity__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline smx_file_t simcall_file_read__get__fd(smx_simcall_t simcall) {
-  return (smx_file_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_read__set__fd(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_file_read__set__fd(smx_simcall_t simcall, smx_file_t arg) {
+    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
 static inline sg_size_t simcall_file_read__get__size(smx_simcall_t simcall) {
-  return  simcall->args[1].sgsz;
+  return simgrid::simix::unmarshal<sg_size_t>(simcall->args[1]);
 }
 static inline void simcall_file_read__set__size(smx_simcall_t simcall, sg_size_t arg) {
-    simcall->args[1].sgsz = arg;
+    simgrid::simix::marshal<sg_size_t>(simcall->args[1], arg);
 }
 static inline sg_host_t simcall_file_read__get__host(smx_simcall_t simcall) {
-  return (sg_host_t) simcall->args[2].dp;
+  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[2]);
 }
-static inline void simcall_file_read__set__host(smx_simcall_t simcall, void* arg) {
-    simcall->args[2].dp = arg;
+static inline void simcall_file_read__set__host(smx_simcall_t simcall, sg_host_t arg) {
+    simgrid::simix::marshal<sg_host_t>(simcall->args[2], arg);
 }
 static inline sg_size_t simcall_file_read__get__result(smx_simcall_t simcall){
-    return  simcall->result.sgsz;
+    return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
 }
 static inline void simcall_file_read__set__result(smx_simcall_t simcall, sg_size_t result){
-    simcall->result.sgsz = result;
+    simgrid::simix::marshal<sg_size_t>(simcall->result, result);
 }
 
 static inline smx_file_t simcall_file_write__get__fd(smx_simcall_t simcall) {
-  return (smx_file_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_write__set__fd(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_file_write__set__fd(smx_simcall_t simcall, smx_file_t arg) {
+    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
 static inline sg_size_t simcall_file_write__get__size(smx_simcall_t simcall) {
-  return  simcall->args[1].sgsz;
+  return simgrid::simix::unmarshal<sg_size_t>(simcall->args[1]);
 }
 static inline void simcall_file_write__set__size(smx_simcall_t simcall, sg_size_t arg) {
-    simcall->args[1].sgsz = arg;
+    simgrid::simix::marshal<sg_size_t>(simcall->args[1], arg);
 }
 static inline sg_host_t simcall_file_write__get__host(smx_simcall_t simcall) {
-  return (sg_host_t) simcall->args[2].dp;
+  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[2]);
 }
-static inline void simcall_file_write__set__host(smx_simcall_t simcall, void* arg) {
-    simcall->args[2].dp = arg;
+static inline void simcall_file_write__set__host(smx_simcall_t simcall, sg_host_t arg) {
+    simgrid::simix::marshal<sg_host_t>(simcall->args[2], arg);
 }
 static inline sg_size_t simcall_file_write__get__result(smx_simcall_t simcall){
-    return  simcall->result.sgsz;
+    return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
 }
 static inline void simcall_file_write__set__result(smx_simcall_t simcall, sg_size_t result){
-    simcall->result.sgsz = result;
+    simgrid::simix::marshal<sg_size_t>(simcall->result, result);
 }
 
 static inline const char* simcall_file_open__get__fullpath(smx_simcall_t simcall) {
-  return  simcall->args[0].cc;
+  return simgrid::simix::unmarshal<const char*>(simcall->args[0]);
 }
 static inline void simcall_file_open__set__fullpath(smx_simcall_t simcall, const char* arg) {
-    simcall->args[0].cc = arg;
+    simgrid::simix::marshal<const char*>(simcall->args[0], arg);
 }
 static inline sg_host_t simcall_file_open__get__host(smx_simcall_t simcall) {
-  return (sg_host_t) simcall->args[1].dp;
+  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[1]);
 }
-static inline void simcall_file_open__set__host(smx_simcall_t simcall, void* arg) {
-    simcall->args[1].dp = arg;
+static inline void simcall_file_open__set__host(smx_simcall_t simcall, sg_host_t arg) {
+    simgrid::simix::marshal<sg_host_t>(simcall->args[1], arg);
 }
 static inline smx_file_t simcall_file_open__get__result(smx_simcall_t simcall){
-    return (smx_file_t) simcall->result.dp;
+    return simgrid::simix::unmarshal<smx_file_t>(simcall->result);
 }
-static inline void simcall_file_open__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_file_open__set__result(smx_simcall_t simcall, smx_file_t result){
+    simgrid::simix::marshal<smx_file_t>(simcall->result, result);
 }
 
 static inline smx_file_t simcall_file_close__get__fd(smx_simcall_t simcall) {
-  return (smx_file_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_close__set__fd(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_file_close__set__fd(smx_simcall_t simcall, smx_file_t arg) {
+    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
 static inline sg_host_t simcall_file_close__get__host(smx_simcall_t simcall) {
-  return (sg_host_t) simcall->args[1].dp;
+  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[1]);
 }
-static inline void simcall_file_close__set__host(smx_simcall_t simcall, void* arg) {
-    simcall->args[1].dp = arg;
+static inline void simcall_file_close__set__host(smx_simcall_t simcall, sg_host_t arg) {
+    simgrid::simix::marshal<sg_host_t>(simcall->args[1], arg);
 }
 static inline int simcall_file_close__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline void simcall_file_close__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline smx_file_t simcall_file_unlink__get__fd(smx_simcall_t simcall) {
-  return (smx_file_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_unlink__set__fd(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_file_unlink__set__fd(smx_simcall_t simcall, smx_file_t arg) {
+    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
 static inline sg_host_t simcall_file_unlink__get__host(smx_simcall_t simcall) {
-  return (sg_host_t) simcall->args[1].dp;
+  return simgrid::simix::unmarshal<sg_host_t>(simcall->args[1]);
 }
-static inline void simcall_file_unlink__set__host(smx_simcall_t simcall, void* arg) {
-    simcall->args[1].dp = arg;
+static inline void simcall_file_unlink__set__host(smx_simcall_t simcall, sg_host_t arg) {
+    simgrid::simix::marshal<sg_host_t>(simcall->args[1], arg);
 }
 static inline int simcall_file_unlink__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline void simcall_file_unlink__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline smx_file_t simcall_file_get_size__get__fd(smx_simcall_t simcall) {
-  return (smx_file_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_get_size__set__fd(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_file_get_size__set__fd(smx_simcall_t simcall, smx_file_t arg) {
+    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
 static inline sg_size_t simcall_file_get_size__get__result(smx_simcall_t simcall){
-    return  simcall->result.sgsz;
+    return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
 }
 static inline void simcall_file_get_size__set__result(smx_simcall_t simcall, sg_size_t result){
-    simcall->result.sgsz = result;
+    simgrid::simix::marshal<sg_size_t>(simcall->result, result);
 }
 
 static inline smx_file_t simcall_file_tell__get__fd(smx_simcall_t simcall) {
-  return (smx_file_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_tell__set__fd(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_file_tell__set__fd(smx_simcall_t simcall, smx_file_t arg) {
+    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
 static inline sg_size_t simcall_file_tell__get__result(smx_simcall_t simcall){
-    return  simcall->result.sgsz;
+    return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
 }
 static inline void simcall_file_tell__set__result(smx_simcall_t simcall, sg_size_t result){
-    simcall->result.sgsz = result;
+    simgrid::simix::marshal<sg_size_t>(simcall->result, result);
 }
 
 static inline smx_file_t simcall_file_seek__get__fd(smx_simcall_t simcall) {
-  return (smx_file_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_seek__set__fd(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_file_seek__set__fd(smx_simcall_t simcall, smx_file_t arg) {
+    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
 static inline sg_offset_t simcall_file_seek__get__offset(smx_simcall_t simcall) {
-  return  simcall->args[1].sgoff;
+  return simgrid::simix::unmarshal<sg_offset_t>(simcall->args[1]);
 }
 static inline void simcall_file_seek__set__offset(smx_simcall_t simcall, sg_offset_t arg) {
-    simcall->args[1].sgoff = arg;
+    simgrid::simix::marshal<sg_offset_t>(simcall->args[1], arg);
 }
 static inline int simcall_file_seek__get__origin(smx_simcall_t simcall) {
-  return  simcall->args[2].i;
+  return simgrid::simix::unmarshal<int>(simcall->args[2]);
 }
 static inline void simcall_file_seek__set__origin(smx_simcall_t simcall, int arg) {
-    simcall->args[2].i = arg;
+    simgrid::simix::marshal<int>(simcall->args[2], arg);
 }
 static inline int simcall_file_seek__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline void simcall_file_seek__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline smx_file_t simcall_file_get_info__get__fd(smx_simcall_t simcall) {
-  return (smx_file_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_get_info__set__fd(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_file_get_info__set__fd(smx_simcall_t simcall, smx_file_t arg) {
+    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
 static inline xbt_dynar_t simcall_file_get_info__get__result(smx_simcall_t simcall){
-    return (xbt_dynar_t) simcall->result.dp;
+    return simgrid::simix::unmarshal<xbt_dynar_t>(simcall->result);
 }
-static inline void simcall_file_get_info__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_file_get_info__set__result(smx_simcall_t simcall, xbt_dynar_t result){
+    simgrid::simix::marshal<xbt_dynar_t>(simcall->result, result);
 }
 
 static inline smx_file_t simcall_file_move__get__fd(smx_simcall_t simcall) {
-  return (smx_file_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_file_t>(simcall->args[0]);
 }
-static inline void simcall_file_move__set__fd(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_file_move__set__fd(smx_simcall_t simcall, smx_file_t arg) {
+    simgrid::simix::marshal<smx_file_t>(simcall->args[0], arg);
 }
 static inline const char* simcall_file_move__get__fullpath(smx_simcall_t simcall) {
-  return  simcall->args[1].cc;
+  return simgrid::simix::unmarshal<const char*>(simcall->args[1]);
 }
 static inline void simcall_file_move__set__fullpath(smx_simcall_t simcall, const char* arg) {
-    simcall->args[1].cc = arg;
+    simgrid::simix::marshal<const char*>(simcall->args[1], arg);
 }
 static inline int simcall_file_move__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline void simcall_file_move__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline smx_storage_t simcall_storage_get_free_size__get__storage(smx_simcall_t simcall) {
-  return (smx_storage_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_storage_t>(simcall->args[0]);
 }
-static inline void simcall_storage_get_free_size__set__storage(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_storage_get_free_size__set__storage(smx_simcall_t simcall, smx_storage_t arg) {
+    simgrid::simix::marshal<smx_storage_t>(simcall->args[0], arg);
 }
 static inline sg_size_t simcall_storage_get_free_size__get__result(smx_simcall_t simcall){
-    return  simcall->result.sgsz;
+    return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
 }
 static inline void simcall_storage_get_free_size__set__result(smx_simcall_t simcall, sg_size_t result){
-    simcall->result.sgsz = result;
+    simgrid::simix::marshal<sg_size_t>(simcall->result, result);
 }
 
 static inline smx_storage_t simcall_storage_get_used_size__get__name(smx_simcall_t simcall) {
-  return (smx_storage_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_storage_t>(simcall->args[0]);
 }
-static inline void simcall_storage_get_used_size__set__name(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_storage_get_used_size__set__name(smx_simcall_t simcall, smx_storage_t arg) {
+    simgrid::simix::marshal<smx_storage_t>(simcall->args[0], arg);
 }
 static inline sg_size_t simcall_storage_get_used_size__get__result(smx_simcall_t simcall){
-    return  simcall->result.sgsz;
+    return simgrid::simix::unmarshal<sg_size_t>(simcall->result);
 }
 static inline void simcall_storage_get_used_size__set__result(smx_simcall_t simcall, sg_size_t result){
-    simcall->result.sgsz = result;
+    simgrid::simix::marshal<sg_size_t>(simcall->result, result);
 }
 
 static inline smx_storage_t simcall_storage_get_properties__get__storage(smx_simcall_t simcall) {
-  return (smx_storage_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_storage_t>(simcall->args[0]);
 }
-static inline void simcall_storage_get_properties__set__storage(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_storage_get_properties__set__storage(smx_simcall_t simcall, smx_storage_t arg) {
+    simgrid::simix::marshal<smx_storage_t>(simcall->args[0], arg);
 }
 static inline xbt_dict_t simcall_storage_get_properties__get__result(smx_simcall_t simcall){
-    return (xbt_dict_t) simcall->result.dp;
+    return simgrid::simix::unmarshal<xbt_dict_t>(simcall->result);
 }
-static inline void simcall_storage_get_properties__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_storage_get_properties__set__result(smx_simcall_t simcall, xbt_dict_t result){
+    simgrid::simix::marshal<xbt_dict_t>(simcall->result, result);
 }
 
 static inline smx_storage_t simcall_storage_get_content__get__storage(smx_simcall_t simcall) {
-  return (smx_storage_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_storage_t>(simcall->args[0]);
 }
-static inline void simcall_storage_get_content__set__storage(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_storage_get_content__set__storage(smx_simcall_t simcall, smx_storage_t arg) {
+    simgrid::simix::marshal<smx_storage_t>(simcall->args[0], arg);
 }
 static inline xbt_dict_t simcall_storage_get_content__get__result(smx_simcall_t simcall){
-    return (xbt_dict_t) simcall->result.dp;
+    return simgrid::simix::unmarshal<xbt_dict_t>(simcall->result);
 }
-static inline void simcall_storage_get_content__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_storage_get_content__set__result(smx_simcall_t simcall, xbt_dict_t result){
+    simgrid::simix::marshal<xbt_dict_t>(simcall->result, result);
 }
 
 static inline const char* simcall_asr_get_properties__get__name(smx_simcall_t simcall) {
-  return  simcall->args[0].cc;
+  return simgrid::simix::unmarshal<const char*>(simcall->args[0]);
 }
 static inline void simcall_asr_get_properties__set__name(smx_simcall_t simcall, const char* arg) {
-    simcall->args[0].cc = arg;
+    simgrid::simix::marshal<const char*>(simcall->args[0], arg);
 }
 static inline xbt_dict_t simcall_asr_get_properties__get__result(smx_simcall_t simcall){
-    return (xbt_dict_t) simcall->result.dp;
+    return simgrid::simix::unmarshal<xbt_dict_t>(simcall->result);
 }
-static inline void simcall_asr_get_properties__set__result(smx_simcall_t simcall, void* result){
-    simcall->result.dp = result;
+static inline void simcall_asr_get_properties__set__result(smx_simcall_t simcall, xbt_dict_t result){
+    simgrid::simix::marshal<xbt_dict_t>(simcall->result, result);
 }
 
 static inline int simcall_mc_random__get__min(smx_simcall_t simcall) {
-  return  simcall->args[0].i;
+  return simgrid::simix::unmarshal<int>(simcall->args[0]);
 }
 static inline void simcall_mc_random__set__min(smx_simcall_t simcall, int arg) {
-    simcall->args[0].i = arg;
+    simgrid::simix::marshal<int>(simcall->args[0], arg);
 }
 static inline int simcall_mc_random__get__max(smx_simcall_t simcall) {
-  return  simcall->args[1].i;
+  return simgrid::simix::unmarshal<int>(simcall->args[1]);
 }
 static inline void simcall_mc_random__set__max(smx_simcall_t simcall, int arg) {
-    simcall->args[1].i = arg;
+    simgrid::simix::marshal<int>(simcall->args[1], arg);
 }
 static inline int simcall_mc_random__get__result(smx_simcall_t simcall){
-    return  simcall->result.i;
+    return simgrid::simix::unmarshal<int>(simcall->result);
 }
 static inline void simcall_mc_random__set__result(smx_simcall_t simcall, int result){
-    simcall->result.i = result;
+    simgrid::simix::marshal<int>(simcall->result, result);
 }
 
 static inline smx_synchro_t simcall_set_category__get__synchro(smx_simcall_t simcall) {
-  return (smx_synchro_t) simcall->args[0].dp;
+  return simgrid::simix::unmarshal<smx_synchro_t>(simcall->args[0]);
 }
-static inline void simcall_set_category__set__synchro(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_set_category__set__synchro(smx_simcall_t simcall, smx_synchro_t arg) {
+    simgrid::simix::marshal<smx_synchro_t>(simcall->args[0], arg);
 }
 static inline const char* simcall_set_category__get__category(smx_simcall_t simcall) {
-  return  simcall->args[1].cc;
+  return simgrid::simix::unmarshal<const char*>(simcall->args[1]);
 }
 static inline void simcall_set_category__set__category(smx_simcall_t simcall, const char* arg) {
-    simcall->args[1].cc = arg;
+    simgrid::simix::marshal<const char*>(simcall->args[1], arg);
+}
+
+static inline std::function<void()> const* simcall_run_kernel__get__code(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<std::function<void()> const*>(simcall->args[0]);
+}
+static inline void simcall_run_kernel__set__code(smx_simcall_t simcall, std::function<void()> const* arg) {
+    simgrid::simix::marshal<std::function<void()> const*>(simcall->args[0], arg);
 }
 
-static inline void* simcall_run_kernel__get__code(smx_simcall_t simcall) {
-  return  simcall->args[0].dp;
+static inline std::function<void()> const* simcall_run_blocking__get__code(smx_simcall_t simcall) {
+  return simgrid::simix::unmarshal<std::function<void()> const*>(simcall->args[0]);
 }
-static inline void simcall_run_kernel__set__code(smx_simcall_t simcall, void* arg) {
-    simcall->args[0].dp = arg;
+static inline void simcall_run_blocking__set__code(smx_simcall_t simcall, std::function<void()> const* arg) {
+    simgrid::simix::marshal<std::function<void()> const*>(simcall->args[0], arg);
 }
 
 /* The prototype of all simcall handlers, automatically generated for you */
@@ -1329,7 +1176,6 @@ XBT_PRIVATE void simcall_HANDLER_vm_resume(smx_simcall_t simcall, sg_host_t ind_
 XBT_PRIVATE void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, sg_host_t ind_vm);
 XBT_PRIVATE void simcall_HANDLER_vm_save(smx_simcall_t simcall, sg_host_t ind_vm);
 XBT_PRIVATE void simcall_HANDLER_vm_restore(smx_simcall_t simcall, sg_host_t ind_vm);
-XBT_PRIVATE void* simcall_HANDLER_process_create(smx_simcall_t simcall, const char* name, xbt_main_func_t code, void* data, const char* hostname, double kill_time, int argc, char** argv, xbt_dict_t properties, int auto_restart);
 XBT_PRIVATE void simcall_HANDLER_process_kill(smx_simcall_t simcall, smx_process_t process);
 XBT_PRIVATE void simcall_HANDLER_process_killall(smx_simcall_t simcall, int reset_pid);
 XBT_PRIVATE void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_process_t process);
@@ -1345,10 +1191,10 @@ XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_process_t
 XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_clean_func_t clean_fun, simix_copy_data_func_t copy_data_fun, void* data, int detached);
 XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_process_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout, double rate);
 XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_process_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double rate);
-XBT_PRIVATE void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t comms);
+XBT_PRIVATE void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t comms, double timeout);
 XBT_PRIVATE void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_synchro_t comm, double timeout);
 XBT_PRIVATE void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_synchro_t comm);
-XBT_PRIVATE void simcall_HANDLER_comm_testany(smx_simcall_t simcall, xbt_dynar_t comms);
+XBT_PRIVATE void simcall_HANDLER_comm_testany(smx_simcall_t simcall, smx_synchro_t* comms, size_t count);
 XBT_PRIVATE smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall);
 XBT_PRIVATE void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex);
 XBT_PRIVATE int simcall_HANDLER_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex);