[uClibc-cvs] uClibc/libpthread/linuxthreads/sysdeps/mips stackinfo.h,NONE,1.1 pt-machine.h,1.2,1.3
Erik Andersen
andersen at codepoet.org
Thu Feb 27 18:13:27 UTC 2003
Update of /var/cvs/uClibc/libpthread/linuxthreads/sysdeps/mips
In directory winder:/tmp/cvs-serv18985/libpthread/linuxthreads/sysdeps/mips
Modified Files:
pt-machine.h
Added Files:
stackinfo.h
Log Message:
Major update for pthreads, based in large part on improvements
from glibc 2.3. This should make threads much more efficient.
-Erik
--- NEW FILE: stackinfo.h ---
/* Copyright (C) 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
/* This file contains a bit of information about the stack allocation
of the processor. */
#ifndef _STACKINFO_H
#define _STACKINFO_H 1
/* On MIPS the stack grows down. */
#define _STACK_GROWS_DOWN 1
#endif /* stackinfo.h */
Index: pt-machine.h
===================================================================
RCS file: /var/cvs/uClibc/libpthread/linuxthreads/sysdeps/mips/pt-machine.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pt-machine.h 23 Jan 2003 07:58:29 -0000 1.2
+++ pt-machine.h 27 Feb 2003 18:12:51 -0000 1.3
@@ -1,59 +1,44 @@
/* Machine-dependent pthreads configuration and inline functions.
- Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 2000, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ralf Baechle <ralf at gnu.ai.mit.edu>.
+ Contributed by Ralf Baechle <ralf at gnu.org>.
Based on the Alpha version by Richard Henderson <rth at tamu.edu>.
The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
+ modify it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
The GNU C Library 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
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
+ You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
- TODO: This version makes use of MIPS ISA 2 features. It won't
- work on ISA 1. These machines will have to take the overhead of
- a sysmips(MIPS_ATOMIC_SET, ...) syscall which isn't implemented
- yet correctly. There is however a better solution for R3000
- uniprocessor machines possible. */
+#ifndef _PT_MACHINE_H
+#define _PT_MACHINE_H 1
+
+#include <sys/tas.h>
#ifndef PT_EI
# define PT_EI extern inline
#endif
+extern long int testandset (int *spinlock);
+extern int __compare_and_swap (long int *p, long int oldval, long int newval);
+
/* Spinlock implementation; required. */
+
PT_EI long int
testandset (int *spinlock)
{
- long int ret, temp;
-
- __asm__ __volatile__(
- "# Inline spinlock test & set\n\t"
- ".set\tmips2\n"
- "1:\tll\t%0,%3\n\t"
- "bnez\t%0,2f\n\t"
- ".set\tnoreorder\n\t"
- "li\t%1,1\n\t"
- ".set\treorder\n\t"
- "sc\t%1,%2\n\t"
- "beqz\t%1,1b\n"
- "2:\t.set\tmips0\n\t"
- "/* End spinlock test & set */"
- : "=&r"(ret), "=&r" (temp), "=m"(*spinlock)
- : "m"(*spinlock)
- : "memory");
-
- return ret;
+ return _test_and_set (spinlock, 1);
}
@@ -69,49 +54,27 @@
PT_EI int
__compare_and_swap (long int *p, long int oldval, long int newval)
{
- long ret;
+ long int ret, temp;
- __asm__ __volatile__ (
- "/* Inline compare & swap */\n\t"
- ".set\tmips2\n"
- "1:\tll\t%0,%4\n\t"
- ".set\tnoreorder\n\t"
- "bne\t%0,%2,2f\n\t"
- "move\t%0,$0\n\t" /*[NDF] Failure case. */
- "move\t%0,%3\n\t"
- ".set\treorder\n\t"
- "sc\t%0,%1\n\t"
- "beqz\t%0,1b\n"
- "2:\t.set\tmips0\n\t"
- "/* End compare & swap */"
- : "=&r"(ret), "=m"(*p)
- : "r"(oldval), "r"(newval), "m"(*p));
+ __asm__ __volatile__
+ ("/* Inline compare & swap */\n"
+ "1:\n\t"
+ ".set push\n\t"
+ ".set mips2\n\t"
+ "ll %1,%5\n\t"
+ "move %0,$0\n\t"
+ "bne %1,%3,2f\n\t"
+ "move %0,%4\n\t"
+ "sc %0,%2\n\t"
+ ".set pop\n\t"
+ "beqz %0,1b\n"
+ "2:\n\t"
+ "/* End compare & swap */"
+ : "=&r" (ret), "=&r" (temp), "=m" (*p)
+ : "r" (oldval), "r" (newval), "m" (*p)
+ : "memory");
return ret;
-
- /*
- 1: load locked: into ret(%0), from *p(0(%4))
- branch to 2 if ret(%0) != oldval(%2)
- Delay slot: move 0 into ret(%0) // [NDF] Added
- Don't branch case:
- move newval(%3) into ret(%0)
- setcompare ret(%0) into *p(0(%1))
- branch to 1 if ret(%0) == 0 (sc failed)
- Delay slot: unknown/none
- return
-
- 2: Delay slot
- return
-
-ll a b
-Sets a to the value pointed to by address b, and "locks" b so that if
-any of a number of things are attempted that might access b then the
-next sc will fail.
-
-sc a b
-Sets the memory address pointed to by b to the value in a atomically.
-If it succeeds then a will be set to 1, if it fails a will be set to 0.
-
- */
-
}
+
+#endif /* pt-machine.h */
More information about the uClibc-cvs
mailing list