Changeset 189 for soft/giet_vm/libs

Timestamp:

Aug 7, 2012, 6:37:49 PM (12 years ago)

Author:

alain

Message:

Introducing a new release where all initialisation
is done in the boot code.

Location:

soft/giet_vm/libs

Files:

• mwmr_channel.c (modified) (4 diffs)
• mwmr_channel.h (modified) (2 diffs)
• spin_lock.c (modified) (2 diffs)
• spin_lock.h (modified) (1 diff)
• srl.h (modified) (1 diff)
• stdio.h (modified) (2 diffs)
• utils.c (added)
• utils.h (added)

soft/giet_vm/libs/mwmr_channel.c

@@ -33 +33 @@
 #include <mwmr_channel.h>
 #include <stdio.h>
-#include <common.h>
 
 //////////////////////////////////////////////////////////////////////////////
@@ -74 +73 @@
 // after a random delay.
 //////////////////////////////////////////////////////////////////////////////
-void mwmr_write( mwmr_channel_t*            mwmr, 
-                 const unsigned int*    buffer,
-                 unsigned int               nitems )
+void mwmr_write( mwmr_channel_t*        mwmr, 
+                 unsigned int*          buffer,
+                 unsigned int           nitems )
 {
     unsigned int        x;
@@ -86 +85 @@
     unsigned int    ptw;        // channel ptw
 
-    if(nitems == 0)
-        return;
-
-    assert(buffer && "mwmr write: Empty buffer");
+    if(nitems == 0) return;
+
+    // address virtuelle 0 is illegal...
+    assert(buffer && "mwmr read: Empty buffer");
 
     while(1)
@@ -163 +162 @@
     unsigned int    ptr;        // channel ptw
 
-    if(nitems == 0)
-        return;
-
+    if(nitems == 0) return;
+
+    // address virtuelle 0 is illegal...
     assert(buffer && "mwmr read: Empty buffer");
 

soft/giet_vm/libs/mwmr_channel.h

@@ -20 +20 @@
     unsigned int        sts;                    // number of words available
     unsigned int        depth;                  // max number of words in the channel
-    unsigned int        width;                  // number of word in an item    
+    unsigned int        width;                  // number of words in an item   
     unsigned int        lock;                   // exclusive access lock
-    unsigned int        data[1];                // circular buffer
+    unsigned int        data[1018];             // circular buffer
 } mwmr_channel_t;
 
@@ -29 +29 @@
 //////////////////////////////////////////////////////////////////////////////
 
-void mwmr_write( mwmr_channel_t*            mwmr, 
-                 const unsigned int*    buffer,
-                 unsigned int               nitems );
+void mwmr_write( mwmr_channel_t*        mwmr, 
+                 unsigned int*          buffer,
+                 unsigned int           nitems );
 
 void mwmr_read( mwmr_channel_t*         mwmr, 

soft/giet_vm/libs/spin_lock.c

@@ -10 +10 @@
 // It is a simple binary lock, without waiting queue.
 // 
-// The lock_acquire(), lock_try_acquire() and lock_release() functions do 
-// not require a system call.
+// The lock_acquire() and lock_release() functions do not require a system call.
+// The barrier itself must have been allocated in a non cacheable segment,
+// if the platform does not provide hardwate cache coherence.
 //
 // ALL locks must be defined in the mapping_info data structure, 
 // to be initialised by the GIET in the boot phase.
 // The vobj_get_vbase() system call (defined in stdio.c and stdio.h files)
-// can be used to get the virtual base address of the lock from it's name.
+// can be used to get the virtual base address of the lock fro it's name.
 ///////////////////////////////////////////////////////////////////////////////////
 
@@ -64 +65 @@
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// lock_try_acquire()
-//////////////////////////////////////////////////////////////////////////////
-int lock_try_acquire( giet_lock_t* lock )
-{
-        register int ret = 0;   
-    register unsigned int*      plock = &lock->value;
-
-        asm volatile ("ll   $2,    0(%1)                    \n" // $2 <= _locks_lock
-                  "bnez $2,    _lock_done           \n" // exitif busy
-                  "li   $3,    1                            \n" // prepare argument for sc  
-                  "sc   $3,    0(%1)                \n" // try to set _locks_busy
-                  "xori %0, $3, 1                   \n" // ret = !$3
-                  "_lock_done:                          \n"
-                  :"=r"(ret)
-                  :"r"(plock)
-                  :"$2","$3");
-    return ret;
-}

soft/giet_vm/libs/spin_lock.h

@@ -27 +27 @@
 void lock_release( giet_lock_t* lock );
 
-// return 0 if success
-int lock_try_acquire( giet_lock_t* lock );
-
 #endif
 

soft/giet_vm/libs/srl.h

@@ -19 +19 @@
 #include "libsrl/srl_hw_helpers.h"
 
-#include "libsrl/srl_args.h"
-
 //kernel use!
 //#include "libsrl/srl_mwmr_sys.h"
 
+/* port, APP_NAME, TASK */
+# define GET_MWMR(port)                                                                       \
+({                                                                                            \
+    srl_mwmr_t  _mwmr;                                                                      \
+    if( vobj_get_vbase( APP_NAME , #port, MWMR, (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( TRACE, "*** &"#port" = %x\n\n", (unsigned int)_mwmr );                 \
+        exit();/*srl?*/                                                                     \
+    }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 ); \
+    _mwmr;\
+})
 
 #endif

soft/giet_vm/libs/stdio.h

@@ -8 +8 @@
 #ifndef _STDIO_H
 #define _STDIO_H
-
-#include <mapping_info.h>
-#include <common.h>
 
 /* MIPS32 related functions */
@@ -64 +61 @@
 void         giet_exit();
 unsigned int giet_rand();
-unsigned int ctx_switch();
+unsigned int giet_ctx_switch();
 unsigned int giet_procnumber();
 
+#endif
 
-#endif