* fp-bit.h: New file.

	* fp-bit.c: Move common code, prototypes, etc into fp-bit.h.
	Comment #endif statements.
	(__thenan_sf, __thenan_df): Add missing braces around initializer.


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

1 files changed, 29 insertions, 316 deletions

diff --git a/gcc/config/fp-bit.c b/gcc/config/fp-bit.c
index 75d2ee1b31d..70a3f254ccd 100644
--- a/gcc/config/fp-bit.c
+++ b/gcc/config/fp-bit.c
@@ -44,61 +44,7 @@ Boston, MA 02111-1307, USA.  */
 /* The intended way to use this file is to make two copies, add `#define FLOAT'
    to one copy, then compile both copies and add them to libgcc.a.  */
 
-/* Defining FINE_GRAINED_LIBRARIES allows one to select which routines
-   from this file are compiled via additional -D options.
-
-   This avoids the need to pull in the entire fp emulation library
-   when only a small number of functions are needed.
-
-   If FINE_GRAINED_LIBRARIES is not defined, then compile every 
-   suitable routine.  */
-#ifndef FINE_GRAINED_LIBRARIES
-#define L_pack_df
-#define L_unpack_df
-#define L_pack_sf
-#define L_unpack_sf
-#define L_addsub_sf
-#define L_addsub_df
-#define L_mul_sf
-#define L_mul_df
-#define L_div_sf
-#define L_div_df
-#define L_fpcmp_parts_sf
-#define L_fpcmp_parts_df
-#define L_compare_sf
-#define L_compare_df
-#define L_eq_sf
-#define L_eq_df
-#define L_ne_sf
-#define L_ne_df
-#define L_gt_sf
-#define L_gt_df
-#define L_ge_sf
-#define L_ge_df
-#define L_lt_sf
-#define L_lt_df
-#define L_le_sf
-#define L_le_df
-#define L_unord_sf
-#define L_unord_df
-#define L_si_to_sf
-#define L_si_to_df
-#define L_sf_to_si
-#define L_df_to_si
-#define L_f_to_usi
-#define L_df_to_usi
-#define L_negate_sf
-#define L_negate_df
-#define L_make_sf
-#define L_make_df
-#define L_sf_to_df
-#define L_df_to_sf
-#ifdef FLOAT
-#define L_thenan_sf
-#else
-#define L_thenan_df
-#endif
-#endif
+#include "fp-bit.h"
 
 /* The following macros can be defined to change the behaviour of this file:
    FLOAT: Implement a `float', aka SFmode, fp library.  If this is not
@@ -164,233 +110,6 @@ __fixxfsi (){ abort(); }
 __floatsixf (){ abort(); }
 #else	/* !EXTENDED_FLOAT_STUBS, rest of file */
 
