mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

ILP32 math changes

Browse Source 
* sysdeps/aarch64/fpu/s_llrint.c (OREG_SIZE): New macro.
	* sysdeps/aarch64/fpu/s_llround.c (OREG_SIZE): Likewise.
	* sysdeps/aarch64/fpu/s_llrintf.c (OREGS, IREGS): Remove.
	(IREG_SIZE, OREG_SIZE): New macros.
	* sysdeps/aarch64/fpu/s_llroundf.c: (OREGS, IREGS): Remove.
	(IREG_SIZE, OREG_SIZE): New macros.
	* sysdeps/aarch64/fpu/s_lrintf.c (IREGS): Remove.
	(IREG_SIZE): New macro.
	* sysdeps/aarch64/fpu/s_lroundf.c (IREGS): Remove.
	(IREG_SIZE): New macro.
	* sysdeps/aarch64/fpu/s_lrint.c (get-rounding-mode.h, stdint.h):
	New includes.
	(IREG_SIZE, OREG_SIZE): Initialize if not already set.
	(OREGS, IREGS): Set based on IREG_SIZE and OREG_SIZE.
	(__CONCATX): Handle exceptions correctly on large values that may
	set FE_INVALID.
	* sysdeps/aarch64/fpu/s_lround.c (IREG_SIZE, OREG_SIZE):
	Initialize if not already set.
        (OREGS, IREGS): Set based on IREG_SIZE and OREG_SIZE.
This commit is contained in:
Steve Ellcey 2017-08-31 13:38:11 -07:00
parent 102dde842a
commit d9ff799a5b
9 changed files with 110 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,3 +1,26 @@
2017-08-31 Steve Ellcey <sellcey@cavium.com>
Richard Henderson <rth@twiddle.net>
* sysdeps/aarch64/fpu/s_llrint.c (OREG_SIZE): New macro.
* sysdeps/aarch64/fpu/s_llround.c (OREG_SIZE): Likewise.
* sysdeps/aarch64/fpu/s_llrintf.c (OREGS, IREGS): Remove.
(IREG_SIZE, OREG_SIZE): New macros.
* sysdeps/aarch64/fpu/s_llroundf.c: (OREGS, IREGS): Remove.
(IREG_SIZE, OREG_SIZE): New macros.
* sysdeps/aarch64/fpu/s_lrintf.c (IREGS): Remove.
(IREG_SIZE): New macro.
* sysdeps/aarch64/fpu/s_lroundf.c (IREGS): Remove.
(IREG_SIZE): New macro.
* sysdeps/aarch64/fpu/s_lrint.c (get-rounding-mode.h, stdint.h):
New includes.
(IREG_SIZE, OREG_SIZE): Initialize if not already set.
(OREGS, IREGS): Set based on IREG_SIZE and OREG_SIZE.
(__CONCATX): Handle exceptions correctly on large values that may
set FE_INVALID.
* sysdeps/aarch64/fpu/s_lround.c (IREG_SIZE, OREG_SIZE):
Initialize if not already set.
(OREGS, IREGS): Set based on IREG_SIZE and OREG_SIZE.
2017-08-31 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/generic/not-cancel.h (NO_CANCELLATION): Remove macro.

1
sysdeps/aarch64/fpu/s_llrint.c
View File

@ -18,4 +18,5 @@
#define FUNC llrint
#define OTYPE long long int
#define OREG_SIZE 64
#include <s_lrint.c>

3
sysdeps/aarch64/fpu/s_llrintf.c
View File

@ -18,6 +18,7 @@
#define FUNC llrintf
#define ITYPE float
#define IREGS "s"
#define IREG_SIZE 32
#define OTYPE long long int
#define OREG_SIZE 64
#include <s_lrint.c>

1
sysdeps/aarch64/fpu/s_llround.c
View File

@ -18,4 +18,5 @@
#define FUNC llround
#define OTYPE long long int
#define OREG_SIZE 64
#include <s_lround.c>

3
sysdeps/aarch64/fpu/s_llroundf.c
View File

@ -18,6 +18,7 @@
#define FUNC llroundf
#define ITYPE float
#define IREGS "s"
#define IREG_SIZE 32
#define OTYPE long long int
#define OREG_SIZE 64
#include <s_lround.c>

