Merged eb/gcell-wip2 rev 10130:10152 into trunk.

This makes several gcell related changes.

{{{
The first two are INCOMPATIBLE CHANGES:

(1) The gcell portion of the code base was reorganized.  As part of that
reorganization, the paths to the include files changed.  They are now
installed under PREFIX/include/gcell instead of directly in PREFIX/include.

This means that all includes of the form:

  #include <gc_foo.h>

should be changed to

  #include <gcell/gc_foo.h>


(2a) If you are directly using gcell-embedspu-libtool or the
$(GCELL_EMBEDSPU_LIBTOOL) variable in your Makefiles, the order of the
two command line arguments was switched.  It's now 

  $(GCELL_EMBEDSPU_LIBTOOL) input_file output_file

or equivalently

  $(GCELL_EMBEDSPU_LIBTOOL) $< $@


gcell-embedspu-libtool allows you to convert an SPE executable
into something that libtool will allow you add to a host shared library.


(2b) The name of the symbol created by gcell-embedspu-libtool is now
suffixed with _spx (SPE executable) to reduce the probability of name
collision.  If you have lines like this:

  extern spe_program_handle_t gcell_all;

in your code, you may have to change them to:

  extern spe_program_handle_t gcell_all_spx;



The following changes are enhancements and shouldn't break any
existing code:


(3) We now install two new pkg-config files, gcell.pc and gcell_spu.pc.
These can be used to assist in building gcell code that lives outside
the GNU Radio repository.  The first gives the include and library
paths for the PPE host code, the second is the same info for the the
SPE code.

There is also a new .m4 macro, GR_GCELL, contained in
config/gr_gcell.m4, that uses PKG_CONFIG_MODULES to fish out the
relevant variables.  If you've got standalone code that uses gcell,
you'll probably want to copy this macro (along with our version of
pkg.m4) to your tree and use it.  It sets the following variables:

  GCELL_CFLAGS
  GCELL_CPPFLAGS
  GCELL_INCLUDEDIR
  GCELL_LIBS
  GCELL_SPU_CFLAGS
  GCELL_SPU_CPPFLAGS
  GCELL_SPU_INCLUDEDIR
  GCELL_SPU_LIBS
  GCELL_EMBEDSPU_LIBTOOL


(4) make -j now works in the gcell directory (fixes ticket:242).
}}}



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10153 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 178 insertions, 0 deletions