-
-typedef float SFtype __attribute__ ((mode (SF)));
-typedef float DFtype __attribute__ ((mode (DF)));
-
-typedef int HItype __attribute__ ((mode (HI)));
-typedef int SItype __attribute__ ((mode (SI)));
-typedef int DItype __attribute__ ((mode (DI)));
-
-/* The type of the result of a fp compare */
-#ifndef CMPtype
-#define CMPtype SItype
-#endif
-
-typedef unsigned int UHItype __attribute__ ((mode (HI)));
-typedef unsigned int USItype __attribute__ ((mode (SI)));
-typedef unsigned int UDItype __attribute__ ((mode (DI)));
-
-#define MAX_SI_INT   ((SItype) ((unsigned) (~0)>>1))
-#define MAX_USI_INT  ((USItype) ~0)
-
-
-#ifdef FLOAT_ONLY
-#define NO_DI_MODE
-#endif
-
-#ifdef FLOAT
-#	define NGARDS    7L
-#	define GARDROUND 0x3f
-#	define GARDMASK  0x7f
-#	define GARDMSB   0x40
-#	define EXPBITS 8
-#	define EXPBIAS 127
-#	define FRACBITS 23
-#	define EXPMAX (0xff)
-#	define QUIET_NAN 0x100000L
-#	define FRAC_NBITS 32
-#	define FRACHIGH  0x80000000L
-#	define FRACHIGH2 0xc0000000L
-#	define pack_d __pack_f
-#	define unpack_d __unpack_f
-#	define __fpcmp_parts __fpcmp_parts_f
-	typedef USItype fractype;
-	typedef UHItype halffractype;
-	typedef SFtype FLO_type;
-	typedef SItype intfrac;
-
-#else
-#	define PREFIXFPDP dp
-#	define PREFIXSFDF df
-#	define NGARDS 8L
-#	define GARDROUND 0x7f
-#	define GARDMASK  0xff
-#	define GARDMSB   0x80
-#	define EXPBITS 11
-#	define EXPBIAS 1023
-#	define FRACBITS 52
-#	define EXPMAX (0x7ff)
-#	define QUIET_NAN 0x8000000000000LL
-#	define FRAC_NBITS 64
-#	define FRACHIGH  0x8000000000000000LL
-#	define FRACHIGH2 0xc000000000000000LL
-#	define pack_d __pack_d
-#	define unpack_d __unpack_d
-#	define __fpcmp_parts __fpcmp_parts_d
-	typedef UDItype fractype;
-	typedef USItype halffractype;
-	typedef DFtype FLO_type;
-	typedef DItype intfrac;
-#endif
-
-#ifdef US_SOFTWARE_GOFAST
-#	ifdef FLOAT
-#		define add 		fpadd
-#		define sub 		fpsub
-#		define multiply 	fpmul
-#		define divide 		fpdiv
-#		define compare 		fpcmp
-#		define si_to_float 	sitofp
-#		define float_to_si 	fptosi
-#		define float_to_usi 	fptoui
-#		define negate 		__negsf2
-#		define sf_to_df		fptodp
-#		define dptofp 		dptofp
-#else
-#		define add 		dpadd
-#		define sub 		dpsub
-#		define multiply 	dpmul
-#		define divide 		dpdiv
-#		define compare 		dpcmp
-#		define si_to_float 	litodp
-#		define float_to_si 	dptoli
-#		define float_to_usi 	dptoul
-#		define negate 		__negdf2
-#		define df_to_sf 	dptofp
-#endif
-#else
-#	ifdef FLOAT
-#		define add 		__addsf3
-#		define sub 		__subsf3
-#		define multiply 	__mulsf3
-#		define divide 		__divsf3
-#		define compare 		__cmpsf2
-#		define _eq_f2 		__eqsf2
-#		define _ne_f2 		__nesf2
-#		define _gt_f2 		__gtsf2
-#		define _ge_f2 		__gesf2
-#		define _lt_f2 		__ltsf2
-#		define _le_f2 		__lesf2
-#		define _unord_f2	__unordsf2
-#		define si_to_float 	__floatsisf
-#		define float_to_si 	__fixsfsi
-#		define float_to_usi 	__fixunssfsi
-#		define negate 		__negsf2
-#		define sf_to_df		__extendsfdf2
-#else
-#		define add 		__adddf3
-#		define sub 		__subdf3
-#		define multiply 	__muldf3
-#		define divide 		__divdf3
-#		define compare 		__cmpdf2
-#		define _eq_f2 		__eqdf2
-#		define _ne_f2 		__nedf2
-#		define _gt_f2 		__gtdf2
-#		define _ge_f2 		__gedf2
-#		define _lt_f2 		__ltdf2
-#		define _le_f2 		__ledf2
-#		define _unord_f2	__unorddf2
-#		define si_to_float 	__floatsidf
-#		define float_to_si 	__fixdfsi
-#		define float_to_usi 	__fixunsdfsi
-#		define negate 		__negdf2
-#		define df_to_sf		__truncdfsf2
-#	endif
-#endif
-
-
-#ifndef INLINE
-#define INLINE __inline__
-#endif
-
-/* Preserve the sticky-bit when shifting fractions to the right.  */
-#define LSHIFT(a) { a = (a & 1) | (a >> 1); }
-
-/* numeric parameters */
-/* F_D_BITOFF is the number of bits offset between the MSB of the mantissa
-   of a float and of a double. Assumes there are only two float types.
-   (double::FRAC_BITS+double::NGARDS-(float::FRAC_BITS-float::NGARDS))
- */
-#define F_D_BITOFF (52+8-(23+7))
-
-
-#define NORMAL_EXPMIN (-(EXPBIAS)+1)
-#define IMPLICIT_1 (1LL<<(FRACBITS+NGARDS))
-#define IMPLICIT_2 (1LL<<(FRACBITS+1+NGARDS))
-
-/* common types */
-
-typedef enum
-{
-  CLASS_SNAN,
-  CLASS_QNAN,
-  CLASS_ZERO,
-  CLASS_NUMBER,
-  CLASS_INFINITY
-} fp_class_type;
-
-typedef struct
-{
-#ifdef SMALL_MACHINE
-  char class;
-  unsigned char sign;
-  short normal_exp;
-#else
-  fp_class_type class;
-  unsigned int sign;
-  int normal_exp;
-#endif
-
-  union
-    {
-      fractype ll;
-      halffractype l[2];
-    } fraction;
-} fp_number_type;
-
-typedef union
-{
-  FLO_type value;
-  fractype value_raw;
-
-#ifndef FLOAT
-  halffractype words[2];
-#endif
-
-#ifdef FLOAT_BIT_ORDER_MISMATCH
-  struct
-    {
-      fractype fraction:FRACBITS __attribute__ ((packed));
-      unsigned int exp:EXPBITS __attribute__ ((packed));
-      unsigned int sign:1 __attribute__ ((packed));
-    }
-  bits;
-#endif
-
-#ifdef _DEBUG_BITFLOAT
-  struct
-    {
-      unsigned int sign:1 __attribute__ ((packed));
-      unsigned int exp:EXPBITS __attribute__ ((packed));
-      fractype fraction:FRACBITS __attribute__ ((packed));
-    }
-  bits_big_endian;
-
-  struct
-    {
-      fractype fraction:FRACBITS __attribute__ ((packed));
-      unsigned int exp:EXPBITS __attribute__ ((packed));
-      unsigned int sign:1 __attribute__ ((packed));
-    }
-  bits_little_endian;
-#endif
-}
-FLO_union_type;
-
-
-/* end of header */
-
 /* IEEE "special" number predicates */
 
 #ifdef NO_NANS
