This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
[PATCH] Fix ppc64 lrint

From: Jakub Jelinek <jakub at redhat dot com>
To: Ulrich Drepper <drepper at redhat dot com>, Steve Munroe <sjmunroe at us dot ibm dot com>
Cc: Glibc hackers <libc-hacker at sources dot redhat dot com>
Date: Thu, 12 Feb 2004 20:15:33 +0100
Subject: [PATCH] Fix ppc64 lrint
Reply-to: Jakub Jelinek <jakub at redhat dot com>
Hi!

My last libm-test.inc revealed buggy lrint on ppc64.
This patch could DTRT, but I have not tested it yet (will in the next
build).

2004-02-12  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/powerpc/fpu/s_lrint.c: Move to...
	* sysdeps/powerpc/powerpc32/fpu/s_lrint.c: ... here.
	* sysdeps/powerpc/fpu/s_llrint.c: Move to...
	* sysdeps/powerpc/powerpc32/fpu/s_llrint.c: ... here.
	* sysdeps/powerpc/fpu/s_lrintf.S: Move to...
	* sysdeps/powerpc/powerpc32/fpu/s_lrintf.S: ... here.
	* sysdeps/powerpc/fpu/s_llrintf.c: Move to...
	* sysdeps/powerpc/powerpc32/fpu/s_llrintf.c: ... here.
	* sysdeps/powerpc/powerpc64/fpu/s_lrint.c: New file.
	* sysdeps/powerpc/powerpc64/fpu/s_llrint.c: New file.
	* sysdeps/powerpc/powerpc64/fpu/s_lrintf.S: New file.
	* sysdeps/powerpc/powerpc64/fpu/s_llrintf.S: New file.

