Changeset 230 for soft/giet_vm/libs

Timestamp:

Feb 22, 2013, 4:03:48 PM (12 years ago)

Author:

meunier

Message:

Correction d'un bug lors du boot pour les alignements
Modification de l'appel SRL pour les CONST

File:

• soft/giet_vm/libs/libsrl/srl_args.h (modified) (3 diffs)

soft/giet_vm/libs/libsrl/srl_args.h

@@ -7 +7 @@
 #define SRL_GET_BARRIER(port)   (srl_barrier_t)  APP_GET_ARG(port, VOBJ_TYPE_BARRIER)
 #define SRL_GET_LOCK(port)                       APP_GET_ARG(port, VOBJ_TYPE_LOCK)
-#define SRL_GET_CONST(port)                      APP_GET_ARG(port, VOBJ_TYPE_CONST)
 #define SRL_GET_MEMSPACE(port)  (srl_memspace_t) APP_GET_ARG(port, VOBJ_TYPE_MEMSPACE)
 
@@ -14 +13 @@
 ({                                                                                                 \
     unsigned int  vbase;                                                                           \
-    if (giet_vobj_get_vbase(APP_NAME , alias_##task_name.port, type, &vbase))                      \
+    if (giet_vobj_get_vbase(APP_NAME , args->port, type, &vbase))                                  \
     {                                                                                              \
         srl_log_printf(NONE, "\n[ERROR] in "#task_name" task :\n");                                \
         srl_log_printf(NONE, "          undefined port <"#port"> for channel \"%s\": %x\n",        \
-                                                                alias_##task_name.port, vbase);    \
+                                                                args->port, vbase);                \
         srl_log_printf(TRACE, "*** &"#port" = %x\n\n", vbase);                                     \
         srl_exit();                                                                                \
@@ -29 +28 @@
 
 
+#define SRL_GET_CONST(port)                                                                        \
+({                                                                                                 \
+    unsigned int vbase;                                                                            \
+    if (giet_vobj_get_vbase(APP_NAME, args->port, VOBJ_TYPE_CONST, &vbase)) {                      \
+        srl_log_printf(NONE, "\n[ERROR] in some task :\n");                                        \
+        srl_log_printf(NONE, "          undefined port <"#port"> for channel \"%s\": %x\n",        \
+                                                                args->port, vbase);                \
+        srl_log_printf(TRACE, "*** &"#port" = %x\n\n", vbase);                                     \
+        srl_exit();                                                                                \
+    }                                                                                              \
+    else                                                                                           \
+        srl_log_printf(TRACE, "%s:%d: arg of %s, from %s; &"#port" = %x\n\n",                      \
+                            __FILE__, __LINE__, APP_NAME, #port, vbase);                           \
+    *(int *) vbase;                                                                                \
+})
+
 
 #endif