@@ -401,9 +120,9 @@ FLO_union_type;
 #else
 
 #if   defined L_thenan_sf
-const fp_number_type __thenan_sf = { CLASS_SNAN, 0, 0, (fractype) 0 };
+const fp_number_type __thenan_sf = { CLASS_SNAN, 0, 0, {(fractype) 0} };
 #elif defined L_thenan_df
-const fp_number_type __thenan_df = { CLASS_SNAN, 0, 0, (fractype) 0 };
+const fp_number_type __thenan_df = { CLASS_SNAN, 0, 0, {(fractype) 0} };
 #elif defined FLOAT
 extern const fp_number_type __thenan_sf;
 #else
@@ -412,7 +131,7 @@ extern const fp_number_type __thenan_df;
 
 INLINE
 static fp_number_type *
-nan ()
+nan (void)
 {
   /* Discard the const qualifier... */
 #ifdef FLOAT  
@@ -436,7 +155,7 @@ isinf ( fp_number_type *  x)
   return x->class == CLASS_INFINITY;
 }
 
-#endif
+#endif /* NO_NANS */
 
 INLINE
 static int
@@ -580,8 +299,6 @@ pack_d ( fp_number_type *  src)
 }
 #endif
 
-extern void unpack_d (FLO_union_type *, fp_number_type *);
-
 #if defined(L_unpack_df) || defined(L_unpack_sf)
 void
 unpack_d (FLO_union_type * src, fp_number_type * dst)
@@ -674,7 +391,7 @@ unpack_d (FLO_union_type * src, fp_number_type * dst)
       dst->fraction.ll = (fraction << NGARDS) | IMPLICIT_1;
     }
 }
-#endif
+#endif /* L_unpack_df || L_unpack_sf */
 
 #if defined(L_addsub_sf) || defined(L_addsub_df)
 static fp_number_type *
@@ -858,7 +575,7 @@ sub (FLO_type arg_a, FLO_type arg_b)
 
   return pack_d (res);
 }
-#endif
+#endif /* L_addsub_sf || L_addsub_df */
 
 #if defined(L_mul_sf) || defined(L_mul_df)
 static INLINE fp_number_type *
@@ -1050,7 +767,7 @@ multiply (FLO_type arg_a, FLO_type arg_b)
 
   return pack_d (res);
 }
-#endif
+#endif /* L_mul_sf || L_mul_df */
 
 #if defined(L_div_sf) || defined(L_div_df)
 static INLINE fp_number_type *
@@ -1160,9 +877,7 @@ divide (FLO_type arg_a, FLO_type arg_b)
 
   return pack_d (res);
 }
-#endif
-
-int __fpcmp_parts (fp_number_type * a, fp_number_type *b);
+#endif /* L_div_sf || L_div_df */
 
 #if defined(L_fpcmp_parts_sf) || defined(L_fpcmp_parts_df)
 /* according to the demo, fpcmp returns a comparison with 0... thus
@@ -1265,7 +980,7 @@ compare (FLO_type arg_a, FLO_type arg_b)
 
   return __fpcmp_parts (&a, &b);
 }
-#endif
+#endif /* L_compare_sf || L_compare_df */
 
 #ifndef US_SOFTWARE_GOFAST
 
@@ -1290,7 +1005,7 @@ _eq_f2 (FLO_type arg_a, FLO_type arg_b)
 
   return __fpcmp_parts (&a, &b) ;
 }
-#endif
+#endif /* L_eq_sf || L_eq_df */
 
 #if defined(L_ne_sf) || defined(L_ne_df)
 CMPtype
@@ -1311,7 +1026,7 @@ _ne_f2 (FLO_type arg_a, FLO_type arg_b)
 
   return  __fpcmp_parts (&a, &b) ;
 }
-#endif
+#endif /* L_ne_sf || L_ne_df */
 
 #if defined(L_gt_sf) || defined(L_gt_df)
 CMPtype
