2000-12-13 Jeff Johnston <jjohnstn@redhat.com>

* libc/stdlib/ldtoa.c (_ldcheck): New routine
        that categorizes a long double as NaN, Infinity, or other.
        * libc/stdio/vfprintf.c [WANT_IO_LONG_DBL](_VFPRINTF_R): Removed
        isinfl and isnanl static routines which were i386-specific.  Changed
        calls to the two removed routines to a single _ldcheck call.
        * libc/stdio/vfieeefp.h (ldieee): Fixed missing semi-colons.
This commit is contained in:
Jeff Johnston
2000-12-14 00:25:06 +00:00
parent adbbb0348c
commit b6182a09dd
4 changed files with 60 additions and 35 deletions

View File

@ -70,7 +70,7 @@ struct ldieee
unsigned manh:23;
unsigned exp:8;
unsigned sign:1;
}
};
#elif LDBL_MANT_DIG == 53
struct ldieee
{
@ -78,7 +78,7 @@ struct ldieee
unsigned manh:32;
unsigned exp:11;
unsigned sign:1;
}
};
#elif LDBL_MANT_DIG == 64
struct ldieee
{
@ -105,7 +105,7 @@ struct ldieee
unsigned sign:1;
unsigned exp:8;
unsigned manh:23;
}
};
#elif LDBL_MANT_DIG == 53
struct ldieee
{
@ -113,7 +113,7 @@ struct ldieee
unsigned exp:11;
unsigned manh:32;
unsigned manl:20;
}
};
#elif LDBL_MANT_DIG == 64
struct ldieee
{
@ -121,7 +121,7 @@ struct ldieee
unsigned exp:15;
unsigned manh:32;
unsigned manl:32;
}
};
#elif LDBL_MANT_DIG > 64
struct ldieee
{

View File

@ -252,8 +252,7 @@ __sbprintf(fp, fmt, ap)
static char *cvt _PARAMS((struct _reent *, double, int, int, char *, int *, int, int *));
#else
static char *cvt _PARAMS((struct _reent *, _LONG_DOUBLE, int, int, char *, int *, int, int *));
static int isinfl _PARAMS((_LONG_DOUBLE *));
static int isnanl _PARAMS((_LONG_DOUBLE *));
extern int _ldcheck _PARAMS((_LONG_DOUBLE *));
#endif
static int exponent _PARAMS((char *, int, int));
@ -322,6 +321,7 @@ _DEFUN (_VFPRINTF_R, (data, fp, fmt0, ap),
#else
union { int i; _LONG_DOUBLE ld; } _long_double_ = {0};
#define _fpvalue (_long_double_.ld)
int tmp;
#endif
int expt; /* integer value of exponent */
int expsize = 0; /* character count for expstr */
@ -604,14 +604,15 @@ reswitch: switch (ch) {
}
/* do this before tricky precision changes */
if (isinfl(&_fpvalue)) {
tmp = _ldcheck (&_fpvalue);
if (tmp == 2) {
if (_fpvalue < 0)
sign = '-';
cp = "Inf";
size = 3;
break;
}
if (isnanl(&_fpvalue)) {
if (tmp == 1) {
cp = "NaN";
size = 3;
break;
@ -912,32 +913,6 @@ extern char *_ldtoa_r _PARAMS((struct _reent *, _LONG_DOUBLE, int,
int, int *, int *, char **));
#undef word0
#define word0(x) ldword0(x)
static int
isinfl (value)
_LONG_DOUBLE *value;
{
struct ldieee *ldptr;
ldptr = (struct ldieee *)value;
if (ldptr->exp == 0x7fff && !(ldptr->manh & 0x7fffffff) && !ldptr->manl)
return 1;
return 0;
}
static int
isnanl (value)
_LONG_DOUBLE *value;
{
struct ldieee *ldptr;
ldptr = (struct ldieee *)value;
if (ldptr->exp == 0x7fff && ((ldptr->manh & 0x7fffffff) || ldptr->manl))
return 1;
return 0;
}
#endif
static char *