60
sysdeps/aarch64/fpu/s_lrint.c
View File

@ -17,6 +17,8 @@
<http://www.gnu.org/licenses/>. */
#include <math.h>
#include <get-rounding-mode.h>
#include <stdint.h>
#ifndef FUNC
# define FUNC lrint
@ -24,18 +26,37 @@
#ifndef ITYPE
# define ITYPE double
# define IREGS "d"
# define IREG_SIZE 64
#else
# ifndef IREGS
# error IREGS not defined
# ifndef IREG_SIZE
# error IREG_SIZE not defined
# endif
#endif
#ifndef OTYPE
# define OTYPE long int
# ifdef __ILP32__
# define OREG_SIZE 32
# else
# define OREG_SIZE 64
# endif
#else
# ifndef OREG_SIZE
# error OREG_SIZE not defined
# endif
#endif
#define OREGS "x"
#if IREG_SIZE == 32
# define IREGS "s"
#else
# define IREGS "d"
#endif
#if OREG_SIZE == 32
# define OREGS "w"
#else
# define OREGS "x"
#endif
#define __CONCATX(a,b) __CONCAT(a,b)
@ -44,6 +65,37 @@ __CONCATX(__,FUNC) (ITYPE x)
{
OTYPE result;
ITYPE temp;
#if IREG_SIZE == 64 && OREG_SIZE == 32
if (__builtin_fabs (x) > INT32_MAX)
{
/* Converting large values to a 32 bit int may cause the frintx/fcvtza
sequence to set both FE_INVALID and FE_INEXACT. To avoid this
check the rounding mode and do a single instruction with the
appropriate rounding mode. */
switch (get_rounding_mode ())
{
case FE_TONEAREST:
asm volatile ("fcvtns" "\t%" OREGS "0, %" IREGS "1"
: "=r" (result) : "w" (x));
break;
case FE_UPWARD:
asm volatile ("fcvtps" "\t%" OREGS "0, %" IREGS "1"
: "=r" (result) : "w" (x));
break;
case FE_DOWNWARD:
asm volatile ("fcvtms" "\t%" OREGS "0, %" IREGS "1"
: "=r" (result) : "w" (x));
break;
case FE_TOWARDZERO:
default:
asm volatile ("fcvtzs" "\t%" OREGS "0, %" IREGS "1"
: "=r" (result) : "w" (x));
}
return result;
}
#endif
asm ( "frintx" "\t%" IREGS "1, %" IREGS "2\n\t"
"fcvtzs" "\t%" OREGS "0, %" IREGS "1"
: "=r" (result), "=w" (temp) : "w" (x) );

2
sysdeps/aarch64/fpu/s_lrintf.c
View File

@ -18,5 +18,5 @@
#define FUNC lrintf
#define ITYPE float
#define IREGS "s"
#define IREG_SIZE 32
#include <s_lrint.c>

27
sysdeps/aarch64/fpu/s_lround.c
View File

@ -24,18 +24,37 @@
#ifndef ITYPE
# define ITYPE double
# define IREGS "d"
# define IREG_SIZE 64
#else
# ifndef IREGS
# error IREGS not defined
# ifndef IREG_SIZE
# error IREG_SIZE not defined
# endif
#endif
#ifndef OTYPE
# define OTYPE long int
# ifdef __ILP32__
# define OREG_SIZE 32
# else
# define OREG_SIZE 64
# endif
#else
# ifndef OREG_SIZE
# error OREG_SIZE not defined
# endif
#endif
#define OREGS "x"
#if IREG_SIZE == 32
# define IREGS "s"
#else
# define IREGS "d"
#endif
#if OREG_SIZE == 32
# define OREGS "w"
#else
# define OREGS "x"
#endif
#define __CONCATX(a,b) __CONCAT(a,b)

2
sysdeps/aarch64/fpu/s_lroundf.c
View File

@ -18,5 +18,5 @@
#define FUNC lroundf
#define ITYPE float
#define IREGS "s"
#define IREG_SIZE 32
#include <s_lround.c>