From 06e7a0313a09ee812061d855a47206ed303eac7f Mon Sep 17 00:00:00 2001
From: eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Mon, 22 Dec 2008 04:24:34 +0000
Subject: 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
---
gcell/src/lib/runtime/gc_jd_stack.c | 108 ------------------------------------
1 file changed, 108 deletions(-)
delete mode 100644 gcell/src/lib/runtime/gc_jd_stack.c
(limited to 'gcell/src/lib/runtime/gc_jd_stack.c')
diff --git a/gcell/src/lib/runtime/gc_jd_stack.c b/gcell/src/lib/runtime/gc_jd_stack.c
deleted file mode 100644
index 0fffc0d1f8..0000000000
--- a/gcell/src/lib/runtime/gc_jd_stack.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "gc_jd_stack.h"
-#include "memory_barrier.h"
-
-
-void
-gc_jd_stack_init(gc_jd_stack_t *stack)
-{
- stack->top = 0;
-}
-
-
-#ifdef __powerpc64__ // 64-bit mode
-
-void
-gc_jd_stack_push(gc_jd_stack_t *stack, gc_job_desc_t *item)
-{
- gc_eaddr_t top;
- gc_eaddr_t item_ea = ptr_to_ea(item);
- unsigned int done;
-
- do {
- top = __ldarx(&stack->top);
- item->sys.next = top;
- smp_wmb(); // order store of item->next before store of stack->top
- done = __stdcx(&stack->top, item_ea);
- } while (unlikely(done == 0));
-}
-
-gc_job_desc_t *
-gc_jd_stack_pop(gc_jd_stack_t *stack)
-{
- gc_eaddr_t s;
- gc_eaddr_t t;
- unsigned int done;
-
- do {
- s = __ldarx(&stack->top);
- if (s == 0) /* stack's empty */
- return 0;
- t = ((gc_job_desc_t *) ea_to_ptr(s))->sys.next;
- done = __stdcx(&stack->top, t);
- } while (unlikely(done == 0));
-
- return ea_to_ptr(s);
-}
-
-#else // 32-bit mode
-
-/*
- * In 32-bit mode, gc_eaddr's will have the top 32-bits zero.
- * The ldarx/stdcx instructions aren't available in 32-bit mode,
- * thus we use lwarx/stwcx on the low 32-bits of the 64-bit addresses.
- * Since we're big-endian, the low 32-bits are at word offset 1.
- */
-void
-gc_jd_stack_push(gc_jd_stack_t *stack, gc_job_desc_t *item)
-{
- gc_eaddr_t top;
- unsigned int done;
-
- do {
- top = __lwarx((int32_t *)(&stack->top) + 1);
- item->sys.next = top;
- smp_wmb(); // order store of item->sys.next before store of stack->top
- done = __stwcx((int32_t *)(&stack->top) + 1, item);
- } while (unlikely(done == 0));
-}
-
-gc_job_desc_t *
-gc_jd_stack_pop(gc_jd_stack_t *stack)
-{
- gc_eaddr_t s;
- gc_eaddr_t t;
- unsigned int done;
-
- do {
- s = __lwarx((int32_t *)(&stack->top) + 1);
- if (s == 0) /* stack's empty */
- return 0;
- t = ((gc_job_desc_t *) ea_to_ptr(s))->sys.next;
- done = __stwcx((int32_t *)(&stack->top) + 1, (uint32_t) t);
- } while (unlikely(done == 0));
-
- return ea_to_ptr(s);
-}
-
-#endif
--
cgit v1.2.3