Changeset 175 for soft/giet_vm/libs

Timestamp:

Jul 21, 2012, 10:20:47 AM (12 years ago)

Author:

karaoui

Message:

+ Adding the init attribute to the mwmr to specify the width of the mwmr channel
+ Fixing bugs in kernels_init

Location:

soft/giet_vm/libs

Files:

• common.c (modified) (2 diffs)
• common.h (added)
• libsrl/srl_hw_helpers.h (modified) (2 diffs)
• libsrl/srl_log.h (modified) (2 diffs)
• libsrl/srl_mwmr.h (modified) (1 diff)
• mwmr_channel.c (modified) (4 diffs)
• srl.h (modified) (1 diff)

soft/giet_vm/libs/common.c

@@ -1 @@
-
-////////////////////////////////////////////////////////////////////////////////////////
-//  mempcy()
-// GCC requires this function. Taken from MutekH.
-////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////
 void *memcpy(void *_dst, const void *_src, unsigned int size)
 {
@@ -23 +19 @@
 }
 
-////////////////////////////////////////////////////////////////////////////////////////
-//  mempcy()
-// GCC requires this function. Taken from MutekH.
-////////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////
 inline void * memset(void *dst, int s, unsigned int count)
 {

soft/giet_vm/libs/libsrl/srl_hw_helpers.h

@@ -63 +63 @@
  */
 
-
+//static: to avoid multiple definition error
 static inline unsigned int srl_cycle_count()
 {
-        return proctime();
+        return giet_proctime();
 }
 
@@ -79 +79 @@
 }
 
+/**
+ *
+ */
+static inline void srl_exit()
+{
+    giet_exit();
+}
+
 #endif

soft/giet_vm/libs/libsrl/srl_log.h

@@ -48 +48 @@
 #define srl_log( l, c ) do {                                                                               \
                 if (GET_VERB(l) <= GET_VERB(CONFIG_SRL_VERBOSITY)) {               \
-            tty_printf(c);                                             \
+            giet_tty_printf(c);                                             \
                 }                                                                                                                          \
         } while (0)
@@ -60 +60 @@
 #define srl_log_printf( l, ... ) do {                                   \
                 if (GET_VERB(l) <= GET_VERB(CONFIG_SRL_VERBOSITY)) {                \
-            tty_printf(__VA_ARGS__);                                    \
+            giet_tty_printf(__VA_ARGS__);                                    \
                 }                                                                                                                           \
         } while (0)

soft/giet_vm/libs/libsrl/srl_mwmr.h

@@ -2 +2 @@
 #define SRL_MWMR_H_
 
-#include "mwmr.h"
+#include "mwmr_channel.h"
 
-#define  srl_mwmr_t mwmr_channel_t*
+typedef  mwmr_channel_t* srl_mwmr_t;
 
 #define srl_mwmr_write mwmr_write

soft/giet_vm/libs/mwmr_channel.c

@@ -33 +33 @@
 #include <mwmr_channel.h>
 #include <stdio.h>
+#include <common.h>
 
 //////////////////////////////////////////////////////////////////////////////
@@ -85 +86 @@
     unsigned int    ptw;        // channel ptw
 
+    if(nitems == 0)
+        return;
+
+    assert(buffer && "mwmr write: Empty buffer");
+
     while(1)
     {
@@ -118 +124 @@
         else    // write as many items as possible, release lock and retry after delay
         {
-            nwords = (spaces/width) * width;  // integer nmber of items
+            nwords = (spaces/width) * width;  // integer number of items
             for ( x = 0 ; x < nwords ; x++ )  
             {
@@ -157 +163 @@
     unsigned int    ptr;        // channel ptw
 
+    if(nitems == 0)
+        return;
+
+    assert(buffer && "mwmr read: Empty buffer");
+
     while(1)
     {

soft/giet_vm/libs/srl.h

@@ -22 +22 @@
 //#include "libsrl/srl_mwmr_sys.h"
 
-/* port, APP_NAME, TASK */
-# define GET_MWMR(port)                                                                       \
+#define GET_MWMR(port) GET_ARG(port, VOBJ_TYPE_MWMR)
+/* port, APP_NAME, TASK, #task_name, alias */
+# define SRL_GET_ARG(task_name, port, type)                                                                       \
 ({                                                                                            \
-    srl_mwmr_t  _mwmr;                                                                      \
-    if( vobj_get_vbase( APP_NAME , #port, MWMR, (unsigned int*)&_mwmr ) )                   \
+    srl_mwmr_t  _mwmr;                                                                      \
+    if( giet_vobj_get_vbase( APP_NAME , alias_##task_name.port, type, (unsigned int*)&_mwmr ) )                   \
     {                                                                                         \
-        srl_log_printf( NONE, "\n[ERROR] in "TASK" task :\n");                              \
-        srl_log_printf( NONE, "          undefined <"#port"> channel: %d\n", _mwmr);           \
+        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,_mwmr);           \
         srl_log_printf( TRACE, "*** &"#port" = %x\n\n", (unsigned int)_mwmr );                 \
-        exit();/*srl?*/                                                                     \
+        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,#port, (unsigned int)_mwmr ); \
+        srl_log_printf( TRACE, "%s:%d: arg of %s for %s,from %s; &"#port" = %x\n\n", __FILE__, __LINE__, APP_NAME, #task_name,#port, (unsigned int)_mwmr ); \
     _mwmr;\
 })
 
+
+
+
 #endif