This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
soft-fp speedup patch
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: libc-alpha at sourceware dot org
- Date: Thu, 9 Feb 2006 22:57:35 +0000 (UTC)
- Subject: soft-fp speedup patch
This patch speeds up the soft-fp code in glibc, and fixes several bugs in
the process.
The motivation is to be able to replace the existing code in libgcc
(gcc/config/fp-bit.c) with soft-fp, which is faster and provides features
missing from the other available software floating point support code
(exception and rounding mode support). There is however another
implementation available, Torbjorn Granlund's ieeelib
<http://gcc.gnu.org/ml/gcc/1999-07n/msg00553.html>, which is smaller and
faster than soft-fp but has less maintainable code and more source code
duplication (and doesn't have any exception or rounding mode support). I
examined the code of the various implementations and concluded that the
best approach would be to take the ideas and carefully tuned algorithms of
ieeelib and put them in the macro structure of soft-fp to get (most of)
the speed of ieeelib but in a more maintainable structure.
This patch uses ideas from ieeelib to speed up addition/subtraction and
conversion operations in soft-fp (based on profiling indicating these as
the most promising operations to speed up). As measured with EEMBC it
gains two thirds of the former difference in performance from ieeelib (was
2% worse, now 0.7% worse), and I expect further fine tuning could speed it
up further.
More operations that previously worked on cooked (fully unpacked) floating
point values now operate on raw values (comparisons already did so). An
intermediate form of unpacking, where numbers are shifted to allow for
guard bits but no other classification is done, is also added; this is
very similar to the form used in ieeelib.
As well as being benchmarked with EEMBC, the new code has been tested with
the GCC testsuite, with paranoia and with ucbtest. Several bugs were
found in the old implementations of conversions between floating-point and
integers, and fixed in the course of this work:
* Floating-to-signed conversions which overflow could have undefined
behavior in the soft-fp implementation, subtracting 1 from the most
negative integer. Fixed by always using unsigned integers for the
relevant temporary variable.
* Conversion of the most negative integer from floating would wrongly set
the "invalid" exception. Converting (double)INT_MIN to int shouldn't set
INVALID; converting (double)INT_MIN-0.1 should set INEXACT but not
INVALID.
* Converting to a wider integer (float -> long long, __fixsfdi) would
always try to left-shift, sometimes by a negative amount, which is
undefined and doesn't work.
* When converting to floating point an integer using exactly one more bits
than (mantissa + guard) bits for the floating point format, it didn't get
shifted correctly. For example, converting (1<<26) + (1<<27) to float
gave the wrong result (namely 1<<28) because float has 24 mantissa bits,
soft-fp uses 3 guard bits and an off-by-one error meant the number didn't
get shifted right.
* Conversions from long long to float were broken because they used
__FP_FRAC_SRS_1 on long long values, but that macro only works for
arguments of size _FP_W_TYPE_SIZE.
I have I hope updated all the target-specific soft-fp code using the
soft-fp macros whose semantics have changed, although I haven't tested
those parts of the patch.
2006-02-09 Joseph S. Myers <joseph@codesourcery.com>
* soft-fp/op-common.h (_FP_UNPACK_SEMIRAW): Define.
(_FP_OVERFLOW_SEMIRAW): Likewise.
(_FP_CHECK_SIGNAN_SEMIRAW): Likewise.
(_FP_CHOOSENAN_SEMIRAW): Likewise.
(_FP_EXP_NORMAL): Likewise.
(_FP_PACK_SEMIRAW): Likewise.
(_FP_ADD_INTERNAL): Rewrite to operate on semi-raw value.
(_FP_SUB): Likewise.
(_FP_TO_INT): Rewrite to operate on raw values. Don't set INVALID
exception for conversions where most negative representable
integer is correct truncated value, but do set INEXACT for such
conversions where appropriate. Don't always left-shift for
converting to a wider integer.
(_FP_FROM_INT): Rewrite to yield raw value. Correct shift for
integers with one more bits than (mantissa + guard) bits for the
floating point format. Don't use __FP_FRAC_SRS_1 for shifting
integers that may be wider than _FP_W_TYPE_SIZE.
(FP_CONV): Don't define.
(FP_EXTEND): Define.
(FP_TRUNC): Likewise.
* soft-fp/op-1.h (_FP_FRAC_SRST_1, __FP_FRAC_SRST_1): Define.
(_FP_FRAC_CONV_1_1): Don't define.
(_FP_FRAC_COPY_1_1): Define.
* soft-fp/op-2.h (_FP_FRAC_SRST_2): Define.
(_FP_FRAC_CONV_1_2, _FP_FRAC_CONV_2_1): Don't define.
(_FP_FRAC_COPY_1_2, _FP_FRAC_COPY_2_1): Define.
* soft-fp/op-4.h (_FP_FRAC_SRST_4): Define.
(_FP_FRAC_SRS_4): Define based on _FP_FRAC_SRST_4.
(_FP_FRAC_CONV_1_4, _FP_FRAC_CONV_2_4): Don't define.
(_FP_FRAC_COPY_1_4, _FP_FRAC_COPY_2_4): Define.
(_FP_FRAC_CONV_4_1, _FP_FRAC_CONV_4_2): Don't define.
(_FP_FRAC_COPY_4_1, _FP_FRAC_COPY_4_2): Define.
* soft-fp/single.h (_FP_FRACTBITS_S): Define.
(_FP_FRACXBITS_S): Define in terms of _FP_FRACXBITS_S.
(_FP_WFRACXBITS_S): Likewise.
(_FP_QNANBIT_SH_S, _FP_IMPLBIT_SH_S): Define.
(FP_UNPACK_SEMIRAW_S, FP_UNPACK_SEMIRAW_SP): Define.
(FP_PACK_SEMIRAW_S, FP_PACK_SEMIRAW_SP): Define.
* soft-fp/double.h (_FP_QNANBIT_SH_D, _FP_IMPLBIT_SH_D): Define.
(FP_UNPACK_SEMIRAW_D, FP_UNPACK_SEMIRAW_D): Define
(FP_PACK_SEMIRAW_D, FP_PACK_SEMIRAW_DP): Define.
* soft-fp/extended.h (_FP_QNANBIT_SH_E, _FP_IMPLBIT_SH_E): Define.
(FP_UNPACK_EP): Correct typo.
(FP_UNPACK_SEMIRAW_E, FP_UNPACK_SEMIRAW_EP): Define.
(FP_PACK_SEMIRAW_E, FP_PACK_SEMIRAW_EP): Define.
* soft-fp/quad.h (_FP_QNANBIT_SH_Q, _FP_IMPLBIT_SH_Q): Define.
(FP_UNPACK_SEMIRAW_Q, FP_UNPACK_SEMIRAW_QP): Define.
(FP_PACK_SEMIRAW_Q, FP_PACK_SEMIRAW_QP): Define.
* soft-fp/fixdfdi.c: Use unsigned type for result of conversion.
* soft-fp/fixdfsi.c: Likewise.
* soft-fp/fixsfdi.c: Likewise.
* soft-fp/fixsfsi.c: Likewise.
* soft-fp/fixtfdi.c: Likewise.
* soft-fp/fixtfsi.c: Likewise.
* sysdeps/alpha/soft-fp/ots_cvtxq.c: Likewise.
* sysdeps/alpha/soft-fp/ots_nintxq.c: Likewise.
* sysdeps/powerpc/soft-fp/q_qtoi.c: Likewise.
* sysdeps/powerpc/soft-fp/q_qtoll.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_qtoi.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_qtoll.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_qtoi.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_qtox.c: Likewise.
* soft-fp/adddf3.c: Update for changed soft-fp interfaces.
* soft-fp/addsf3.c: Likewise.
* soft-fp/addtf3.c: Likewise.
* soft-fp/extenddftf2.c: Likewise.
* soft-fp/extendsfdf2.c: Likewise.
* soft-fp/extendsftf2.c: Likewise.
* soft-fp/fixdfdi.c: Likewise.
* soft-fp/fixdfsi.c: Likewise.
* soft-fp/fixsfdi.c: Likewise.
* soft-fp/fixsfsi.c: Likewise.
* soft-fp/fixtfdi.c: Likewise.
* soft-fp/fixtfsi.c: Likewise.
* soft-fp/fixunsdfdi.c: Likewise.
* soft-fp/fixunsdfsi.c: Likewise.
* soft-fp/fixunssfdi.c: Likewise.
* soft-fp/fixunssfsi.c: Likewise.
* soft-fp/fixunstfdi.c: Likewise.
* soft-fp/fixunstfsi.c: Likewise.
* soft-fp/floatdidf.c: Likewise.
* soft-fp/floatdisf.c: Likewise.
* soft-fp/floatditf.c: Likewise.
* soft-fp/floatsidf.c: Likewise.
* soft-fp/floatsisf.c: Likewise.
* soft-fp/floatsitf.c: Likewise.
* soft-fp/floatundidf.c: Likewise.
* soft-fp/floatundisf.c: Likewise.
* soft-fp/floatunditf.c: Likewise.
* soft-fp/floatunsidf.c: Likewise.
* soft-fp/floatunsisf.c: Likewise.
* soft-fp/floatunsitf.c: Likewise.
* soft-fp/subdf3.c: Likewise.
* soft-fp/subsf3.c: Likewise.
* soft-fp/subtf3.c: Likewise.
* soft-fp/truncdfsf2.c: Likewise.
* soft-fp/trunctfdf2.c: Likewise.
* soft-fp/trunctfsf2.c: Likewise.
* sysdeps/alpha/soft-fp/ots_add.c: Likewise.
* sysdeps/alpha/soft-fp/ots_cvtqux.c: Likewise.
* sysdeps/alpha/soft-fp/ots_cvtqx.c: Likewise.
* sysdeps/alpha/soft-fp/ots_cvttx.c: Likewise.
* sysdeps/alpha/soft-fp/ots_cvtxq.c: Likewise.
* sysdeps/alpha/soft-fp/ots_cvtxt.c: Likewise.
* sysdeps/alpha/soft-fp/ots_nintxq.c: Likewise.
* sysdeps/alpha/soft-fp/ots_sub.c: Likewise.
* sysdeps/powerpc/soft-fp/q_add.c: Likewise.
* sysdeps/powerpc/soft-fp/q_dtoq.c: Likewise.
* sysdeps/powerpc/soft-fp/q_itoq.c: Likewise.
* sysdeps/powerpc/soft-fp/q_lltoq.c: Likewise.
* sysdeps/powerpc/soft-fp/q_qtod.c: Likewise.
* sysdeps/powerpc/soft-fp/q_qtoi.c: Likewise.
* sysdeps/powerpc/soft-fp/q_qtoll.c: Likewise.
* sysdeps/powerpc/soft-fp/q_qtos.c: Likewise.
* sysdeps/powerpc/soft-fp/q_qtou.c: Likewise.
* sysdeps/powerpc/soft-fp/q_qtoull.c: Likewise.
* sysdeps/powerpc/soft-fp/q_stoq.c: Likewise.
* sysdeps/powerpc/soft-fp/q_sub.c: Likewise.
* sysdeps/powerpc/soft-fp/q_ulltoq.c: Likewise.
* sysdeps/powerpc/soft-fp/q_utoq.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_add.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_dtoq.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_itoq.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_lltoq.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_qtod.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_qtoi.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_qtoll.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_qtos.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_qtou.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_qtoull.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_stoq.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_sub.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_ulltoq.c: Likewise.
* sysdeps/sparc/sparc32/soft-fp/q_utoq.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_add.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_dtoq.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_itoq.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_qtod.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_qtoi.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_qtos.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_qtoui.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_qtoux.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_qtox.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_stoq.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_sub.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_uitoq.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_uxtoq.c: Likewise.
* sysdeps/sparc/sparc64/soft-fp/qp_xtoq.c: Likewise.
Index: soft-fp/adddf3.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/adddf3.c,v
retrieving revision 1.2
diff -u -p -r1.2 adddf3.c
--- soft-fp/adddf3.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/adddf3.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return a + b
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,10 +30,10 @@ double __adddf3(double a, double b)
double r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_D(A, a);
- FP_UNPACK_D(B, b);
+ FP_UNPACK_SEMIRAW_D(A, a);
+ FP_UNPACK_SEMIRAW_D(B, b);
FP_ADD_D(R, A, B);
- FP_PACK_D(r, R);
+ FP_PACK_SEMIRAW_D(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: soft-fp/addsf3.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/addsf3.c,v
retrieving revision 1.2
diff -u -p -r1.2 addsf3.c
--- soft-fp/addsf3.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/addsf3.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return a + b
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,10 +30,10 @@ float __addsf3(float a, float b)
float r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_S(A, a);
- FP_UNPACK_S(B, b);
+ FP_UNPACK_SEMIRAW_S(A, a);
+ FP_UNPACK_SEMIRAW_S(B, b);
FP_ADD_S(R, A, B);
- FP_PACK_S(r, R);
+ FP_PACK_SEMIRAW_S(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: soft-fp/addtf3.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/addtf3.c,v
retrieving revision 1.2
diff -u -p -r1.2 addtf3.c
--- soft-fp/addtf3.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/addtf3.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return a + b
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,10 +30,10 @@ long double __addtf3(long double a, long
long double r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
- FP_UNPACK_Q(B, b);
+ FP_UNPACK_SEMIRAW_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(B, b);
FP_ADD_Q(R, A, B);
- FP_PACK_Q(r, R);
+ FP_PACK_SEMIRAW_Q(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: soft-fp/double.h
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/double.h,v
retrieving revision 1.4
diff -u -p -r1.4 double.h
--- soft-fp/double.h 30 Jan 2006 22:27:21 -0000 1.4
+++ soft-fp/double.h 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Definitions for IEEE Double Precision
- Copyright (C) 1997,1998,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1998,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com),
Jakub Jelinek (jj@ultra.linux.cz),
@@ -42,8 +42,12 @@
#define _FP_QNANBIT_D \
((_FP_W_TYPE)1 << (_FP_FRACBITS_D-2) % _FP_W_TYPE_SIZE)
+#define _FP_QNANBIT_SH_D \
+ ((_FP_W_TYPE)1 << (_FP_FRACBITS_D-2+_FP_WORKBITS) % _FP_W_TYPE_SIZE)
#define _FP_IMPLBIT_D \
((_FP_W_TYPE)1 << (_FP_FRACBITS_D-1) % _FP_W_TYPE_SIZE)
+#define _FP_IMPLBIT_SH_D \
+ ((_FP_W_TYPE)1 << (_FP_FRACBITS_D-1+_FP_WORKBITS) % _FP_W_TYPE_SIZE)
#define _FP_OVERFLOW_D \
((_FP_W_TYPE)1 << _FP_WFRACBITS_D % _FP_W_TYPE_SIZE)
@@ -89,6 +93,18 @@ union _FP_UNION_D
_FP_UNPACK_CANONICAL(D,2,X); \
} while (0)
+#define FP_UNPACK_SEMIRAW_D(X,val) \
+ do { \
+ _FP_UNPACK_RAW_2(D,X,val); \
+ _FP_UNPACK_SEMIRAW(D,2,X); \
+ } while (0)
+
+#define FP_UNPACK_SEMIRAW_DP(X,val) \
+ do { \
+ _FP_UNPACK_RAW_2_P(D,X,val); \
+ _FP_UNPACK_SEMIRAW(D,2,X); \
+ } while (0)
+
#define FP_PACK_D(val,X) \
do { \
_FP_PACK_CANONICAL(D,2,X); \
@@ -102,6 +118,19 @@ union _FP_UNION_D
_FP_PACK_RAW_2_P(D,val,X); \
} while (0)
+#define FP_PACK_SEMIRAW_D(val,X) \
+ do { \
+ _FP_PACK_SEMIRAW(D,2,X); \
+ _FP_PACK_RAW_2(D,val,X); \
+ } while (0)
+
+#define FP_PACK_SEMIRAW_DP(val,X) \
+ do { \
+ _FP_PACK_SEMIRAW(D,2,X); \
+ if (!FP_INHIBIT_RESULTS) \
+ _FP_PACK_RAW_2_P(D,val,X); \
+ } while (0)
+
#define FP_ISSIGNAN_D(X) _FP_ISSIGNAN(D,2,X)
#define FP_NEG_D(R,X) _FP_NEG(D,2,R,X)
#define FP_ADD_D(R,X,Y) _FP_ADD(D,2,R,X,Y)
@@ -161,6 +190,18 @@ union _FP_UNION_D
_FP_UNPACK_CANONICAL(D,1,X); \
} while (0)
+#define FP_UNPACK_SEMIRAW_D(X,val) \
+ do { \
+ _FP_UNPACK_RAW_2(1,X,val); \
+ _FP_UNPACK_SEMIRAW(D,1,X); \
+ } while (0)
+
+#define FP_UNPACK_SEMIRAW_DP(X,val) \
+ do { \
+ _FP_UNPACK_RAW_2_P(1,X,val); \
+ _FP_UNPACK_SEMIRAW(D,1,X); \
+ } while (0)
+
#define FP_PACK_D(val,X) \
do { \
_FP_PACK_CANONICAL(D,1,X); \
@@ -174,6 +215,19 @@ union _FP_UNION_D
_FP_PACK_RAW_1_P(D,val,X); \
} while (0)
+#define FP_PACK_SEMIRAW_D(val,X) \
+ do { \
+ _FP_PACK_SEMIRAW(D,1,X); \
+ _FP_PACK_RAW_1(D,val,X); \
+ } while (0)
+
+#define FP_PACK_SEMIRAW_DP(val,X) \
+ do { \
+ _FP_PACK_SEMIRAW(D,1,X); \
+ if (!FP_INHIBIT_RESULTS) \
+ _FP_PACK_RAW_1_P(D,val,X); \
+ } while (0)
+
#define FP_ISSIGNAN_D(X) _FP_ISSIGNAN(D,1,X)
#define FP_NEG_D(R,X) _FP_NEG(D,1,R,X)
#define FP_ADD_D(R,X,Y) _FP_ADD(D,1,R,X,Y)
Index: soft-fp/extenddftf2.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/extenddftf2.c,v
retrieving revision 1.2
diff -u -p -r1.2 extenddftf2.c
--- soft-fp/extenddftf2.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/extenddftf2.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return a converted to IEEE quad
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -32,13 +32,13 @@ long double __extenddftf2(double a)
long double r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_D(A, a);
+ FP_UNPACK_RAW_D(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(Q,D,4,2,R,A);
+ FP_EXTEND(Q,D,4,2,R,A);
#else
- FP_CONV(Q,D,2,1,R,A);
+ FP_EXTEND(Q,D,2,1,R,A);
#endif
- FP_PACK_Q(r, R);
+ FP_PACK_RAW_Q(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: soft-fp/extended.h
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/extended.h,v
retrieving revision 1.4
diff -u -p -r1.4 extended.h
--- soft-fp/extended.h 30 Jan 2006 22:27:21 -0000 1.4
+++ soft-fp/extended.h 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Definitions for IEEE Extended Precision.
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek (jj@ultra.linux.cz).
@@ -39,8 +39,12 @@
#define _FP_QNANBIT_E \
((_FP_W_TYPE)1 << (_FP_FRACBITS_E-2) % _FP_W_TYPE_SIZE)
+#define _FP_QNANBIT_SH_E \
+ ((_FP_W_TYPE)1 << (_FP_FRACBITS_E-2+_FP_WORKBITS) % _FP_W_TYPE_SIZE)
#define _FP_IMPLBIT_E \
((_FP_W_TYPE)1 << (_FP_FRACBITS_E-1) % _FP_W_TYPE_SIZE)
+#define _FP_IMPLBIT_SH_E \
+ ((_FP_W_TYPE)1 << (_FP_FRACBITS_E-1+_FP_WORKBITS) % _FP_W_TYPE_SIZE)
#define _FP_OVERFLOW_E \
((_FP_W_TYPE)1 << (_FP_WFRACBITS_E % _FP_W_TYPE_SIZE))
@@ -143,10 +147,22 @@ union _FP_UNION_E
#define FP_UNPACK_EP(X,val) \
do { \
- FP_UNPACK_RAW_2_P(X,val); \
+ FP_UNPACK_RAW_EP(X,val); \
_FP_UNPACK_CANONICAL(E,4,X); \
} while (0)
+#define FP_UNPACK_SEMIRAW_E(X,val) \
+ do { \
+ _FP_UNPACK_RAW_E(X,val); \
+ _FP_UNPACK_SEMIRAW(E,4,X); \
+ } while (0)
+
+#define FP_UNPACK_SEMIRAW_EP(X,val) \
+ do { \
+ _FP_UNPACK_RAW_EP(X,val); \
+ _FP_UNPACK_SEMIRAW(E,4,X); \
+ } while (0)
+
#define FP_PACK_E(val,X) \
do { \
_FP_PACK_CANONICAL(E,4,X); \
@@ -159,6 +175,18 @@ union _FP_UNION_E
FP_PACK_RAW_EP(val,X); \
} while (0)
+#define FP_PACK_SEMIRAW_E(val,X) \
+ do { \
+ _FP_PACK_SEMIRAW(E,4,X); \
+ _FP_PACK_RAW_E(val,X); \
+ } while (0)
+
+#define FP_PACK_SEMIRAW_EP(val,X) \
+ do { \
+ _FP_PACK_SEMIRAW(E,4,X); \
+ _FP_PACK_RAW_EP(val,X); \
+ } while (0)
+
#define FP_ISSIGNAN_E(X) _FP_ISSIGNAN(E,4,X)
#define FP_NEG_E(R,X) _FP_NEG(E,4,R,X)
#define FP_ADD_E(R,X,Y) _FP_ADD(E,4,R,X,Y)
@@ -324,6 +352,18 @@ union _FP_UNION_E
_FP_UNPACK_CANONICAL(E,2,X); \
} while (0)
+#define FP_UNPACK_SEMIRAW_E(X,val) \
+ do { \
+ _FP_UNPACK_RAW_E(X,val); \
+ _FP_UNPACK_SEMIRAW(E,2,X); \
+ } while (0)
+
+#define FP_UNPACK_SEMIRAW_EP(X,val) \
+ do { \
+ _FP_UNPACK_RAW_EP(X,val); \
+ _FP_UNPACK_SEMIRAW(E,2,X); \
+ } while (0)
+
#define FP_PACK_E(val,X) \
do { \
_FP_PACK_CANONICAL(E,2,X); \
@@ -336,6 +376,18 @@ union _FP_UNION_E
FP_PACK_RAW_EP(val,X); \
} while (0)
+#define FP_PACK_SEMIRAW_E(val,X) \
+ do { \
+ _FP_PACK_SEMIRAW(E,2,X); \
+ _FP_PACK_RAW_E(val,X); \
+ } while (0)
+
+#define FP_PACK_SEMIRAW_EP(val,X) \
+ do { \
+ _FP_PACK_SEMIRAW(E,2,X); \
+ _FP_PACK_RAW_EP(val,X); \
+ } while (0)
+
#define FP_ISSIGNAN_E(X) _FP_ISSIGNAN(E,2,X)
#define FP_NEG_E(R,X) _FP_NEG(E,2,R,X)
#define FP_ADD_E(R,X,Y) _FP_ADD(E,2,R,X,Y)
Index: soft-fp/extendsfdf2.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/extendsfdf2.c,v
retrieving revision 1.2
diff -u -p -r1.2 extendsfdf2.c
--- soft-fp/extendsfdf2.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/extendsfdf2.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return a converted to IEEE double
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -32,13 +32,13 @@ double __extendsfdf2(float a)
double r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_S(A, a);
+ FP_UNPACK_RAW_S(A, a);
#if _FP_W_TYPE_SIZE < _FP_FRACBITS_D
- FP_CONV(D,S,2,1,R,A);
+ FP_EXTEND(D,S,2,1,R,A);
#else
- FP_CONV(D,S,1,1,R,A);
+ FP_EXTEND(D,S,1,1,R,A);
#endif
- FP_PACK_D(r, R);
+ FP_PACK_RAW_D(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: soft-fp/extendsftf2.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/extendsftf2.c,v
retrieving revision 1.2
diff -u -p -r1.2 extendsftf2.c
--- soft-fp/extendsftf2.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/extendsftf2.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return a converted to IEEE quad
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -32,13 +32,13 @@ long double __extendsftf2(float a)
long double r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_S(A, a);
+ FP_UNPACK_RAW_S(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(Q,S,4,1,R,A);
+ FP_EXTEND(Q,S,4,1,R,A);
#else
- FP_CONV(Q,S,2,1,R,A);
+ FP_EXTEND(Q,S,2,1,R,A);
#endif
- FP_PACK_Q(r, R);
+ FP_PACK_RAW_Q(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: soft-fp/fixdfdi.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/fixdfdi.c,v
retrieving revision 1.2
diff -u -p -r1.2 fixdfdi.c
--- soft-fp/fixdfdi.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/fixdfdi.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a to 64bit signed integer
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -27,9 +27,9 @@ DItype __fixdfdi(double a)
{
FP_DECL_EX;
FP_DECL_D(A);
- DItype r;
+ UDItype r;
- FP_UNPACK_D(A, a);
+ FP_UNPACK_RAW_D(A, a);
FP_TO_INT_D(r, A, 64, 1);
FP_HANDLE_EXCEPTIONS;
Index: soft-fp/fixdfsi.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/fixdfsi.c,v
retrieving revision 1.2
diff -u -p -r1.2 fixdfsi.c
--- soft-fp/fixdfsi.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/fixdfsi.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a to 32bit signed integer
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -27,9 +27,9 @@ SItype __fixdfsi(double a)
{
FP_DECL_EX;
FP_DECL_D(A);
- SItype r;
+ USItype r;
- FP_UNPACK_D(A, a);
+ FP_UNPACK_RAW_D(A, a);
FP_TO_INT_D(r, A, 32, 1);
FP_HANDLE_EXCEPTIONS;
Index: soft-fp/fixsfdi.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/fixsfdi.c,v
retrieving revision 1.2
diff -u -p -r1.2 fixsfdi.c
--- soft-fp/fixsfdi.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/fixsfdi.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a to 64bit signed integer
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -27,9 +27,9 @@ DItype __fixsfdi(float a)
{
FP_DECL_EX;
FP_DECL_S(A);
- DItype r;
+ UDItype r;
- FP_UNPACK_S(A, a);
+ FP_UNPACK_RAW_S(A, a);
FP_TO_INT_S(r, A, 64, 1);
FP_HANDLE_EXCEPTIONS;
Index: soft-fp/fixsfsi.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/fixsfsi.c,v
retrieving revision 1.2
diff -u -p -r1.2 fixsfsi.c
--- soft-fp/fixsfsi.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/fixsfsi.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a to 32bit signed integer
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -27,9 +27,9 @@ SItype __fixsfsi(float a)
{
FP_DECL_EX;
FP_DECL_S(A);
- SItype r;
+ USItype r;
- FP_UNPACK_S(A, a);
+ FP_UNPACK_RAW_S(A, a);
FP_TO_INT_S(r, A, 32, 1);
FP_HANDLE_EXCEPTIONS;
Index: soft-fp/fixtfdi.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/fixtfdi.c,v
retrieving revision 1.2
diff -u -p -r1.2 fixtfdi.c
--- soft-fp/fixtfdi.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/fixtfdi.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a to 64bit signed integer
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -27,9 +27,9 @@ DItype __fixtfdi(long double a)
{
FP_DECL_EX;
FP_DECL_Q(A);
- DItype r;
+ UDItype r;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_RAW_Q(A, a);
FP_TO_INT_Q(r, A, 64, 1);
FP_HANDLE_EXCEPTIONS;
Index: soft-fp/fixtfsi.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/fixtfsi.c,v
retrieving revision 1.2
diff -u -p -r1.2 fixtfsi.c
--- soft-fp/fixtfsi.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/fixtfsi.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a to 32bit signed integer
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -27,9 +27,9 @@ SItype __fixtfsi(long double a)
{
FP_DECL_EX;
FP_DECL_Q(A);
- SItype r;
+ USItype r;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_RAW_Q(A, a);
FP_TO_INT_Q(r, A, 32, 1);
FP_HANDLE_EXCEPTIONS;
Index: soft-fp/fixunsdfdi.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/fixunsdfdi.c,v
retrieving revision 1.2
diff -u -p -r1.2 fixunsdfdi.c
--- soft-fp/fixunsdfdi.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/fixunsdfdi.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a to 64bit unsigned integer
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -29,7 +29,7 @@ UDItype __fixunsdfdi(double a)
FP_DECL_D(A);
UDItype r;
- FP_UNPACK_D(A, a);
+ FP_UNPACK_RAW_D(A, a);
FP_TO_INT_D(r, A, 64, 0);
FP_HANDLE_EXCEPTIONS;
Index: soft-fp/fixunsdfsi.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/fixunsdfsi.c,v
retrieving revision 1.2
diff -u -p -r1.2 fixunsdfsi.c
--- soft-fp/fixunsdfsi.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/fixunsdfsi.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a to 32bit unsigned integer
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -29,7 +29,7 @@ USItype __fixunsdfsi(double a)
FP_DECL_D(A);
USItype r;
- FP_UNPACK_D(A, a);
+ FP_UNPACK_RAW_D(A, a);
FP_TO_INT_D(r, A, 32, 0);
FP_HANDLE_EXCEPTIONS;
Index: soft-fp/fixunssfdi.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/fixunssfdi.c,v
retrieving revision 1.2
diff -u -p -r1.2 fixunssfdi.c
--- soft-fp/fixunssfdi.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/fixunssfdi.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a to 64bit unsigned integer
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -29,7 +29,7 @@ UDItype __fixunssfdi(float a)
FP_DECL_S(A);
UDItype r;
- FP_UNPACK_S(A, a);
+ FP_UNPACK_RAW_S(A, a);
FP_TO_INT_S(r, A, 64, 0);
FP_HANDLE_EXCEPTIONS;
Index: soft-fp/fixunssfsi.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/fixunssfsi.c,v
retrieving revision 1.2
diff -u -p -r1.2 fixunssfsi.c
--- soft-fp/fixunssfsi.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/fixunssfsi.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a to 32bit unsigned integer
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -29,7 +29,7 @@ USItype __fixunssfsi(float a)
FP_DECL_S(A);
USItype r;
- FP_UNPACK_S(A, a);
+ FP_UNPACK_RAW_S(A, a);
FP_TO_INT_S(r, A, 32, 0);
FP_HANDLE_EXCEPTIONS;
Index: soft-fp/fixunstfdi.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/fixunstfdi.c,v
retrieving revision 1.2
diff -u -p -r1.2 fixunstfdi.c
--- soft-fp/fixunstfdi.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/fixunstfdi.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a to 64bit unsigned integer
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -29,7 +29,7 @@ UDItype __fixunstfdi(long double a)
FP_DECL_Q(A);
UDItype r;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_RAW_Q(A, a);
FP_TO_INT_Q(r, A, 64, 0);
FP_HANDLE_EXCEPTIONS;
Index: soft-fp/fixunstfsi.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/fixunstfsi.c,v
retrieving revision 1.2
diff -u -p -r1.2 fixunstfsi.c
--- soft-fp/fixunstfsi.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/fixunstfsi.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a to 32bit unsigned integer
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -29,7 +29,7 @@ USItype __fixunstfsi(long double a)
FP_DECL_Q(A);
USItype r;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_RAW_Q(A, a);
FP_TO_INT_Q(r, A, 32, 0);
FP_HANDLE_EXCEPTIONS;
Index: soft-fp/floatdidf.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/floatdidf.c,v
retrieving revision 1.2
diff -u -p -r1.2 floatdidf.c
--- soft-fp/floatdidf.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/floatdidf.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a 64bit signed integer to IEEE double
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,7 +30,7 @@ double __floatdidf(DItype i)
double a;
FP_FROM_INT_D(A, i, 64, long long);
- FP_PACK_D(a, A);
+ FP_PACK_RAW_D(a, A);
FP_HANDLE_EXCEPTIONS;
return a;
Index: soft-fp/floatdisf.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/floatdisf.c,v
retrieving revision 1.3
diff -u -p -r1.3 floatdisf.c
--- soft-fp/floatdisf.c 6 Dec 2005 00:38:31 -0000 1.3
+++ soft-fp/floatdisf.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a 64bit signed integer to IEEE single
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,7 +30,7 @@ float __floatdisf(DItype i)
float a;
FP_FROM_INT_S(A, i, 64, long long);
- FP_PACK_S(a, A);
+ FP_PACK_RAW_S(a, A);
FP_HANDLE_EXCEPTIONS;
return a;
Index: soft-fp/floatditf.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/floatditf.c,v
retrieving revision 1.2
diff -u -p -r1.2 floatditf.c
--- soft-fp/floatditf.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/floatditf.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a 64bit signed integer to IEEE quad
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,7 +30,7 @@ long double __floatditf(DItype i)
long double a;
FP_FROM_INT_Q(A, i, 64, long long);
- FP_PACK_Q(a, A);
+ FP_PACK_RAW_Q(a, A);
FP_HANDLE_EXCEPTIONS;
return a;
Index: soft-fp/floatsidf.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/floatsidf.c,v
retrieving revision 1.2
diff -u -p -r1.2 floatsidf.c
--- soft-fp/floatsidf.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/floatsidf.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a 32bit signed integer to IEEE double
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,7 +30,7 @@ double __floatsidf(SItype i)
double a;
FP_FROM_INT_D(A, i, 32, int);
- FP_PACK_D(a, A);
+ FP_PACK_RAW_D(a, A);
FP_HANDLE_EXCEPTIONS;
return a;
Index: soft-fp/floatsisf.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/floatsisf.c,v
retrieving revision 1.2
diff -u -p -r1.2 floatsisf.c
--- soft-fp/floatsisf.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/floatsisf.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a 32bit signed integer to IEEE single
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,7 +30,7 @@ float __floatsisf(SItype i)
float a;
FP_FROM_INT_S(A, i, 32, int);
- FP_PACK_S(a, A);
+ FP_PACK_RAW_S(a, A);
FP_HANDLE_EXCEPTIONS;
return a;
Index: soft-fp/floatsitf.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/floatsitf.c,v
retrieving revision 1.2
diff -u -p -r1.2 floatsitf.c
--- soft-fp/floatsitf.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/floatsitf.c 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Convert a 32bit signed integer to IEEE quad
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,7 +30,7 @@ long double __floatsitf(SItype i)
long double a;
FP_FROM_INT_Q(A, i, 32, int);
- FP_PACK_Q(a, A);
+ FP_PACK_RAW_Q(a, A);
FP_HANDLE_EXCEPTIONS;
return a;
Index: soft-fp/floatundidf.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/floatundidf.c,v
retrieving revision 1.1
diff -u -p -r1.1 floatundidf.c
--- soft-fp/floatundidf.c 6 Jan 2006 10:47:45 -0000 1.1
+++ soft-fp/floatundidf.c 9 Feb 2006 22:05:31 -0000
@@ -31,7 +31,7 @@ __floatundidf(UDItype i)
double a;
FP_FROM_INT_D(A, i, 64, long long);
- FP_PACK_D(a, A);
+ FP_PACK_RAW_D(a, A);
FP_HANDLE_EXCEPTIONS;
return a;
Index: soft-fp/floatundisf.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/floatundisf.c,v
retrieving revision 1.1
diff -u -p -r1.1 floatundisf.c
--- soft-fp/floatundisf.c 6 Jan 2006 10:47:45 -0000 1.1
+++ soft-fp/floatundisf.c 9 Feb 2006 22:05:31 -0000
@@ -31,7 +31,7 @@ __floatundisf(UDItype i)
float a;
FP_FROM_INT_S(A, i, 64, long long);
- FP_PACK_S(a, A);
+ FP_PACK_RAW_S(a, A);
FP_HANDLE_EXCEPTIONS;
return a;
Index: soft-fp/floatunditf.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/floatunditf.c,v
retrieving revision 1.1
diff -u -p -r1.1 floatunditf.c
--- soft-fp/floatunditf.c 6 Jan 2006 10:47:45 -0000 1.1
+++ soft-fp/floatunditf.c 9 Feb 2006 22:05:31 -0000
@@ -31,7 +31,7 @@ __floatunditf(UDItype i)
long double a;
FP_FROM_INT_Q(A, i, 64, long long);
- FP_PACK_Q(a, A);
+ FP_PACK_RAW_Q(a, A);
FP_HANDLE_EXCEPTIONS;
return a;
Index: soft-fp/floatunsidf.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/floatunsidf.c,v
retrieving revision 1.1
diff -u -p -r1.1 floatunsidf.c
--- soft-fp/floatunsidf.c 6 Jan 2006 10:47:45 -0000 1.1
+++ soft-fp/floatunsidf.c 9 Feb 2006 22:05:31 -0000
@@ -31,7 +31,7 @@ __floatunsidf(USItype i)
double a;
FP_FROM_INT_D(A, i, 32, int);
- FP_PACK_D(a, A);
+ FP_PACK_RAW_D(a, A);
FP_HANDLE_EXCEPTIONS;
return a;
Index: soft-fp/floatunsisf.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/floatunsisf.c,v
retrieving revision 1.1
diff -u -p -r1.1 floatunsisf.c
--- soft-fp/floatunsisf.c 6 Jan 2006 10:47:45 -0000 1.1
+++ soft-fp/floatunsisf.c 9 Feb 2006 22:05:31 -0000
@@ -31,7 +31,7 @@ __floatunsisf(USItype i)
float a;
FP_FROM_INT_S(A, i, 32, int);
- FP_PACK_S(a, A);
+ FP_PACK_RAW_S(a, A);
FP_HANDLE_EXCEPTIONS;
return a;
Index: soft-fp/floatunsitf.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/floatunsitf.c,v
retrieving revision 1.1
diff -u -p -r1.1 floatunsitf.c
--- soft-fp/floatunsitf.c 6 Jan 2006 10:47:45 -0000 1.1
+++ soft-fp/floatunsitf.c 9 Feb 2006 22:05:31 -0000
@@ -31,7 +31,7 @@ __floatunsitf(USItype i)
long double a;
FP_FROM_INT_Q(A, i, 32, int);
- FP_PACK_Q(a, A);
+ FP_PACK_RAW_Q(a, A);
FP_HANDLE_EXCEPTIONS;
return a;
Index: soft-fp/op-1.h
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/op-1.h,v
retrieving revision 1.4
diff -u -p -r1.4 op-1.h
--- soft-fp/op-1.h 21 May 2002 02:10:25 -0000 1.4
+++ soft-fp/op-1.h 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Basic one-word fraction declaration and manipulation.
- Copyright (C) 1997,1998,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1998,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com),
Jakub Jelinek (jj@ultra.linux.cz),
@@ -40,8 +40,16 @@
#define _FP_FRAC_SRL_1(X,N) (X##_f >>= N)
/* Right shift with sticky-lsb. */
+#define _FP_FRAC_SRST_1(X,S,N,sz) __FP_FRAC_SRST_1(X##_f, S, N, sz)
#define _FP_FRAC_SRS_1(X,N,sz) __FP_FRAC_SRS_1(X##_f, N, sz)
+#define __FP_FRAC_SRST_1(X,S,N,sz) \
+do { \
+ S = (__builtin_constant_p(N) && (N) == 1 \
+ ? X & 1 : (X << (_FP_W_TYPE_SIZE - (N))) != 0); \
+ X = X >> (N); \
+} while (0)
+
#define __FP_FRAC_SRS_1(X,N,sz) \
(X = (X >> (N) | (__builtin_constant_p(N) && (N) == 1 \
? X & 1 : (X << (_FP_W_TYPE_SIZE - (N))) != 0)))
@@ -282,17 +290,4 @@
* Convert FP values between word sizes
*/
-#define _FP_FRAC_CONV_1_1(dfs, sfs, D, S) \
- do { \
- D##_f = S##_f; \
- if (_FP_WFRACBITS_##sfs > _FP_WFRACBITS_##dfs) \
- { \
- if (S##_c != FP_CLS_NAN) \
- _FP_FRAC_SRS_1(D, (_FP_WFRACBITS_##sfs-_FP_WFRACBITS_##dfs), \
- _FP_WFRACBITS_##sfs); \
- else \
- _FP_FRAC_SRL_1(D, (_FP_WFRACBITS_##sfs-_FP_WFRACBITS_##dfs)); \
- } \
- else \
- D##_f <<= _FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs; \
- } while (0)
+#define _FP_FRAC_COPY_1_1(D, S) (D##_f = S##_f)
Index: soft-fp/op-2.h
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/op-2.h,v
retrieving revision 1.4
diff -u -p -r1.4 op-2.h
--- soft-fp/op-2.h 21 May 2002 02:11:05 -0000 1.4
+++ soft-fp/op-2.h 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Basic two-word fraction declaration and manipulation.
- Copyright (C) 1997,1998,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1998,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com),
Jakub Jelinek (jj@ultra.linux.cz),
@@ -66,6 +66,24 @@
} while (0)
/* Right shift with sticky-lsb. */
+#define _FP_FRAC_SRST_2(X,S, N,sz) \
+ do { \
+ if ((N) < _FP_W_TYPE_SIZE) \
+ { \
+ S = (__builtin_constant_p(N) && (N) == 1 \
+ ? X##_f0 & 1 \
+ : (X##_f0 << (_FP_W_TYPE_SIZE - (N))) != 0); \
+ X##_f0 = (X##_f1 << (_FP_W_TYPE_SIZE - (N)) | X##_f0 >> (N)); \
+ X##_f1 >>= (N); \
+ } \
+ else \
+ { \
+ S = (((X##_f1 << (2*_FP_W_TYPE_SIZE - (N))) | X##_f0) != 0); \
+ X##_f0 = (X##_f1 >> ((N) - _FP_W_TYPE_SIZE)); \
+ X##_f1 = 0; \
+ } \
+ } while (0)
+
#define _FP_FRAC_SRS_2(X,N,sz) \
do { \
if ((N) < _FP_W_TYPE_SIZE) \
@@ -591,20 +609,6 @@
* Convert FP values between word sizes
*/
-#define _FP_FRAC_CONV_1_2(dfs, sfs, D, S) \
- do { \
- if (S##_c != FP_CLS_NAN) \
- _FP_FRAC_SRS_2(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs), \
- _FP_WFRACBITS_##sfs); \
- else \
- _FP_FRAC_SRL_2(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs)); \
- D##_f = S##_f0; \
- } while (0)
-
-#define _FP_FRAC_CONV_2_1(dfs, sfs, D, S) \
- do { \
- D##_f0 = S##_f; \
- D##_f1 = 0; \
- _FP_FRAC_SLL_2(D, (_FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs)); \
- } while (0)
+#define _FP_FRAC_COPY_1_2(D, S) (D##_f = S##_f0)
+#define _FP_FRAC_COPY_2_1(D, S) ((D##_f0 = S##_f), (D##_f1 = 0))
Index: soft-fp/op-4.h
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/op-4.h,v
retrieving revision 1.5
diff -u -p -r1.5 op-4.h
--- soft-fp/op-4.h 17 Oct 2002 23:15:54 -0000 1.5
+++ soft-fp/op-4.h 9 Feb 2006 22:05:31 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Basic four-word fraction declaration and manipulation.
- Copyright (C) 1997,1998,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1998,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com),
Jakub Jelinek (jj@ultra.linux.cz),
@@ -78,31 +78,37 @@
* but that if any of the bits that fall off the right hand side
* were one then we always set the LSbit.
*/
-#define _FP_FRAC_SRS_4(X,N,size) \
- do { \
- _FP_I_TYPE _up, _down, _skip, _i; \
- _FP_W_TYPE _s; \
- _skip = (N) / _FP_W_TYPE_SIZE; \
- _down = (N) % _FP_W_TYPE_SIZE; \
- _up = _FP_W_TYPE_SIZE - _down; \
- for (_s = _i = 0; _i < _skip; ++_i) \
- _s |= X##_f[_i]; \
- _s |= X##_f[_i] << _up; \
-/* s is now != 0 if we want to set the LSbit */ \
- if (!_down) \
- for (_i = 0; _i <= 3-_skip; ++_i) \
- X##_f[_i] = X##_f[_i+_skip]; \
- else \
- { \
- for (_i = 0; _i < 3-_skip; ++_i) \
- X##_f[_i] = X##_f[_i+_skip] >> _down \
- | X##_f[_i+_skip+1] << _up; \
- X##_f[_i++] = X##_f[3] >> _down; \
- } \
- for (; _i < 4; ++_i) \
- X##_f[_i] = 0; \
- /* don't fix the LSB until the very end when we're sure f[0] is stable */ \
- X##_f[0] |= (_s != 0); \
+#define _FP_FRAC_SRST_4(X,S,N,size) \
+ do { \
+ _FP_I_TYPE _up, _down, _skip, _i; \
+ _FP_W_TYPE _s; \
+ _skip = (N) / _FP_W_TYPE_SIZE; \
+ _down = (N) % _FP_W_TYPE_SIZE; \
+ _up = _FP_W_TYPE_SIZE - _down; \
+ for (_s = _i = 0; _i < _skip; ++_i) \
+ _s |= X##_f[_i]; \
+ _s |= X##_f[_i] << _up; \
+/* s is now != 0 if we want to set the LSbit */ \
+ if (!_down) \
+ for (_i = 0; _i <= 3-_skip; ++_i) \
+ X##_f[_i] = X##_f[_i+_skip]; \
+ else \
+ { \
+ for (_i = 0; _i < 3-_skip; ++_i) \
+ X##_f[_i] = X##_f[_i+_skip] >> _down \
+ | X##_f[_i+_skip+1] << _up; \
+ X##_f[_i++] = X##_f[3] >> _down; \
+ } \
+ for (; _i < 4; ++_i) \
+ X##_f[_i] = 0; \
+ S = (_s != 0); \
+ } while (0)
+
+#define _FP_FRAC_SRS_4(X,N,size) \
+ do { \
+ int _sticky; \
+ _FP_FRAC_SRST_4(X, _sticky, N, size); \
+ X##_f[0] |= _sticky; \
} while (0)
#define _FP_FRAC_ADD_4(R,X,Y) \
@@ -609,26 +615,13 @@
* internally [eg, that 2 word vars are X_f0 and x_f1]. But so do
* the ones in op-2.h and op-1.h.
*/
-#define _FP_FRAC_CONV_1_4(dfs, sfs, D, S) \
- do { \
- if (S##_c != FP_CLS_NAN) \
- _FP_FRAC_SRS_4(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs), \
- _FP_WFRACBITS_##sfs); \
- else \
- _FP_FRAC_SRL_4(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs)); \
- D##_f = S##_f[0]; \
- } while (0)
-
-#define _FP_FRAC_CONV_2_4(dfs, sfs, D, S) \
- do { \
- if (S##_c != FP_CLS_NAN) \
- _FP_FRAC_SRS_4(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs), \
- _FP_WFRACBITS_##sfs); \
- else \
- _FP_FRAC_SRL_4(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs)); \
- D##_f0 = S##_f[0]; \
- D##_f1 = S##_f[1]; \
- } while (0)
+#define _FP_FRAC_COPY_1_4(D, S) (D##_f = S##_f[0])
+
+#define _FP_FRAC_COPY_2_4(D, S) \
+do { \
+ D##_f0 = S##_f[0]; \
+ D##_f1 = S##_f[1]; \
+} while (0)
/* Assembly/disassembly for converting to/from integral types.
* No shifting or overflow handled here.
@@ -671,18 +664,15 @@
X##_f[3] = (rsize <= 3*_FP_W_TYPE_SIZE ? 0 : r >> 3*_FP_W_TYPE_SIZE); \
} while (0);
-#define _FP_FRAC_CONV_4_1(dfs, sfs, D, S) \
- do { \
- D##_f[0] = S##_f; \
- D##_f[1] = D##_f[2] = D##_f[3] = 0; \
- _FP_FRAC_SLL_4(D, (_FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs)); \
- } while (0)
-
-#define _FP_FRAC_CONV_4_2(dfs, sfs, D, S) \
- do { \
- D##_f[0] = S##_f0; \
- D##_f[1] = S##_f1; \
- D##_f[2] = D##_f[3] = 0; \
- _FP_FRAC_SLL_4(D, (_FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs)); \
- } while (0)
-
+#define _FP_FRAC_COPY_4_1(D, S) \
+do { \
+ D##_f[0] = S##_f; \
+ D##_f[1] = D##_f[2] = D##_f[3] = 0; \
+} while (0)
+
+#define _FP_FRAC_COPY_4_2(D, S) \
+do { \
+ D##_f[0] = S##_f0; \
+ D##_f[1] = S##_f1; \
+ D##_f[2] = D##_f[3] = 0; \
+} while (0)
Index: soft-fp/op-common.h
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/op-common.h,v
retrieving revision 1.6
diff -u -p -r1.6 op-common.h
--- soft-fp/op-common.h 6 Jan 2006 10:47:45 -0000 1.6
+++ soft-fp/op-common.h 9 Feb 2006 22:05:32 -0000
@@ -71,6 +71,87 @@ do { \
} \
} while (0)
+/* Finish unpacking an fp value in semi-raw mode: the mantissa is
+ shifted by _FP_WORKBITS but the implicit MSB is not inserted and
+ other classification is not done. */
+#define _FP_UNPACK_SEMIRAW(fs, wc, X) _FP_FRAC_SLL_##wc(X, _FP_WORKBITS)
+
+/* A semi-raw value has overflowed to infinity. Adjust the mantissa
+ and exponent appropriately. */
+#define _FP_OVERFLOW_SEMIRAW(fs, wc, X) \
+do { \
+ if (FP_ROUNDMODE == FP_RND_NEAREST \
+ || (FP_ROUNDMODE == FP_RND_PINF && !X##_s) \
+ || (FP_ROUNDMODE == FP_RND_MINF && X##_s)) \
+ { \
+ X##_e = _FP_EXPMAX_##fs; \
+ _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc); \
+ } \
+ else \
+ { \
+ X##_e = _FP_EXPMAX_##fs - 1; \
+ FP_SET_EXCEPTION(FP_EX_OVERFLOW); \
+ FP_SET_EXCEPTION(FP_EX_INEXACT); \
+ _FP_FRAC_SET_##wc(X, _FP_MAXFRAC_##wc); \
+ } \
+} while (0)
+
+/* Check for a semi-raw value being a signaling NaN and raise the
+ invalid exception if so. */
+#define _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X) \
+do { \
+ if (X##_e == _FP_EXPMAX_##fs \
+ && !_FP_FRAC_ZEROP_##wc(X) \
+ && !(_FP_FRAC_HIGH_##fs(X) & _FP_QNANBIT_SH_##fs)) \
+ FP_SET_EXCEPTION(FP_EX_INVALID); \
+} while (0)
+
+/* Choose a NaN result from an operation on two semi-raw NaN
+ values. */
+#define _FP_CHOOSENAN_SEMIRAW(fs, wc, R, X, Y, OP) \
+do { \
+ /* _FP_CHOOSENAN expects raw values, so shift as required. */ \
+ _FP_FRAC_SRL_##wc(X, _FP_WORKBITS); \
+ _FP_FRAC_SRL_##wc(Y, _FP_WORKBITS); \
+ _FP_CHOOSENAN(fs, wc, R, X, Y, OP); \
+ _FP_FRAC_SLL_##wc(R, _FP_WORKBITS); \
+} while (0)
+
+/* Test whether a biased exponent is normal (not zero or maximum). */
+#define _FP_EXP_NORMAL(fs, wc, X) (((X##_e + 1) & _FP_EXPMAX_##fs) > 1)
+
+/* Prepare to pack an fp value in semi-raw mode: the mantissa is
+ rounded and shifted right, with the rounding possibly increasing
+ the exponent (including changing a finite value to infinity). */
+#define _FP_PACK_SEMIRAW(fs, wc, X) \
+do { \
+ _FP_ROUND(wc, X); \
+ if (_FP_FRAC_HIGH_##fs(X) \
+ & (_FP_OVERFLOW_##fs >> 1)) \
+ { \
+ _FP_FRAC_HIGH_##fs(X) &= ~(_FP_OVERFLOW_##fs >> 1); \
+ X##_e++; \
+ if (X##_e == _FP_EXPMAX_##fs) \
+ _FP_OVERFLOW_SEMIRAW(fs, wc, X); \
+ } \
+ _FP_FRAC_SRL_##wc(X, _FP_WORKBITS); \
+ if (!_FP_EXP_NORMAL(fs, wc, X) && !_FP_FRAC_ZEROP_##wc(X)) \
+ { \
+ if (X##_e == 0) \
+ FP_SET_EXCEPTION(FP_EX_UNDERFLOW); \
+ else \
+ { \
+ if (!_FP_KEEPNANFRACP) \
+ { \
+ _FP_FRAC_SET_##wc(X, _FP_NANFRAC_##fs); \
+ X##_s = _FP_NANSIGN_##fs; \
+ } \
+ else \
+ _FP_FRAC_HIGH_RAW_##fs(X) |= _FP_QNANBIT_##fs; \
+ } \
+ } \
+} while (0)
+
/*
* Before packing the bits back into the native fp result, take care
* of such mundane things as rounding and overflow. Also, for some
@@ -202,153 +283,433 @@ do { \
-/*
- * Main addition routine. The input values should be cooked.
- */
-
-#define _FP_ADD_INTERNAL(fs, wc, R, X, Y, OP) \
-do { \
- switch (_FP_CLS_COMBINE(X##_c, Y##_c)) \
- { \
- case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NORMAL): \
- { \
- /* shift the smaller number so that its exponent matches the larger */ \
- _FP_I_TYPE diff = X##_e - Y##_e; \
- \
- if (diff < 0) \
- { \
- diff = -diff; \
- if (diff <= _FP_WFRACBITS_##fs) \
- _FP_FRAC_SRS_##wc(X, diff, _FP_WFRACBITS_##fs); \
- else if (!_FP_FRAC_ZEROP_##wc(X)) \
- _FP_FRAC_SET_##wc(X, _FP_MINFRAC_##wc); \
- R##_e = Y##_e; \
- } \
- else \
- { \
- if (diff > 0) \
- { \
- if (diff <= _FP_WFRACBITS_##fs) \
- _FP_FRAC_SRS_##wc(Y, diff, _FP_WFRACBITS_##fs); \
- else if (!_FP_FRAC_ZEROP_##wc(Y)) \
- _FP_FRAC_SET_##wc(Y, _FP_MINFRAC_##wc); \
- } \
- R##_e = X##_e; \
- } \
- \
- R##_c = FP_CLS_NORMAL; \
- \
- if (X##_s == Y##_s) \
- { \
- R##_s = X##_s; \
- _FP_FRAC_ADD_##wc(R, X, Y); \
- if (_FP_FRAC_OVERP_##wc(fs, R)) \
- { \
- _FP_FRAC_SRS_##wc(R, 1, _FP_WFRACBITS_##fs); \
- R##_e++; \
- } \
- } \
- else \
- { \
- R##_s = X##_s; \
- _FP_FRAC_SUB_##wc(R, X, Y); \
- if (_FP_FRAC_ZEROP_##wc(R)) \
- { \
- /* return an exact zero */ \
- if (FP_ROUNDMODE == FP_RND_MINF) \
- R##_s |= Y##_s; \
- else \
- R##_s &= Y##_s; \
- R##_c = FP_CLS_ZERO; \
- } \
- else \
- { \
- if (_FP_FRAC_NEGP_##wc(R)) \
- { \
- _FP_FRAC_SUB_##wc(R, Y, X); \
- R##_s = Y##_s; \
- } \
- \
- /* renormalize after subtraction */ \
- _FP_FRAC_CLZ_##wc(diff, R); \
- diff -= _FP_WFRACXBITS_##fs; \
- if (diff) \
- { \
- R##_e -= diff; \
- _FP_FRAC_SLL_##wc(R, diff); \
- } \
- } \
- } \
- break; \
- } \
- \
- case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NAN): \
- _FP_CHOOSENAN(fs, wc, R, X, Y, OP); \
- break; \
- \
- case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO): \
- R##_e = X##_e; \
- case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL): \
- case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF): \
- case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO): \
- _FP_FRAC_COPY_##wc(R, X); \
- R##_s = X##_s; \
- R##_c = X##_c; \
- break; \
- \
- case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL): \
- R##_e = Y##_e; \
- case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN): \
- case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN): \
- case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN): \
- _FP_FRAC_COPY_##wc(R, Y); \
- R##_s = Y##_s; \
- R##_c = Y##_c; \
- break; \
- \
- case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF): \
- if (X##_s != Y##_s) \
- { \
- /* +INF + -INF => NAN */ \
- _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs); \
- R##_s = _FP_NANSIGN_##fs; \
- R##_c = FP_CLS_NAN; \
- FP_SET_EXCEPTION(FP_EX_INVALID); \
- break; \
- } \
- /* FALLTHRU */ \
- \
- case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL): \
- case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO): \
- R##_s = X##_s; \
- R##_c = FP_CLS_INF; \
- break; \
- \
- case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF): \
- case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_INF): \
- R##_s = Y##_s; \
- R##_c = FP_CLS_INF; \
- break; \
- \
- case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_ZERO): \
- /* make sure the sign is correct */ \
- if (FP_ROUNDMODE == FP_RND_MINF) \
- R##_s = X##_s | Y##_s; \
- else \
- R##_s = X##_s & Y##_s; \
- R##_c = FP_CLS_ZERO; \
- break; \
- \
- default: \
- abort(); \
- } \
+/* Addition on semi-raw values. */
+#define _FP_ADD_INTERNAL(fs, wc, R, X, Y, OP) \
+do { \
+ if (X##_s == Y##_s) \
+ { \
+ /* Addition. */ \
+ R##_s = X##_s; \
+ int ediff = X##_e - Y##_e; \
+ if (ediff > 0) \
+ { \
+ R##_e = X##_e; \
+ if (Y##_e == 0) \
+ { \
+ /* Y is zero or denormalized. */ \
+ if (_FP_FRAC_ZEROP_##wc(Y)) \
+ { \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X); \
+ _FP_FRAC_COPY_##wc(R, X); \
+ goto add_done; \
+ } \
+ else \
+ { \
+ FP_SET_EXCEPTION(FP_EX_DENORM); \
+ ediff--; \
+ if (ediff == 0) \
+ { \
+ _FP_FRAC_ADD_##wc(R, X, Y); \
+ goto add3; \
+ } \
+ if (X##_e == _FP_EXPMAX_##fs) \
+ { \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X); \
+ _FP_FRAC_COPY_##wc(R, X); \
+ goto add_done; \
+ } \
+ goto add1; \
+ } \
+ } \
+ else if (X##_e == _FP_EXPMAX_##fs) \
+ { \
+ /* X is NaN or Inf, Y is normal. */ \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X); \
+ _FP_FRAC_COPY_##wc(R, X); \
+ goto add_done; \
+ } \
+ \
+ /* Insert implicit MSB of Y. */ \
+ _FP_FRAC_HIGH_##fs(Y) |= _FP_IMPLBIT_SH_##fs; \
+ \
+ add1: \
+ /* Shift the mantissa of Y to the right EDIFF steps; \
+ remember to account later for the implicit MSB of X. */ \
+ if (ediff <= _FP_WFRACBITS_##fs) \
+ _FP_FRAC_SRS_##wc(Y, ediff, _FP_WFRACBITS_##fs); \
+ else if (!_FP_FRAC_ZEROP_##wc(Y)) \
+ _FP_FRAC_SET_##wc(Y, _FP_MINFRAC_##wc); \
+ _FP_FRAC_ADD_##wc(R, X, Y); \
+ } \
+ else if (ediff < 0) \
+ { \
+ ediff = -ediff; \
+ R##_e = Y##_e; \
+ if (X##_e == 0) \
+ { \
+ /* X is zero or denormalized. */ \
+ if (_FP_FRAC_ZEROP_##wc(X)) \
+ { \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y); \
+ _FP_FRAC_COPY_##wc(R, Y); \
+ goto add_done; \
+ } \
+ else \
+ { \
+ FP_SET_EXCEPTION(FP_EX_DENORM); \
+ ediff--; \
+ if (ediff == 0) \
+ { \
+ _FP_FRAC_ADD_##wc(R, Y, X); \
+ goto add3; \
+ } \
+ if (Y##_e == _FP_EXPMAX_##fs) \
+ { \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y); \
+ _FP_FRAC_COPY_##wc(R, Y); \
+ goto add_done; \
+ } \
+ goto add2; \
+ } \
+ } \
+ else if (Y##_e == _FP_EXPMAX_##fs) \
+ { \
+ /* Y is NaN or Inf, X is normal. */ \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y); \
+ _FP_FRAC_COPY_##wc(R, Y); \
+ goto add_done; \
+ } \
+ \
+ /* Insert implicit MSB of X. */ \
+ _FP_FRAC_HIGH_##fs(X) |= _FP_IMPLBIT_SH_##fs; \
+ \
+ add2: \
+ /* Shift the mantissa of X to the right EDIFF steps; \
+ remember to account later for the implicit MSB of Y. */ \
+ if (ediff <= _FP_WFRACBITS_##fs) \
+ _FP_FRAC_SRS_##wc(X, ediff, _FP_WFRACBITS_##fs); \
+ else if (!_FP_FRAC_ZEROP_##wc(X)) \
+ _FP_FRAC_SET_##wc(X, _FP_MINFRAC_##wc); \
+ _FP_FRAC_ADD_##wc(R, Y, X); \
+ } \
+ else \
+ { \
+ /* ediff == 0. */ \
+ if (!_FP_EXP_NORMAL(fs, wc, X)) \
+ { \
+ if (X##_e == 0) \
+ { \
+ /* X and Y are zero or denormalized. */ \
+ R##_e = 0; \
+ if (_FP_FRAC_ZEROP_##wc(X)) \
+ { \
+ if (!_FP_FRAC_ZEROP_##wc(Y)) \
+ FP_SET_EXCEPTION(FP_EX_DENORM); \
+ _FP_FRAC_COPY_##wc(R, Y); \
+ goto add_done; \
+ } \
+ else if (_FP_FRAC_ZEROP_##wc(Y)) \
+ { \
+ FP_SET_EXCEPTION(FP_EX_DENORM); \
+ _FP_FRAC_COPY_##wc(R, X); \
+ goto add_done; \
+ } \
+ else \
+ { \
+ FP_SET_EXCEPTION(FP_EX_DENORM); \
+ _FP_FRAC_ADD_##wc(R, X, Y); \
+ if (_FP_FRAC_HIGH_##fs(R) & _FP_IMPLBIT_SH_##fs) \
+ { \
+ /* Normalized result. */ \
+ _FP_FRAC_HIGH_##fs(R) \
+ &= ~(_FP_W_TYPE)_FP_IMPLBIT_SH_##fs; \
+ R##_e = 1; \
+ } \
+ goto add_done; \
+ } \
+ } \
+ else \
+ { \
+ /* X and Y are NaN or Inf. */ \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X); \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y); \
+ R##_e = _FP_EXPMAX_##fs; \
+ if (_FP_FRAC_ZEROP_##wc(X)) \
+ _FP_FRAC_COPY_##wc(R, Y); \
+ else if (_FP_FRAC_ZEROP_##wc(Y)) \
+ _FP_FRAC_COPY_##wc(R, X); \
+ else \
+ _FP_CHOOSENAN_SEMIRAW(fs, wc, R, X, Y, OP); \
+ goto add_done; \
+ } \
+ } \
+ /* The exponents of X and Y, both normal, are equal. The \
+ implicit MSBs will always add to increase the \
+ exponent. */ \
+ _FP_FRAC_ADD_##wc(R, X, Y); \
+ R##_e = X##_e + 1; \
+ _FP_FRAC_SRS_##wc(R, 1, _FP_WFRACBITS_##fs); \
+ if (R##_e == _FP_EXPMAX_##fs) \
+ /* Overflow to infinity (depending on rounding mode). */ \
+ _FP_OVERFLOW_SEMIRAW(fs, wc, R); \
+ goto add_done; \
+ } \
+ add3: \
+ if (_FP_FRAC_HIGH_##fs(R) & _FP_IMPLBIT_SH_##fs) \
+ { \
+ /* Overflow. */ \
+ _FP_FRAC_HIGH_##fs(R) &= ~(_FP_W_TYPE)_FP_IMPLBIT_SH_##fs; \
+ R##_e++; \
+ _FP_FRAC_SRS_##wc(R, 1, _FP_WFRACBITS_##fs); \
+ if (R##_e == _FP_EXPMAX_##fs) \
+ /* Overflow to infinity (depending on rounding mode). */ \
+ _FP_OVERFLOW_SEMIRAW(fs, wc, R); \
+ } \
+ add_done: ; \
+ } \
+ else \
+ { \
+ /* Subtraction. */ \
+ int ediff = X##_e - Y##_e; \
+ if (ediff > 0) \
+ { \
+ R##_e = X##_e; \
+ R##_s = X##_s; \
+ if (Y##_e == 0) \
+ { \
+ /* Y is zero or denormalized. */ \
+ if (_FP_FRAC_ZEROP_##wc(Y)) \
+ { \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X); \
+ _FP_FRAC_COPY_##wc(R, X); \
+ goto sub_done; \
+ } \
+ else \
+ { \
+ FP_SET_EXCEPTION(FP_EX_DENORM); \
+ ediff--; \
+ if (ediff == 0) \
+ { \
+ _FP_FRAC_SUB_##wc(R, X, Y); \
+ goto sub3; \
+ } \
+ if (X##_e == _FP_EXPMAX_##fs) \
+ { \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X); \
+ _FP_FRAC_COPY_##wc(R, X); \
+ goto sub_done; \
+ } \
+ goto sub1; \
+ } \
+ } \
+ else if (X##_e == _FP_EXPMAX_##fs) \
+ { \
+ /* X is NaN or Inf, Y is normal. */ \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X); \
+ _FP_FRAC_COPY_##wc(R, X); \
+ goto sub_done; \
+ } \
+ \
+ /* Insert implicit MSB of Y. */ \
+ _FP_FRAC_HIGH_##fs(Y) |= _FP_IMPLBIT_SH_##fs; \
+ \
+ sub1: \
+ /* Shift the mantissa of Y to the right EDIFF steps; \
+ remember to account later for the implicit MSB of X. */ \
+ if (ediff <= _FP_WFRACBITS_##fs) \
+ _FP_FRAC_SRS_##wc(Y, ediff, _FP_WFRACBITS_##fs); \
+ else if (!_FP_FRAC_ZEROP_##wc(Y)) \
+ _FP_FRAC_SET_##wc(Y, _FP_MINFRAC_##wc); \
+ _FP_FRAC_SUB_##wc(R, X, Y); \
+ } \
+ else if (ediff < 0) \
+ { \
+ ediff = -ediff; \
+ R##_e = Y##_e; \
+ R##_s = Y##_s; \
+ if (X##_e == 0) \
+ { \
+ /* X is zero or denormalized. */ \
+ if (_FP_FRAC_ZEROP_##wc(X)) \
+ { \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y); \
+ _FP_FRAC_COPY_##wc(R, Y); \
+ goto sub_done; \
+ } \
+ else \
+ { \
+ FP_SET_EXCEPTION(FP_EX_DENORM); \
+ ediff--; \
+ if (ediff == 0) \
+ { \
+ _FP_FRAC_SUB_##wc(R, Y, X); \
+ goto sub3; \
+ } \
+ if (Y##_e == _FP_EXPMAX_##fs) \
+ { \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y); \
+ _FP_FRAC_COPY_##wc(R, Y); \
+ goto sub_done; \
+ } \
+ goto sub2; \
+ } \
+ } \
+ else if (Y##_e == _FP_EXPMAX_##fs) \
+ { \
+ /* Y is NaN or Inf, X is normal. */ \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y); \
+ _FP_FRAC_COPY_##wc(R, Y); \
+ goto sub_done; \
+ } \
+ \
+ /* Insert implicit MSB of X. */ \
+ _FP_FRAC_HIGH_##fs(X) |= _FP_IMPLBIT_SH_##fs; \
+ \
+ sub2: \
+ /* Shift the mantissa of X to the right EDIFF steps; \
+ remember to account later for the implicit MSB of Y. */ \
+ if (ediff <= _FP_WFRACBITS_##fs) \
+ _FP_FRAC_SRS_##wc(X, ediff, _FP_WFRACBITS_##fs); \
+ else if (!_FP_FRAC_ZEROP_##wc(X)) \
+ _FP_FRAC_SET_##wc(X, _FP_MINFRAC_##wc); \
+ _FP_FRAC_SUB_##wc(R, Y, X); \
+ } \
+ else \
+ { \
+ /* ediff == 0. */ \
+ if (!_FP_EXP_NORMAL(fs, wc, X)) \
+ { \
+ if (X##_e == 0) \
+ { \
+ /* X and Y are zero or denormalized. */ \
+ R##_e = 0; \
+ if (_FP_FRAC_ZEROP_##wc(X)) \
+ { \
+ _FP_FRAC_COPY_##wc(R, Y); \
+ if (_FP_FRAC_ZEROP_##wc(Y)) \
+ R##_s = (FP_ROUNDMODE == FP_RND_MINF); \
+ else \
+ { \
+ FP_SET_EXCEPTION(FP_EX_DENORM); \
+ R##_s = Y##_s; \
+ } \
+ goto sub_done; \
+ } \
+ else if (_FP_FRAC_ZEROP_##wc(Y)) \
+ { \
+ FP_SET_EXCEPTION(FP_EX_DENORM); \
+ _FP_FRAC_COPY_##wc(R, X); \
+ R##_s = X##_s; \
+ goto sub_done; \
+ } \
+ else \
+ { \
+ FP_SET_EXCEPTION(FP_EX_DENORM); \
+ _FP_FRAC_SUB_##wc(R, X, Y); \
+ R##_s = X##_s; \
+ if (_FP_FRAC_HIGH_##fs(R) & _FP_IMPLBIT_SH_##fs) \
+ { \
+ /* |X| < |Y|, negate result. */ \
+ _FP_FRAC_SUB_##wc(R, Y, X); \
+ R##_s = Y##_s; \
+ } \
+ else if (_FP_FRAC_ZEROP_##wc(R)) \
+ R##_s = (FP_ROUNDMODE == FP_RND_MINF); \
+ goto sub_done; \
+ } \
+ } \
+ else \
+ { \
+ /* X and Y are NaN or Inf, of opposite signs. */ \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, X); \
+ _FP_CHECK_SIGNAN_SEMIRAW(fs, wc, Y); \
+ R##_e = _FP_EXPMAX_##fs; \
+ if (_FP_FRAC_ZEROP_##wc(X)) \
+ { \
+ if (_FP_FRAC_ZEROP_##wc(Y)) \
+ { \
+ /* Inf - Inf. */ \
+ R##_s = _FP_NANSIGN_##fs; \
+ _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs); \
+ _FP_FRAC_SLL_##wc(R, _FP_WORKBITS); \
+ FP_SET_EXCEPTION(FP_EX_INVALID); \
+ } \
+ else \
+ { \
+ /* Inf - NaN. */ \
+ R##_s = Y##_s; \
+ _FP_FRAC_COPY_##wc(R, Y); \
+ } \
+ } \
+ else \
+ { \
+ if (_FP_FRAC_ZEROP_##wc(Y)) \
+ { \
+ /* NaN - Inf. */ \
+ R##_s = X##_s; \
+ _FP_FRAC_COPY_##wc(R, X); \
+ } \
+ else \
+ { \
+ /* NaN - NaN. */ \
+ _FP_CHOOSENAN_SEMIRAW(fs, wc, R, X, Y, OP); \
+ } \
+ } \
+ goto sub_done; \
+ } \
+ } \
+ /* The exponents of X and Y, both normal, are equal. The \
+ implicit MSBs cancel. */ \
+ R##_e = X##_e; \
+ _FP_FRAC_SUB_##wc(R, X, Y); \
+ R##_s = X##_s; \
+ if (_FP_FRAC_HIGH_##fs(R) & _FP_IMPLBIT_SH_##fs) \
+ { \
+ /* |X| < |Y|, negate result. */ \
+ _FP_FRAC_SUB_##wc(R, Y, X); \
+ R##_s = Y##_s; \
+ } \
+ else if (_FP_FRAC_ZEROP_##wc(R)) \
+ { \
+ R##_e = 0; \
+ R##_s = (FP_ROUNDMODE == FP_RND_MINF); \
+ goto sub_done; \
+ } \
+ goto norm; \
+ } \
+ sub3: \
+ if (_FP_FRAC_HIGH_##fs(R) & _FP_IMPLBIT_SH_##fs) \
+ { \
+ int diff; \
+ /* Carry into most significant bit of larger one of X and Y, \
+ canceling it; renormalize. */ \
+ _FP_FRAC_HIGH_##fs(R) &= _FP_IMPLBIT_SH_##fs - 1; \
+ norm: \
+ _FP_FRAC_CLZ_##wc(diff, R); \
+ diff -= _FP_WFRACXBITS_##fs; \
+ _FP_FRAC_SLL_##wc(R, diff); \
+ if (R##_e <= diff) \
+ { \
+ /* R is denormalized. */ \
+ diff = diff - R##_e + 1; \
+ _FP_FRAC_SRS_##wc(R, diff, _FP_WFRACBITS_##fs); \
+ R##_e = 0; \
+ } \
+ else \
+ { \
+ R##_e -= diff; \
+ _FP_FRAC_HIGH_##fs(R) &= ~(_FP_W_TYPE)_FP_IMPLBIT_SH_##fs; \
+ } \
+ } \
+ sub_done: ; \
+ } \
} while (0)
#define _FP_ADD(fs, wc, R, X, Y) _FP_ADD_INTERNAL(fs, wc, R, X, Y, '+')
-#define _FP_SUB(fs, wc, R, X, Y) \
- do { \
- if (Y##_c != FP_CLS_NAN) Y##_s ^= 1; \
- _FP_ADD_INTERNAL(fs, wc, R, X, Y, '-'); \
+#define _FP_SUB(fs, wc, R, X, Y) \
+ do { \
+ if (!(Y##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(Y))) Y##_s ^= 1; \
+ _FP_ADD_INTERNAL(fs, wc, R, X, Y, '-'); \
} while (0)
@@ -616,115 +977,275 @@ do { \
} while (0)
/*
- * Convert from FP to integer
+ * Convert from FP to integer. Input is raw.
*/
/* RSIGNED can have following values:
* 0: the number is required to be 0..(2^rsize)-1, if not, NV is set plus
- * the result is either 0 or (2^rsize)-1 depending on the sign in such case.
- * 1: the number is required to be -(2^(rsize-1))..(2^(rsize-1))-1, if not, NV is
- * set plus the result is either -(2^(rsize-1)) or (2^(rsize-1))-1 depending
- * on the sign in such case.
+ * the result is either 0 or (2^rsize)-1 depending on the sign in such
+ * case.
+ * 1: the number is required to be -(2^(rsize-1))..(2^(rsize-1))-1, if not,
+ * NV is set plus the result is either -(2^(rsize-1)) or (2^(rsize-1))-1
+ * depending on the sign in such case.
* -1: the number is required to be -(2^(rsize-1))..(2^rsize)-1, if not, NV is
- * set plus the result is either -(2^(rsize-1)) or (2^(rsize-1))-1 depending
- * on the sign in such case.
+ * set plus the result is either -(2^(rsize-1)) or (2^(rsize-1))-1
+ * depending on the sign in such case.
*/
-#define _FP_TO_INT(fs, wc, r, X, rsize, rsigned) \
- do { \
- switch (X##_c) \
- { \
- case FP_CLS_NORMAL: \
- if (X##_e < 0) \
- { \
- FP_SET_EXCEPTION(FP_EX_INEXACT); \
- case FP_CLS_ZERO: \
- r = 0; \
- } \
- else if (X##_e >= rsize - (rsigned > 0 || X##_s) \
- || (!rsigned && X##_s)) \
- { /* overflow */ \
- case FP_CLS_NAN: \
- case FP_CLS_INF: \
- if (rsigned) \
- { \
- r = 1; \
- r <<= rsize - 1; \
- r -= 1 - X##_s; \
- } else { \
- r = 0; \
- if (X##_s) \
- r = ~r; \
- } \
- FP_SET_EXCEPTION(FP_EX_INVALID); \
- } \
- else \
- { \
- if (_FP_W_TYPE_SIZE*wc < rsize) \
- { \
- _FP_FRAC_ASSEMBLE_##wc(r, X, rsize); \
- r <<= X##_e - _FP_WFRACBITS_##fs; \
- } \
- else \
- { \
- if (X##_e >= _FP_WFRACBITS_##fs) \
- _FP_FRAC_SLL_##wc(X, (X##_e - _FP_WFRACBITS_##fs + 1)); \
- else if (X##_e < _FP_WFRACBITS_##fs - 1) \
- { \
- _FP_FRAC_SRS_##wc(X, (_FP_WFRACBITS_##fs - X##_e - 2), \
- _FP_WFRACBITS_##fs); \
- if (_FP_FRAC_LOW_##wc(X) & 1) \
- FP_SET_EXCEPTION(FP_EX_INEXACT); \
- _FP_FRAC_SRL_##wc(X, 1); \
- } \
- _FP_FRAC_ASSEMBLE_##wc(r, X, rsize); \
- } \
- if (rsigned && X##_s) \
- r = -r; \
- } \
- break; \
- } \
- } while (0)
-
-#define _FP_FROM_INT(fs, wc, X, r, rsize, rtype) \
- do { \
- if (r) \
- { \
- unsigned rtype ur_; \
- X##_c = FP_CLS_NORMAL; \
- \
- if ((X##_s = (r < 0))) \
- r = -r; \
- \
- ur_ = (unsigned rtype) r; \
- if (rsize <= _FP_W_TYPE_SIZE) \
- __FP_CLZ(X##_e, ur_); \
- else \
- __FP_CLZ_2(X##_e, (_FP_W_TYPE)(ur_ >> _FP_W_TYPE_SIZE), \
- (_FP_W_TYPE)ur_); \
- if (rsize < _FP_W_TYPE_SIZE) \
- X##_e -= (_FP_W_TYPE_SIZE - rsize); \
- X##_e = rsize - X##_e - 1; \
+#define _FP_TO_INT(fs, wc, r, X, rsize, rsigned) \
+do { \
+ if (X##_e < _FP_EXPBIAS_##fs) \
+ { \
+ r = 0; \
+ if (X##_e == 0) \
+ { \
+ if (!_FP_FRAC_ZEROP_##wc(X)) \
+ { \
+ FP_SET_EXCEPTION(FP_EX_INEXACT); \
+ FP_SET_EXCEPTION(FP_EX_DENORM); \
+ } \
+ } \
+ else \
+ FP_SET_EXCEPTION(FP_EX_INEXACT); \
+ } \
+ else if (X##_e >= _FP_EXPBIAS_##fs + rsize - (rsigned > 0 || X##_s) \
+ || (!rsigned && X##_s)) \
+ { \
+ /* Overflow or converting to the most negative integer. */ \
+ if (rsigned) \
+ { \
+ r = 1; \
+ r <<= rsize - 1; \
+ r -= 1 - X##_s; \
+ } else { \
+ r = 0; \
+ if (X##_s) \
+ r = ~r; \
+ } \
\
- if (_FP_FRACBITS_##fs < rsize && _FP_WFRACBITS_##fs < X##_e) \
- __FP_FRAC_SRS_1(ur_, (X##_e - _FP_WFRACBITS_##fs + 1), rsize);\
- _FP_FRAC_DISASSEMBLE_##wc(X, ur_, rsize); \
- if ((_FP_WFRACBITS_##fs - X##_e - 1) > 0) \
- _FP_FRAC_SLL_##wc(X, (_FP_WFRACBITS_##fs - X##_e - 1)); \
- } \
- else \
- { \
- X##_c = FP_CLS_ZERO, X##_s = 0; \
- } \
+ if (rsigned && X##_s && X##_e == _FP_EXPBIAS_##fs + rsize - 1) \
+ { \
+ /* Possibly converting to most negative integer; check the \
+ mantissa. */ \
+ int inexact = 0; \
+ if (_FP_FRACBITS_##fs > rsize) \
+ _FP_FRAC_SRST_##wc(X, inexact, _FP_FRACBITS_##fs - rsize, \
+ _FP_FRACBITS_##fs); \
+ if (!_FP_FRAC_ZEROP_##wc(X)) \
+ FP_SET_EXCEPTION(FP_EX_INVALID); \
+ else if (inexact) \
+ FP_SET_EXCEPTION(FP_EX_INEXACT); \
+ } \
+ else \
+ FP_SET_EXCEPTION(FP_EX_INVALID); \
+ } \
+ else \
+ { \
+ _FP_FRAC_HIGH_RAW_##fs(X) |= _FP_IMPLBIT_##fs; \
+ if (X##_e >= _FP_EXPBIAS_##fs + _FP_FRACBITS_##fs - 1) \
+ { \
+ _FP_FRAC_ASSEMBLE_##wc(r, X, rsize); \
+ r <<= X##_e - _FP_EXPBIAS_##fs - _FP_FRACBITS_##fs + 1; \
+ } \
+ else \
+ { \
+ int inexact; \
+ _FP_FRAC_SRST_##wc(X, inexact, \
+ (_FP_FRACBITS_##fs + _FP_EXPBIAS_##fs - 1 \
+ - X##_e), \
+ _FP_FRACBITS_##fs); \
+ if (inexact) \
+ FP_SET_EXCEPTION(FP_EX_INEXACT); \
+ _FP_FRAC_ASSEMBLE_##wc(r, X, rsize); \
+ } \
+ if (rsigned && X##_s) \
+ r = -r; \
+ } \
+} while (0)
+
+/* Convert integer to fp. Output is raw. RTYPE is signed even if
+ input is unsigned. */
+#define _FP_FROM_INT(fs, wc, X, r, rsize, rtype) \
+ do { \
+ if (r) \
+ { \
+ unsigned rtype ur_; \
+ \
+ if ((X##_s = (r < 0))) \
+ r = -(unsigned rtype)r; \
+ \
+ ur_ = (unsigned rtype) r; \
+ if (rsize <= _FP_W_TYPE_SIZE) \
+ { \
+ int lz_; \
+ __FP_CLZ(lz_, (_FP_W_TYPE)ur_); \
+ X##_e = _FP_EXPBIAS_##fs + _FP_W_TYPE_SIZE - 1 - lz_; \
+ } \
+ else if (rsize <= 2 * _FP_W_TYPE_SIZE) \
+ { \
+ int lz_; \
+ __FP_CLZ_2(lz_, (_FP_W_TYPE)(ur_ >> _FP_W_TYPE_SIZE), \
+ (_FP_W_TYPE)ur_); \
+ X##_e = _FP_EXPBIAS_##fs + 2 * _FP_W_TYPE_SIZE - 1 - lz_; \
+ } \
+ else \
+ abort(); \
+ \
+ if (rsize - 1 + _FP_EXPBIAS_##fs >= _FP_EXPMAX_##fs \
+ && X##_e >= _FP_EXPMAX_##fs) \
+ { \
+ /* Exponent too big; overflow to infinity. (May also \
+ happen after rounding below.) */ \
+ _FP_OVERFLOW_SEMIRAW(fs, wc, X); \
+ goto pack_semiraw; \
+ } \
+ \
+ if (rsize <= _FP_FRACBITS_##fs \
+ || X##_e < _FP_EXPBIAS_##fs + _FP_FRACBITS_##fs) \
+ { \
+ /* Exactly representable; shift left. */ \
+ _FP_FRAC_DISASSEMBLE_##wc(X, ur_, rsize); \
+ _FP_FRAC_SLL_##wc(X, (_FP_EXPBIAS_##fs \
+ + _FP_FRACBITS_##fs - 1 - X##_e)); \
+ } \
+ else \
+ { \
+ /* More bits in integer than in floating type; need to \
+ round. */ \
+ if (_FP_EXPBIAS_##fs + _FP_WFRACBITS_##fs - 1 < X##_e) \
+ ur_ = ((ur_ >> (X##_e - _FP_EXPBIAS_##fs \
+ - _FP_WFRACBITS_##fs + 1)) \
+ | ((ur_ << (rsize - (X##_e - _FP_EXPBIAS_##fs \
+ - _FP_WFRACBITS_##fs + 1))) \
+ != 0)); \
+ _FP_FRAC_DISASSEMBLE_##wc(X, ur_, rsize); \
+ if ((_FP_EXPBIAS_##fs + _FP_WFRACBITS_##fs - 1 - X##_e) > 0) \
+ _FP_FRAC_SLL_##wc(X, (_FP_EXPBIAS_##fs \
+ + _FP_WFRACBITS_##fs - 1 - X##_e)); \
+ _FP_FRAC_HIGH_##fs(X) &= ~(_FP_W_TYPE)_FP_IMPLBIT_SH_##fs; \
+ pack_semiraw: \
+ _FP_PACK_SEMIRAW(fs, wc, X); \
+ } \
+ } \
+ else \
+ { \
+ X##_s = 0; \
+ X##_e = 0; \
+ _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc); \
+ } \
} while (0)
-#define FP_CONV(dfs,sfs,dwc,swc,D,S) \
- do { \
- _FP_FRAC_CONV_##dwc##_##swc(dfs, sfs, D, S); \
- D##_e = S##_e; \
- D##_c = S##_c; \
- D##_s = S##_s; \
- } while (0)
+/* Extend from a narrower floating-point format to a wider one. Input
+ and output are raw. */
+#define FP_EXTEND(dfs,sfs,dwc,swc,D,S) \
+do { \
+ if (_FP_FRACBITS_##dfs < _FP_FRACBITS_##sfs \
+ || (_FP_EXPMAX_##dfs - _FP_EXPBIAS_##dfs \
+ < _FP_EXPMAX_##sfs - _FP_EXPBIAS_##sfs) \
+ || _FP_EXPBIAS_##dfs < _FP_EXPBIAS_##sfs + _FP_FRACBITS_##sfs - 1) \
+ abort(); \
+ D##_s = S##_s; \
+ _FP_FRAC_COPY_##dwc##_##swc(D, S); \
+ if (_FP_EXP_NORMAL(sfs, swc, S)) \
+ { \
+ D##_e = S##_e + _FP_EXPBIAS_##dfs - _FP_EXPBIAS_##sfs; \
+ _FP_FRAC_SLL_##dwc(D, (_FP_FRACBITS_##dfs - _FP_FRACBITS_##sfs)); \
+ } \
+ else \
+ { \
+ if (S##_e == 0) \
+ { \
+ if (_FP_FRAC_ZEROP_##swc(S)) \
+ D##_e = 0; \
+ else \
+ { \
+ int _lz; \
+ FP_SET_EXCEPTION(FP_EX_DENORM); \
+ _FP_FRAC_CLZ_##swc(_lz, S); \
+ _FP_FRAC_SLL_##dwc(D, \
+ _lz + _FP_FRACBITS_##dfs \
+ - _FP_FRACTBITS_##sfs); \
+ D##_e = (_FP_EXPBIAS_##dfs - _FP_EXPBIAS_##sfs + 1 \
+ + _FP_FRACXBITS_##sfs - _lz); \
+ } \
+ } \
+ else \
+ { \
+ D##_e = _FP_EXPMAX_##dfs; \
+ if (!_FP_FRAC_ZEROP_##swc(S)) \
+ { \
+ if (!(_FP_FRAC_HIGH_RAW_##sfs(S) & _FP_QNANBIT_##sfs)) \
+ FP_SET_EXCEPTION(FP_EX_INVALID); \
+ _FP_FRAC_SLL_##dwc(D, (_FP_FRACBITS_##dfs \
+ - _FP_FRACBITS_##sfs)); \
+ } \
+ } \
+ } \
+} while (0)
+
+/* Truncate from a wider floating-point format to a narrower one.
+ Input and output are semi-raw. */
+#define FP_TRUNC(dfs,sfs,dwc,swc,D,S) \
+do { \
+ if (_FP_FRACBITS_##sfs < _FP_FRACBITS_##dfs \
+ || _FP_EXPBIAS_##sfs < _FP_EXPBIAS_##dfs + _FP_FRACBITS_##dfs - 1) \
+ abort(); \
+ D##_s = S##_s; \
+ if (_FP_EXP_NORMAL(sfs, swc, S)) \
+ { \
+ D##_e = S##_e + _FP_EXPBIAS_##dfs - _FP_EXPBIAS_##sfs; \
+ if (D##_e >= _FP_EXPMAX_##dfs) \
+ _FP_OVERFLOW_SEMIRAW(dfs, dwc, D); \
+ else \
+ { \
+ if (D##_e <= 0) \
+ { \
+ if (D##_e <= 1 - _FP_FRACBITS_##dfs) \
+ _FP_FRAC_SET_##swc(S, _FP_ZEROFRAC_##swc); \
+ else \
+ { \
+ _FP_FRAC_HIGH_##sfs(S) |= _FP_IMPLBIT_SH_##sfs; \
+ _FP_FRAC_SRS_##swc(S, (_FP_WFRACBITS_##sfs \
+ - _FP_WFRACBITS_##dfs + 1 - D##_e), \
+ _FP_WFRACBITS_##sfs); \
+ } \
+ D##_e = 0; \
+ } \
+ else \
+ _FP_FRAC_SRS_##swc(S, (_FP_WFRACBITS_##sfs \
+ - _FP_WFRACBITS_##dfs), \
+ _FP_WFRACBITS_##sfs); \
+ _FP_FRAC_COPY_##dwc##_##swc(D, S); \
+ } \
+ } \
+ else \
+ { \
+ if (S##_e == 0) \
+ { \
+ D##_e = 0; \
+ _FP_FRAC_SET_##dwc(D, _FP_ZEROFRAC_##dwc); \
+ if (!_FP_FRAC_ZEROP_##swc(S)) \
+ { \
+ FP_SET_EXCEPTION(FP_EX_DENORM); \
+ FP_SET_EXCEPTION(FP_EX_INEXACT); \
+ } \
+ } \
+ else \
+ { \
+ D##_e = _FP_EXPMAX_##dfs; \
+ if (_FP_FRAC_ZEROP_##swc(S)) \
+ _FP_FRAC_SET_##dwc(D, _FP_ZEROFRAC_##dwc); \
+ else \
+ { \
+ _FP_CHECK_SIGNAN_SEMIRAW(sfs, swc, S); \
+ _FP_FRAC_SRL_##swc(S, (_FP_WFRACBITS_##sfs \
+ - _FP_WFRACBITS_##dfs)); \
+ _FP_FRAC_COPY_##dwc##_##swc(D, S); \
+ _FP_FRAC_HIGH_##dfs(D) |= _FP_QNANBIT_SH_##dfs; \
+ } \
+ } \
+ } \
+} while (0)
/*
* Helper primitives.
Index: soft-fp/quad.h
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/quad.h,v
retrieving revision 1.5
diff -u -p -r1.5 quad.h
--- soft-fp/quad.h 30 Jan 2006 22:27:21 -0000 1.5
+++ soft-fp/quad.h 9 Feb 2006 22:05:32 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Definitions for IEEE Quad Precision.
- Copyright (C) 1997,1998,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1998,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com),
Jakub Jelinek (jj@ultra.linux.cz),
@@ -42,8 +42,12 @@
#define _FP_QNANBIT_Q \
((_FP_W_TYPE)1 << (_FP_FRACBITS_Q-2) % _FP_W_TYPE_SIZE)
+#define _FP_QNANBIT_SH_Q \
+ ((_FP_W_TYPE)1 << (_FP_FRACBITS_Q-2+_FP_WORKBITS) % _FP_W_TYPE_SIZE)
#define _FP_IMPLBIT_Q \
((_FP_W_TYPE)1 << (_FP_FRACBITS_Q-1) % _FP_W_TYPE_SIZE)
+#define _FP_IMPLBIT_SH_Q \
+ ((_FP_W_TYPE)1 << (_FP_FRACBITS_Q-1+_FP_WORKBITS) % _FP_W_TYPE_SIZE)
#define _FP_OVERFLOW_Q \
((_FP_W_TYPE)1 << (_FP_WFRACBITS_Q % _FP_W_TYPE_SIZE))
@@ -95,6 +99,18 @@ union _FP_UNION_Q
_FP_UNPACK_CANONICAL(Q,4,X); \
} while (0)
+#define FP_UNPACK_SEMIRAW_Q(X,val) \
+ do { \
+ _FP_UNPACK_RAW_4(Q,X,val); \
+ _FP_UNPACK_SEMIRAW(Q,4,X); \
+ } while (0)
+
+#define FP_UNPACK_SEMIRAW_QP(X,val) \
+ do { \
+ _FP_UNPACK_RAW_4_P(Q,X,val); \
+ _FP_UNPACK_SEMIRAW(Q,4,X); \
+ } while (0)
+
#define FP_PACK_Q(val,X) \
do { \
_FP_PACK_CANONICAL(Q,4,X); \
@@ -108,6 +124,19 @@ union _FP_UNION_Q
_FP_PACK_RAW_4_P(Q,val,X); \
} while (0)
+#define FP_PACK_SEMIRAW_Q(val,X) \
+ do { \
+ _FP_PACK_SEMIRAW(Q,4,X); \
+ _FP_PACK_RAW_4(Q,val,X); \
+ } while (0)
+
+#define FP_PACK_SEMIRAW_QP(val,X) \
+ do { \
+ _FP_PACK_SEMIRAW(Q,4,X); \
+ if (!FP_INHIBIT_RESULTS) \
+ _FP_PACK_RAW_4_P(Q,val,X); \
+ } while (0)
+
#define FP_ISSIGNAN_Q(X) _FP_ISSIGNAN(Q,4,X)
#define FP_NEG_Q(R,X) _FP_NEG(Q,4,R,X)
#define FP_ADD_Q(R,X,Y) _FP_ADD(Q,4,R,X,Y)
@@ -171,6 +200,18 @@ union _FP_UNION_Q
_FP_UNPACK_CANONICAL(Q,2,X); \
} while (0)
+#define FP_UNPACK_SEMIRAW_Q(X,val) \
+ do { \
+ _FP_UNPACK_RAW_2(Q,X,val); \
+ _FP_UNPACK_SEMIRAW(Q,2,X); \
+ } while (0)
+
+#define FP_UNPACK_SEMIRAW_QP(X,val) \
+ do { \
+ _FP_UNPACK_RAW_2_P(Q,X,val); \
+ _FP_UNPACK_SEMIRAW(Q,2,X); \
+ } while (0)
+
#define FP_PACK_Q(val,X) \
do { \
_FP_PACK_CANONICAL(Q,2,X); \
@@ -184,6 +225,19 @@ union _FP_UNION_Q
_FP_PACK_RAW_2_P(Q,val,X); \
} while (0)
+#define FP_PACK_SEMIRAW_Q(val,X) \
+ do { \
+ _FP_PACK_SEMIRAW(Q,2,X); \
+ _FP_PACK_RAW_2(Q,val,X); \
+ } while (0)
+
+#define FP_PACK_SEMIRAW_QP(val,X) \
+ do { \
+ _FP_PACK_SEMIRAW(Q,2,X); \
+ if (!FP_INHIBIT_RESULTS) \
+ _FP_PACK_RAW_2_P(Q,val,X); \
+ } while (0)
+
#define FP_ISSIGNAN_Q(X) _FP_ISSIGNAN(Q,2,X)
#define FP_NEG_Q(R,X) _FP_NEG(Q,2,R,X)
#define FP_ADD_Q(R,X,Y) _FP_ADD(Q,2,R,X,Y)
Index: soft-fp/single.h
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/single.h,v
retrieving revision 1.3
diff -u -p -r1.3 single.h
--- soft-fp/single.h 6 Jan 2006 10:47:45 -0000 1.3
+++ soft-fp/single.h 9 Feb 2006 22:05:32 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Definitions for IEEE Single Precision.
- Copyright (C) 1997,1998,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1998,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com),
Jakub Jelinek (jj@ultra.linux.cz),
@@ -26,15 +26,19 @@
#error "Here's a nickel kid. Go buy yourself a real computer."
#endif
+#define _FP_FRACTBITS_S _FP_W_TYPE_SIZE
+
#define _FP_FRACBITS_S 24
-#define _FP_FRACXBITS_S (_FP_W_TYPE_SIZE - _FP_FRACBITS_S)
+#define _FP_FRACXBITS_S (_FP_FRACTBITS_S - _FP_FRACBITS_S)
#define _FP_WFRACBITS_S (_FP_WORKBITS + _FP_FRACBITS_S)
-#define _FP_WFRACXBITS_S (_FP_W_TYPE_SIZE - _FP_WFRACBITS_S)
+#define _FP_WFRACXBITS_S (_FP_FRACTBITS_S - _FP_WFRACBITS_S)
#define _FP_EXPBITS_S 8
#define _FP_EXPBIAS_S 127
#define _FP_EXPMAX_S 255
#define _FP_QNANBIT_S ((_FP_W_TYPE)1 << (_FP_FRACBITS_S-2))
+#define _FP_QNANBIT_SH_S ((_FP_W_TYPE)1 << (_FP_FRACBITS_S-2+_FP_WORKBITS))
#define _FP_IMPLBIT_S ((_FP_W_TYPE)1 << (_FP_FRACBITS_S-1))
+#define _FP_IMPLBIT_SH_S ((_FP_W_TYPE)1 << (_FP_FRACBITS_S-1+_FP_WORKBITS))
#define _FP_OVERFLOW_S ((_FP_W_TYPE)1 << (_FP_WFRACBITS_S))
/* The implementation of _FP_MUL_MEAT_S and _FP_DIV_MEAT_S should be
@@ -78,6 +82,18 @@ union _FP_UNION_S
_FP_UNPACK_CANONICAL(S,1,X); \
} while (0)
+#define FP_UNPACK_SEMIRAW_S(X,val) \
+ do { \
+ _FP_UNPACK_RAW_1(S,X,val); \
+ _FP_UNPACK_SEMIRAW(S,1,X); \
+ } while (0)
+
+#define FP_UNPACK_SEMIRAW_SP(X,val) \
+ do { \
+ _FP_UNPACK_RAW_1_P(S,X,val); \
+ _FP_UNPACK_SEMIRAW(S,1,X); \
+ } while (0)
+
#define FP_PACK_S(val,X) \
do { \
_FP_PACK_CANONICAL(S,1,X); \
@@ -91,6 +107,19 @@ union _FP_UNION_S
_FP_PACK_RAW_1_P(S,val,X); \
} while (0)
+#define FP_PACK_SEMIRAW_S(val,X) \
+ do { \
+ _FP_PACK_SEMIRAW(S,1,X); \
+ _FP_PACK_RAW_1(S,val,X); \
+ } while (0)
+
+#define FP_PACK_SEMIRAW_SP(val,X) \
+ do { \
+ _FP_PACK_SEMIRAW(S,1,X); \
+ if (!FP_INHIBIT_RESULTS) \
+ _FP_PACK_RAW_1_P(S,val,X); \
+ } while (0)
+
#define FP_ISSIGNAN_S(X) _FP_ISSIGNAN(S,1,X)
#define FP_NEG_S(R,X) _FP_NEG(S,1,R,X)
#define FP_ADD_S(R,X,Y) _FP_ADD(S,1,R,X,Y)
Index: soft-fp/subdf3.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/subdf3.c,v
retrieving revision 1.2
diff -u -p -r1.2 subdf3.c
--- soft-fp/subdf3.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/subdf3.c 9 Feb 2006 22:05:32 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return a - b
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,10 +30,10 @@ double __subdf3(double a, double b)
double r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_D(A, a);
- FP_UNPACK_D(B, b);
+ FP_UNPACK_SEMIRAW_D(A, a);
+ FP_UNPACK_SEMIRAW_D(B, b);
FP_SUB_D(R, A, B);
- FP_PACK_D(r, R);
+ FP_PACK_SEMIRAW_D(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: soft-fp/subsf3.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/subsf3.c,v
retrieving revision 1.2
diff -u -p -r1.2 subsf3.c
--- soft-fp/subsf3.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/subsf3.c 9 Feb 2006 22:05:32 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return a - b
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,10 +30,10 @@ float __subsf3(float a, float b)
float r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_S(A, a);
- FP_UNPACK_S(B, b);
+ FP_UNPACK_SEMIRAW_S(A, a);
+ FP_UNPACK_SEMIRAW_S(B, b);
FP_SUB_S(R, A, B);
- FP_PACK_S(r, R);
+ FP_PACK_SEMIRAW_S(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: soft-fp/subtf3.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/subtf3.c,v
retrieving revision 1.2
diff -u -p -r1.2 subtf3.c
--- soft-fp/subtf3.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/subtf3.c 9 Feb 2006 22:05:32 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return a - b
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,10 +30,10 @@ long double __subtf3(long double a, long
long double r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
- FP_UNPACK_Q(B, b);
+ FP_UNPACK_SEMIRAW_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(B, b);
FP_SUB_Q(R, A, B);
- FP_PACK_Q(r, R);
+ FP_PACK_SEMIRAW_Q(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: soft-fp/truncdfsf2.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/truncdfsf2.c,v
retrieving revision 1.2
diff -u -p -r1.2 truncdfsf2.c
--- soft-fp/truncdfsf2.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/truncdfsf2.c 9 Feb 2006 22:05:32 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Truncate IEEE double into IEEE single
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -32,13 +32,13 @@ float __truncdfsf2(double a)
float r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_D(A, a);
+ FP_UNPACK_SEMIRAW_D(A, a);
#if _FP_W_TYPE_SIZE < _FP_FRACBITS_D
- FP_CONV(S,D,1,2,R,A);
+ FP_TRUNC(S,D,1,2,R,A);
#else
- FP_CONV(S,D,1,1,R,A);
+ FP_TRUNC(S,D,1,1,R,A);
#endif
- FP_PACK_S(r, R);
+ FP_PACK_SEMIRAW_S(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: soft-fp/trunctfdf2.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/trunctfdf2.c,v
retrieving revision 1.2
diff -u -p -r1.2 trunctfdf2.c
--- soft-fp/trunctfdf2.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/trunctfdf2.c 9 Feb 2006 22:05:32 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Truncate IEEE quad into IEEE double
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -32,13 +32,13 @@ double __trunctfdf2(long double a)
double r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(D,Q,2,4,R,A);
+ FP_TRUNC(D,Q,2,4,R,A);
#else
- FP_CONV(D,Q,1,2,R,A);
+ FP_TRUNC(D,Q,1,2,R,A);
#endif
- FP_PACK_D(r, R);
+ FP_PACK_SEMIRAW_D(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: soft-fp/trunctfsf2.c
===================================================================
RCS file: /cvs/glibc/libc/soft-fp/trunctfsf2.c,v
retrieving revision 1.2
diff -u -p -r1.2 trunctfsf2.c
--- soft-fp/trunctfsf2.c 6 Jul 2001 04:55:40 -0000 1.2
+++ soft-fp/trunctfsf2.c 9 Feb 2006 22:05:32 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Truncate IEEE quad into IEEE single
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -32,13 +32,13 @@ float __trunctfsf2(long double a)
float r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(S,Q,1,4,R,A);
+ FP_TRUNC(S,Q,1,4,R,A);
#else
- FP_CONV(S,Q,1,2,R,A);
+ FP_TRUNC(S,Q,1,2,R,A);
#endif
- FP_PACK_S(r, R);
+ FP_PACK_SEMIRAW_S(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: sysdeps/alpha/soft-fp/ots_add.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/alpha/soft-fp/ots_add.c,v
retrieving revision 1.1
diff -u -p -r1.1 ots_add.c
--- sysdeps/alpha/soft-fp/ots_add.c 6 Mar 2004 20:46:23 -0000 1.1
+++ sysdeps/alpha/soft-fp/ots_add.c 9 Feb 2006 22:05:32 -0000
@@ -1,5 +1,5 @@
/* Software floating-point emulation: addition.
- Copyright (C) 1997,1999,2004 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2004,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -29,10 +29,10 @@ _OtsAddX(long al, long ah, long bl, long
FP_DECL_RETURN(c);
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
- FP_UNPACK_Q(B, b);
+ FP_UNPACK_SEMIRAW_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(B, b);
FP_ADD_Q(C, A, B);
- FP_PACK_Q(c, C);
+ FP_PACK_SEMIRAW_Q(c, C);
FP_HANDLE_EXCEPTIONS;
FP_RETURN(c);
Index: sysdeps/alpha/soft-fp/ots_cvtqux.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/alpha/soft-fp/ots_cvtqux.c,v
retrieving revision 1.1
diff -u -p -r1.1 ots_cvtqux.c
--- sysdeps/alpha/soft-fp/ots_cvtqux.c 6 Mar 2004 20:46:23 -0000 1.1
+++ sysdeps/alpha/soft-fp/ots_cvtqux.c 9 Feb 2006 22:05:32 -0000
@@ -1,5 +1,5 @@
/* Software floating-point emulation: unsigned integer to float conversion.
- Copyright (C) 1997,1999,2004 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2004,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -34,7 +34,7 @@ _OtsCvtQUX (unsigned long a)
FP_DECL_RETURN(c);
FP_FROM_INT_Q(C, a, 64, long);
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_RETURN(c);
}
Index: sysdeps/alpha/soft-fp/ots_cvtqx.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/alpha/soft-fp/ots_cvtqx.c,v
retrieving revision 1.1
diff -u -p -r1.1 ots_cvtqx.c
--- sysdeps/alpha/soft-fp/ots_cvtqx.c 6 Mar 2004 20:46:23 -0000 1.1
+++ sysdeps/alpha/soft-fp/ots_cvtqx.c 9 Feb 2006 22:05:32 -0000
@@ -1,5 +1,5 @@
/* Software floating-point emulation: signed integer to float conversion.
- Copyright (C) 1997,1999,2004 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2004,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -34,6 +34,6 @@ _OtsCvtQX (long a)
FP_DECL_RETURN(c);
FP_FROM_INT_Q(C, a, 64, long);
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_RETURN(c);
}
Index: sysdeps/alpha/soft-fp/ots_cvttx.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/alpha/soft-fp/ots_cvttx.c,v
retrieving revision 1.1
diff -u -p -r1.1 ots_cvttx.c
--- sysdeps/alpha/soft-fp/ots_cvttx.c 6 Mar 2004 20:46:23 -0000 1.1
+++ sysdeps/alpha/soft-fp/ots_cvttx.c 9 Feb 2006 22:05:32 -0000
@@ -1,5 +1,5 @@
/* Software floating-point emulation: floating point extension.
- Copyright (C) 1997,1999,2004 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2004,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -35,13 +35,13 @@ _OtsConvertFloatTX(double a)
FP_DECL_Q(C);
FP_DECL_RETURN(c);
- FP_UNPACK_D(A, a);
+ FP_UNPACK_RAW_D(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(Q,D,4,2,C,A);
+ FP_EXTEND(Q,D,4,2,C,A);
#else
- FP_CONV(Q,D,2,1,C,A);
+ FP_EXTEND(Q,D,2,1,C,A);
#endif
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_HANDLE_EXCEPTIONS;
FP_RETURN(c);
Index: sysdeps/alpha/soft-fp/ots_cvtxq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/alpha/soft-fp/ots_cvtxq.c,v
retrieving revision 1.1
diff -u -p -r1.1 ots_cvtxq.c
--- sysdeps/alpha/soft-fp/ots_cvtxq.c 6 Mar 2004 20:46:23 -0000 1.1
+++ sysdeps/alpha/soft-fp/ots_cvtxq.c 9 Feb 2006 22:05:32 -0000
@@ -1,5 +1,5 @@
/* Software floating-point emulation: float to integer conversion.
- Copyright (C) 1997,1999,2004 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2004,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -26,14 +26,15 @@ _OtsCvtXQ (long al, long ah, long _round
{
FP_DECL_EX;
FP_DECL_Q(A);
- long r, s;
+ unsigned long r;
+ long s;
/* If bit 3 is set, then integer overflow detection is requested. */
s = _round & 8 ? 1 : -1;
_round = _round & 3;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_RAW_Q(A, a);
FP_TO_INT_Q(r, A, 64, s);
if (s > 0 && (_fex &= FP_EX_INVALID))
Index: sysdeps/alpha/soft-fp/ots_cvtxt.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/alpha/soft-fp/ots_cvtxt.c,v
retrieving revision 1.2
diff -u -p -r1.2 ots_cvtxt.c
--- sysdeps/alpha/soft-fp/ots_cvtxt.c 8 Mar 2004 12:34:18 -0000 1.2
+++ sysdeps/alpha/soft-fp/ots_cvtxt.c 9 Feb 2006 22:05:32 -0000
@@ -1,5 +1,5 @@
/* Software floating-point emulation: floating point truncation.
- Copyright (C) 1997,1999,2004 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2004,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -31,13 +31,13 @@ _OtsConvertFloatXT (long al, long ah, lo
double r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(D,Q,2,4,R,A);
+ FP_TRUNC(D,Q,2,4,R,A);
#else
- FP_CONV(D,Q,1,2,R,A);
+ FP_TRUNC(D,Q,1,2,R,A);
#endif
- FP_PACK_D(r, R);
+ FP_PACK_SEMIRAW_D(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: sysdeps/alpha/soft-fp/ots_nintxq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/alpha/soft-fp/ots_nintxq.c,v
retrieving revision 1.1
diff -u -p -r1.1 ots_nintxq.c
--- sysdeps/alpha/soft-fp/ots_nintxq.c 6 Mar 2004 20:46:23 -0000 1.1
+++ sysdeps/alpha/soft-fp/ots_nintxq.c 9 Feb 2006 22:05:32 -0000
@@ -1,5 +1,5 @@
/* Software floating-point emulation: convert to fortran nearest.
- Copyright (C) 1997,1999,2004 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2004,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -26,22 +26,24 @@ _OtsNintXQ (long al, long ah, long _roun
{
FP_DECL_EX;
FP_DECL_Q(A); FP_DECL_Q(B); FP_DECL_Q(C);
- long r, s;
+ unsigned long r;
+ long s;
/* If bit 3 is set, then integer overflow detection is requested. */
s = _round & 8 ? 1 : -1;
_round = _round & 3;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(A, a);
/* Build 0.5 * sign(A) */
B_e = _FP_EXPBIAS_Q;
- __FP_FRAC_SET_2 (B, _FP_IMPLBIT_Q, 0);
+ __FP_FRAC_SET_2 (B, 0, 0);
B_s = A_s;
- _FP_UNPACK_CANONICAL(Q,2,B);
FP_ADD_Q(C, A, B);
+ _FP_FRAC_SRL_2(C, _FP_WORKBITS);
+ _FP_FRAC_HIGH_RAW_Q(C) &= ~(_FP_W_TYPE)_FP_IMPLBIT_Q;
FP_TO_INT_Q(r, C, 64, s);
if (s > 0 && (_fex &= FP_EX_INVALID))
FP_HANDLE_EXCEPTIONS;
Index: sysdeps/alpha/soft-fp/ots_sub.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/alpha/soft-fp/ots_sub.c,v
retrieving revision 1.1
diff -u -p -r1.1 ots_sub.c
--- sysdeps/alpha/soft-fp/ots_sub.c 6 Mar 2004 20:46:23 -0000 1.1
+++ sysdeps/alpha/soft-fp/ots_sub.c 9 Feb 2006 22:05:32 -0000
@@ -1,5 +1,5 @@
/* Software floating-point emulation: subtraction.
- Copyright (C) 1997,1999,2004 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2004,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -29,10 +29,10 @@ _OtsSubX(long al, long ah, long bl, long
FP_DECL_RETURN(c);
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
- FP_UNPACK_Q(B, b);
+ FP_UNPACK_SEMIRAW_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(B, b);
FP_SUB_Q(C, A, B);
- FP_PACK_Q(c, C);
+ FP_PACK_SEMIRAW_Q(c, C);
FP_HANDLE_EXCEPTIONS;
FP_RETURN(c);
Index: sysdeps/powerpc/soft-fp/q_add.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/soft-fp/q_add.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_add.c
--- sysdeps/powerpc/soft-fp/q_add.c 6 Jul 2001 04:56:02 -0000 1.2
+++ sysdeps/powerpc/soft-fp/q_add.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return a + b
- Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,10 +30,10 @@ long double _q_add(const long double a,
long double c;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
- FP_UNPACK_Q(B, b);
+ FP_UNPACK_SEMIRAW_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(B, b);
FP_ADD_Q(C, A, B);
- FP_PACK_Q(c, C);
+ FP_PACK_SEMIRAW_Q(c, C);
FP_HANDLE_EXCEPTIONS;
return c;
}
Index: sysdeps/powerpc/soft-fp/q_dtoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/soft-fp/q_dtoq.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_dtoq.c
--- sysdeps/powerpc/soft-fp/q_dtoq.c 6 Jul 2001 04:56:02 -0000 1.2
+++ sysdeps/powerpc/soft-fp/q_dtoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (long double)(a)
- Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -32,13 +32,13 @@ long double _q_dtoq(const double a)
long double c;
FP_INIT_ROUNDMODE;
- FP_UNPACK_D(A, a);
+ FP_UNPACK_RAW_D(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(Q,D,4,2,C,A);
+ FP_EXTEND(Q,D,4,2,C,A);
#else
- FP_CONV(Q,D,2,1,C,A);
+ FP_EXTEND(Q,D,2,1,C,A);
#endif
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_HANDLE_EXCEPTIONS;
return c;
}
Index: sysdeps/powerpc/soft-fp/q_itoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/soft-fp/q_itoq.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_itoq.c
--- sysdeps/powerpc/soft-fp/q_itoq.c 6 Jul 2001 04:56:02 -0000 1.2
+++ sysdeps/powerpc/soft-fp/q_itoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (long double)(a)
- Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -31,7 +31,7 @@ long double _q_itoq(const int a)
long double c;
FP_FROM_INT_Q(C, b, 32, int);
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_CLEAR_EXCEPTIONS;
FP_HANDLE_EXCEPTIONS;
return c;
Index: sysdeps/powerpc/soft-fp/q_lltoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/soft-fp/q_lltoq.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_lltoq.c
--- sysdeps/powerpc/soft-fp/q_lltoq.c 6 Jul 2001 04:56:02 -0000 1.2
+++ sysdeps/powerpc/soft-fp/q_lltoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (long double)a
- Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -31,7 +31,7 @@ long double _q_lltoq(const long long a)
long long b = a;
FP_FROM_INT_Q(C, b, 64, long long);
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_CLEAR_EXCEPTIONS;
FP_HANDLE_EXCEPTIONS;
return c;
Index: sysdeps/powerpc/soft-fp/q_qtod.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/soft-fp/q_qtod.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_qtod.c
--- sysdeps/powerpc/soft-fp/q_qtod.c 6 Jul 2001 04:56:02 -0000 1.2
+++ sysdeps/powerpc/soft-fp/q_qtod.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (double)a
- Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -32,13 +32,13 @@ double _q_qtod(const long double a)
double r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(D,Q,2,4,R,A);
+ FP_TRUNC(D,Q,2,4,R,A);
#else
- FP_CONV(D,Q,1,2,R,A);
+ FP_TRUNC(D,Q,1,2,R,A);
#endif
- FP_PACK_D(r, R);
+ FP_PACK_SEMIRAW_D(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: sysdeps/powerpc/soft-fp/q_qtoi.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/soft-fp/q_qtoi.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_qtoi.c
--- sysdeps/powerpc/soft-fp/q_qtoi.c 6 Jul 2001 04:56:02 -0000 1.2
+++ sysdeps/powerpc/soft-fp/q_qtoi.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (int)a
- Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -28,9 +28,9 @@ int _q_qtoi(const long double a)
{
FP_DECL_EX;
FP_DECL_Q(A);
- int r;
+ unsigned int r;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_RAW_Q(A, a);
FP_TO_INT_Q(r, A, 32, 1);
FP_HANDLE_EXCEPTIONS;
Index: sysdeps/powerpc/soft-fp/q_qtoll.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/soft-fp/q_qtoll.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_qtoll.c
--- sysdeps/powerpc/soft-fp/q_qtoll.c 6 Jul 2001 04:56:02 -0000 1.2
+++ sysdeps/powerpc/soft-fp/q_qtoll.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (long)a
- Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -28,9 +28,9 @@ long long _q_qtoll(const long double a)
{
FP_DECL_EX;
FP_DECL_Q(A);
- long long r;
+ unsigned long long r;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_RAW_Q(A, a);
FP_TO_INT_Q(r, A, 64, 1);
FP_HANDLE_EXCEPTIONS;
Index: sysdeps/powerpc/soft-fp/q_qtos.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/soft-fp/q_qtos.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_qtos.c
--- sysdeps/powerpc/soft-fp/q_qtos.c 6 Jul 2001 04:56:02 -0000 1.2
+++ sysdeps/powerpc/soft-fp/q_qtos.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (float)a
- Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -32,13 +32,13 @@ float _q_qtos(const long double a)
float r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(S,Q,1,4,R,A);
+ FP_TRUNC(S,Q,1,4,R,A);
#else
- FP_CONV(S,Q,1,2,R,A);
+ FP_TRUNC(S,Q,1,2,R,A);
#endif
- FP_PACK_S(r, R);
+ FP_PACK_SEMIRAW_S(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: sysdeps/powerpc/soft-fp/q_qtou.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/soft-fp/q_qtou.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_qtou.c
--- sysdeps/powerpc/soft-fp/q_qtou.c 6 Jul 2001 04:56:02 -0000 1.2
+++ sysdeps/powerpc/soft-fp/q_qtou.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (unsigned int)a
- Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,7 +30,7 @@ unsigned int _q_qtou(const long double a
FP_DECL_Q(A);
unsigned int r;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_RAW_Q(A, a);
FP_TO_INT_Q(r, A, 32, -1);
FP_HANDLE_EXCEPTIONS;
Index: sysdeps/powerpc/soft-fp/q_qtoull.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/soft-fp/q_qtoull.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_qtoull.c
--- sysdeps/powerpc/soft-fp/q_qtoull.c 6 Jul 2001 04:56:02 -0000 1.2
+++ sysdeps/powerpc/soft-fp/q_qtoull.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (long)a
- Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,7 +30,7 @@ unsigned long long _q_qtoull(const long
FP_DECL_Q(A);
unsigned long long r;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_RAW_Q(A, a);
FP_TO_INT_Q(r, A, 64, -1);
FP_HANDLE_EXCEPTIONS;
Index: sysdeps/powerpc/soft-fp/q_stoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/soft-fp/q_stoq.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_stoq.c
--- sysdeps/powerpc/soft-fp/q_stoq.c 6 Jul 2001 04:56:02 -0000 1.2
+++ sysdeps/powerpc/soft-fp/q_stoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
c = (long double)(a)
- Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -31,13 +31,13 @@ long double _q_stoq(const float a)
FP_DECL_Q(C);
long double c;
- FP_UNPACK_S(A, a);
+ FP_UNPACK_RAW_S(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(Q,S,4,1,C,A);
+ FP_EXTEND(Q,S,4,1,C,A);
#else
- FP_CONV(Q,S,2,1,C,A);
+ FP_EXTEND(Q,S,2,1,C,A);
#endif
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_HANDLE_EXCEPTIONS;
return c;
}
Index: sysdeps/powerpc/soft-fp/q_sub.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/soft-fp/q_sub.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_sub.c
--- sysdeps/powerpc/soft-fp/q_sub.c 6 Jul 2001 04:56:02 -0000 1.2
+++ sysdeps/powerpc/soft-fp/q_sub.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
c = a - b
- Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,10 +30,10 @@ long double _q_sub(const long double a,
long double c;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
- FP_UNPACK_Q(B, b);
+ FP_UNPACK_SEMIRAW_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(B, b);
FP_SUB_Q(C, A, B);
- FP_PACK_Q(c, C);
+ FP_PACK_SEMIRAW_Q(c, C);
FP_HANDLE_EXCEPTIONS;
return c;
}
Index: sysdeps/powerpc/soft-fp/q_ulltoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/soft-fp/q_ulltoq.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_ulltoq.c
--- sysdeps/powerpc/soft-fp/q_ulltoq.c 6 Jul 2001 04:56:02 -0000 1.2
+++ sysdeps/powerpc/soft-fp/q_ulltoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (long double)a
- Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -31,7 +31,7 @@ long double _q_ulltoq(const unsigned lon
unsigned long long b = a;
FP_FROM_INT_Q(C, b, 64, long long);
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_CLEAR_EXCEPTIONS;
FP_HANDLE_EXCEPTIONS;
return c;
Index: sysdeps/powerpc/soft-fp/q_utoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/soft-fp/q_utoq.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_utoq.c
--- sysdeps/powerpc/soft-fp/q_utoq.c 6 Jul 2001 04:56:02 -0000 1.2
+++ sysdeps/powerpc/soft-fp/q_utoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
c = (long double)(a)
- Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -31,7 +31,7 @@ long double _q_uitoq(const unsigned int
unsigned int b = a;
FP_FROM_INT_Q(C, b, 32, int);
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_CLEAR_EXCEPTIONS;
FP_HANDLE_EXCEPTIONS;
return c;
Index: sysdeps/sparc/sparc32/soft-fp/q_add.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/soft-fp/q_add.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_add.c
--- sysdeps/sparc/sparc32/soft-fp/q_add.c 6 Jul 2001 04:56:05 -0000 1.2
+++ sysdeps/sparc/sparc32/soft-fp/q_add.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return a + b
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,10 +30,10 @@ long double _Q_add(const long double a,
long double c;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
- FP_UNPACK_Q(B, b);
+ FP_UNPACK_SEMIRAW_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(B, b);
FP_ADD_Q(C, A, B);
- FP_PACK_Q(c, C);
+ FP_PACK_SEMIRAW_Q(c, C);
FP_HANDLE_EXCEPTIONS;
return c;
}
Index: sysdeps/sparc/sparc32/soft-fp/q_dtoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/soft-fp/q_dtoq.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_dtoq.c
--- sysdeps/sparc/sparc32/soft-fp/q_dtoq.c 6 Jul 2001 04:56:05 -0000 1.2
+++ sysdeps/sparc/sparc32/soft-fp/q_dtoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (long double)(a)
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -32,13 +32,13 @@ long double _Q_dtoq(const double a)
long double c;
FP_INIT_ROUNDMODE;
- FP_UNPACK_D(A, a);
+ FP_UNPACK_RAW_D(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(Q,D,4,2,C,A);
+ FP_EXTEND(Q,D,4,2,C,A);
#else
- FP_CONV(Q,D,2,1,C,A);
+ FP_EXTEND(Q,D,2,1,C,A);
#endif
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_HANDLE_EXCEPTIONS;
return c;
}
Index: sysdeps/sparc/sparc32/soft-fp/q_itoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/soft-fp/q_itoq.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_itoq.c
--- sysdeps/sparc/sparc32/soft-fp/q_itoq.c 6 Jul 2001 04:56:05 -0000 1.2
+++ sysdeps/sparc/sparc32/soft-fp/q_itoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (long double)(a)
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -31,7 +31,7 @@ long double _Q_itoq(const int a)
long double c;
FP_FROM_INT_Q(C, b, 32, int);
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_CLEAR_EXCEPTIONS;
FP_HANDLE_EXCEPTIONS;
return c;
Index: sysdeps/sparc/sparc32/soft-fp/q_lltoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/soft-fp/q_lltoq.c,v
retrieving revision 1.1
diff -u -p -r1.1 q_lltoq.c
--- sysdeps/sparc/sparc32/soft-fp/q_lltoq.c 14 Jan 2006 12:09:02 -0000 1.1
+++ sysdeps/sparc/sparc32/soft-fp/q_lltoq.c 9 Feb 2006 22:05:33 -0000
@@ -31,7 +31,7 @@ long double _Q_lltoq(const long long a)
long long b = a;
FP_FROM_INT_Q(C, b, 64, long long);
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_CLEAR_EXCEPTIONS;
FP_HANDLE_EXCEPTIONS;
return c;
Index: sysdeps/sparc/sparc32/soft-fp/q_qtod.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/soft-fp/q_qtod.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_qtod.c
--- sysdeps/sparc/sparc32/soft-fp/q_qtod.c 6 Jul 2001 04:56:05 -0000 1.2
+++ sysdeps/sparc/sparc32/soft-fp/q_qtod.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (double)a
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -32,13 +32,13 @@ double _Q_qtod(const long double a)
double r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(D,Q,2,4,R,A);
+ FP_TRUNC(D,Q,2,4,R,A);
#else
- FP_CONV(D,Q,1,2,R,A);
+ FP_TRUNC(D,Q,1,2,R,A);
#endif
- FP_PACK_D(r, R);
+ FP_PACK_SEMIRAW_D(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: sysdeps/sparc/sparc32/soft-fp/q_qtoi.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/soft-fp/q_qtoi.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_qtoi.c
--- sysdeps/sparc/sparc32/soft-fp/q_qtoi.c 6 Jul 2001 04:56:05 -0000 1.2
+++ sysdeps/sparc/sparc32/soft-fp/q_qtoi.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (int)a
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -28,9 +28,9 @@ int _Q_qtoi(const long double a)
{
FP_DECL_EX;
FP_DECL_Q(A);
- int r;
+ unsigned int r;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_RAW_Q(A, a);
FP_TO_INT_Q(r, A, 32, 1);
FP_HANDLE_EXCEPTIONS;
Index: sysdeps/sparc/sparc32/soft-fp/q_qtoll.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/soft-fp/q_qtoll.c,v
retrieving revision 1.1
diff -u -p -r1.1 q_qtoll.c
--- sysdeps/sparc/sparc32/soft-fp/q_qtoll.c 14 Jan 2006 12:09:02 -0000 1.1
+++ sysdeps/sparc/sparc32/soft-fp/q_qtoll.c 9 Feb 2006 22:05:33 -0000
@@ -28,9 +28,9 @@ long long _Q_qtoll(const long double a)
{
FP_DECL_EX;
FP_DECL_Q(A);
- long long r;
+ unsigned long long r;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_RAW_Q(A, a);
FP_TO_INT_Q(r, A, 64, 1);
FP_HANDLE_EXCEPTIONS;
Index: sysdeps/sparc/sparc32/soft-fp/q_qtos.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/soft-fp/q_qtos.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_qtos.c
--- sysdeps/sparc/sparc32/soft-fp/q_qtos.c 6 Jul 2001 04:56:05 -0000 1.2
+++ sysdeps/sparc/sparc32/soft-fp/q_qtos.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (float)a
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -32,13 +32,13 @@ float _Q_qtos(const long double a)
float r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(S,Q,1,4,R,A);
+ FP_TRUNC(S,Q,1,4,R,A);
#else
- FP_CONV(S,Q,1,2,R,A);
+ FP_TRUNC(S,Q,1,2,R,A);
#endif
- FP_PACK_S(r, R);
+ FP_PACK_SEMIRAW_S(r, R);
FP_HANDLE_EXCEPTIONS;
return r;
Index: sysdeps/sparc/sparc32/soft-fp/q_qtou.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/soft-fp/q_qtou.c,v
retrieving revision 1.1
diff -u -p -r1.1 q_qtou.c
--- sysdeps/sparc/sparc32/soft-fp/q_qtou.c 14 Jan 2006 12:09:02 -0000 1.1
+++ sysdeps/sparc/sparc32/soft-fp/q_qtou.c 9 Feb 2006 22:05:33 -0000
@@ -30,7 +30,7 @@ unsigned int _Q_qtou(const long double a
FP_DECL_Q(A);
unsigned int r;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_RAW_Q(A, a);
FP_TO_INT_Q(r, A, 32, -1);
FP_HANDLE_EXCEPTIONS;
Index: sysdeps/sparc/sparc32/soft-fp/q_qtoull.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/soft-fp/q_qtoull.c,v
retrieving revision 1.1
diff -u -p -r1.1 q_qtoull.c
--- sysdeps/sparc/sparc32/soft-fp/q_qtoull.c 14 Jan 2006 12:09:02 -0000 1.1
+++ sysdeps/sparc/sparc32/soft-fp/q_qtoull.c 9 Feb 2006 22:05:33 -0000
@@ -30,7 +30,7 @@ unsigned long long _Q_qtoull(const long
FP_DECL_Q(A);
unsigned long long r;
- FP_UNPACK_Q(A, a);
+ FP_UNPACK_RAW_Q(A, a);
FP_TO_INT_Q(r, A, 64, -1);
FP_HANDLE_EXCEPTIONS;
Index: sysdeps/sparc/sparc32/soft-fp/q_stoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/soft-fp/q_stoq.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_stoq.c
--- sysdeps/sparc/sparc32/soft-fp/q_stoq.c 6 Jul 2001 04:56:05 -0000 1.2
+++ sysdeps/sparc/sparc32/soft-fp/q_stoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
c = (long double)(a)
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -31,13 +31,13 @@ long double _Q_stoq(const float a)
FP_DECL_Q(C);
long double c;
- FP_UNPACK_S(A, a);
+ FP_UNPACK_RAW_S(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(Q,S,4,1,C,A);
+ FP_EXTEND(Q,S,4,1,C,A);
#else
- FP_CONV(Q,S,2,1,C,A);
+ FP_EXTEND(Q,S,2,1,C,A);
#endif
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_HANDLE_EXCEPTIONS;
return c;
}
Index: sysdeps/sparc/sparc32/soft-fp/q_sub.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/soft-fp/q_sub.c,v
retrieving revision 1.2
diff -u -p -r1.2 q_sub.c
--- sysdeps/sparc/sparc32/soft-fp/q_sub.c 6 Jul 2001 04:56:05 -0000 1.2
+++ sysdeps/sparc/sparc32/soft-fp/q_sub.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
c = a - b
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,10 +30,10 @@ long double _Q_sub(const long double a,
long double c;
FP_INIT_ROUNDMODE;
- FP_UNPACK_Q(A, a);
- FP_UNPACK_Q(B, b);
+ FP_UNPACK_SEMIRAW_Q(A, a);
+ FP_UNPACK_SEMIRAW_Q(B, b);
FP_SUB_Q(C, A, B);
- FP_PACK_Q(c, C);
+ FP_PACK_SEMIRAW_Q(c, C);
FP_HANDLE_EXCEPTIONS;
return c;
}
Index: sysdeps/sparc/sparc32/soft-fp/q_ulltoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/soft-fp/q_ulltoq.c,v
retrieving revision 1.1
diff -u -p -r1.1 q_ulltoq.c
--- sysdeps/sparc/sparc32/soft-fp/q_ulltoq.c 14 Jan 2006 12:09:02 -0000 1.1
+++ sysdeps/sparc/sparc32/soft-fp/q_ulltoq.c 9 Feb 2006 22:05:33 -0000
@@ -31,7 +31,7 @@ long double _Q_ulltoq(const unsigned lon
unsigned long long b = a;
FP_FROM_INT_Q(C, b, 64, long long);
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_CLEAR_EXCEPTIONS;
FP_HANDLE_EXCEPTIONS;
return c;
Index: sysdeps/sparc/sparc32/soft-fp/q_utoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/soft-fp/q_utoq.c,v
retrieving revision 1.1
diff -u -p -r1.1 q_utoq.c
--- sysdeps/sparc/sparc32/soft-fp/q_utoq.c 14 Jan 2006 12:09:02 -0000 1.1
+++ sysdeps/sparc/sparc32/soft-fp/q_utoq.c 9 Feb 2006 22:05:33 -0000
@@ -31,7 +31,7 @@ long double _Q_utoq(const unsigned int a
unsigned int b = a;
FP_FROM_INT_Q(C, b, 32, int);
- FP_PACK_Q(c, C);
+ FP_PACK_RAW_Q(c, C);
FP_CLEAR_EXCEPTIONS;
FP_HANDLE_EXCEPTIONS;
return c;
Index: sysdeps/sparc/sparc64/soft-fp/qp_add.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/soft-fp/qp_add.c,v
retrieving revision 1.3
diff -u -p -r1.3 qp_add.c
--- sysdeps/sparc/sparc64/soft-fp/qp_add.c 6 Jul 2001 04:56:05 -0000 1.3
+++ sysdeps/sparc/sparc64/soft-fp/qp_add.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
(*c) = (*a) + (*b)
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -29,10 +29,10 @@ void _Qp_add(long double *c, const long
FP_DECL_Q(A); FP_DECL_Q(B); FP_DECL_Q(C);
FP_INIT_ROUNDMODE;
- FP_UNPACK_QP(A, a);
- FP_UNPACK_QP(B, b);
+ FP_UNPACK_SEMIRAW_QP(A, a);
+ FP_UNPACK_SEMIRAW_QP(B, b);
FP_ADD_Q(C, A, B);
- FP_PACK_QP(c, C);
+ FP_PACK_SEMIRAW_QP(c, C);
QP_HANDLE_EXCEPTIONS(__asm (
" ldd [%1], %%f52\n"
" ldd [%1+8], %%f54\n"
Index: sysdeps/sparc/sparc64/soft-fp/qp_dtoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/soft-fp/qp_dtoq.c,v
retrieving revision 1.3
diff -u -p -r1.3 qp_dtoq.c
--- sysdeps/sparc/sparc64/soft-fp/qp_dtoq.c 6 Jul 2001 04:56:05 -0000 1.3
+++ sysdeps/sparc/sparc64/soft-fp/qp_dtoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
(*c) = (long double)(a)
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -31,13 +31,13 @@ void _Qp_dtoq(long double *c, const doub
FP_DECL_Q(C);
FP_INIT_ROUNDMODE;
- FP_UNPACK_D(A, a);
+ FP_UNPACK_RAW_D(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(Q,D,4,2,C,A);
+ FP_EXTEND(Q,D,4,2,C,A);
#else
- FP_CONV(Q,D,2,1,C,A);
+ FP_EXTEND(Q,D,2,1,C,A);
#endif
- FP_PACK_QP(c, C);
+ FP_PACK_RAW_QP(c, C);
QP_HANDLE_EXCEPTIONS(__asm (
" fdtoq %1, %%f60\n"
" std %%f60, [%0]\n"
Index: sysdeps/sparc/sparc64/soft-fp/qp_itoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/soft-fp/qp_itoq.c,v
retrieving revision 1.2
diff -u -p -r1.2 qp_itoq.c
--- sysdeps/sparc/sparc64/soft-fp/qp_itoq.c 6 Jul 2001 04:56:05 -0000 1.2
+++ sysdeps/sparc/sparc64/soft-fp/qp_itoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
(*c) = (long double)(a)
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,6 +30,6 @@ void _Qp_itoq(long double *c, const int
int b = a;
FP_FROM_INT_Q(C, b, 32, int);
- FP_PACK_QP(c, C);
+ FP_PACK_RAW_QP(c, C);
QP_NO_EXCEPTIONS;
}
Index: sysdeps/sparc/sparc64/soft-fp/qp_qtod.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/soft-fp/qp_qtod.c,v
retrieving revision 1.3
diff -u -p -r1.3 qp_qtod.c
--- sysdeps/sparc/sparc64/soft-fp/qp_qtod.c 6 Jul 2001 04:56:05 -0000 1.3
+++ sysdeps/sparc/sparc64/soft-fp/qp_qtod.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (double)(*a)
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -32,13 +32,13 @@ double _Qp_qtod(const long double *a)
double r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_QP(A, a);
+ FP_UNPACK_SEMIRAW_QP(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(D,Q,2,4,R,A);
+ FP_TRUNC(D,Q,2,4,R,A);
#else
- FP_CONV(D,Q,1,2,R,A);
+ FP_TRUNC(D,Q,1,2,R,A);
#endif
- FP_PACK_D(r, R);
+ FP_PACK_SEMIRAW_D(r, R);
QP_HANDLE_EXCEPTIONS(__asm (
" ldd [%1], %%f52\n"
" ldd [%1+8], %%f54\n"
Index: sysdeps/sparc/sparc64/soft-fp/qp_qtoi.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/soft-fp/qp_qtoi.c,v
retrieving revision 1.4
diff -u -p -r1.4 qp_qtoi.c
--- sysdeps/sparc/sparc64/soft-fp/qp_qtoi.c 29 Apr 2004 20:02:34 -0000 1.4
+++ sysdeps/sparc/sparc64/soft-fp/qp_qtoi.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (int)(*a)
- Copyright (C) 1997, 1999, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -28,10 +28,10 @@ int _Qp_qtoi(const long double *a)
{
FP_DECL_EX;
FP_DECL_Q(A);
- int r;
+ unsigned int r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_QP(A, a);
+ FP_UNPACK_RAW_QP(A, a);
FP_TO_INT_Q(r, A, 32, 1);
QP_HANDLE_EXCEPTIONS(
int rx;
Index: sysdeps/sparc/sparc64/soft-fp/qp_qtos.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/soft-fp/qp_qtos.c,v
retrieving revision 1.3
diff -u -p -r1.3 qp_qtos.c
--- sysdeps/sparc/sparc64/soft-fp/qp_qtos.c 6 Jul 2001 04:56:05 -0000 1.3
+++ sysdeps/sparc/sparc64/soft-fp/qp_qtos.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (float)(*a)
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -32,13 +32,13 @@ float _Qp_qtos(const long double *a)
float r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_QP(A, a);
+ FP_UNPACK_SEMIRAW_QP(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(S,Q,1,4,R,A);
+ FP_TRUNC(S,Q,1,4,R,A);
#else
- FP_CONV(S,Q,1,2,R,A);
+ FP_TRUNC(S,Q,1,2,R,A);
#endif
- FP_PACK_S(r, R);
+ FP_PACK_SEMIRAW_S(r, R);
QP_HANDLE_EXCEPTIONS(__asm (
" ldd [%1], %%f52\n"
Index: sysdeps/sparc/sparc64/soft-fp/qp_qtoui.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/soft-fp/qp_qtoui.c,v
retrieving revision 1.4
diff -u -p -r1.4 qp_qtoui.c
--- sysdeps/sparc/sparc64/soft-fp/qp_qtoui.c 29 Apr 2004 20:02:34 -0000 1.4
+++ sysdeps/sparc/sparc64/soft-fp/qp_qtoui.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (unsigned int)(*a)
- Copyright (C) 1997, 1999, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -31,7 +31,7 @@ unsigned int _Qp_qtoui(const long double
unsigned int r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_QP(A, a);
+ FP_UNPACK_RAW_QP(A, a);
FP_TO_INT_Q(r, A, 32, -1);
QP_HANDLE_EXCEPTIONS(
int rx;
Index: sysdeps/sparc/sparc64/soft-fp/qp_qtoux.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/soft-fp/qp_qtoux.c,v
retrieving revision 1.4
diff -u -p -r1.4 qp_qtoux.c
--- sysdeps/sparc/sparc64/soft-fp/qp_qtoux.c 29 Apr 2004 20:02:34 -0000 1.4
+++ sysdeps/sparc/sparc64/soft-fp/qp_qtoux.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (unsigned long)(*a)
- Copyright (C) 1997, 1999, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -31,7 +31,7 @@ unsigned long _Qp_qtoux(const long doubl
unsigned long r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_QP(A, a);
+ FP_UNPACK_RAW_QP(A, a);
FP_TO_INT_Q(r, A, 64, -1);
QP_HANDLE_EXCEPTIONS(
unsigned long rx;
Index: sysdeps/sparc/sparc64/soft-fp/qp_qtox.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/soft-fp/qp_qtox.c,v
retrieving revision 1.4
diff -u -p -r1.4 qp_qtox.c
--- sysdeps/sparc/sparc64/soft-fp/qp_qtox.c 29 Apr 2004 20:02:34 -0000 1.4
+++ sysdeps/sparc/sparc64/soft-fp/qp_qtox.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
Return (long)(*a)
- Copyright (C) 1997, 1999, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -28,10 +28,10 @@ long _Qp_qtox(const long double *a)
{
FP_DECL_EX;
FP_DECL_Q(A);
- long r;
+ unsigned long r;
FP_INIT_ROUNDMODE;
- FP_UNPACK_QP(A, a);
+ FP_UNPACK_RAW_QP(A, a);
FP_TO_INT_Q(r, A, 64, 1);
QP_HANDLE_EXCEPTIONS(
long rx;
Index: sysdeps/sparc/sparc64/soft-fp/qp_stoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/soft-fp/qp_stoq.c,v
retrieving revision 1.3
diff -u -p -r1.3 qp_stoq.c
--- sysdeps/sparc/sparc64/soft-fp/qp_stoq.c 6 Jul 2001 04:56:05 -0000 1.3
+++ sysdeps/sparc/sparc64/soft-fp/qp_stoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
(*c) = (long double)(a)
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -31,13 +31,13 @@ void _Qp_stoq(long double *c, const floa
FP_DECL_Q(C);
FP_INIT_ROUNDMODE;
- FP_UNPACK_S(A, a);
+ FP_UNPACK_RAW_S(A, a);
#if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
- FP_CONV(Q,S,4,1,C,A);
+ FP_EXTEND(Q,S,4,1,C,A);
#else
- FP_CONV(Q,S,2,1,C,A);
+ FP_EXTEND(Q,S,2,1,C,A);
#endif
- FP_PACK_QP(c, C);
+ FP_PACK_RAW_QP(c, C);
QP_HANDLE_EXCEPTIONS(__asm (
" fstoq %1, %%f60\n"
" std %%f60, [%0]\n"
Index: sysdeps/sparc/sparc64/soft-fp/qp_sub.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/soft-fp/qp_sub.c,v
retrieving revision 1.3
diff -u -p -r1.3 qp_sub.c
--- sysdeps/sparc/sparc64/soft-fp/qp_sub.c 6 Jul 2001 04:56:05 -0000 1.3
+++ sysdeps/sparc/sparc64/soft-fp/qp_sub.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
(*c) = (*a) - (*b)
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -29,10 +29,10 @@ void _Qp_sub(long double *c, const long
FP_DECL_Q(A); FP_DECL_Q(B); FP_DECL_Q(C);
FP_INIT_ROUNDMODE;
- FP_UNPACK_QP(A, a);
- FP_UNPACK_QP(B, b);
+ FP_UNPACK_SEMIRAW_QP(A, a);
+ FP_UNPACK_SEMIRAW_QP(B, b);
FP_SUB_Q(C, A, B);
- FP_PACK_QP(c, C);
+ FP_PACK_SEMIRAW_QP(c, C);
QP_HANDLE_EXCEPTIONS(__asm (
" ldd [%1], %%f52\n"
" ldd [%1+8], %%f54\n"
Index: sysdeps/sparc/sparc64/soft-fp/qp_uitoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/soft-fp/qp_uitoq.c,v
retrieving revision 1.2
diff -u -p -r1.2 qp_uitoq.c
--- sysdeps/sparc/sparc64/soft-fp/qp_uitoq.c 6 Jul 2001 04:56:05 -0000 1.2
+++ sysdeps/sparc/sparc64/soft-fp/qp_uitoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
(*c) = (long double)(a)
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,6 +30,6 @@ void _Qp_uitoq(long double *c, const uns
unsigned int b = a;
FP_FROM_INT_Q(C, b, 32, int);
- FP_PACK_QP(c, C);
+ FP_PACK_RAW_QP(c, C);
QP_NO_EXCEPTIONS;
}
Index: sysdeps/sparc/sparc64/soft-fp/qp_uxtoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/soft-fp/qp_uxtoq.c,v
retrieving revision 1.2
diff -u -p -r1.2 qp_uxtoq.c
--- sysdeps/sparc/sparc64/soft-fp/qp_uxtoq.c 6 Jul 2001 04:56:05 -0000 1.2
+++ sysdeps/sparc/sparc64/soft-fp/qp_uxtoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
(*c) = (long double)(a)
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,6 +30,6 @@ void _Qp_uxtoq(long double *c, const uns
unsigned long b = a;
FP_FROM_INT_Q(C, b, 64, long);
- FP_PACK_QP(c, C);
+ FP_PACK_RAW_QP(c, C);
QP_NO_EXCEPTIONS;
}
Index: sysdeps/sparc/sparc64/soft-fp/qp_xtoq.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/soft-fp/qp_xtoq.c,v
retrieving revision 1.2
diff -u -p -r1.2 qp_xtoq.c
--- sysdeps/sparc/sparc64/soft-fp/qp_xtoq.c 6 Jul 2001 04:56:05 -0000 1.2
+++ sysdeps/sparc/sparc64/soft-fp/qp_xtoq.c 9 Feb 2006 22:05:33 -0000
@@ -1,6 +1,6 @@
/* Software floating-point emulation.
(*c) = (long double)(*a)
- Copyright (C) 1997,1999 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@cygnus.com) and
Jakub Jelinek (jj@ultra.linux.cz).
@@ -30,6 +30,6 @@ void _Qp_xtoq(long double *c, const long
long b = a;
FP_FROM_INT_Q(C, b, 64, long);
- FP_PACK_QP(c, C);
+ FP_PACK_RAW_QP(c, C);
QP_NO_EXCEPTIONS;
}
--
Joseph S. Myers
joseph@codesourcery.com