diff --git a/common/ieee.h b/common/ieee.h new file mode 100644 index 00000000..68b820cf --- /dev/null +++ b/common/ieee.h @@ -0,0 +1,147 @@ +/* Imported into HyperDex by Robert Escriva from OpenBSD 5.7 */ +#ifndef __x86_64__ +#error this file depends on the amd64 arch +#endif + +/* $OpenBSD: ieee.h,v 1.2 2008/09/07 20:36:06 martynas Exp $ */ +/* $NetBSD: ieee.h,v 1.1 1996/09/30 16:34:25 ws Exp $ */ + +/* + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This software was developed by the Computer Systems Engineering group + * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and + * contributed to Berkeley. + * + * All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Lawrence Berkeley Laboratory. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)ieee.h 8.1 (Berkeley) 6/11/93 + */ + +/* + * ieee.h defines the machine-dependent layout of the machine's IEEE + * floating point. It does *not* define (yet?) any of the rounding + * mode bits, exceptions, and so forth. + */ + +/* + * Define the number of bits in each fraction and exponent. + * + * k k+1 + * Note that 1.0 x 2 == 0.1 x 2 and that denorms are represented + * + * (-exp_bias+1) + * as fractions that look like 0.fffff x 2 . This means that + * + * -126 + * the number 0.10000 x 2 , for instance, is the same as the normalized + * + * -127 -128 + * float 1.0 x 2 . Thus, to represent 2 , we need one leading zero + * + * -129 + * in the fraction; to represent 2 , we need two, and so on. This + * + * (-exp_bias-fracbits+1) + * implies that the smallest denormalized number is 2 + * + * for whichever format we are talking about: for single precision, for + * + * -126 -149 + * instance, we get .00000000000000000000001 x 2 , or 1.0 x 2 , and + * + * -149 == -127 - 23 + 1. + */ +#define SNG_EXPBITS 8 +#define SNG_FRACBITS 23 + +#define DBL_EXPBITS 11 +#define DBL_FRACHBITS 20 +#define DBL_FRACLBITS 32 +#define DBL_FRACBITS 52 + +#define EXT_EXPBITS 15 +#define EXT_FRACHBITS 32 +#define EXT_FRACLBITS 32 +#define EXT_FRACBITS 64 + +#define EXT_TO_ARRAY32(p, a) do { \ + (a)[0] = (uint32_t)(p)->ext_fracl; \ + (a)[1] = (uint32_t)(p)->ext_frach; \ +} while(0) + +struct ieee_single { + u_int sng_frac:23; + u_int sng_exp:8; + u_int sng_sign:1; +}; + +struct ieee_double { + u_int dbl_fracl; + u_int dbl_frach:20; + u_int dbl_exp:11; + u_int dbl_sign:1; +}; + +struct ieee_ext { + u_int ext_fracl; + u_int ext_frach; + u_int ext_exp:15; + u_int ext_sign:1; + u_int ext_padl:16; + u_int ext_padh; +}; + +/* + * Floats whose exponent is in [1..INFNAN) (of whatever type) are + * `normal'. Floats whose exponent is INFNAN are either Inf or NaN. + * Floats whose exponent is zero are either zero (iff all fraction + * bits are zero) or subnormal values. + * + * A NaN is a `signalling NaN' if its QUIETNAN bit is clear in its + * high fraction; if the bit is set, it is a `quiet NaN'. + */ +#define SNG_EXP_INFNAN 255 +#define DBL_EXP_INFNAN 2047 +#define EXT_EXP_INFNAN 32767 + +#if 0 +#define SNG_QUIETNAN (1 << 22) +#define DBL_QUIETNAN (1 << 19) +#define EXT_QUIETNAN (1 << 15) +#endif + +/* + * Exponent biases. + */ +#define SNG_EXP_BIAS 127 +#define DBL_EXP_BIAS 1023 +#define EXT_EXP_BIAS 16383 diff --git a/common/ordered_encoding.cc b/common/ordered_encoding.cc index c37b11fc..c1dd8471 100644 --- a/common/ordered_encoding.cc +++ b/common/ordered_encoding.cc @@ -29,21 +29,15 @@ #include // C -#if defined(_MSC_VER) || defined(_LIBCPP_VERSION) +#if defined(_LIBCPP_VERSION) #include #else #include #endif #include -// Linux -#ifdef __APPLE__ -#include -#else -#include -#endif - // HyperDex +#include "common/ieee.h" #include "common/ordered_encoding.h" uint64_t @@ -114,21 +108,15 @@ hyperdex :: ordered_decode_int64(uint64_t x) // exp=0x7ff // frac=0 // shift=3 -#ifndef _MSC_VER -#pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wfloat-equal" -#endif uint64_t hyperdex :: ordered_encode_double(double x) { uint64_t out = 0xffffffffffffffffULL; -#ifdef _MSC_VER - if (isinf(x)) -#else if (std::isinf(x)) -#endif { if (x > 0) { @@ -139,11 +127,7 @@ hyperdex :: ordered_encode_double(double x) out = 0; } } -#ifdef _MSC_VER - else if (isnan(x)) -#else else if (std::isnan(x)) -#endif { out = 0xfff0000000000000ULL + 3; } @@ -153,13 +137,13 @@ hyperdex :: ordered_encode_double(double x) } else { - ieee754_double d; + union { double d; ieee_double ieee; } d; d.d = x; - uint64_t sign = d.ieee.negative ^ 0x1; - uint64_t exp = d.ieee.exponent; - uint64_t frac = d.ieee.mantissa0; + uint64_t sign = d.ieee.dbl_sign ^ 0x1; + uint64_t exp = d.ieee.dbl_exp; + uint64_t frac = d.ieee.dbl_frach; frac <<= 32; - frac |= d.ieee.mantissa1; + frac |= d.ieee.dbl_fracl; uint64_t shift = 2; if (x < 0) @@ -175,7 +159,3 @@ hyperdex :: ordered_encode_double(double x) return out; } - -#ifndef _MSC_VER -#pragma GCC diagnostic pop -#endif