Module Name: src
Committed By: matt
Date: Mon Feb 11 12:43:04 UTC 2013
Modified Files:
src/lib/libm: Makefile
Added Files:
src/lib/libm/arch/arm: lrint.S lrintf.S
Log Message:
Add VFP versions of lrint/lrintf/lrintl for earmhf*
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/lib/libm/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/libm/arch/arm/lrint.S \
src/lib/libm/arch/arm/lrintf.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.130 src/lib/libm/Makefile:1.131
--- src/lib/libm/Makefile:1.130 Mon Feb 11 01:47:04 2013
+++ src/lib/libm/Makefile Mon Feb 11 12:43:04 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2013/02/11 01:47:04 christos Exp $
+# $NetBSD: Makefile,v 1.131 2013/02/11 12:43:04 matt Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -52,7 +52,7 @@ USE_SHLIBDIR= yes
ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
.elif (${MACHINE_ARCH} == "earmhf" || ${MACHINE_ARCH} == "earmhfeb")
.PATH: ${.CURDIR}/arch/arm
-ARCH_SRCS = e_sqrt.S e_sqrtf.S s_fabsf.S
+ARCH_SRCS = e_sqrt.S e_sqrtf.S s_fabsf.S lrint.S lrintf.S
.elif (${MACHINE_ARCH} == "sparc")
.PATH: ${.CURDIR}/arch/sparc
COMMON_SRCS+= fenv.c
Added files:
Index: src/lib/libm/arch/arm/lrint.S
diff -u /dev/null src/lib/libm/arch/arm/lrint.S:1.1
--- /dev/null Mon Feb 11 12:43:04 2013
+++ src/lib/libm/arch/arm/lrint.S Mon Feb 11 12:43:03 2013
@@ -0,0 +1,42 @@
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * 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 <arm/asm.h>
+
+RCSID("$NetBSD: lrint.S,v 1.1 2013/02/11 12:43:03 matt Exp $")
+
+STRONG_ALIAS(_lrintl, _lrint)
+WEAK_ALIAS(lrintl, _lrintl)
+WEAK_ALIAS(lrint, _lrint)
+
+ENTRY(_lrint)
+ vcvt.s32.f64 s0, d0
+ vmov r0, s0
+ RET
+END(_lrint)
Index: src/lib/libm/arch/arm/lrintf.S
diff -u /dev/null src/lib/libm/arch/arm/lrintf.S:1.1
--- /dev/null Mon Feb 11 12:43:04 2013
+++ src/lib/libm/arch/arm/lrintf.S Mon Feb 11 12:43:03 2013
@@ -0,0 +1,40 @@
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * 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 <arm/asm.h>
+
+RCSID("$NetBSD: lrintf.S,v 1.1 2013/02/11 12:43:03 matt Exp $")
+
+WEAK_ALIAS(lrintf, _lrintf)
+
+ENTRY(_lrintf)
+ vcvt.s32.f32 s0, s0
+ vmov r0, s0
+ RET
+END(_lrintf)
