Date: Tue, 10 Apr 2012 23:24:39 +1200 From: Andrew Turner <andrew@fubar.geek.nz> To: Juli Mallett <jmallett@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r234014 - head/lib/libc/arm/gen Message-ID: <20120410232439.5e4cd59f@fubar.geek.nz> In-Reply-To: <CACVs6=-adLopfRtMJeJn_yZhyZOZO1YLv1Ziv%2BCfypkvh0_GKw@mail.gmail.com> References: <201204080436.q384aRXS093116@svn.freebsd.org> <20120408164521.55aecdd1@fubar.geek.nz> <CACVs6=8SW9PhZaxc4KRnVyo5p6NyhdD09_cAowLCbgczDqBsVg@mail.gmail.com> <20120409161453.29d1f3de@fubar.geek.nz> <CACVs6=_t=VSqA-DTZi-rNxpE9bEZRzaHDSVe0FVw0xDV4c3Q=Q@mail.gmail.com> <20120409204416.77f61674@fubar.geek.nz> <CACVs6=-adLopfRtMJeJn_yZhyZOZO1YLv1Ziv%2BCfypkvh0_GKw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Mon, 9 Apr 2012 09:39:23 -0700
Juli Mallett <jmallett@FreeBSD.org> wrote:
> On Mon, Apr 9, 2012 at 01:44, Andrew Turner <andrew@fubar.geek.nz>
> wrote:
> > How does the attached (untested) patch look. It explicitly loads
> > ARM_TP_ADDRESS into a r0 to ensure r1-3 are not touched.
>
> The example file I pointed at was for the kernel, where the
> LOCORE-related ifdefs (almost) make sense, but for userland you
> probably want to conditionalize on __ASSEMBLER__.
How does the attached patch look? I've updated it to use __ASSEMBLER__
where required.
Andrew
[-- Attachment #2 --]
Index: lib/libc/arm/gen/Makefile.inc
===================================================================
--- lib/libc/arm/gen/Makefile.inc (revision 234093)
+++ lib/libc/arm/gen/Makefile.inc (working copy)
@@ -3,4 +3,4 @@
SRCS+= _ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.c \
getcontextx.c infinity.c ldexp.c makecontext.c \
- __aeabi_read_tp.c setjmp.S signalcontext.c sigsetjmp.S divsi3.S flt_rounds.c
+ __aeabi_read_tp.S setjmp.S signalcontext.c sigsetjmp.S divsi3.S flt_rounds.c
Index: lib/libc/arm/gen/__aeabi_read_tp.S
===================================================================
--- lib/libc/arm/gen/__aeabi_read_tp.S (revision 0)
+++ lib/libc/arm/gen/__aeabi_read_tp.S (working copy)
@@ -0,0 +1,40 @@
+/*-
+ * Copyright (c) 2012 Oleksandr Tymoshenko
+ * Copyright (c) 2012 Andrew Turner
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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 <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
+#include <machine/sysarch.h>
+
+ENTRY(__aeabi_read_tp)
+ ldr r0, .Larm_tp_address
+ ldr r0, [r0]
+ RET
+
+.Larm_tp_address:
+ .word ARM_TP_ADDRESS
+
Index: lib/libc/arm/gen/__aeabi_read_tp.c
===================================================================
--- lib/libc/arm/gen/__aeabi_read_tp.c (revision 234093)
+++ lib/libc/arm/gen/__aeabi_read_tp.c (working copy)
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2012 Oleksandr Tymoshenko
- * Copyright (c) 2012 Andrew Turner
- * All rights reserved.
- *
- * 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 AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD$
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-
-#include "machine/sysarch.h"
-
-void *
-__aeabi_read_tp()
-{
- void *_tp;
-
- asm("ldr %0, [%1]\n" : "=r"(_tp) : "r"(ARM_TP_ADDRESS));
-
- return _tp;
-}
Index: sys/arm/include/sysarch.h
===================================================================
--- sys/arm/include/sysarch.h (revision 234093)
+++ sys/arm/include/sysarch.h (working copy)
@@ -55,6 +55,7 @@
#define ARM_RAS_END (ARM_TP_ADDRESS + 8)
#ifndef LOCORE
+#ifndef __ASSEMBLER__
#include <sys/cdefs.h>
@@ -85,6 +86,7 @@
__END_DECLS
#endif
+#endif /* __ASSEMBLER__ */
#endif /* LOCORE */
#endif /* !_ARM_SYSARCH_H_ */
Index: sys/arm/include/armreg.h
===================================================================
--- sys/arm/include/armreg.h (revision 234093)
+++ sys/arm/include/armreg.h (working copy)
@@ -316,8 +316,13 @@
/*
* Address of the vector page, low and high versions.
*/
+#ifndef __ASSEMBLER__
#define ARM_VECTORS_LOW 0x00000000U
#define ARM_VECTORS_HIGH 0xffff0000U
+#else
+#define ARM_VECTORS_LOW 0
+#define ARM_VECTORS_HIGH 0xffff0000
+#endif
/*
* ARM Instructions
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120410232439.5e4cd59f>