Merge botch fixed.

	* decNumber.c, decNumber.h, decNumberLocal.h, decDouble.c,
	decDouble.h, decSingle.c, decContext.c, decSingle.h, decPacked.c,
	decCommon.c, decContext.h, decQuad.c, decPacked.h, decQuad.h,
	decDPD.h, decBasic.c: Upgrade to decNumber 3.61.
	* dpd/decimal128.h, dpd/decimal32.c, dpd/decimal32.h,
	dpd/decimal64.c, dpd/decimal128.c, dpd/decimal64.h: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@145274 138bc75d-0d04-0410-961f-82ee72b054a4

libdecnumber/ChangeLog

@@ -1,3 +1,12 @@
+2009-03-30  Ben Elliston  <[email protected]>
+
+	* decNumber.c, decNumber.h, decNumberLocal.h, decDouble.c,
+	decDouble.h, decSingle.c, decContext.c, decSingle.h, decPacked.c,
+	decCommon.c, decContext.h, decQuad.c, decPacked.h, decQuad.h,
+	decDPD.h, decBasic.c: Upgrade to decNumber 3.61.
+	* dpd/decimal128.h, dpd/decimal32.c, dpd/decimal32.h,
+	dpd/decimal64.c, dpd/decimal128.c, dpd/decimal64.h: Likewise.
+
 2009-02-10  Joseph Myers  <[email protected]>
 
 	* Makefile.in (clean): Don't remove makedepend$(EXEEXT).

libdecnumber/decContext.c

@@ -38,15 +38,13 @@
 #include <string.h>	      /* for strcmp */
 #include <stdio.h>	      /* for printf if DECCHECK */
 #include "dconfig.h"	      /* for GCC definitions */
-#include "decContext.h"	      /* context and base types */
+#include "decContext.h"       /* context and base types */
 #include "decNumberLocal.h"   /* decNumber local types, etc. */
 
-#if DECCHECK
 /* compile-time endian tester [assumes sizeof(Int)>1] */
 static	const  Int mfcone=1;		     /* constant 1 */
-static	const  Flag *mfctop=(Flag *)&mfcone; /* -> top byte */
+static	const  Flag *mfctop=(const Flag *)&mfcone; /* -> top byte */
 #define LITEND *mfctop		   /* named flag; 1=little-endian */
-#endif
 
 /* ------------------------------------------------------------------ */
 /* round-for-reround digits					      */