@@ -1332,7 +1047,7 @@ _gt_f2 (FLO_type arg_a, FLO_type arg_b)
 
   return __fpcmp_parts (&a, &b);
 }
-#endif
+#endif /* L_gt_sf || L_gt_df */
 
 #if defined(L_ge_sf) || defined(L_ge_df)
 CMPtype
@@ -1352,7 +1067,7 @@ _ge_f2 (FLO_type arg_a, FLO_type arg_b)
     return -1;			/* false, truth >= 0 */
   return __fpcmp_parts (&a, &b) ;
 }
-#endif
+#endif /* L_ge_sf || L_ge_df */
 
 #if defined(L_lt_sf) || defined(L_lt_df)
 CMPtype
@@ -1373,7 +1088,7 @@ _lt_f2 (FLO_type arg_a, FLO_type arg_b)
 
   return __fpcmp_parts (&a, &b);
 }
-#endif
+#endif /* L_lt_sf || L_lt_df */
 
 #if defined(L_le_sf) || defined(L_le_df)
 CMPtype
@@ -1394,7 +1109,7 @@ _le_f2 (FLO_type arg_a, FLO_type arg_b)
 
   return __fpcmp_parts (&a, &b) ;
 }
-#endif
+#endif /* L_le_sf || L_le_df */
 
 #if defined(L_unord_sf) || defined(L_unord_df)
 CMPtype
@@ -1412,7 +1127,7 @@ _unord_f2 (FLO_type arg_a, FLO_type arg_b)
 
   return (isnan (&a) || isnan (&b));
 }
-#endif
+#endif /* L_unord_sf || L_unord_df */
 
 #endif /* ! US_SOFTWARE_GOFAST */
 
@@ -1452,7 +1167,7 @@ si_to_float (SItype arg_a)
     }
   return pack_d (&in);
 }
-#endif
+#endif /* L_si_to_sf || L_si_to_df */
 
 #if defined(L_sf_to_si) || defined(L_df_to_si)
 SItype
@@ -1480,7 +1195,7 @@ float_to_si (FLO_type arg_a)
   tmp = a.fraction.ll >> ((FRACBITS + NGARDS) - a.normal_exp);
   return a.sign ? (-tmp) : (tmp);
 }
-#endif
+#endif /* L_sf_to_si || L_df_to_si */
 
 #if defined(L_sf_to_usi) || defined(L_df_to_usi)
 #ifdef US_SOFTWARE_GOFAST
@@ -1519,8 +1234,8 @@ float_to_usi (FLO_type arg_a)
   else
     return a.fraction.ll >> ((FRACBITS + NGARDS) - a.normal_exp);
 }
-#endif
-#endif
+#endif /* US_SOFTWARE_GOFAST */
+#endif /* L_sf_to_usi || L_df_to_usi */
 
 #if defined(L_negate_sf) || defined(L_negate_df)
 FLO_type
@@ -1535,7 +1250,7 @@ negate (FLO_type arg_a)
   flip_sign (&a);
   return pack_d (&a);
 }
-#endif
+#endif /* L_negate_sf || L_negate_df */
 
 #ifdef FLOAT
 
@@ -1554,7 +1269,7 @@ __make_fp(fp_class_type class,
   in.fraction.ll = frac;
   return pack_d (&in);
 }
-#endif
+#endif /* L_make_sf */
 
 #ifndef FLOAT_ONLY
 
@@ -1563,8 +1278,6 @@ __make_fp(fp_class_type class,
    This is needed for some 8-bit ports that can't handle well values that
    are 8-bytes in size, so we just don't support double for them at all.  */
 
-extern DFtype __make_dp (fp_class_type, unsigned int, int, UDItype frac);
-
 #if defined(L_sf_to_df)
 DFtype
 sf_to_df (SFtype arg_a)
@@ -1578,10 +1291,10 @@ sf_to_df (SFtype arg_a)
   return __make_dp (in.class, in.sign, in.normal_exp,
 		    ((UDItype) in.fraction.ll) << F_D_BITOFF);
 }
-#endif
+#endif /* L_sf_to_df */
 
-#endif
-#endif
+#endif /* ! FLOAT_ONLY */
+#endif /* FLOAT */
 
 #ifndef FLOAT
 
@@ -1599,7 +1312,7 @@ __make_dp (fp_class_type class, unsigned int sign, int exp, UDItype frac)
   in.fraction.ll = frac;
   return pack_d (&in);
 }
-#endif
+#endif /* L_make_df */
 
 #if defined(L_df_to_sf)
 SFtype
@@ -1621,7 +1334,7 @@ df_to_sf (DFtype arg_a)
 
   return __make_fp (in.class, in.sign, in.normal_exp, sffrac);
 }
-#endif
+#endif /* L_df_to_sf */
 
-#endif
+#endif /* ! FLOAT */
 #endif /* !EXTENDED_FLOAT_STUBS */