From 8035ceffafed38b82bfdfa0cf5306e678483d2d8 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 14 Jan 2016 13:10:15 +0100 Subject: [PATCH] libc/xdr: Remove VAX specific code. --- lib/libc/xdr/xdr_float.c | 185 +-------------------------------------- 1 file changed, 3 insertions(+), 182 deletions(-) diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c index 53c78fa6bd..1ec00f16d4 100644 --- a/lib/libc/xdr/xdr_float.c +++ b/lib/libc/xdr/xdr_float.c @@ -46,6 +46,8 @@ #include #include +#include + #include #include @@ -53,105 +55,19 @@ #include "un-namespace.h" /* - * NB: Not portable. - * This routine works on machines with IEEE754 FP and Vaxen. + * This routine works on machines with IEEE754 FP. */ -#if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \ - defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \ - defined(__arm__) || defined(__ppc__) || defined(__ia64__) || \ - defined(__arm26__) || defined(__sparc64__) || defined(__x86_64__) -#include -#define IEEEFP -#endif - -#if defined(__vax__) - -/* What IEEE single precision floating point looks like on a Vax */ -struct ieee_single { - unsigned int mantissa: 23; - unsigned int exp : 8; - unsigned int sign : 1; -}; - -/* Vax single precision floating point */ -struct vax_single { - unsigned int mantissa1 : 7; - unsigned int exp : 8; - unsigned int sign : 1; - unsigned int mantissa2 : 16; -}; - -#define VAX_SNG_BIAS 0x81 -#define IEEE_SNG_BIAS 0x7f - -static struct sgl_limits { - struct vax_single s; - struct ieee_single ieee; -} sgl_limits[2] = { - {{ 0x7f, 0xff, 0x0, 0xffff }, /* Max Vax */ - { 0x0, 0xff, 0x0 }}, /* Max IEEE */ - {{ 0x0, 0x0, 0x0, 0x0 }, /* Min Vax */ - { 0x0, 0x0, 0x0 }} /* Min IEEE */ -}; -#endif /* vax */ - bool_t xdr_float(XDR *xdrs, float *fp) { -#ifndef IEEEFP - struct ieee_single is; - struct vax_single vs, *vsp; - struct sgl_limits *lim; - int i; -#endif switch (xdrs->x_op) { case XDR_ENCODE: -#ifdef IEEEFP return (XDR_PUTINT32(xdrs, (int32_t *)fp)); -#else - vs = *((struct vax_single *)fp); - for (i = 0, lim = sgl_limits; - i < NELEM(sgl_limits); - i++, lim++) { - if ((vs.mantissa2 == lim->s.mantissa2) && - (vs.exp == lim->s.exp) && - (vs.mantissa1 == lim->s.mantissa1)) { - is = lim->ieee; - goto shipit; - } - } - is.exp = vs.exp - VAX_SNG_BIAS + IEEE_SNG_BIAS; - is.mantissa = (vs.mantissa1 << 16) | vs.mantissa2; - shipit: - is.sign = vs.sign; - return (XDR_PUTINT32(xdrs, (int32_t *)&is)); -#endif case XDR_DECODE: -#ifdef IEEEFP return (XDR_GETINT32(xdrs, (int32_t *)fp)); -#else - vsp = (struct vax_single *)fp; - if (!XDR_GETINT32(xdrs, (int32_t *)&is)) - return (FALSE); - for (i = 0, lim = sgl_limits; - i < NELEM(sgl_limits); - i++, lim++) { - if ((is.exp == lim->ieee.exp) && - (is.mantissa == lim->ieee.mantissa)) { - *vsp = lim->s; - goto doneit; - } - } - vsp->exp = is.exp - IEEE_SNG_BIAS + VAX_SNG_BIAS; - vsp->mantissa2 = is.mantissa; - vsp->mantissa1 = (is.mantissa >> 16); - doneit: - vsp->sign = is.sign; - return (TRUE); -#endif case XDR_FREE: return (TRUE); @@ -160,60 +76,15 @@ xdr_float(XDR *xdrs, float *fp) return (FALSE); } -#if defined(__vax__) -/* What IEEE double precision floating point looks like on a Vax */ -struct ieee_double { - unsigned int mantissa1 : 20; - unsigned int exp : 11; - unsigned int sign : 1; - unsigned int mantissa2 : 32; -}; - -/* Vax double precision floating point */ -struct vax_double { - unsigned int mantissa1 : 7; - unsigned int exp : 8; - unsigned int sign : 1; - unsigned int mantissa2 : 16; - unsigned int mantissa3 : 16; - unsigned int mantissa4 : 16; -}; - -#define VAX_DBL_BIAS 0x81 -#define IEEE_DBL_BIAS 0x3ff -#define MASK(nbits) ((1 << nbits) - 1) - -static struct dbl_limits { - struct vax_double d; - struct ieee_double ieee; -} dbl_limits[2] = { - {{ 0x7f, 0xff, 0x0, 0xffff, 0xffff, 0xffff }, /* Max Vax */ - { 0x0, 0x7ff, 0x0, 0x0 }}, /* Max IEEE */ - {{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, /* Min Vax */ - { 0x0, 0x0, 0x0, 0x0 }} /* Min IEEE */ -}; - -#endif /* vax */ - - bool_t xdr_double(XDR *xdrs, double *dp) { -#ifdef IEEEFP int32_t *i32p; bool_t rv; -#else - int32_t *lp; - struct ieee_double id; - struct vax_double vd; - struct dbl_limits *lim; - int i; -#endif switch (xdrs->x_op) { case XDR_ENCODE: -#ifdef IEEEFP i32p = (int32_t *)(void *)dp; #if BYTE_ORDER == BIG_ENDIAN rv = XDR_PUTINT32(xdrs, i32p); @@ -227,33 +98,8 @@ xdr_double(XDR *xdrs, double *dp) rv = XDR_PUTINT32(xdrs, i32p); #endif return (rv); -#else - vd = *((struct vax_double *)dp); - for (i = 0, lim = dbl_limits; - i < NELEM(dbl_limits); - i++, lim++) { - if ((vd.mantissa4 == lim->d.mantissa4) && - (vd.mantissa3 == lim->d.mantissa3) && - (vd.mantissa2 == lim->d.mantissa2) && - (vd.mantissa1 == lim->d.mantissa1) && - (vd.exp == lim->d.exp)) { - id = lim->ieee; - goto shipit; - } - } - id.exp = vd.exp - VAX_DBL_BIAS + IEEE_DBL_BIAS; - id.mantissa1 = (vd.mantissa1 << 13) | (vd.mantissa2 >> 3); - id.mantissa2 = ((vd.mantissa2 & MASK(3)) << 29) | - (vd.mantissa3 << 13) | - ((vd.mantissa4 >> 3) & MASK(13)); - shipit: - id.sign = vd.sign; - lp = (int32_t *)&id; - return (XDR_PUTINT32(xdrs, lp++) && XDR_PUTINT32(xdrs, lp)); -#endif case XDR_DECODE: -#ifdef IEEEFP i32p = (int32_t *)(void *)dp; #if BYTE_ORDER == BIG_ENDIAN rv = XDR_GETINT32(xdrs, i32p); @@ -267,31 +113,6 @@ xdr_double(XDR *xdrs, double *dp) rv = XDR_GETINT32(xdrs, i32p); #endif return (rv); -#else - lp = (int32_t *)&id; - if (!XDR_GETINT32(xdrs, lp++) || !XDR_GETINT32(xdrs, lp)) - return (FALSE); - for (i = 0, lim = dbl_limits; - i < NELEM(dbl_limits); - i++, lim++) { - if ((id.mantissa2 == lim->ieee.mantissa2) && - (id.mantissa1 == lim->ieee.mantissa1) && - (id.exp == lim->ieee.exp)) { - vd = lim->d; - goto doneit; - } - } - vd.exp = id.exp - IEEE_DBL_BIAS + VAX_DBL_BIAS; - vd.mantissa1 = (id.mantissa1 >> 13); - vd.mantissa2 = ((id.mantissa1 & MASK(13)) << 3) | - (id.mantissa2 >> 29); - vd.mantissa3 = (id.mantissa2 >> 13); - vd.mantissa4 = (id.mantissa2 << 3); - doneit: - vd.sign = id.sign; - *dp = *((double *)&vd); - return (TRUE); -#endif case XDR_FREE: return (TRUE); -- 2.41.0