Module Name: src
Committed By: matt
Date: Mon Jul 4 06:23:50 UTC 2011
Modified Files:
src/common/lib/libc/quad: quad.h
src/lib/libc/quad: Makefile.inc fixdfdi.c fixunsdfdi.c floatdidf.c
floatdisf.c
Added Files:
src/lib/libc/quad: floatundidf.c
Removed Files:
src/lib/libc/quad: floatunsdidf.c
Log Message:
Update to C89 style.
Fix name of floatundidf (uns -> un).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/quad/quad.h
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/quad/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/quad/fixdfdi.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/quad/fixunsdfdi.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/quad/floatdidf.c \
src/lib/libc/quad/floatdisf.c
cvs rdiff -u -r0 -r1.1 src/lib/libc/quad/floatundidf.c
cvs rdiff -u -r1.6 -r0 src/lib/libc/quad/floatunsdidf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/quad/quad.h
diff -u src/common/lib/libc/quad/quad.h:1.1 src/common/lib/libc/quad/quad.h:1.2
--- src/common/lib/libc/quad/quad.h:1.1 Tue Dec 20 20:29:40 2005
+++ src/common/lib/libc/quad/quad.h Mon Jul 4 06:23:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: quad.h,v 1.1 2005/12/20 20:29:40 christos Exp $ */
+/* $NetBSD: quad.h,v 1.2 2011/07/04 06:23:50 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -122,7 +122,7 @@
u_quad_t __fixunssfdi __P((float));
double __floatdidf __P((quad_t));
float __floatdisf __P((quad_t));
-double __floatunsdidf __P((u_quad_t));
+double __floatundidf __P((u_quad_t));
quad_t __iordi3 __P((quad_t, quad_t));
quad_t __lshldi3 __P((quad_t, qshift_t));
quad_t __lshrdi3 __P((quad_t, qshift_t));
Index: src/lib/libc/quad/Makefile.inc
diff -u src/lib/libc/quad/Makefile.inc:1.11 src/lib/libc/quad/Makefile.inc:1.12
--- src/lib/libc/quad/Makefile.inc:1.11 Sun Dec 6 05:34:42 2009
+++ src/lib/libc/quad/Makefile.inc Mon Jul 4 06:23:50 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.11 2009/12/06 05:34:42 uebayasi Exp $
+# $NetBSD: Makefile.inc,v 1.12 2011/07/04 06:23:50 matt Exp $
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
# Quad support
SRCS.quad= cmpdi2.c divdi3.c fixdfdi.c fixsfdi.c fixunsdfdi.c \
- fixunssfdi.c floatdidf.c floatdisf.c floatunsdidf.c \
+ fixunssfdi.c floatdidf.c floatdisf.c floatundidf.c \
moddi3.c muldi3.c negdi2.c qdivrem.c \
ucmpdi2.c udivdi3.c umoddi3.c
Index: src/lib/libc/quad/fixdfdi.c
diff -u src/lib/libc/quad/fixdfdi.c:1.4 src/lib/libc/quad/fixdfdi.c:1.5
--- src/lib/libc/quad/fixdfdi.c:1.4 Thu Aug 7 16:43:16 2003
+++ src/lib/libc/quad/fixdfdi.c Mon Jul 4 06:23:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fixdfdi.c,v 1.4 2003/08/07 16:43:16 agc Exp $ */
+/* $NetBSD: fixdfdi.c,v 1.5 2011/07/04 06:23:50 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)fixdfdi.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fixdfdi.c,v 1.4 2003/08/07 16:43:16 agc Exp $");
+__RCSID("$NetBSD: fixdfdi.c,v 1.5 2011/07/04 06:23:50 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -49,8 +49,7 @@
* We clamp anything that is out of range.
*/
quad_t
-__fixdfdi(x)
- double x;
+__fixdfdi(double x)
{
if (x < 0)
if (x <= QUAD_MIN)
Index: src/lib/libc/quad/fixunsdfdi.c
diff -u src/lib/libc/quad/fixunsdfdi.c:1.7 src/lib/libc/quad/fixunsdfdi.c:1.8
--- src/lib/libc/quad/fixunsdfdi.c:1.7 Thu Aug 7 16:43:16 2003
+++ src/lib/libc/quad/fixunsdfdi.c Mon Jul 4 06:23:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fixunsdfdi.c,v 1.7 2003/08/07 16:43:16 agc Exp $ */
+/* $NetBSD: fixunsdfdi.c,v 1.8 2011/07/04 06:23:50 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)fixunsdfdi.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fixunsdfdi.c,v 1.7 2003/08/07 16:43:16 agc Exp $");
+__RCSID("$NetBSD: fixunsdfdi.c,v 1.8 2011/07/04 06:23:50 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -54,8 +54,7 @@
* of range becomes UQUAD_MAX.
*/
u_quad_t
-__fixunsdfdi(x)
- double x;
+__fixunsdfdi(double x)
{
union uu t;
unsigned int tmp;
Index: src/lib/libc/quad/floatdidf.c
diff -u src/lib/libc/quad/floatdidf.c:1.6 src/lib/libc/quad/floatdidf.c:1.7
--- src/lib/libc/quad/floatdidf.c:1.6 Thu Aug 7 16:43:16 2003
+++ src/lib/libc/quad/floatdidf.c Mon Jul 4 06:23:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: floatdidf.c,v 1.6 2003/08/07 16:43:16 agc Exp $ */
+/* $NetBSD: floatdidf.c,v 1.7 2011/07/04 06:23:50 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)floatdidf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: floatdidf.c,v 1.6 2003/08/07 16:43:16 agc Exp $");
+__RCSID("$NetBSD: floatdidf.c,v 1.7 2011/07/04 06:23:50 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -48,8 +48,7 @@
* Convert (signed) quad to double.
*/
double
-__floatdidf(x)
- quad_t x;
+__floatdidf(quad_t x)
{
double d;
union uu u;
Index: src/lib/libc/quad/floatdisf.c
diff -u src/lib/libc/quad/floatdisf.c:1.6 src/lib/libc/quad/floatdisf.c:1.7
--- src/lib/libc/quad/floatdisf.c:1.6 Thu Aug 7 16:43:16 2003
+++ src/lib/libc/quad/floatdisf.c Mon Jul 4 06:23:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: floatdisf.c,v 1.6 2003/08/07 16:43:16 agc Exp $ */
+/* $NetBSD: floatdisf.c,v 1.7 2011/07/04 06:23:50 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)floatdisf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: floatdisf.c,v 1.6 2003/08/07 16:43:16 agc Exp $");
+__RCSID("$NetBSD: floatdisf.c,v 1.7 2011/07/04 06:23:50 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -48,8 +48,7 @@
* Convert (signed) quad to float.
*/
float
-__floatdisf(x)
- quad_t x;
+__floatdisf(quad_t x)
{
float f;
union uu u;
Added files:
Index: src/lib/libc/quad/floatundidf.c
diff -u /dev/null src/lib/libc/quad/floatundidf.c:1.1
--- /dev/null Mon Jul 4 06:23:50 2011
+++ src/lib/libc/quad/floatundidf.c Mon Jul 4 06:23:50 2011
@@ -0,0 +1,61 @@
+/* $NetBSD: floatundidf.c,v 1.1 2011/07/04 06:23:50 matt Exp $ */
+
+/*-
+ * Copyright (c) 1992, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * This software was developed by the Computer Systems Engineering group
+ * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
+ * contributed to Berkeley.
+ *
+ * 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)floatunsdidf.c 8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: floatundidf.c,v 1.1 2011/07/04 06:23:50 matt Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include "quad.h"
+
+/*
+ * Convert (unsigned) quad to double.
+ * This is exactly like floatdidf.c except that negatives never occur.
+ */
+double
+__floatundidf(u_quad_t x)
+{
+ double d;
+ union uu u;
+
+ u.uq = x;
+ d = (double)u.ul[H] * (((int)1 << (INT_BITS - 2)) * 4.0);
+ d += u.ul[L];
+ return (d);
+}