diff --git a/gcell/ibm/sync/spu_source/mutex.h b/gcell/ibm/sync/spu_source/mutex.h
new file mode 100644
index 000000000..37f2b4d62
--- /dev/null
+++ b/gcell/ibm/sync/spu_source/mutex.h
@@ -0,0 +1,178 @@
+/* --------------------------------------------------------------  */
+/* (C)Copyright 2001,2007,                                         */
+/* International Business Machines Corporation,                    */
+/* Sony Computer Entertainment, Incorporated,                      */
+/* Toshiba Corporation,                                            */
+/*                                                                 */
+/* All Rights Reserved.                                            */
+/*                                                                 */
+/* Redistribution and use in source and binary forms, with or      */
+/* without modification, are permitted provided that the           */
+/* following conditions are met:                                   */
+/*                                                                 */
+/* - Redistributions of source code must retain the above copyright*/
+/*   notice, this list of conditions and the following disclaimer. */
+/*                                                                 */
+/* - Redistributions in binary form must reproduce the above       */
+/*   copyright notice, this list of conditions and the following   */
+/*   disclaimer in the documentation and/or other materials        */
+/*   provided with the distribution.                               */
+/*                                                                 */
+/* - Neither the name of IBM Corporation nor the names of its      */
+/*   contributors may be used to endorse or promote products       */
+/*   derived from this software without specific prior written     */
+/*   permission.                                                   */
+/*                                                                 */
+/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
+/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
+/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
+/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
+/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
+/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
+/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
+/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
+/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
+/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
+/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
+/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
+/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
+/* --------------------------------------------------------------  */
+/* PROLOG END TAG zYx                                              */
+#ifndef _SPU_MUTEX_H_
+#define _SPU_MUTEX_H_           1
+
+#include "sync_utils.h"
+#include "sync_irq.h"
+#include <spu_mfcio.h>
+
+typedef eaddr_t mutex_ea_t;
+
+#define DECL_MUTEX_VARS()                               \
+    char _tmp[256];                                     \
+    char *tmp = (char *) ALIGN(_tmp, 128);              \
+    volatile s32 *buf = (volatile s32 *) &tmp[0];       \
+    u32 size = 128, tagid = 0;                          \
+    u32 offset;                                         \
+    addr64 ea64
+
+/* RAW_TEST_AND_SET
+ *    Macro implementing the test and set primitive.
+ *
+ *    RAW_TEST_AND_SET(==, 1)	used by spin_try_lock()
+ *    RAW_TEST_AND_SET(>=, 1)	used by read_try_lock()
+ *    RAW_TEST_AND_SET(==, -1)	used by write_try_lock()
+ */
+#define RAW_TEST_AND_SET(_RELOP_, _val)				\
+    ea64.ull = ALIGN128_EA(ea);					\
+    offset = OFFSET128_EA_U32(ea);				\
+    do {							\
+        MFC_DMA(buf, ea64, size, tagid, MFC_GETLLAR_CMD);	\
+        spu_readch(MFC_RdAtomicStat);				\
+        SET_HIT;						\
+        if (likely(buf[offset] _RELOP_ 0)) {			\
+            buf[offset] += _val;				\
+	    MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLC_CMD);	\
+            status = spu_readch(MFC_RdAtomicStat);		\
+            ret_val = 1;					\
+        } else {						\
+	    MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLC_CMD);	\
+            spu_readch(MFC_RdAtomicStat);			\
+            status = ret_val = 0;				\
+            break;						\
+        }							\
+    } while (status != 0)
+
+/* RAW_SPINLOCK
+ *    Macro implementing the spinlock primitive.
+ *
+ *    RAW_SPINLOCK(==, 1)	used by spin_lock()
+ *    RAW_SPINLOCK(>=, 1)	used by read_lock()
+ *    RAW_SPINLOCK(==, -1)	used by write_lock()
+ */
+
+
+#define RAW_SPINLOCK(_RELOP_, _val) 				\
+    ea64.ull = ALIGN128_EA(ea);					\
+    offset = OFFSET128_EA_U32(ea);				\
+    do {							\
+        MFC_DMA(buf, ea64, size, tagid, MFC_GETLLAR_CMD);	\
+        spu_readch(MFC_RdAtomicStat);				\
+        SET_HIT;						\
+        status = 1;						\
+        if (likely(buf[offset] _RELOP_ 0)) {			\
+            buf[offset] += _val;				\
+	    MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLC_CMD);	\
+            status = spu_readch(MFC_RdAtomicStat);		\
+        }							\
+    } while (status != 0);
+
+
+static inline void _lock_init(eaddr_t ea)
+{
+    DECL_MUTEX_VARS();
+    u32 oldtmask, tagmask;
+  
+    tagid = mfc_tag_reserve(); 
+   
+    tagmask = 1 << (tagid & 31);
+
+    /* __lock_init
+     *    Internal routine to initialize a spinlock or
+     *    reader/writer lock.
+     */
+    ea64.ull = ALIGN128_EA(ea);
+    offset = OFFSET128_EA_U32(ea);
+    MFC_DMA(buf, ea64, size, tagid & 31, MFC_GET_CMD);
+    oldtmask = spu_readch(MFC_RdTagMask);
+    spu_writech(MFC_WrTagMask, tagmask);
+    spu_writech(MFC_WrTagUpdate, MFC_TAG_UPDATE_ANY);
+    spu_readch(MFC_RdTagStat);
+
+    buf[offset] = 0;
+    MFC_DMA(buf, ea64, size, tagid & 31, MFC_PUT_CMD);
+    spu_writech(MFC_WrTagMask, tagmask);
+    spu_writech(MFC_WrTagUpdate, MFC_TAG_UPDATE_ANY);
+    spu_readch(MFC_RdTagStat);
+    spu_writech(MFC_WrTagMask, oldtmask);
+    mfc_tag_release(tagid);
+}
+
+static inline void _spin_lock(eaddr_t ea)
+{
+    DECL_MUTEX_VARS();
+    s32 status;
+
+    /* _spin_lock
+     *    Internal routine to acquire spinlock.
+     */
+/* non trace - no hit/miss indicator */
+#define SET_HIT
+    RAW_SPINLOCK(==, 1);
+}
+
+#ifdef LIBSYNC_TRACE
+static inline s32 _spin_lock_trace(eaddr_t ea)
+{
+    DECL_MUTEX_VARS();
+    s32 status = 0;
+/* trace - need hit/miss indicator */
+#undef SET_HIT
+#define SET_HIT	if (status == 0) hit = buf[offset]
+    s32 hit;
+
+    hit = 0;
+    /* _spin_lock_trace for trace
+     *    Internal routine to acquire spinlock.
+     */
+    RAW_SPINLOCK(==, 1);
+
+    return hit;
+
+#undef SET_HIT
+#define SET_HIT
+}
+
+#endif /* LIBSYNC_TRACE */
+
+
+#endif /* SPU_MUTEX_H */