--- libc/sysdeps/powerpc/fpu/s_lrint.c.jj	2002-09-20 23:39:16.000000000 +0200
+++ libc/sysdeps/powerpc/fpu/s_lrint.c	2004-02-12 22:13:12.000000000 +0100
@@ -1,53 +0,0 @@
-/* Round floating-point to integer.  PowerPC version.
-   Copyright (C) 1997,2002 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.  */
-
-/* Kludge to avoid decls that will confuse strong_alias below.  */
-#define __lrintf XXX__lrintf
-#define __lrintl XXX__lrintl
-#define lrintf XXXlrintf
-#define lrintl XXXlrintl
-
-#include "math.h"
-
-#undef __lrintf
-#undef __lrintl
-#undef lrintf
-#undef lrintl
-
-
-long int
-__lrint (double x)
-{
-  union
-  {
-    double d;
-    int ll[2];
-  } u;
-  asm ("fctiw %0,%1" : "=f"(u.d) : "f"(x));
-  return u.ll[1];
-}
-weak_alias (__lrint, lrint)
-
-strong_alias (__lrint, __lrintf)
-weak_alias (__lrint, lrintf)
-
-#ifdef NO_LONG_DOUBLE
-strong_alias (__lrint, __lrintl)
-weak_alias (__lrint, lrintl)
-#endif
--- libc/sysdeps/powerpc/fpu/s_llrint.c.jj	2001-07-06 06:56:02.000000000 +0200
+++ libc/sysdeps/powerpc/fpu/s_llrint.c	2004-02-12 22:13:12.000000000 +0100
@@ -1,31 +0,0 @@
-/* Round a double value to a long long in the current rounding mode.
-   Copyright (C) 1997 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.  */
-
-#include "math.h"
-
-long long int
-__llrint (double x)
-{
-  return (long long int) __rint (x);
-}
-weak_alias (__llrint, llrint)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__llrint, __llrintl)
-weak_alias (__llrint, llrintl)
-#endif
--- libc/sysdeps/powerpc/fpu/s_llrintf.c.jj	2001-07-06 06:56:02.000000000 +0200
+++ libc/sysdeps/powerpc/fpu/s_llrintf.c	2004-02-12 22:13:12.000000000 +0100
@@ -1,27 +0,0 @@
-/* Round a float value to a long long in the current rounding mode.
-   Copyright (C) 1997 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.  */
-
-#include "math.h"
-
-long long int
-__llrintf (float x)
-{
-  return (long long int) __rintf (x);
-}
-weak_alias (__llrintf, llrintf)
--- libc/sysdeps/powerpc/fpu/s_lrintf.S.jj	1999-10-10 01:53:53.000000000 +0200
+++ libc/sysdeps/powerpc/fpu/s_lrintf.S	2004-02-12 22:13:12.000000000 +0100
@@ -1 +0,0 @@
-/* __lrintf is in s_lrint.c  */
--- libc/sysdeps/powerpc/powerpc32/fpu/s_llrint.c.jj	2004-02-12 22:12:47.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc32/fpu/s_llrint.c	2001-07-06 06:56:02.000000000 +0200
@@ -0,0 +1,31 @@
+/* Round a double value to a long long in the current rounding mode.
+   Copyright (C) 1997 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.  */
+
+#include "math.h"
+
+long long int
+__llrint (double x)
+{
+  return (long long int) __rint (x);
+}
+weak_alias (__llrint, llrint)
+#ifdef NO_LONG_DOUBLE
+strong_alias (__llrint, __llrintl)
+weak_alias (__llrint, llrintl)
+#endif
--- libc/sysdeps/powerpc/powerpc32/fpu/s_llrintf.c.jj	2004-02-12 22:12:50.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc32/fpu/s_llrintf.c	2001-07-06 06:56:02.000000000 +0200
@@ -0,0 +1,27 @@
+/* Round a float value to a long long in the current rounding mode.
+   Copyright (C) 1997 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.  */
+
+#include "math.h"
+
+long long int
+__llrintf (float x)
+{
+  return (long long int) __rintf (x);
+}
+weak_alias (__llrintf, llrintf)
--- libc/sysdeps/powerpc/powerpc32/fpu/s_lrint.c.jj	2004-02-12 22:12:53.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc32/fpu/s_lrint.c	2002-09-20 23:39:16.000000000 +0200
@@ -0,0 +1,53 @@
+/* Round floating-point to integer.  PowerPC version.
+   Copyright (C) 1997,2002 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.  */
+
+/* Kludge to avoid decls that will confuse strong_alias below.  */
+#define __lrintf XXX__lrintf
+#define __lrintl XXX__lrintl
+#define lrintf XXXlrintf
+#define lrintl XXXlrintl
+
+#include "math.h"
+
+#undef __lrintf
+#undef __lrintl
+#undef lrintf
+#undef lrintl
+
+
+long int
+__lrint (double x)
+{
+  union
+  {
+    double d;
+    int ll[2];
+  } u;
+  asm ("fctiw %0,%1" : "=f"(u.d) : "f"(x));
+  return u.ll[1];
+}
+weak_alias (__lrint, lrint)
+
+strong_alias (__lrint, __lrintf)
+weak_alias (__lrint, lrintf)
+
+#ifdef NO_LONG_DOUBLE
+strong_alias (__lrint, __lrintl)
+weak_alias (__lrint, lrintl)
+#endif
--- libc/sysdeps/powerpc/powerpc32/fpu/s_lrintf.S.jj	2004-02-12 22:12:56.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc32/fpu/s_lrintf.S	1999-10-10 01:53:53.000000000 +0200
@@ -0,0 +1 @@
+/* __lrintf is in s_lrint.c  */
--- libc/sysdeps/powerpc/powerpc64/fpu/s_llrint.c.jj	2004-02-12 22:05:41.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc64/fpu/s_llrint.c	2004-02-12 22:08:54.000000000 +0100
@@ -0,0 +1,46 @@
+/* Round a double value to a long long in the current rounding mode.
+   Copyright (C) 1997, 2004 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.  */
+
+/* Kludge to avoid decls that will confuse strong_alias below.  */
+#define __lrint XXX__lrint
+#define __lrintl XXX__lrintl
+#define lrint XXXlrint
+#define lrintl XXXlrintl
+
+#include "math.h"
+
+#undef __lrint
+#undef __lrintl
+#undef lrint
+#undef lrintl
+
+long long int
+__llrint (double x)
+{
+  return (long long int) __rint (x);
+}
+string_alias (__llrint, __lrint)
+weak_alias (__llrint, llrint)
+weak_alias (__lrint, lrint)
+#ifdef NO_LONG_DOUBLE
+strong_alias (__llrint, __llrintl)
+weak_alias (__llrint, llrintl)
+strong_alias (__lrint, __lrintl)
+weak_alias (__lrint, lrintl)
+#endif
--- libc/sysdeps/powerpc/powerpc64/fpu/s_llrintf.c.jj	2004-02-12 22:09:12.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc64/fpu/s_llrintf.c	2004-02-12 22:10:12.000000000 +0100
@@ -0,0 +1,36 @@
+/* Round a float value to a long long in the current rounding mode.
+   Copyright (C) 1997, 2004 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.  */
+
+/* Kludge to avoid decls that will confuse strong_alias below.  */
+#define __lrintl XXX__lrintf
+#define lrintl XXXlrintf
+
+#include "math.h"
+
+#undef __lrintf
+#undef lrintf
+
+long long int
+__llrintf (float x)
+{
+  return (long long int) __rintf (x);
+}
+strong_alias (__llrintf, __lrintf)
+weak_alias (__llrintf, llrintf)
+weak_alias (__lrintf, lrintf)
--- libc/sysdeps/powerpc/powerpc64/fpu/s_lrintf.S.jj	2004-02-12 22:10:38.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc64/fpu/s_lrintf.S	2004-02-12 22:10:51.000000000 +0100
@@ -0,0 +1 @@
+/* __lrintf is in s_llrintf.c  */
--- libc/sysdeps/powerpc/powerpc64/fpu/s_lrint.S.jj	2004-02-12 22:10:38.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc64/fpu/s_lrint.S	2004-02-12 22:12:23.000000000 +0100
@@ -0,0 +1 @@
+/* __lrint is in s_llrint.c  */


	Jakub
Follow-Ups:
- Re: [PATCH] Fix ppc64 lrint
  - From: Ulrich Drepper
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]