Changeset 228 for soft/giet_vm/libs/libsrl/srl_args.h

Timestamp:

Feb 12, 2013, 6:33:31 PM (11 years ago)

Author:

meunier

Message:

Added support for memspaces and const.
Added an interrupt masking to the "giet_context_switch" syscall
Corrected two bugs in boot/boot_init.c (one minor and one regarding barriers initialization)
Reformatted the code in all files.

File:

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

soft/giet_vm/libs/libsrl/srl_args.h

@@ -4 +4 @@
 
 
-#define SRL_GET_MWMR(port)      (srl_mwmr_t) APP_GET_ARG(port, VOBJ_TYPE_MWMR)
-#define SRL_GET_BARRIER(port)   APP_GET_ARG(port, VOBJ_TYPE_BARRIER)
-#define SRL_GET_LOCK(port)      APP_GET_ARG(port, VOBJ_TYPE_LOCK)
-//#define SRL_GET_MEMSPACE(port)  APP_GET_ARG(port, VOBJ_TYPE_BUFFER) TODO
-#define SRL_GET_MEMSPACE        #error "SRL_GET_MEMSPACE is not implemented"//
+#define SRL_GET_MWMR(port)      (srl_mwmr_t)     APP_GET_ARG(port, VOBJ_TYPE_MWMR)
+#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 +14 @@
 ({                                                                                                 \
     unsigned int  vbase;                                                                           \
-    if( giet_vobj_get_vbase( APP_NAME , alias_##task_name.port, type, &vbase ) )                   \
+    if (giet_vobj_get_vbase(APP_NAME , alias_##task_name.port, type, &vbase))                      \
     {                                                                                              \
-        srl_log_printf( NONE, "\n[ERROR] in "#task_name" task :\n");                               \
-        srl_log_printf( NONE, "          undefined port <"#port"> for channel(%s): %d\n",          \
-                                                                alias_##task_name.port,vbase);     \
-        srl_log_printf( TRACE, "*** &"#port" = %x\n\n", 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);    \
+        srl_log_printf(TRACE, "*** &"#port" = %x\n\n", vbase);                                     \
         srl_exit();                                                                                \
-    }else                                                                                          \
-        srl_log_printf( TRACE, "%s:%d: arg of %s for %s,from %s; &"#port" = %x\n\n",               \
-                            __FILE__, __LINE__, APP_NAME, #task_name,#port, vbase );               \
-    vbase;\
+    }                                                                                              \
+    else                                                                                           \
+        srl_log_printf(TRACE, "%s:%d: arg of %s for %s, from %s; &"#port" = %x\n\n",               \
+                            __FILE__, __LINE__, APP_NAME, #task_name, #port, vbase);               \
+    vbase;                                                                                         \
 })