2011-12-15 Konrad Eisele <konrad@gaisler.com>

        * configure.in: Add SPARC LEON support.
        * configure: Regenerated.
        * sparc_leon/asm-leon/amba.h, sparc_leon/asm-leon/asmmacro.h,
        sparc_leon/asm-leon/clock.h, sparc_leon/asm-leon/contextswitch.h,
        sparc_leon/asm-leon/elfmacro.h, sparc_leon/asm-leon/head.h,
        sparc_leon/asm-leon/irq.h, sparc_leon/asm-leon/jiffies.h,
        sparc_leon/asm-leon/lambapp.h, sparc_leon/asm-leon/lambapp_devs.h,
        sparc_leon/asm-leon/leon.h, sparc_leon/asm-leon/leon3.h,
        sparc_leon/asm-leon/leonbare_debug.h, sparc_leon/asm-leon/leonbare_kernel.h,
        sparc_leon/asm-leon/leonbare_kernel_queue.h, sparc_leon/asm-leon/leoncompat.h,
        sparc_leon/asm-leon/leondbg.h, sparc_leon/asm-leon/leonstack.h,
        sparc_leon/asm-leon/liblocks.h, sparc_leon/asm-leon/linkage.h,
        sparc_leon/asm-leon/param.h, sparc_leon/asm-leon/queue.h,
        sparc_leon/asm-leon/spinlock.h, sparc_leon/asm-leon/stack.h,
        sparc_leon/asm-leon/time.h, sparc_leon/asm-leon/timer.h,
        sparc_leon/asm-leon/types.h, sparc_leon/asm-leon/winmacros.h:
        New file.
        * sparc_leon/Makefile.in, sparc_leon/_exit.c,
        sparc_leon/amba.c, sparc_leon/amba_dbg.c,
        sparc_leon/amba_driver.c, sparc_leon/amba_scan.c,
        sparc_leon/asm-leon, sparc_leon/bdinit.S,
        sparc_leon/busscan.S, sparc_leon/cacheA.S,
        sparc_leon/catch_interrupt.c, sparc_leon/catch_interrupt_mvt.c,
        sparc_leon/catch_interrupt_pending.c, sparc_leon/catch_interrupt_svt.c,
        sparc_leon/configure.in,
        sparc_leon/console.c, sparc_leon/console_dbg.c,
        sparc_leon/console_init.c, sparc_leon/contextswitch.c,
        sparc_leon/contextswitch_asm.S, sparc_leon/crt0.S,
        sparc_leon/crti.S, sparc_leon/crtn.S,
        sparc_leon/etrap.S, sparc_leon/etrap_fast.S,
        sparc_leon/fpu.S, sparc_leon/gettimeofday.c,
        sparc_leon/initcalls.c, sparc_leon/io.c,
        sparc_leon/irqinstall.S, sparc_leon/irqtrap.S,
        sparc_leon/irqtrap_fast.S, sparc_leon/jiffies.c,
        sparc_leon/kernel.c, sparc_leon/kernel_context.S,
        sparc_leon/kernel_debug.c, sparc_leon/kernel_debug_var.c,
        sparc_leon/kernel_mm.c, sparc_leon/kernel_mutex.c,
        sparc_leon/kernel_queue.c, sparc_leon/kernel_sched.c,
        sparc_leon/kernel_thread.c, sparc_leon/lcpuinit.S,
        sparc_leon/locore.S, sparc_leon/locore_atexit.c,
        sparc_leon/locore_clean.S, sparc_leon/locore_mvt.S,
        sparc_leon/locore_mvt_reset.S, sparc_leon/locore_svt.S,
        sparc_leon/locore_svt_reset.S, sparc_leon/locore_svtdisp.S,
        sparc_leon/locore_var.S, sparc_leon/locore_var_svt.S,
        sparc_leon/mmu_asm.S, sparc_leon/mutex.c,
        sparc_leon/nocache.S, sparc_leon/pnpinit.c,
        sparc_leon/pnpinit_malloc.c, sparc_leon/pnpinit_simple.c,
        sparc_leon/regwin.S, sparc_leon/regwin_patch.c,
        sparc_leon/regwin_slow.S, sparc_leon/regwinflush.S,
        sparc_leon/rtc.c, sparc_leon/rtrap.S,
        sparc_leon/rtrap_fast.S, sparc_leon/stop.S,
        sparc_leon/timer.c, sparc_leon/times.c:
        New file
        * sparc_leon/configure: Regenerate