@@ -64,7 +62,7 @@ const uInt DECPOWERS[10]={1, 10, 100, 1000, 10000, 100000, 1000000,
 /*								      */
 /*  context is the context structure to be queried		      */
 /*  mask indicates the bits to be cleared (the status bit that	      */
-/*    corresponds to each 1 bit in the mask is cleared)		      */
+/*    corresponds to each 1 bit in the mask is cleared) 	      */
 /*  returns context						      */
 /*								      */
 /* No error is possible.					      */
@@ -80,9 +78,9 @@ decContext *decContextClearStatus(decContext *context, uInt mask) {
 /*  context is the structure to be initialized			      */
 /*  kind selects the required set of default values, one of:	      */
 /*	DEC_INIT_BASE	    -- select ANSI X3-274 defaults	      */
-/*	DEC_INIT_DECIMAL32  -- select IEEE 754r defaults, 32-bit      */
-/*	DEC_INIT_DECIMAL64  -- select IEEE 754r defaults, 64-bit      */
-/*	DEC_INIT_DECIMAL128 -- select IEEE 754r defaults, 128-bit     */
+/*	DEC_INIT_DECIMAL32  -- select IEEE 754 defaults, 32-bit       */
+/*	DEC_INIT_DECIMAL64  -- select IEEE 754 defaults, 64-bit       */
+/*	DEC_INIT_DECIMAL128 -- select IEEE 754 defaults, 128-bit      */
 /*	For any other value a valid context is returned, but with     */
 /*	Invalid_operation set in the status field.		      */
 /*  returns a context structure with the appropriate initial values.  */
@@ -105,11 +103,11 @@ decContext * decContextDefault(decContext *context, Int kind) {
       break;
     case DEC_INIT_DECIMAL32:
       context->digits=7;		     /* digits */
-      context->emax=96;			     /* Emax */
+      context->emax=96; 		     /* Emax */
       context->emin=-95;		     /* Emin */
       context->round=DEC_ROUND_HALF_EVEN;    /* 0.5 to nearest even */
-      context->traps=0;			     /* no traps set */
-      context->clamp=1;			     /* clamp exponents */
+      context->traps=0; 		     /* no traps set */
+      context->clamp=1; 		     /* clamp exponents */
       #if DECSUBSET
       context->extended=1;		     /* set */
       #endif
@@ -119,8 +117,8 @@ decContext * decContextDefault(decContext *context, Int kind) {
       context->emax=384;		     /* Emax */
       context->emin=-383;		     /* Emin */
       context->round=DEC_ROUND_HALF_EVEN;    /* 0.5 to nearest even */
-      context->traps=0;			     /* no traps set */
-      context->clamp=1;			     /* clamp exponents */
+      context->traps=0; 		     /* no traps set */
+      context->clamp=1; 		     /* clamp exponents */
       #if DECSUBSET
       context->extended=1;		     /* set */
       #endif
@@ -130,8 +128,8 @@ decContext * decContextDefault(decContext *context, Int kind) {
       context->emax=6144;		     /* Emax */
       context->emin=-6143;		     /* Emin */
       context->round=DEC_ROUND_HALF_EVEN;    /* 0.5 to nearest even */
-      context->traps=0;			     /* no traps set */
-      context->clamp=1;			     /* clamp exponents */
+      context->traps=0; 		     /* no traps set */
+      context->clamp=1; 		     /* clamp exponents */
       #if DECSUBSET
       context->extended=1;		     /* set */
       #endif
@@ -142,15 +140,6 @@ decContext * decContextDefault(decContext *context, Int kind) {
       decContextSetStatus(context, DEC_Invalid_operation); /* trap */
     }
 
-  #if DECCHECK
-  if (LITEND!=DECLITEND) {
-    const char *adj;
-    if (LITEND) adj="little";
-	   else adj="big";
-    printf("Warning: DECLITEND is set to %d, but this computer appears to be %s-endian\n",
-	   DECLITEND, adj);
-    }
-  #endif
   return context;} /* decContextDefault */
 
 /* ------------------------------------------------------------------ */
@@ -166,7 +155,7 @@ enum rounding decContextGetRounding(decContext *context) {
   } /* decContextGetRounding */
 
 /* ------------------------------------------------------------------ */
-/* decContextGetStatus -- return current status			      */
+/* decContextGetStatus -- return current status 		      */
 /*								      */
 /*  context is the context structure to be queried		      */
 /*  returns status						      */
@@ -181,8 +170,8 @@ uInt decContextGetStatus(decContext *context) {
 /* decContextRestoreStatus -- restore bits in current status	      */
 /*								      */
 /*  context is the context structure to be updated		      */
-/*  newstatus is the source for the bits to be restored		      */
-/*  mask indicates the bits to be restored (the status bit that	      */
+/*  newstatus is the source for the bits to be restored 	      */
+/*  mask indicates the bits to be restored (the status bit that       */
 /*    corresponds to each 1 bit in the mask is set to the value of    */
 /*    the correspnding bit in newstatus)			      */
 /*  returns context						      */
@@ -252,7 +241,7 @@ decContext * decContextSetStatus(decContext *context, uInt status) {
 /*								      */
 /*  returns the context structure, unless the string is equal to      */
 /*    DEC_Condition_MU or is not recognized.  In these cases NULL is  */
-/*    returned.							      */
+/*    returned. 						      */
 /* ------------------------------------------------------------------ */
 decContext * decContextSetStatusFromString(decContext *context,
 					   const char *string) {
@@ -303,7 +292,7 @@ decContext * decContextSetStatusFromString(decContext *context,
 /*								      */
 /*  returns the context structure, unless the string is equal to      */
 /*    DEC_Condition_MU or is not recognized.  In these cases NULL is  */
-/*    returned.							      */
+/*    returned. 						      */
 /* ------------------------------------------------------------------ */
 decContext * decContextSetStatusFromStringQuiet(decContext *context,
 						const char *string) {
@@ -356,11 +345,11 @@ decContext * decContextSetStatusQuiet(decContext *context, uInt status) {
   return context;} /* decContextSetStatusQuiet */
 
 /* ------------------------------------------------------------------ */
-/* decContextStatusToString -- convert status flags to a string	      */
+/* decContextStatusToString -- convert status flags to a string       */
 /*								      */
 /*  context is a context with valid status field		      */
 /*								      */
-/*  returns a constant string describing the condition.	 If multiple  */
+/*  returns a constant string describing the condition.  If multiple  */
 /*    (or no) flags are set, a generic constant message is returned.  */
 /* ------------------------------------------------------------------ */
 const char *decContextStatusToString(const decContext *context) {
@@ -385,10 +374,40 @@ const char *decContextStatusToString(const decContext *context) {
   #if DECSUBSET
   if (status==DEC_Lost_digits	       ) return DEC_Condition_LD;
   #endif
-  if (status==0			       ) return DEC_Condition_ZE;
+  if (status==0 		       ) return DEC_Condition_ZE;
   return DEC_Condition_MU;  /* Multiple errors */
   } /* decContextStatusToString */
 
+/* ------------------------------------------------------------------ */
+/* decContextTestEndian -- test whether DECLITEND is set correctly    */
+/*								      */
+/*  quiet is 1 to suppress message; 0 otherwise 		      */
+/*  returns 0 if DECLITEND is correct				      */
+/*	    1 if DECLITEND is incorrect and should be 1 	      */
+/*	   -1 if DECLITEND is incorrect and should be 0 	      */
+/*								      */
+/* A message is displayed if the return value is not 0 and quiet==0.  */
+/*								      */
+/* No error is possible.					      */
+/* ------------------------------------------------------------------ */
+Int decContextTestEndian(Flag quiet) {
+  Int res=0;		      /* optimist */
+  uInt dle=(uInt)DECLITEND;   /* unsign */
+  if (dle>1) dle=1;	      /* ensure 0 or 1 */
+
+  if (LITEND!=DECLITEND) {
+    const char *adj;
+    if (!quiet) {
+      if (LITEND) adj="little";
+	     else adj="big";
+      printf("Warning: DECLITEND is set to %d, but this computer appears to be %s-endian\n",
+	     DECLITEND, adj);
+      }
+    res=(Int)LITEND-dle;
+    }
+  return res;
+  } /* decContextTestEndian */
+
 /* ------------------------------------------------------------------ */
 /* decContextTestSavedStatus -- test bits in saved status	      */
 /*								      */

libdecnumber/decContext.h

@@ -34,7 +34,7 @@
 /*								      */
 /* Context variables must always have valid values:		      */
 /*								      */
-/*  status   -- [any bits may be cleared, but not set, by user]	      */
+/*  status   -- [any bits may be cleared, but not set, by user]       */
 /*  round    -- must be one of the enumerated rounding modes	      */
 /*								      */
 /* The following variables are implied for fixed size formats (i.e.,  */
@@ -54,36 +54,42 @@
   #define DECCONTEXT
   #define DECCNAME     "decContext"			/* Short name */
   #define DECCFULLNAME "Decimal Context Descriptor"   /* Verbose name */
-  #define DECCAUTHOR   "Mike Cowlishaw"		      /* Who to blame */
+  #define DECCAUTHOR   "Mike Cowlishaw" 	      /* Who to blame */
 
-  #include "gstdint.h"		   /* C99 standard integers	      */
+  #if !defined(int32_t)
+    #include <stdint.h> 	   /* C99 standard integers	      */
+  #endif
   #include <stdio.h>		   /* for printf, etc.		      */
-  #include <signal.h>		   /* for traps			      */
+  #include <signal.h>		   /* for traps 		      */
 
   /* Extended flags setting -- set this to 0 to use only IEEE flags   */
+  #if !defined(DECEXTFLAG)
   #define DECEXTFLAG 1		   /* 1=enable extended flags	      */
+  #endif
 
   /* Conditional code flag -- set this to 0 for best performance      */
+  #if !defined(DECSUBSET)
   #define DECSUBSET  0		   /* 1=enable subset arithmetic      */
+  #endif
 
   /* Context for operations, with associated constants		      */
   enum rounding {
     DEC_ROUND_CEILING,		   /* round towards +infinity	      */
-    DEC_ROUND_UP,		   /* round away from 0		      */
+    DEC_ROUND_UP,		   /* round away from 0 	      */
     DEC_ROUND_HALF_UP,		   /* 0.5 rounds up		      */
     DEC_ROUND_HALF_EVEN,	   /* 0.5 rounds to nearest even      */
     DEC_ROUND_HALF_DOWN,	   /* 0.5 rounds down		      */
     DEC_ROUND_DOWN,		   /* round towards 0 (truncate)      */
     DEC_ROUND_FLOOR,		   /* round towards -infinity	      */
-    DEC_ROUND_05UP,		   /* round for reround		      */
+    DEC_ROUND_05UP,		   /* round for reround 	      */
     DEC_ROUND_MAX		   /* enum must be less than this     */
     };
   #define DEC_ROUND_DEFAULT DEC_ROUND_HALF_EVEN;
 
   typedef struct {
-    int32_t  digits;		   /* working precision		      */
-    int32_t  emax;		   /* maximum positive exponent	      */
-    int32_t  emin;		   /* minimum negative exponent	      */
+    int32_t  digits;		   /* working precision 	      */
+    int32_t  emax;		   /* maximum positive exponent       */
+    int32_t  emin;		   /* minimum negative exponent       */
     enum     rounding round;	   /* rounding mode		      */
     uint32_t traps;		   /* trap-enabler flags	      */
     uint32_t status;		   /* status flags		      */
@@ -102,9 +108,9 @@
   #define DEC_MIN_EMIN	-999999999
   #define DEC_MAX_MATH	    999999 /* max emax, etc., for math funcs. */
 
-  /* Classifications for decimal numbers, aligned with 754r (note     */
-  /* that 'normal' and 'subnormal' are meaningful only with a	      */
-  /* decContext or a fixed size format).			      */
+  /* Classifications for decimal numbers, aligned with 754 (note that */
+  /* 'normal' and 'subnormal' are meaningful only with a decContext   */
+  /* or a fixed size format).					      */
   enum decClass {
     DEC_CLASS_SNAN,
     DEC_CLASS_QNAN,
@@ -139,15 +145,15 @@
     #define DEC_Division_impossible  0x00000004
     #define DEC_Division_undefined   0x00000008
     #define DEC_Insufficient_storage 0x00000010 /* [when malloc fails]	*/
-    #define DEC_Inexact		     0x00000020
-    #define DEC_Invalid_context	     0x00000040
+    #define DEC_Inexact 	     0x00000020
+    #define DEC_Invalid_context      0x00000040
     #define DEC_Invalid_operation    0x00000080
     #if DECSUBSET
     #define DEC_Lost_digits	     0x00000100
     #endif
     #define DEC_Overflow	     0x00000200
-    #define DEC_Clamped		     0x00000400
-    #define DEC_Rounded		     0x00000800
+    #define DEC_Clamped 	     0x00000400
+    #define DEC_Rounded 	     0x00000800
     #define DEC_Subnormal	     0x00001000
     #define DEC_Underflow	     0x00002000
   #else
@@ -157,43 +163,43 @@
     #define DEC_Division_impossible  0x00000010
     #define DEC_Division_undefined   0x00000010
     #define DEC_Insufficient_storage 0x00000010 /* [when malloc fails]	*/
-    #define DEC_Inexact		     0x00000001
-    #define DEC_Invalid_context	     0x00000010
+    #define DEC_Inexact 	     0x00000001
+    #define DEC_Invalid_context      0x00000010
     #define DEC_Invalid_operation    0x00000010
     #if DECSUBSET
     #define DEC_Lost_digits	     0x00000000
     #endif
     #define DEC_Overflow	     0x00000008
-    #define DEC_Clamped		     0x00000000
-    #define DEC_Rounded		     0x00000000
+    #define DEC_Clamped 	     0x00000000
+    #define DEC_Rounded 	     0x00000000
     #define DEC_Subnormal	     0x00000000
     #define DEC_Underflow	     0x00000004
   #endif
 
-  /* IEEE 854 groupings for the flags				      */
+  /* IEEE 754 groupings for the flags				      */
   /* [DEC_Clamped, DEC_Lost_digits, DEC_Rounded, and DEC_Subnormal    */
-  /* are not in IEEE 854]					      */
-  #define DEC_IEEE_854_Division_by_zero	 (DEC_Division_by_zero)
+  /* are not in IEEE 754]					      */
+  #define DEC_IEEE_754_Division_by_zero  (DEC_Division_by_zero)
   #if DECSUBSET
-  #define DEC_IEEE_854_Inexact		 (DEC_Inexact | DEC_Lost_digits)
+  #define DEC_IEEE_754_Inexact		 (DEC_Inexact | DEC_Lost_digits)
   #else
-  #define DEC_IEEE_854_Inexact		 (DEC_Inexact)
+  #define DEC_IEEE_754_Inexact		 (DEC_Inexact)
   #endif
-  #define DEC_IEEE_854_Invalid_operation (DEC_Conversion_syntax |     \
+  #define DEC_IEEE_754_Invalid_operation (DEC_Conversion_syntax |     \
 					  DEC_Division_impossible |   \
 					  DEC_Division_undefined |    \
 					  DEC_Insufficient_storage |  \
-					  DEC_Invalid_context |	      \
+					  DEC_Invalid_context |       \
 					  DEC_Invalid_operation)
-  #define DEC_IEEE_854_Overflow		 (DEC_Overflow)
-  #define DEC_IEEE_854_Underflow	 (DEC_Underflow)
+  #define DEC_IEEE_754_Overflow 	 (DEC_Overflow)
+  #define DEC_IEEE_754_Underflow	 (DEC_Underflow)
 
   /* flags which are normally errors (result is qNaN, infinite, or 0) */
-  #define DEC_Errors (DEC_IEEE_854_Division_by_zero |		      \
-		      DEC_IEEE_854_Invalid_operation |		      \
-		      DEC_IEEE_854_Overflow | DEC_IEEE_854_Underflow)
+  #define DEC_Errors (DEC_IEEE_754_Division_by_zero |		      \
+		      DEC_IEEE_754_Invalid_operation |		      \
+		      DEC_IEEE_754_Overflow | DEC_IEEE_754_Underflow)
   /* flags which cause a result to become qNaN			      */
-  #define DEC_NaNs    DEC_IEEE_854_Invalid_operation
+  #define DEC_NaNs    DEC_IEEE_754_Invalid_operation
 
   /* flags which are normally for information only (finite results)   */
   #if DECSUBSET
@@ -203,6 +209,13 @@
   #define DEC_Information (DEC_Clamped | DEC_Rounded | DEC_Inexact)
   #endif
 
+  /* IEEE 854 names (for compatibility with older decNumber versions) */
+  #define DEC_IEEE_854_Division_by_zero  DEC_IEEE_754_Division_by_zero
+  #define DEC_IEEE_854_Inexact		 DEC_IEEE_754_Inexact
+  #define DEC_IEEE_854_Invalid_operation DEC_IEEE_754_Invalid_operation
+  #define DEC_IEEE_854_Overflow 	 DEC_IEEE_754_Overflow
+  #define DEC_IEEE_854_Underflow	 DEC_IEEE_754_Underflow
+
   /* Name strings for the exceptional conditions		      */
   #define DEC_Condition_CS "Conversion syntax"
   #define DEC_Condition_DZ "Division by zero"
@@ -226,7 +239,7 @@
 				   /* including terminator	      */
 
   /* Initialization descriptors, used by decContextDefault	      */
-  #define DEC_INIT_BASE		0
+  #define DEC_INIT_BASE 	0
   #define DEC_INIT_DECIMAL32   32
   #define DEC_INIT_DECIMAL64   64
   #define DEC_INIT_DECIMAL128 128
@@ -251,6 +264,7 @@
   extern decContext  * decContextSetStatusFromStringQuiet(decContext *, const char *);
   extern decContext  * decContextSetStatusQuiet(decContext *, uint32_t);
   extern const char  * decContextStatusToString(const decContext *);
+  extern int32_t       decContextTestEndian(uint8_t);
   extern uint32_t      decContextTestSavedStatus(uint32_t, uint32_t);
   extern uint32_t      decContextTestStatus(decContext *, uint32_t);
   extern decContext  * decContextZeroStatus(decContext *);