Module Name: src
Committed By: pooka
Date: Mon May 31 22:31:07 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern/arch/i386: Makefile.inc
src/sys/rump/librump/rumpkern/arch/x86_64: Makefile.inc
Added Files:
src/sys/rump/librump/rumpkern/arch/i386: spinlock.c
Log Message:
The x86 kernel ABI depends on __cpu_simple_lock stuff being present.
Since they are practically never used (only when prehistoric code
uses simple_lock()), their efficiency doesn't matter that much and
we can simply adapt the versions from x86 lock.h.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/arch/i386/spinlock.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc
diff -u src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc:1.4 src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc:1.5
--- src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc:1.4 Tue May 11 21:03:41 2010
+++ src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc Mon May 31 22:31:07 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.4 2010/05/11 21:03:41 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.5 2010/05/31 22:31:07 pooka Exp $
#
-SRCS+= rumpcpu.c rumpspl.c cpu_counter.c
+SRCS+= rumpcpu.c rumpspl.c cpu_counter.c spinlock.c
.PATH: ${RUMPTOP}/../arch/i386/i386
SRCS+= kobj_machdep.c
Index: src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc
diff -u src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc:1.5 src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc:1.6
--- src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc:1.5 Tue May 11 21:03:41 2010
+++ src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc Mon May 31 22:31:07 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.5 2010/05/11 21:03:41 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.6 2010/05/31 22:31:07 pooka Exp $
#
.PATH: ${ARCHDIR}/../i386
-SRCS+= rumpcpu.c rumpspl.c cpu_counter.c
+SRCS+= rumpcpu.c rumpspl.c cpu_counter.c spinlock.c
.PATH: ${RUMPTOP}/../arch/amd64/amd64
SRCS+= kobj_machdep.c
Added files:
Index: src/sys/rump/librump/rumpkern/arch/i386/spinlock.c
diff -u /dev/null src/sys/rump/librump/rumpkern/arch/i386/spinlock.c:1.1
--- /dev/null Mon May 31 22:31:07 2010
+++ src/sys/rump/librump/rumpkern/arch/i386/spinlock.c Mon May 31 22:31:07 2010
@@ -0,0 +1,78 @@
+/* $NetBSD: spinlock.c,v 1.1 2010/05/31 22:31:07 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2000, 2006 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe and Andrew Doran.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: spinlock.c,v 1.1 2010/05/31 22:31:07 pooka Exp $");
+
+#define _HARDKERNEL /* XXX: non-inline prototypes */
+#include <x86/lock.h>
+#undef _HARDKERNEL
+
+/*
+ * Spinlocks, from src/sys/arch/x86/include/lock.h
+ */
+void
+__cpu_simple_lock_init(__cpu_simple_lock_t *lockp)
+{
+
+ *lockp = __SIMPLELOCK_UNLOCKED;
+ __insn_barrier();
+}
+
+int
+__cpu_simple_lock_try(__cpu_simple_lock_t *lockp)
+{
+ uint8_t val;
+
+ val = __SIMPLELOCK_LOCKED;
+ __asm volatile ("xchgb %0,(%2)" :
+ "=r" (val)
+ :"0" (val), "r" (lockp));
+ __insn_barrier();
+ return val == __SIMPLELOCK_UNLOCKED;
+}
+
+void
+__cpu_simple_lock(__cpu_simple_lock_t *lockp)
+{
+
+ while (!__cpu_simple_lock_try(lockp))
+ /* nothing */;
+ __insn_barrier();
+}
+
+void
+__cpu_simple_unlock(__cpu_simple_lock_t *lockp)
+{
+
+ __insn_barrier();
+ *lockp = __SIMPLELOCK_UNLOCKED;
+}