1 files changed, 107 insertions, 0 deletions

diff --git a/libgloss/sparc_leon/kernel_mutex.c b/libgloss/sparc_leon/kernel_mutex.c
new file mode 100644
index 000000000..a81344932
--- /dev/null
+++ b/libgloss/sparc_leon/kernel_mutex.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2011 Aeroflex Gaisler
+ *
+ * BSD license:
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+#include <asm-leon/queue.h>
+/*#include <sys/fsu_pthread_queue.h>*/
+#include <asm-leon/contextswitch.h>
+#include <asm-leon/leonbare_kernel.h>
+#include <asm-leon/leonbare_debug.h>
+#include <asm-leon/stack.h>
+#include <asm-leon/leonstack.h>
+#include <asm-leon/irq.h>
+
+leonbare_mutex_t
+leonbare_mutex_init (leonbare_mutex_t m)
+{
+  m->mx_owner_cnt = 0;
+  m->mx_owner = 0;
+  LBTAILQ_INIT (&(m->mx_threads));
+
+  LEONBARE_PROTECT_KERNEL_START ();
+  {
+    LBTAILQ_INSERT_TAIL (LEONBARE_KR_ALLM, m, mx_allm);
+  }
+  LEONBARE_PROTECT_KERNEL_END ();
+
+}
+
+int
+_self__leonbare_mutex_lock (leonbare_mutex_t m, int wait)
+{
+  int ret = LEONBARE_MUTEX_LOCK_OK;
+  leonbare_thread_t c;
+
+  LEONBARE_PROTECT_MUTEXSTRUCT_START (m);
+  while (1)
+    {
+      if (LEONBARE_MUTEX_OWNER_GET (m) == 0)
+	{
+	  LEONBARE_MUTEX_OWNER_SET (m, LEONBARE_KR_CURRENT);
+	  LEONBARE_MUTEX_OWNER_CNT_SET (m, 0);
+	  LBTAILQ_INSERT_TAIL (&c->th_mutex_locked, m, mx_locked);
+	  ret = LEONBARE_MUTEX_LOCK_OK;
+	  break;
+	}
+      else if (m->mx_owner == LEONBARE_KR_CURRENT)
+	{
+	  m->mx_owner_cnt++;
+	  ret = LEONBARE_MUTEX_LOCK_OK;
+	  break;
+	}
+      LBTAILQ_INSERT_TAIL (&m->mx_threads, c, th_mutex);
+      current_suspend ();
+    }
+  LEONBARE_PROTECT_MUTEXSTRUCT_END (m);
+  return ret;
+}
+
+int
+leonbare_mutex_unlock (leonbare_mutex_t m)
+{
+  int ret = LEONBARE_MUTEX_UNLOCK_ERROR;
+  leonbare_thread_t c, h;
+
+  LEONBARE_PROTECT_MUTEXSTRUCT_START (m);
+  {
+    c = LEONBARE_KR_CURRENT;
+    if (m->mx_owner != c)
+      {
+	ret = LEONBARE_MUTEX_UNLOCK_OK;
+      }
+    else if (m->mx_owner == c && m->mx_owner_cnt)
+      {
+	m->mx_owner_cnt--;
+	ret = LEONBARE_MUTEX_UNLOCK_OK;
+      }
+    else if ((h = LBTAILQ_FIRST (&m->mx_threads)))
+      {
+	LBTAILQ_REMOVE (&m->mx_threads, h, th_mutex);
+	leonbare_thread_resume (h);
+	ret = LEONBARE_MUTEX_UNLOCK_OK;
+      }
+  }
+  LEONBARE_PROTECT_MUTEXSTRUCT_END (m);
+  return ret;
+}