Index: uspace/lib/softfloat/add.c =================================================================== --- uspace/lib/softfloat/add.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/softfloat/add.c (revision 615e83d68dc1cfdb51a3e2557d4776a37010a7ca) @@ -49,5 +49,5 @@ int expdiff; uint32_t exp1, exp2, frac1, frac2; - + expdiff = a.parts.exp - b.parts.exp; if (expdiff < 0) { @@ -59,9 +59,9 @@ return b; } - + if (b.parts.exp == FLOAT32_MAX_EXPONENT) { return b; } - + frac1 = b.parts.fraction; exp1 = b.parts.exp; @@ -76,9 +76,9 @@ return (is_float32_nan(a) ? a : b); } - + if (a.parts.exp == FLOAT32_MAX_EXPONENT) { return a; } - + frac1 = a.parts.fraction; exp1 = a.parts.exp; @@ -86,5 +86,5 @@ exp2 = b.parts.exp; } - + if (exp1 == 0) { /* both are denormalized */ @@ -97,5 +97,5 @@ return a; } - + frac1 |= FLOAT32_HIDDEN_BIT_MASK; /* add hidden bit */ @@ -107,9 +107,9 @@ frac2 |= FLOAT32_HIDDEN_BIT_MASK; } - + /* create some space for rounding */ frac1 <<= 6; frac2 <<= 6; - + if (expdiff < (FLOAT32_FRACTION_SIZE + 2)) { frac2 >>= expdiff; @@ -120,13 +120,13 @@ return a; } - + if (frac1 & (FLOAT32_HIDDEN_BIT_MASK << 7)) { ++exp1; frac1 >>= 1; } - + /* rounding - if first bit after fraction is set then round up */ frac1 += (0x1 << 5); - + if (frac1 & (FLOAT32_HIDDEN_BIT_MASK << 7)) { /* rounding overflow */ @@ -134,5 +134,5 @@ frac1 >>= 1; } - + if ((exp1 == FLOAT32_MAX_EXPONENT) || (exp2 > exp1)) { /* overflow - set infinity as result */ @@ -141,7 +141,7 @@ return a; } - + a.parts.exp = exp1; - + /* Clear hidden bit and shift */ a.parts.fraction = ((frac1 >> 6) & (~FLOAT32_HIDDEN_BIT_MASK)); @@ -160,5 +160,5 @@ uint32_t exp1, exp2; uint64_t frac1, frac2; - + expdiff = ((int) a.parts.exp) - b.parts.exp; if (expdiff < 0) { @@ -170,10 +170,10 @@ return b; } - + /* b is infinity and a not */ if (b.parts.exp == FLOAT64_MAX_EXPONENT) { return b; } - + frac1 = b.parts.fraction; exp1 = b.parts.exp; @@ -188,10 +188,10 @@ return a; } - + /* a is infinity and b not */ if (a.parts.exp == FLOAT64_MAX_EXPONENT) { return a; } - + frac1 = a.parts.fraction; exp1 = a.parts.exp; @@ -199,5 +199,5 @@ exp2 = b.parts.exp; } - + if (exp1 == 0) { /* both are denormalized */ @@ -210,5 +210,5 @@ return a; } - + /* add hidden bit - frac1 is sure not denormalized */ frac1 |= FLOAT64_HIDDEN_BIT_MASK; @@ -222,9 +222,9 @@ frac2 |= FLOAT64_HIDDEN_BIT_MASK; } - + /* create some space for rounding */ frac1 <<= 6; frac2 <<= 6; - + if (expdiff < (FLOAT64_FRACTION_SIZE + 2)) { frac2 >>= expdiff; @@ -235,13 +235,13 @@ return a; } - + if (frac1 & (FLOAT64_HIDDEN_BIT_MASK << 7)) { ++exp1; frac1 >>= 1; } - + /* rounding - if first bit after fraction is set then round up */ frac1 += (0x1 << 5); - + if (frac1 & (FLOAT64_HIDDEN_BIT_MASK << 7)) { /* rounding overflow */ @@ -249,5 +249,5 @@ frac1 >>= 1; } - + if ((exp1 == FLOAT64_MAX_EXPONENT) || (exp2 > exp1)) { /* overflow - set infinity as result */ @@ -256,5 +256,5 @@ return a; } - + a.parts.exp = exp1; /* Clear hidden bit and shift */ @@ -400,5 +400,5 @@ a.parts.exp = exp1; - + /* Clear hidden bit and shift */ rshift128(frac1_hi, frac1_lo, 6, &frac1_hi, &frac1_lo); @@ -419,10 +419,10 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + float32_u res; - + if (ua.data.parts.sign != ub.data.parts.sign) { if (ua.data.parts.sign) { @@ -435,5 +435,5 @@ } else res.data = add_float32(ua.data, ub.data); - + return res.val; } @@ -443,10 +443,10 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + float32_u res; - + if (ua.data.parts.sign != ub.data.parts.sign) { if (ua.data.parts.sign) { @@ -459,5 +459,5 @@ } else res.data = add_float32(ua.data, ub.data); - + return res.val; } @@ -471,10 +471,10 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + float64_u res; - + if (ua.data.parts.sign != ub.data.parts.sign) { if (ua.data.parts.sign) { @@ -487,5 +487,5 @@ } else res.data = add_float64(ua.data, ub.data); - + return res.val; } @@ -495,10 +495,10 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + float64_u res; - + if (ua.data.parts.sign != ub.data.parts.sign) { if (ua.data.parts.sign) { @@ -511,5 +511,5 @@ } else res.data = add_float64(ua.data, ub.data); - + return res.val; } @@ -523,10 +523,10 @@ float128_u ua; ua.val = a; - + float128_u ub; ub.val = b; - + float128_u res; - + if (ua.data.parts.sign != ub.data.parts.sign) { if (ua.data.parts.sign) { @@ -539,5 +539,5 @@ } else res.data = add_float128(ua.data, ub.data); - + return res.val; } Index: uspace/lib/softfloat/common.c =================================================================== --- uspace/lib/softfloat/common.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/softfloat/common.c (revision 615e83d68dc1cfdb51a3e2557d4776a37010a7ca) @@ -78,5 +78,5 @@ /* TODO: fix underflow */ } - + if ((cexp < 0) || (cexp == 0 && (!(cfrac & (FLOAT64_HIDDEN_BIT_MASK << (64 - FLOAT64_FRACTION_SIZE - 1)))))) { @@ -87,12 +87,12 @@ return result; } - + while (cexp < 0) { cexp++; cfrac >>= 1; } - + cfrac += (0x1 << (64 - FLOAT64_FRACTION_SIZE - 3)); - + if (!(cfrac & (FLOAT64_HIDDEN_BIT_MASK << (64 - FLOAT64_FRACTION_SIZE - 1)))) { result.parts.fraction = @@ -103,5 +103,5 @@ cfrac += (0x1 << (64 - FLOAT64_FRACTION_SIZE - 3)); } - + ++cexp; @@ -120,8 +120,8 @@ result.parts.exp = (uint32_t) cexp; - + result.parts.fraction = ((cfrac >> (64 - FLOAT64_FRACTION_SIZE - 2)) & (~FLOAT64_HIDDEN_BIT_MASK)); - + return result; } @@ -289,5 +289,5 @@ /* rounding - if first bit after fraction is set then round up */ (*fraction) += (0x1 << (32 - FLOAT32_FRACTION_SIZE - 3)); - + if ((*fraction) & (FLOAT32_HIDDEN_BIT_MASK << (32 - FLOAT32_FRACTION_SIZE - 1))) { @@ -296,5 +296,5 @@ (*fraction) >>= 1; } - + if (((*exp) >= FLOAT32_MAX_EXPONENT) || ((*exp) < 0)) { /* overflow - set infinity as result */ @@ -322,5 +322,5 @@ */ (*fraction) += (0x1 << (64 - FLOAT64_FRACTION_SIZE - 3)); - + /* See if there was a carry to bit 63. */ if ((*fraction) & @@ -330,5 +330,5 @@ (*fraction) >>= 1; } - + if (((*exp) >= FLOAT64_MAX_EXPONENT) || ((*exp) < 0)) { /* overflow - set infinity as result */ @@ -677,5 +677,5 @@ mul64(b, result, &tmp_hi, &tmp_lo); sub128(a_hi, a_lo, tmp_hi, tmp_lo, &rem_hi, &rem_lo); - + while ((int64_t) rem_hi < 0) { result -= 0x1ll << 32; Index: uspace/lib/softfloat/comparison.c =================================================================== --- uspace/lib/softfloat/comparison.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/softfloat/comparison.c (revision 615e83d68dc1cfdb51a3e2557d4776a37010a7ca) @@ -190,8 +190,8 @@ uint64_t tmp_hi; uint64_t tmp_lo; - + and128(ld.bin.hi, ld.bin.lo, 0x7FFFFFFFFFFFFFFFll, 0xFFFFFFFFFFFFFFFFll, &tmp_hi, &tmp_lo); - + return eq128(tmp_hi, tmp_lo, 0x0ll, 0x0ll); } @@ -236,5 +236,5 @@ uint64_t tmp_hi; uint64_t tmp_lo; - + /* both are zeros (with any sign) */ or128(a.bin.hi, a.bin.lo, @@ -243,8 +243,8 @@ 0x7FFFFFFFFFFFFFFFll, 0xFFFFFFFFFFFFFFFFll, &tmp_hi, &tmp_lo); int both_zero = eq128(tmp_hi, tmp_lo, 0x0ll, 0x0ll); - + /* a equals to b */ int are_equal = eq128(a.bin.hi, a.bin.lo, b.bin.hi, b.bin.lo); - + return are_equal || both_zero; } @@ -263,10 +263,10 @@ return 0; } - + if ((a.parts.sign) && (b.parts.sign)) { /* if both are negative, smaller is that with greater binary value */ return (a.bin > b.bin); } - + /* * lets negate signs - now will be positive numbers always @@ -292,10 +292,10 @@ return 0; } - + if ((a.parts.sign) && (b.parts.sign)) { /* if both are negative, smaller is that with greater binary value */ return (a.bin > b.bin); } - + /* * lets negate signs - now will be positive numbers always @@ -319,5 +319,5 @@ uint64_t tmp_hi; uint64_t tmp_lo; - + or128(a.bin.hi, a.bin.lo, b.bin.hi, b.bin.lo, &tmp_hi, &tmp_lo); @@ -328,10 +328,10 @@ return 0; } - + if ((a.parts.sign) && (b.parts.sign)) { /* if both are negative, smaller is that with greater binary value */ return lt128(b.bin.hi, b.bin.lo, a.bin.hi, a.bin.lo); } - + /* * lets negate signs - now will be positive numbers always @@ -357,10 +357,10 @@ return 0; } - + if ((a.parts.sign) && (b.parts.sign)) { /* if both are negative, greater is that with smaller binary value */ return (a.bin < b.bin); } - + /* * lets negate signs - now will be positive numbers always @@ -386,10 +386,10 @@ return 0; } - + if ((a.parts.sign) && (b.parts.sign)) { /* if both are negative, greater is that with smaller binary value */ return (a.bin < b.bin); } - + /* * lets negate signs - now will be positive numbers always @@ -413,5 +413,5 @@ uint64_t tmp_hi; uint64_t tmp_lo; - + or128(a.bin.hi, a.bin.lo, b.bin.hi, b.bin.lo, &tmp_hi, &tmp_lo); @@ -422,10 +422,10 @@ return 0; } - + if ((a.parts.sign) && (b.parts.sign)) { /* if both are negative, greater is that with smaller binary value */ return lt128(a.bin.hi, a.bin.lo, b.bin.hi, b.bin.lo); } - + /* * lets negate signs - now will be positive numbers always @@ -444,16 +444,16 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + if ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))) { // TODO: sigNaNs return -1; } - + if (is_float32_gt(ua.data, ub.data)) return 1; - + return 0; } @@ -463,19 +463,19 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + if ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))) { // TODO: sigNaNs return -1; } - + if (is_float32_eq(ua.data, ub.data)) return 0; - + if (is_float32_gt(ua.data, ub.data)) return 1; - + return -1; } @@ -485,16 +485,16 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + if ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))) { // TODO: sigNaNs return 1; } - + if (is_float32_lt(ua.data, ub.data)) return -1; - + return 0; } @@ -504,19 +504,19 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + if ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))) { // TODO: sigNaNs return 1; } - + if (is_float32_eq(ua.data, ub.data)) return 0; - + if (is_float32_lt(ua.data, ub.data)) return -1; - + return 1; } @@ -526,13 +526,13 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + if ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))) { // TODO: sigNaNs return 1; } - + return is_float32_eq(ua.data, ub.data) - 1; } @@ -548,19 +548,19 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + if ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))) { /* No special constant for unordered - maybe signaled? */ return 1; } - + if (is_float32_eq(ua.data, ub.data)) return 0; - + if (is_float32_lt(ua.data, ub.data)) return -1; - + return 1; } @@ -570,8 +570,8 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + return ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))); } @@ -581,16 +581,16 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + if ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))) { // TODO: sigNaNs return -1; } - + if (is_float32_gt(ua.data, ub.data)) return 1; - + return 0; } @@ -600,16 +600,16 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + if ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))) { // TODO: sigNaNs return 1; } - + if (is_float32_lt(ua.data, ub.data)) return -1; - + return 0; } @@ -619,19 +619,19 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + if ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))) { // TODO: sigNaNs return -1; } - + if (is_float32_eq(ua.data, ub.data)) return 0; - + if (is_float32_gt(ua.data, ub.data)) return 1; - + return -1; } @@ -641,13 +641,13 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + if ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))) { // TODO: sigNaNs return 1; } - + return is_float32_eq(ua.data, ub.data) - 1; } @@ -661,16 +661,16 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) { // TODO: sigNaNs return -1; } - + if (is_float64_gt(ua.data, ub.data)) return 1; - + return 0; } @@ -680,19 +680,19 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) { // TODO: sigNaNs return -1; } - + if (is_float64_eq(ua.data, ub.data)) return 0; - + if (is_float64_gt(ua.data, ub.data)) return 1; - + return -1; } @@ -702,16 +702,16 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) { // TODO: sigNaNs return 1; } - + if (is_float64_lt(ua.data, ub.data)) return -1; - + return 0; } @@ -721,19 +721,19 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) { // TODO: sigNaNs return 1; } - + if (is_float64_eq(ua.data, ub.data)) return 0; - + if (is_float64_lt(ua.data, ub.data)) return -1; - + return 1; } @@ -743,13 +743,13 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) { // TODO: sigNaNs return 1; } - + return is_float64_eq(ua.data, ub.data) - 1; } @@ -765,19 +765,19 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) { /* No special constant for unordered - maybe signaled? */ return 1; } - + if (is_float64_eq(ua.data, ub.data)) return 0; - + if (is_float64_lt(ua.data, ub.data)) return -1; - + return 1; } @@ -787,8 +787,8 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + return ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))); } @@ -798,16 +798,16 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) { // TODO: sigNaNs return 1; } - + if (is_float64_lt(ua.data, ub.data)) return -1; - + return 0; } @@ -817,13 +817,13 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) { // TODO: sigNaNs return 1; } - + return is_float64_eq(ua.data, ub.data) - 1; } @@ -833,16 +833,16 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) { // TODO: sigNaNs return -1; } - + if (is_float64_gt(ua.data, ub.data)) return 1; - + return 0; } @@ -852,19 +852,19 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) { // TODO: sigNaNs return -1; } - + if (is_float64_eq(ua.data, ub.data)) return 0; - + if (is_float64_gt(ua.data, ub.data)) return 1; - + return -1; } @@ -874,19 +874,19 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) { // TODO: sigNaNs return 1; } - + if (is_float64_eq(ua.data, ub.data)) return 0; - + if (is_float64_lt(ua.data, ub.data)) return -1; - + return 1; } @@ -900,16 +900,16 @@ float128_u ua; ua.val = a; - - float128_u ub; - ub.val = b; - + + float128_u ub; + ub.val = b; + if ((is_float128_nan(ua.data)) || (is_float128_nan(ub.data))) { // TODO: sigNaNs return -1; } - + if (is_float128_gt(ua.data, ub.data)) return 1; - + return 0; } @@ -919,19 +919,19 @@ float128_u ua; ua.val = a; - - float128_u ub; - ub.val = b; - + + float128_u ub; + ub.val = b; + if ((is_float128_nan(ua.data)) || (is_float128_nan(ub.data))) { // TODO: sigNaNs return -1; } - + if (is_float128_eq(ua.data, ub.data)) return 0; - + if (is_float128_gt(ua.data, ub.data)) return 1; - + return -1; } @@ -941,16 +941,16 @@ float128_u ua; ua.val = a; - - float128_u ub; - ub.val = b; - + + float128_u ub; + ub.val = b; + if ((is_float128_nan(ua.data)) || (is_float128_nan(ub.data))) { // TODO: sigNaNs return 1; } - + if (is_float128_lt(ua.data, ub.data)) return -1; - + return 0; } @@ -960,19 +960,19 @@ float128_u ua; ua.val = a; - - float128_u ub; - ub.val = b; - + + float128_u ub; + ub.val = b; + if ((is_float128_nan(ua.data)) || (is_float128_nan(ub.data))) { // TODO: sigNaNs return 1; } - + if (is_float128_eq(ua.data, ub.data)) return 0; - + if (is_float128_lt(ua.data, ub.data)) return -1; - + return 1; } @@ -982,13 +982,13 @@ float128_u ua; ua.val = a; - - float128_u ub; - ub.val = b; - + + float128_u ub; + ub.val = b; + if ((is_float128_nan(ua.data)) || (is_float128_nan(ub.data))) { // TODO: sigNaNs return 1; } - + return is_float128_eq(ua.data, ub.data) - 1; } @@ -1004,19 +1004,19 @@ float128_u ua; ua.val = a; - - float128_u ub; - ub.val = b; - + + float128_u ub; + ub.val = b; + if ((is_float128_nan(ua.data)) || (is_float128_nan(ub.data))) { /* No special constant for unordered - maybe signaled? */ return 1; } - + if (is_float128_eq(ua.data, ub.data)) return 0; - + if (is_float128_lt(ua.data, ub.data)) return -1; - + return 1; } @@ -1026,8 +1026,8 @@ float128_u ua; ua.val = a; - - float128_u ub; - ub.val = b; - + + float128_u ub; + ub.val = b; + return ((is_float128_nan(ua.data)) || (is_float128_nan(ub.data))); } @@ -1037,17 +1037,17 @@ float128_u ua; ua.val = *a; - + float128_u ub; ub.val = *b; - + if ((is_float128_nan(ua.data)) || (is_float128_nan(ub.data))) return 3; - + if (is_float128_eq(ua.data, ub.data)) return 0; - + if (is_float128_lt(ua.data, ub.data)) return 1; - + return 2; } @@ -1063,11 +1063,11 @@ float128_u ua; ua.val = *a; - + float128_u ub; ub.val = *b; - + if ((is_float128_nan(ua.data)) || (is_float128_nan(ub.data))) return 0; - + return is_float128_gt(ua.data, ub.data); } @@ -1077,11 +1077,11 @@ float128_u ua; ua.val = *a; - + float128_u ub; ub.val = *b; - + if ((is_float128_nan(ua.data)) || (is_float128_nan(ub.data))) return 0; - + return is_float128_eq(ua.data, ub.data) || is_float128_gt(ua.data, ub.data); @@ -1092,11 +1092,11 @@ float128_u ua; ua.val = *a; - + float128_u ub; ub.val = *b; - + if ((is_float128_nan(ua.data)) || (is_float128_nan(ub.data))) return 0; - + return is_float128_lt(ua.data, ub.data); } @@ -1106,11 +1106,11 @@ float128_u ua; ua.val = *a; - + float128_u ub; ub.val = *b; - + if ((is_float128_nan(ua.data)) || (is_float128_nan(ub.data))) return 0; - + return is_float128_eq(ua.data, ub.data) || is_float128_lt(ua.data, ub.data); @@ -1121,11 +1121,11 @@ float128_u ua; ua.val = *a; - + float128_u ub; ub.val = *b; - + if ((is_float128_nan(ua.data)) || (is_float128_nan(ub.data))) return 0; - + return is_float128_eq(ua.data, ub.data); } @@ -1135,11 +1135,11 @@ float128_u ua; ua.val = *a; - + float128_u ub; ub.val = *b; - + if ((is_float128_nan(ua.data)) || (is_float128_nan(ub.data))) return 0; - + return !is_float128_eq(ua.data, ub.data); } Index: uspace/lib/softfloat/conversion.c =================================================================== --- uspace/lib/softfloat/conversion.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/softfloat/conversion.c (revision 615e83d68dc1cfdb51a3e2557d4776a37010a7ca) @@ -42,9 +42,9 @@ float64 result; uint64_t frac; - + result.parts.sign = a.parts.sign; result.parts.fraction = a.parts.fraction; result.parts.fraction <<= (FLOAT64_FRACTION_SIZE - FLOAT32_FRACTION_SIZE); - + if ((is_float32_infinity(a)) || (is_float32_nan(a))) { result.parts.exp = FLOAT64_MAX_EXPONENT; @@ -52,25 +52,25 @@ return result; } - + result.parts.exp = a.parts.exp + ((int) FLOAT64_BIAS - FLOAT32_BIAS); if (a.parts.exp == 0) { /* normalize denormalized numbers */ - + if (result.parts.fraction == 0) { /* fix zero */ result.parts.exp = 0; return result; } - + frac = result.parts.fraction; - + while (!(frac & FLOAT64_HIDDEN_BIT_MASK)) { frac <<= 1; --result.parts.exp; } - + ++result.parts.exp; result.parts.fraction = frac; } - + return result; } @@ -81,5 +81,5 @@ uint64_t frac_hi, frac_lo; uint64_t tmp_hi, tmp_lo; - + result.parts.sign = a.parts.sign; result.parts.frac_hi = 0; @@ -90,5 +90,5 @@ result.parts.frac_hi = frac_hi; result.parts.frac_lo = frac_lo; - + if ((is_float32_infinity(a)) || (is_float32_nan(a))) { result.parts.exp = FLOAT128_MAX_EXPONENT; @@ -96,9 +96,9 @@ return result; } - + result.parts.exp = a.parts.exp + ((int) FLOAT128_BIAS - FLOAT32_BIAS); if (a.parts.exp == 0) { /* normalize denormalized numbers */ - + if (eq128(result.parts.frac_hi, result.parts.frac_lo, 0x0ll, 0x0ll)) { /* fix zero */ @@ -106,8 +106,8 @@ return result; } - + frac_hi = result.parts.frac_hi; frac_lo = result.parts.frac_lo; - + and128(frac_hi, frac_lo, FLOAT128_HIDDEN_BIT_MASK_HI, FLOAT128_HIDDEN_BIT_MASK_LO, @@ -117,10 +117,10 @@ --result.parts.exp; } - + ++result.parts.exp; result.parts.frac_hi = frac_hi; result.parts.frac_lo = frac_lo; } - + return result; } @@ -131,5 +131,5 @@ uint64_t frac_hi, frac_lo; uint64_t tmp_hi, tmp_lo; - + result.parts.sign = a.parts.sign; result.parts.frac_hi = 0; @@ -140,5 +140,5 @@ result.parts.frac_hi = frac_hi; result.parts.frac_lo = frac_lo; - + if ((is_float64_infinity(a)) || (is_float64_nan(a))) { result.parts.exp = FLOAT128_MAX_EXPONENT; @@ -146,9 +146,9 @@ return result; } - + result.parts.exp = a.parts.exp + ((int) FLOAT128_BIAS - FLOAT64_BIAS); if (a.parts.exp == 0) { /* normalize denormalized numbers */ - + if (eq128(result.parts.frac_hi, result.parts.frac_lo, 0x0ll, 0x0ll)) { /* fix zero */ @@ -156,8 +156,8 @@ return result; } - + frac_hi = result.parts.frac_hi; frac_lo = result.parts.frac_lo; - + and128(frac_hi, frac_lo, FLOAT128_HIDDEN_BIT_MASK_HI, FLOAT128_HIDDEN_BIT_MASK_LO, @@ -167,10 +167,10 @@ --result.parts.exp; } - + ++result.parts.exp; result.parts.frac_hi = frac_hi; result.parts.frac_lo = frac_lo; } - + return result; } @@ -181,10 +181,10 @@ int32_t exp; uint64_t frac; - + result.parts.sign = a.parts.sign; - + if (is_float64_nan(a)) { result.parts.exp = FLOAT32_MAX_EXPONENT; - + if (is_float64_signan(a)) { /* set first bit of fraction nonzero */ @@ -192,10 +192,10 @@ return result; } - + /* fraction nonzero but its first bit is zero */ result.parts.fraction = 0x1; return result; } - + if (is_float64_infinity(a)) { result.parts.fraction = 0; @@ -203,7 +203,7 @@ return result; } - + exp = (int) a.parts.exp - FLOAT64_BIAS + FLOAT32_BIAS; - + if (exp >= FLOAT32_MAX_EXPONENT) { /* FIXME: overflow */ @@ -213,7 +213,7 @@ } else if (exp <= 0) { /* underflow or denormalized */ - + result.parts.exp = 0; - + exp *= -1; if (exp > FLOAT32_FRACTION_SIZE) { @@ -222,12 +222,12 @@ return result; } - + /* denormalized */ - + frac = a.parts.fraction; frac |= FLOAT64_HIDDEN_BIT_MASK; /* denormalize and set hidden bit */ - + frac >>= (FLOAT64_FRACTION_SIZE - FLOAT32_FRACTION_SIZE + 1); - + while (exp > 0) { --exp; @@ -235,8 +235,8 @@ } result.parts.fraction = frac; - - return result; - } - + + return result; + } + result.parts.exp = exp; result.parts.fraction = @@ -250,10 +250,10 @@ int32_t exp; uint64_t frac_hi, frac_lo; - + result.parts.sign = a.parts.sign; - + if (is_float128_nan(a)) { result.parts.exp = FLOAT32_MAX_EXPONENT; - + if (is_float128_signan(a)) { /* set first bit of fraction nonzero */ @@ -261,10 +261,10 @@ return result; } - + /* fraction nonzero but its first bit is zero */ result.parts.fraction = 0x1; return result; } - + if (is_float128_infinity(a)) { result.parts.fraction = 0; @@ -272,7 +272,7 @@ return result; } - + exp = (int) a.parts.exp - FLOAT128_BIAS + FLOAT32_BIAS; - + if (exp >= FLOAT32_MAX_EXPONENT) { /* FIXME: overflow */ @@ -282,7 +282,7 @@ } else if (exp <= 0) { /* underflow or denormalized */ - + result.parts.exp = 0; - + exp *= -1; if (exp > FLOAT32_FRACTION_SIZE) { @@ -291,17 +291,17 @@ return result; } - + /* denormalized */ - + frac_hi = a.parts.frac_hi; frac_lo = a.parts.frac_lo; - + /* denormalize and set hidden bit */ frac_hi |= FLOAT128_HIDDEN_BIT_MASK_HI; - + rshift128(frac_hi, frac_lo, (FLOAT128_FRACTION_SIZE - FLOAT32_FRACTION_SIZE + 1), &frac_hi, &frac_lo); - + while (exp > 0) { --exp; @@ -309,8 +309,8 @@ } result.parts.fraction = frac_lo; - - return result; - } - + + return result; + } + result.parts.exp = exp; frac_hi = a.parts.frac_hi; @@ -328,10 +328,10 @@ int32_t exp; uint64_t frac_hi, frac_lo; - + result.parts.sign = a.parts.sign; - + if (is_float128_nan(a)) { result.parts.exp = FLOAT64_MAX_EXPONENT; - + if (is_float128_signan(a)) { /* set first bit of fraction nonzero */ @@ -339,10 +339,10 @@ return result; } - + /* fraction nonzero but its first bit is zero */ result.parts.fraction = 0x1; return result; } - + if (is_float128_infinity(a)) { result.parts.fraction = 0; @@ -350,7 +350,7 @@ return result; } - + exp = (int) a.parts.exp - FLOAT128_BIAS + FLOAT64_BIAS; - + if (exp >= FLOAT64_MAX_EXPONENT) { /* FIXME: overflow */ @@ -360,7 +360,7 @@ } else if (exp <= 0) { /* underflow or denormalized */ - + result.parts.exp = 0; - + exp *= -1; if (exp > FLOAT64_FRACTION_SIZE) { @@ -369,17 +369,17 @@ return result; } - + /* denormalized */ - + frac_hi = a.parts.frac_hi; frac_lo = a.parts.frac_lo; - + /* denormalize and set hidden bit */ frac_hi |= FLOAT128_HIDDEN_BIT_MASK_HI; - + rshift128(frac_hi, frac_lo, (FLOAT128_FRACTION_SIZE - FLOAT64_FRACTION_SIZE + 1), &frac_hi, &frac_lo); - + while (exp > 0) { --exp; @@ -387,8 +387,8 @@ } result.parts.fraction = frac_lo; - - return result; - } - + + return result; + } + result.parts.exp = exp; frac_hi = a.parts.frac_hi; @@ -410,16 +410,16 @@ { uint32_t frac; - + if (a.parts.exp < FLOAT32_BIAS) { /* TODO: rounding */ return 0; } - + frac = a.parts.fraction; - + frac |= FLOAT32_HIDDEN_BIT_MASK; /* shift fraction to left so hidden bit will be the most significant bit */ frac <<= 32 - FLOAT32_FRACTION_SIZE - 1; - + frac >>= 32 - (a.parts.exp - FLOAT32_BIAS) - 1; if ((a.parts.sign == 1) && (frac != 0)) { @@ -427,5 +427,5 @@ ++frac; } - + return frac; } @@ -439,12 +439,12 @@ if (is_float32_nan(a)) return UINT32_MAX; - + if (is_float32_infinity(a) || (a.parts.exp >= (32 + FLOAT32_BIAS))) { if (a.parts.sign) return UINT32_MIN; - + return UINT32_MAX; } - + return _float32_to_uint32_helper(a); } @@ -458,12 +458,12 @@ if (is_float32_nan(a)) return INT32_MAX; - + if (is_float32_infinity(a) || (a.parts.exp >= (32 + FLOAT32_BIAS))) { if (a.parts.sign) return INT32_MIN; - + return INT32_MAX; } - + return _float32_to_uint32_helper(a); } @@ -478,16 +478,16 @@ { uint64_t frac; - + if (a.parts.exp < FLOAT32_BIAS) { // TODO: rounding return 0; } - + frac = a.parts.fraction; - + frac |= FLOAT32_HIDDEN_BIT_MASK; /* shift fraction to left so hidden bit will be the most significant bit */ frac <<= 64 - FLOAT32_FRACTION_SIZE - 1; - + frac >>= 64 - (a.parts.exp - FLOAT32_BIAS) - 1; if ((a.parts.sign == 1) && (frac != 0)) { @@ -495,5 +495,5 @@ ++frac; } - + return frac; } @@ -507,12 +507,12 @@ if (is_float32_nan(a)) return UINT64_MAX; - + if (is_float32_infinity(a) || (a.parts.exp >= (64 + FLOAT32_BIAS))) { if (a.parts.sign) return UINT64_MIN; - + return UINT64_MAX; } - + return _float32_to_uint64_helper(a); } @@ -526,12 +526,12 @@ if (is_float32_nan(a)) return INT64_MAX; - + if (is_float32_infinity(a) || (a.parts.exp >= (64 + FLOAT32_BIAS))) { if (a.parts.sign) return INT64_MIN; - + return INT64_MAX; } - + return _float32_to_uint64_helper(a); } @@ -546,16 +546,16 @@ { uint64_t frac; - + if (a.parts.exp < FLOAT64_BIAS) { // TODO: rounding return 0; } - + frac = a.parts.fraction; - + frac |= FLOAT64_HIDDEN_BIT_MASK; /* shift fraction to left so hidden bit will be the most significant bit */ frac <<= 64 - FLOAT64_FRACTION_SIZE - 1; - + frac >>= 64 - (a.parts.exp - FLOAT64_BIAS) - 1; if ((a.parts.sign == 1) && (frac != 0)) { @@ -563,5 +563,5 @@ ++frac; } - + return frac; } @@ -575,12 +575,12 @@ if (is_float64_nan(a)) return UINT32_MAX; - + if (is_float64_infinity(a) || (a.parts.exp >= (32 + FLOAT64_BIAS))) { if (a.parts.sign) return UINT32_MIN; - + return UINT32_MAX; } - + return (uint32_t) _float64_to_uint64_helper(a); } @@ -594,12 +594,12 @@ if (is_float64_nan(a)) return INT32_MAX; - + if (is_float64_infinity(a) || (a.parts.exp >= (32 + FLOAT64_BIAS))) { if (a.parts.sign) return INT32_MIN; - + return INT32_MAX; } - + return (int32_t) _float64_to_uint64_helper(a); } @@ -613,12 +613,12 @@ if (is_float64_nan(a)) return UINT64_MAX; - + if (is_float64_infinity(a) || (a.parts.exp >= (64 + FLOAT64_BIAS))) { if (a.parts.sign) return UINT64_MIN; - + return UINT64_MAX; } - + return _float64_to_uint64_helper(a); } @@ -632,12 +632,12 @@ if (is_float64_nan(a)) return INT64_MAX; - + if (is_float64_infinity(a) || (a.parts.exp >= (64 + FLOAT64_BIAS))) { if (a.parts.sign) return INT64_MIN; - + return INT64_MAX; } - + return _float64_to_uint64_helper(a); } @@ -652,18 +652,18 @@ { uint64_t frac_hi, frac_lo; - + if (a.parts.exp < FLOAT128_BIAS) { // TODO: rounding return 0; } - + frac_hi = a.parts.frac_hi; frac_lo = a.parts.frac_lo; - + frac_hi |= FLOAT128_HIDDEN_BIT_MASK_HI; /* shift fraction to left so hidden bit will be the most significant bit */ lshift128(frac_hi, frac_lo, (128 - FLOAT128_FRACTION_SIZE - 1), &frac_hi, &frac_lo); - + rshift128(frac_hi, frac_lo, (128 - (a.parts.exp - FLOAT128_BIAS) - 1), &frac_hi, &frac_lo); @@ -672,5 +672,5 @@ add128(frac_hi, frac_lo, 0x0ll, 0x1ll, &frac_hi, &frac_lo); } - + return frac_lo; } @@ -684,12 +684,12 @@ if (is_float128_nan(a)) return UINT32_MAX; - + if (is_float128_infinity(a) || (a.parts.exp >= (32 + FLOAT128_BIAS))) { if (a.parts.sign) return UINT32_MIN; - + return UINT32_MAX; } - + return (uint32_t) _float128_to_uint64_helper(a); } @@ -703,12 +703,12 @@ if (is_float128_nan(a)) return INT32_MAX; - + if (is_float128_infinity(a) || (a.parts.exp >= (32 + FLOAT128_BIAS))) { if (a.parts.sign) return INT32_MIN; - + return INT32_MAX; } - + return (int32_t) _float128_to_uint64_helper(a); } @@ -722,12 +722,12 @@ if (is_float128_nan(a)) return UINT64_MAX; - + if (is_float128_infinity(a) || (a.parts.exp >= (64 + FLOAT128_BIAS))) { if (a.parts.sign) return UINT64_MIN; - + return UINT64_MAX; } - + return _float128_to_uint64_helper(a); } @@ -741,12 +741,12 @@ if (is_float128_nan(a)) return INT64_MAX; - + if (is_float128_infinity(a) || (a.parts.exp >= (64 + FLOAT128_BIAS))) { if (a.parts.sign) return INT64_MIN; - + return INT64_MAX; } - + return _float128_to_uint64_helper(a); } @@ -757,17 +757,17 @@ int32_t exp; float32 result; - + result.parts.sign = 0; result.parts.fraction = 0; - + counter = count_zeroes32(i); - + exp = FLOAT32_BIAS + 32 - counter - 1; - + if (counter == 32) { result.bin = 0; return result; } - + if (counter > 0) { i <<= counter - 1; @@ -775,10 +775,10 @@ i >>= 1; } - + round_float32(&exp, &i); - + result.parts.fraction = i >> (32 - FLOAT32_FRACTION_SIZE - 2); result.parts.exp = exp; - + return result; } @@ -787,12 +787,12 @@ { float32 result; - + if (i < 0) result = uint32_to_float32((uint32_t) (-i)); else result = uint32_to_float32((uint32_t) i); - + result.parts.sign = i < 0; - + return result; } @@ -804,17 +804,17 @@ uint32_t j; float32 result; - + result.parts.sign = 0; result.parts.fraction = 0; - + counter = count_zeroes64(i); - + exp = FLOAT32_BIAS + 64 - counter - 1; - + if (counter == 64) { result.bin = 0; return result; } - + /* Shift all to the first 31 bits (31st will be hidden 1) */ if (counter > 33) { @@ -823,8 +823,8 @@ i >>= 1 + 32 - counter; } - + j = (uint32_t) i; round_float32(&exp, &j); - + result.parts.fraction = j >> (32 - FLOAT32_FRACTION_SIZE - 2); result.parts.exp = exp; @@ -835,12 +835,12 @@ { float32 result; - + if (i < 0) result = uint64_to_float32((uint64_t) (-i)); else result = uint64_to_float32((uint64_t) i); - + result.parts.sign = i < 0; - + return result; } @@ -852,25 +852,25 @@ float64 result; uint64_t frac; - + result.parts.sign = 0; result.parts.fraction = 0; - + counter = count_zeroes32(i); - + exp = FLOAT64_BIAS + 32 - counter - 1; - + if (counter == 32) { result.bin = 0; return result; } - + frac = i; frac <<= counter + 32 - 1; - + round_float64(&exp, &frac); - + result.parts.fraction = frac >> (64 - FLOAT64_FRACTION_SIZE - 2); result.parts.exp = exp; - + return result; } @@ -879,12 +879,12 @@ { float64 result; - + if (i < 0) result = uint32_to_float64((uint32_t) (-i)); else result = uint32_to_float64((uint32_t) i); - + result.parts.sign = i < 0; - + return result; } @@ -895,17 +895,17 @@ int32_t exp; float64 result; - + result.parts.sign = 0; result.parts.fraction = 0; - + counter = count_zeroes64(i); - + exp = FLOAT64_BIAS + 64 - counter - 1; - + if (counter == 64) { result.bin = 0; return result; } - + if (counter > 0) { i <<= counter - 1; @@ -913,7 +913,7 @@ i >>= 1; } - + round_float64(&exp, &i); - + result.parts.fraction = i >> (64 - FLOAT64_FRACTION_SIZE - 2); result.parts.exp = exp; @@ -924,12 +924,12 @@ { float64 result; - + if (i < 0) result = uint64_to_float64((uint64_t) (-i)); else result = uint64_to_float64((uint64_t) i); - + result.parts.sign = i < 0; - + return result; } @@ -941,13 +941,13 @@ float128 result; uint64_t frac_hi, frac_lo; - + result.parts.sign = 0; result.parts.frac_hi = 0; result.parts.frac_lo = 0; - + counter = count_zeroes32(i); - + exp = FLOAT128_BIAS + 32 - counter - 1; - + if (counter == 32) { result.bin.hi = 0; @@ -955,11 +955,11 @@ return result; } - + frac_hi = 0; frac_lo = i; lshift128(frac_hi, frac_lo, (counter + 96 - 1), &frac_hi, &frac_lo); - + round_float128(&exp, &frac_hi, &frac_lo); - + rshift128(frac_hi, frac_lo, (128 - FLOAT128_FRACTION_SIZE - 2), &frac_hi, &frac_lo); @@ -967,5 +967,5 @@ result.parts.frac_lo = frac_lo; result.parts.exp = exp; - + return result; } @@ -974,12 +974,12 @@ { float128 result; - + if (i < 0) result = uint32_to_float128((uint32_t) (-i)); else result = uint32_to_float128((uint32_t) i); - + result.parts.sign = i < 0; - + return result; } @@ -992,13 +992,13 @@ float128 result; uint64_t frac_hi, frac_lo; - + result.parts.sign = 0; result.parts.frac_hi = 0; result.parts.frac_lo = 0; - + counter = count_zeroes64(i); - + exp = FLOAT128_BIAS + 64 - counter - 1; - + if (counter == 64) { result.bin.hi = 0; @@ -1006,11 +1006,11 @@ return result; } - + frac_hi = 0; frac_lo = i; lshift128(frac_hi, frac_lo, (counter + 64 - 1), &frac_hi, &frac_lo); - + round_float128(&exp, &frac_hi, &frac_lo); - + rshift128(frac_hi, frac_lo, (128 - FLOAT128_FRACTION_SIZE - 2), &frac_hi, &frac_lo); @@ -1018,5 +1018,5 @@ result.parts.frac_lo = frac_lo; result.parts.exp = exp; - + return result; } @@ -1025,12 +1025,12 @@ { float128 result; - + if (i < 0) result = uint64_to_float128((uint64_t) (-i)); else result = uint64_to_float128((uint64_t) i); - + result.parts.sign = i < 0; - + return result; } @@ -1042,5 +1042,5 @@ float32_u res; res.data = int32_to_float32(i); - + return res.val; } @@ -1050,5 +1050,5 @@ float32_u res; res.data = int64_to_float32(i); - + return res.val; } @@ -1058,5 +1058,5 @@ float32_u res; res.data = uint32_to_float32(i); - + return res.val; } @@ -1066,5 +1066,5 @@ float32_u res; res.data = uint64_to_float32(i); - + return res.val; } @@ -1074,5 +1074,5 @@ float32_u ua; ua.val = a; - + return float32_to_int32(ua.data); } @@ -1082,5 +1082,5 @@ float32_u ua; ua.val = a; - + return float32_to_int64(ua.data); } @@ -1090,5 +1090,5 @@ float32_u ua; ua.val = a; - + return float32_to_uint32(ua.data); } @@ -1098,5 +1098,5 @@ float32_u ua; ua.val = a; - + return float32_to_uint64(ua.data); } @@ -1106,5 +1106,5 @@ float32_u ua; ua.val = a; - + return float32_to_int32(ua.data); } @@ -1114,5 +1114,5 @@ float32_u ua; ua.val = a; - + return float32_to_uint32(ua.data); } @@ -1122,5 +1122,5 @@ float32_u res; res.data = int32_to_float32(i); - + return res.val; } @@ -1130,5 +1130,5 @@ float32_u res; res.data = int64_to_float32(i); - + return res.val; } @@ -1138,5 +1138,5 @@ float32_u res; res.data = uint32_to_float32(i); - + return res.val; } @@ -1146,5 +1146,5 @@ float32_u res; res.data = uint64_to_float32(i); - + return res.val; } @@ -1158,5 +1158,5 @@ float64_u res; res.data = int32_to_float64(i); - + return res.val; } @@ -1166,5 +1166,5 @@ float64_u res; res.data = int64_to_float64(i); - + return res.val; } @@ -1174,5 +1174,5 @@ float64_u res; res.data = uint32_to_float64(i); - + return res.val; } @@ -1182,5 +1182,5 @@ float64_u res; res.data = uint64_to_float64(i); - + return res.val; } @@ -1190,5 +1190,5 @@ float64_u ua; ua.val = a; - + return float64_to_uint32(ua.data); } @@ -1198,5 +1198,5 @@ float64_u ua; ua.val = a; - + return float64_to_uint64(ua.data); } @@ -1206,5 +1206,5 @@ float64_u ua; ua.val = a; - + return float64_to_int32(ua.data); } @@ -1214,5 +1214,5 @@ float64_u ua; ua.val = a; - + return float64_to_int64(ua.data); } @@ -1222,5 +1222,5 @@ float64_u res; res.data = int32_to_float64(i); - + return res.val; } @@ -1230,5 +1230,5 @@ float64_u res; res.data = uint32_to_float64(i); - + return res.val; } @@ -1238,5 +1238,5 @@ float64_u res; res.data = int64_to_float64(i); - + return res.val; } @@ -1246,5 +1246,5 @@ float64_u ua; ua.val = a; - + return float64_to_int32(ua.data); } @@ -1254,5 +1254,5 @@ float64_u ua; ua.val = a; - + return float64_to_int64(ua.data); } @@ -1262,5 +1262,5 @@ float64_u ua; ua.val = a; - + return float64_to_uint32(ua.data); } @@ -1274,5 +1274,5 @@ float128_u res; res.data = int32_to_float128(i); - + return res.val; } @@ -1282,5 +1282,5 @@ float128_u res; res.data = int64_to_float128(i); - + return res.val; } @@ -1290,5 +1290,5 @@ float128_u res; res.data = uint32_to_float128(i); - + return res.val; } @@ -1298,5 +1298,5 @@ float128_u res; res.data = uint64_to_float128(i); - + return res.val; } @@ -1306,5 +1306,5 @@ float128_u ua; ua.val = a; - + return float128_to_int32(ua.data); } @@ -1314,5 +1314,5 @@ float128_u ua; ua.val = a; - + return float128_to_uint64(ua.data); } @@ -1322,5 +1322,5 @@ float128_u ua; ua.val = a; - + return float128_to_uint32(ua.data); } @@ -1330,5 +1330,5 @@ float128_u ua; ua.val = a; - + return float128_to_uint64(ua.data); } @@ -1382,8 +1382,8 @@ float64_u ua; ua.val = a; - + float32_u res; res.data = float64_to_float32(ua.data); - + return res.val; } @@ -1393,8 +1393,8 @@ float32_u ua; ua.val = a; - + float64_u res; res.data = float32_to_float64(ua.data); - + return res.val; } @@ -1404,8 +1404,8 @@ float32_u ua; ua.val = a; - + float64_u res; res.data = float32_to_float64(ua.data); - + return res.val; } @@ -1415,8 +1415,8 @@ float64_u ua; ua.val = a; - + float32_u res; res.data = float64_to_float32(ua.data); - + return res.val; } @@ -1430,8 +1430,8 @@ float128_u ua; ua.val = a; - + float32_u res; res.data = float128_to_float32(ua.data); - + return res.val; } @@ -1441,8 +1441,8 @@ float32_u ua; ua.val = a; - + float128_u res; res.data = float32_to_float128(ua.data); - + return res.val; } @@ -1466,8 +1466,8 @@ float128_u ua; ua.val = a; - + float64_u res; res.data = float128_to_float64(ua.data); - + return res.val; } @@ -1477,8 +1477,8 @@ float64_u ua; ua.val = a; - + float128_u res; res.data = float64_to_float128(ua.data); - + return res.val; } Index: uspace/lib/softfloat/div.c =================================================================== --- uspace/lib/softfloat/div.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/softfloat/div.c (revision 615e83d68dc1cfdb51a3e2557d4776a37010a7ca) @@ -53,7 +53,7 @@ int32_t aexp, bexp, cexp; uint64_t afrac, bfrac, cfrac; - + result.parts.sign = a.parts.sign ^ b.parts.sign; - + if (is_float32_nan(a)) { if (is_float32_signan(a)) { @@ -63,5 +63,5 @@ return a; } - + if (is_float32_nan(b)) { if (is_float32_signan(b)) { @@ -71,5 +71,5 @@ return b; } - + if (is_float32_infinity(a)) { if (is_float32_infinity(b)) { @@ -83,5 +83,5 @@ return result; } - + if (is_float32_infinity(b)) { if (is_float32_zero(a)) { @@ -96,5 +96,5 @@ return result; } - + if (is_float32_zero(b)) { if (is_float32_zero(a)) { @@ -108,10 +108,10 @@ return result; } - + afrac = a.parts.fraction; aexp = a.parts.exp; bfrac = b.parts.fraction; bexp = b.parts.exp; - + /* denormalized numbers */ if (aexp == 0) { @@ -121,5 +121,5 @@ return result; } - + /* normalize it*/ afrac <<= 1; @@ -130,5 +130,5 @@ } } - + if (bexp == 0) { bfrac <<= 1; @@ -139,22 +139,22 @@ } } - + afrac = (afrac | FLOAT32_HIDDEN_BIT_MASK) << (32 - FLOAT32_FRACTION_SIZE - 1); bfrac = (bfrac | FLOAT32_HIDDEN_BIT_MASK) << (32 - FLOAT32_FRACTION_SIZE); - + if (bfrac <= (afrac << 1)) { afrac >>= 1; aexp++; } - + cexp = aexp - bexp + FLOAT32_BIAS - 2; - + cfrac = (afrac << 32) / bfrac; if ((cfrac & 0x3F) == 0) { cfrac |= (bfrac * cfrac != afrac << 32); } - + /* pack and round */ - + /* find first nonzero digit and shift result and detect possibly underflow */ while ((cexp > 0) && (cfrac) && (!(cfrac & (FLOAT32_HIDDEN_BIT_MASK << 7)))) { @@ -163,12 +163,12 @@ /* TODO: fix underflow */ } - + cfrac += (0x1 << 6); /* FIXME: 7 is not sure*/ - + if (cfrac & (FLOAT32_HIDDEN_BIT_MASK << 7)) { ++cexp; cfrac >>= 1; } - + /* check overflow */ if (cexp >= FLOAT32_MAX_EXPONENT) { @@ -178,5 +178,5 @@ return result; } - + if (cexp < 0) { /* FIXME: underflow */ @@ -194,7 +194,7 @@ result.parts.exp = (uint32_t) cexp; } - + result.parts.fraction = ((cfrac >> 6) & (~FLOAT32_HIDDEN_BIT_MASK)); - + return result; } @@ -215,7 +215,7 @@ uint64_t remlo, remhi; uint64_t tmplo, tmphi; - + result.parts.sign = a.parts.sign ^ b.parts.sign; - + if (is_float64_nan(a)) { if (is_float64_signan(b)) { @@ -223,5 +223,5 @@ return b; } - + if (is_float64_signan(a)) { // FIXME: SigNaN @@ -230,5 +230,5 @@ return a; } - + if (is_float64_nan(b)) { if (is_float64_signan(b)) { @@ -238,5 +238,5 @@ return b; } - + if (is_float64_infinity(a)) { if (is_float64_infinity(b) || is_float64_zero(b)) { @@ -250,5 +250,5 @@ return result; } - + if (is_float64_infinity(b)) { if (is_float64_zero(a)) { @@ -263,5 +263,5 @@ return result; } - + if (is_float64_zero(b)) { if (is_float64_zero(a)) { @@ -275,10 +275,10 @@ return result; } - + afrac = a.parts.fraction; aexp = a.parts.exp; bfrac = b.parts.fraction; bexp = b.parts.exp; - + /* denormalized numbers */ if (aexp == 0) { @@ -288,5 +288,5 @@ return result; } - + /* normalize it*/ aexp++; @@ -297,5 +297,5 @@ } } - + if (bexp == 0) { bexp++; @@ -306,21 +306,21 @@ } } - + afrac = (afrac | FLOAT64_HIDDEN_BIT_MASK) << (64 - FLOAT64_FRACTION_SIZE - 2); bfrac = (bfrac | FLOAT64_HIDDEN_BIT_MASK) << (64 - FLOAT64_FRACTION_SIZE - 1); - + if (bfrac <= (afrac << 1)) { afrac >>= 1; aexp++; } - + cexp = aexp - bexp + FLOAT64_BIAS - 2; - + cfrac = div128est(afrac, 0x0ll, bfrac); - + if ((cfrac & 0x1FF) <= 2) { mul64(bfrac, cfrac, &tmphi, &tmplo); sub128(afrac, 0x0ll, tmphi, tmplo, &remhi, &remlo); - + while ((int64_t) remhi < 0) { cfrac--; @@ -329,5 +329,5 @@ cfrac |= (remlo != 0); } - + /* round and shift */ result = finish_float64(cexp, cfrac, result.parts.sign); @@ -351,7 +351,7 @@ uint64_t rem_hihi, rem_hilo, rem_lohi, rem_lolo; uint64_t tmp_hihi, tmp_hilo, tmp_lohi, tmp_lolo; - + result.parts.sign = a.parts.sign ^ b.parts.sign; - + if (is_float128_nan(a)) { if (is_float128_signan(b)) { @@ -359,5 +359,5 @@ return b; } - + if (is_float128_signan(a)) { // FIXME: SigNaN @@ -366,5 +366,5 @@ return a; } - + if (is_float128_nan(b)) { if (is_float128_signan(b)) { @@ -374,5 +374,5 @@ return b; } - + if (is_float128_infinity(a)) { if (is_float128_infinity(b) || is_float128_zero(b)) { @@ -388,5 +388,5 @@ return result; } - + if (is_float128_infinity(b)) { if (is_float128_zero(a)) { @@ -403,5 +403,5 @@ return result; } - + if (is_float128_zero(b)) { if (is_float128_zero(a)) { @@ -417,5 +417,5 @@ return result; } - + afrac_hi = a.parts.frac_hi; afrac_lo = a.parts.frac_lo; @@ -424,5 +424,5 @@ bfrac_lo = b.parts.frac_lo; bexp = b.parts.exp; - + /* denormalized numbers */ if (aexp == 0) { @@ -433,5 +433,5 @@ return result; } - + /* normalize it*/ aexp++; @@ -445,5 +445,5 @@ } } - + if (bexp == 0) { bexp++; @@ -457,5 +457,5 @@ } } - + or128(afrac_hi, afrac_lo, FLOAT128_HIDDEN_BIT_MASK_HI, FLOAT128_HIDDEN_BIT_MASK_LO, @@ -468,17 +468,17 @@ lshift128(bfrac_hi, bfrac_lo, (128 - FLOAT128_FRACTION_SIZE - 1), &bfrac_hi, &bfrac_lo); - + if (le128(bfrac_hi, bfrac_lo, afrac_hi, afrac_lo)) { rshift128(afrac_hi, afrac_lo, 1, &afrac_hi, &afrac_lo); aexp++; } - + cexp = aexp - bexp + FLOAT128_BIAS - 2; - + cfrac_hi = div128est(afrac_hi, afrac_lo, bfrac_hi); - + mul128(bfrac_hi, bfrac_lo, 0x0ll, cfrac_hi, &tmp_lolo /* dummy */, &tmp_hihi, &tmp_hilo, &tmp_lohi); - + /* sub192(afrac_hi, afrac_lo, 0, * tmp_hihi, tmp_hilo, tmp_lohi @@ -489,5 +489,5 @@ } rem_lohi = -tmp_lohi; - + while ((int64_t) rem_hihi < 0) { --cfrac_hi; @@ -500,11 +500,11 @@ } } - + cfrac_lo = div128est(rem_hilo, rem_lohi, bfrac_lo); - + if ((cfrac_lo & 0x3FFF) <= 4) { mul128(bfrac_hi, bfrac_lo, 0x0ll, cfrac_lo, &tmp_hihi /* dummy */, &tmp_hilo, &tmp_lohi, &tmp_lolo); - + /* sub192(rem_hilo, rem_lohi, 0, * tmp_hilo, tmp_lohi, tmp_lolo, @@ -515,5 +515,5 @@ } rem_lolo = -tmp_lolo; - + while ((int64_t) rem_hilo < 0) { --cfrac_lo; @@ -526,12 +526,12 @@ } } - + cfrac_lo |= ((rem_hilo | rem_lohi | rem_lolo) != 0 ); } - + shift_out = cfrac_lo << (64 - (128 - FLOAT128_FRACTION_SIZE - 1)); rshift128(cfrac_hi, cfrac_lo, (128 - FLOAT128_FRACTION_SIZE - 1), &cfrac_hi, &cfrac_lo); - + result = finish_float128(cexp, cfrac_hi, cfrac_lo, result.parts.sign, shift_out); return result; @@ -544,11 +544,11 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + float32_u res; res.data = div_float32(ua.data, ub.data); - + return res.val; } @@ -558,11 +558,11 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + float32_u res; res.data = div_float32(ua.data, ub.data); - + return res.val; } @@ -576,11 +576,11 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + float64_u res; res.data = div_float64(ua.data, ub.data); - + return res.val; } @@ -590,11 +590,11 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + float64_u res; res.data = div_float64(ua.data, ub.data); - + return res.val; } @@ -608,11 +608,11 @@ float128_u ua; ua.val = a; - + float128_u ub; ub.val = b; - + float128_u res; res.data = div_float128(ua.data, ub.data); - + return res.val; } Index: uspace/lib/softfloat/mul.c =================================================================== --- uspace/lib/softfloat/mul.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/softfloat/mul.c (revision 615e83d68dc1cfdb51a3e2557d4776a37010a7ca) @@ -51,7 +51,7 @@ uint64_t frac1, frac2; int32_t exp; - + result.parts.sign = a.parts.sign ^ b.parts.sign; - + if (is_float32_nan(a) || is_float32_nan(b)) { /* TODO: fix SigNaNs */ @@ -61,5 +61,5 @@ return result; } - + if (is_float32_signan(b)) { /* TODO: fix SigNaN */ result.parts.fraction = b.parts.fraction; @@ -67,10 +67,10 @@ return result; } - + /* set NaN as result */ result.bin = FLOAT32_NAN; return result; } - + if (is_float32_infinity(a)) { if (is_float32_zero(b)) { @@ -79,10 +79,10 @@ return result; } - + result.parts.fraction = a.parts.fraction; result.parts.exp = a.parts.exp; return result; } - + if (is_float32_infinity(b)) { if (is_float32_zero(a)) { @@ -91,14 +91,14 @@ return result; } - + result.parts.fraction = b.parts.fraction; result.parts.exp = b.parts.exp; return result; } - + /* exp is signed so we can easy detect underflow */ exp = a.parts.exp + b.parts.exp; exp -= FLOAT32_BIAS; - + if (exp >= FLOAT32_MAX_EXPONENT) { /* FIXME: overflow */ @@ -108,5 +108,5 @@ return result; } - + if (exp < 0) { /* FIXME: underflow */ @@ -116,5 +116,5 @@ return result; } - + frac1 = a.parts.fraction; if (a.parts.exp > 0) { @@ -123,7 +123,7 @@ ++exp; } - + frac2 = b.parts.fraction; - + if (b.parts.exp > 0) { frac2 |= FLOAT32_HIDDEN_BIT_MASK; @@ -131,9 +131,9 @@ ++exp; } - + frac1 <<= 1; /* one bit space for rounding */ - + frac1 = frac1 * frac2; - + /* round and return */ while ((exp < FLOAT32_MAX_EXPONENT) && @@ -143,9 +143,9 @@ frac1 >>= 1; } - + /* rounding */ /* ++frac1; FIXME: not works - without it is ok */ frac1 >>= 1; /* shift off rounding space */ - + if ((exp < FLOAT32_MAX_EXPONENT) && (frac1 >= (1 << (FLOAT32_FRACTION_SIZE + 1)))) { @@ -153,5 +153,5 @@ frac1 >>= 1; } - + if (exp >= FLOAT32_MAX_EXPONENT) { /* TODO: fix overflow */ @@ -161,16 +161,16 @@ return result; } - + exp -= FLOAT32_FRACTION_SIZE; - + if (exp <= FLOAT32_FRACTION_SIZE) { /* denormalized number */ frac1 >>= 1; /* denormalize */ - + while ((frac1 > 0) && (exp < 0)) { frac1 >>= 1; ++exp; } - + if (frac1 == 0) { /* FIXME : underflow */ @@ -180,8 +180,8 @@ } } - + result.parts.exp = exp; result.parts.fraction = frac1 & ((1 << FLOAT32_FRACTION_SIZE) - 1); - + return result; } @@ -200,7 +200,7 @@ uint64_t frac1, frac2; int32_t exp; - + result.parts.sign = a.parts.sign ^ b.parts.sign; - + if (is_float64_nan(a) || is_float64_nan(b)) { /* TODO: fix SigNaNs */ @@ -219,5 +219,5 @@ return result; } - + if (is_float64_infinity(a)) { if (is_float64_zero(b)) { @@ -230,5 +230,5 @@ return result; } - + if (is_float64_infinity(b)) { if (is_float64_zero(a)) { @@ -241,10 +241,10 @@ return result; } - + /* exp is signed so we can easy detect underflow */ exp = a.parts.exp + b.parts.exp - FLOAT64_BIAS; - + frac1 = a.parts.fraction; - + if (a.parts.exp > 0) { frac1 |= FLOAT64_HIDDEN_BIT_MASK; @@ -252,7 +252,7 @@ ++exp; } - + frac2 = b.parts.fraction; - + if (b.parts.exp > 0) { frac2 |= FLOAT64_HIDDEN_BIT_MASK; @@ -260,10 +260,10 @@ ++exp; } - + frac1 <<= (64 - FLOAT64_FRACTION_SIZE - 1); frac2 <<= (64 - FLOAT64_FRACTION_SIZE - 2); - + mul64(frac1, frac2, &frac1, &frac2); - + frac1 |= (frac2 != 0); if (frac1 & (0x1ll << 62)) { @@ -271,5 +271,5 @@ exp--; } - + result = finish_float64(exp, frac1, result.parts.sign); return result; @@ -289,7 +289,7 @@ uint64_t frac1_hi, frac1_lo, frac2_hi, frac2_lo, tmp_hi, tmp_lo; int32_t exp; - + result.parts.sign = a.parts.sign ^ b.parts.sign; - + if (is_float128_nan(a) || is_float128_nan(b)) { /* TODO: fix SigNaNs */ @@ -311,5 +311,5 @@ return result; } - + if (is_float128_infinity(a)) { if (is_float128_zero(b)) { @@ -324,5 +324,5 @@ return result; } - + if (is_float128_infinity(b)) { if (is_float128_zero(a)) { @@ -337,11 +337,11 @@ return result; } - + /* exp is signed so we can easy detect underflow */ exp = a.parts.exp + b.parts.exp - FLOAT128_BIAS - 1; - + frac1_hi = a.parts.frac_hi; frac1_lo = a.parts.frac_lo; - + if (a.parts.exp > 0) { or128(frac1_hi, frac1_lo, @@ -351,8 +351,8 @@ ++exp; } - + frac2_hi = b.parts.frac_hi; frac2_lo = b.parts.frac_lo; - + if (b.parts.exp > 0) { or128(frac2_hi, frac2_lo, @@ -362,8 +362,8 @@ ++exp; } - + lshift128(frac2_hi, frac2_lo, 128 - FLOAT128_FRACTION_SIZE, &frac2_hi, &frac2_lo); - + tmp_hi = frac1_hi; tmp_lo = frac1_lo; @@ -372,5 +372,5 @@ add128(frac1_hi, frac1_lo, tmp_hi, tmp_lo, &frac1_hi, &frac1_lo); frac2_hi |= (frac2_lo != 0x0ll); - + if ((FLOAT128_HIDDEN_BIT_MASK_HI << 1) <= frac1_hi) { frac2_hi >>= 1; @@ -381,5 +381,5 @@ ++exp; } - + result = finish_float128(exp, frac1_hi, frac1_lo, result.parts.sign, frac2_hi); return result; @@ -392,11 +392,11 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + float32_u res; res.data = mul_float32(ua.data, ub.data); - + return res.val; } @@ -406,11 +406,11 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + float32_u res; res.data = mul_float32(ua.data, ub.data); - + return res.val; } @@ -424,11 +424,11 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + float64_u res; res.data = mul_float64(ua.data, ub.data); - + return res.val; } @@ -438,11 +438,11 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + float64_u res; res.data = mul_float64(ua.data, ub.data); - + return res.val; } @@ -456,11 +456,11 @@ float128_u ua; ua.val = a; - + float128_u ub; ub.val = b; - + float128_u res; res.data = mul_float128(ua.data, ub.data); - + return res.val; } Index: uspace/lib/softfloat/neg.c =================================================================== --- uspace/lib/softfloat/neg.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/softfloat/neg.c (revision 615e83d68dc1cfdb51a3e2557d4776a37010a7ca) @@ -43,7 +43,7 @@ float32_u ua; ua.val = a; - + ua.data.parts.sign = !ua.data.parts.sign; - + return ua.val; } @@ -57,7 +57,7 @@ float64_u ua; ua.val = a; - + ua.data.parts.sign = !ua.data.parts.sign; - + return ua.val; } @@ -71,7 +71,7 @@ float128_u ua; ua.val = a; - + ua.data.parts.sign = !ua.data.parts.sign; - + return ua.val; } Index: uspace/lib/softfloat/sub.c =================================================================== --- uspace/lib/softfloat/sub.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/lib/softfloat/sub.c (revision 615e83d68dc1cfdb51a3e2557d4776a37010a7ca) @@ -52,7 +52,7 @@ uint32_t exp1, exp2, frac1, frac2; float32 result; - + result.bin = 0; - + expdiff = a.parts.exp - b.parts.exp; if ((expdiff < 0 ) || ((expdiff == 0) && @@ -62,8 +62,8 @@ // TODO: fix SigNaN } - + return b; } - + if (b.parts.exp == FLOAT32_MAX_EXPONENT) { /* num -(+-inf) = -+inf */ @@ -71,7 +71,7 @@ return b; } - + result.parts.sign = !a.parts.sign; - + frac1 = b.parts.fraction; exp1 = b.parts.exp; @@ -84,8 +84,8 @@ // TODO: fix SigNaN } - + return a; } - + if (a.parts.exp == FLOAT32_MAX_EXPONENT) { if (b.parts.exp == FLOAT32_MAX_EXPONENT) { @@ -95,10 +95,10 @@ return result; } - + return a; } - + result.parts.sign = a.parts.sign; - + frac1 = a.parts.fraction; exp1 = a.parts.exp; @@ -106,5 +106,5 @@ exp2 = b.parts.exp; } - + if (exp1 == 0) { /* both are denormalized */ @@ -114,12 +114,12 @@ return result; } - + result.parts.exp = 0; return result; } - + /* add hidden bit */ frac1 |= FLOAT32_HIDDEN_BIT_MASK; - + if (exp2 == 0) { /* denormalized */ @@ -129,14 +129,14 @@ frac2 |= FLOAT32_HIDDEN_BIT_MASK; } - + /* create some space for rounding */ frac1 <<= 6; frac2 <<= 6; - + if (expdiff > FLOAT32_FRACTION_SIZE + 1) goto done; - + frac1 = frac1 - (frac2 >> expdiff); - + done: /* TODO: find first nonzero digit and shift result and detect possibly underflow */ @@ -146,17 +146,17 @@ /* TODO: fix underflow - frac1 == 0 does not necessary means underflow... */ } - + /* rounding - if first bit after fraction is set then round up */ frac1 += 0x20; - + if (frac1 & (FLOAT32_HIDDEN_BIT_MASK << 7)) { ++exp1; frac1 >>= 1; } - + /* Clear hidden bit and shift */ result.parts.fraction = ((frac1 >> 6) & (~FLOAT32_HIDDEN_BIT_MASK)); result.parts.exp = exp1; - + return result; } @@ -176,7 +176,7 @@ uint64_t frac1, frac2; float64 result; - + result.bin = 0; - + expdiff = a.parts.exp - b.parts.exp; if ((expdiff < 0 ) || @@ -186,8 +186,8 @@ // TODO: fix SigNaN } - + return b; } - + if (b.parts.exp == FLOAT64_MAX_EXPONENT) { /* num -(+-inf) = -+inf */ @@ -195,7 +195,7 @@ return b; } - + result.parts.sign = !a.parts.sign; - + frac1 = b.parts.fraction; exp1 = b.parts.exp; @@ -208,8 +208,8 @@ // TODO: fix SigNaN } - + return a; } - + if (a.parts.exp == FLOAT64_MAX_EXPONENT) { if (b.parts.exp == FLOAT64_MAX_EXPONENT) { @@ -219,10 +219,10 @@ return result; } - + return a; } - + result.parts.sign = a.parts.sign; - + frac1 = a.parts.fraction; exp1 = a.parts.exp; @@ -230,5 +230,5 @@ exp2 = b.parts.exp; } - + if (exp1 == 0) { /* both are denormalized */ @@ -238,12 +238,12 @@ return result; } - + result.parts.exp = 0; return result; } - + /* add hidden bit */ frac1 |= FLOAT64_HIDDEN_BIT_MASK; - + if (exp2 == 0) { /* denormalized */ @@ -253,14 +253,14 @@ frac2 |= FLOAT64_HIDDEN_BIT_MASK; } - + /* create some space for rounding */ frac1 <<= 6; frac2 <<= 6; - + if (expdiff > FLOAT64_FRACTION_SIZE + 1) goto done; - + frac1 = frac1 - (frac2 >> expdiff); - + done: /* TODO: find first nonzero digit and shift result and detect possibly underflow */ @@ -270,17 +270,17 @@ /* TODO: fix underflow - frac1 == 0 does not necessary means underflow... */ } - + /* rounding - if first bit after fraction is set then round up */ frac1 += 0x20; - + if (frac1 & (FLOAT64_HIDDEN_BIT_MASK << 7)) { ++exp1; frac1 >>= 1; } - + /* Clear hidden bit and shift */ result.parts.fraction = ((frac1 >> 6) & (~FLOAT64_HIDDEN_BIT_MASK)); result.parts.exp = exp1; - + return result; } @@ -300,8 +300,8 @@ uint64_t frac1_hi, frac1_lo, frac2_hi, frac2_lo, tmp_hi, tmp_lo; float128 result; - + result.bin.hi = 0; result.bin.lo = 0; - + expdiff = a.parts.exp - b.parts.exp; if ((expdiff < 0 ) || ((expdiff == 0) && @@ -311,8 +311,8 @@ // TODO: fix SigNaN } - + return b; } - + if (b.parts.exp == FLOAT128_MAX_EXPONENT) { /* num -(+-inf) = -+inf */ @@ -320,7 +320,7 @@ return b; } - + result.parts.sign = !a.parts.sign; - + frac1_hi = b.parts.frac_hi; frac1_lo = b.parts.frac_lo; @@ -335,8 +335,8 @@ // TODO: fix SigNaN } - + return a; } - + if (a.parts.exp == FLOAT128_MAX_EXPONENT) { if (b.parts.exp == FLOAT128_MAX_EXPONENT) { @@ -349,7 +349,7 @@ return a; } - + result.parts.sign = a.parts.sign; - + frac1_hi = a.parts.frac_hi; frac1_lo = a.parts.frac_lo; @@ -359,5 +359,5 @@ exp2 = b.parts.exp; } - + if (exp1 == 0) { /* both are denormalized */ @@ -369,14 +369,14 @@ return result; } - + result.parts.exp = 0; return result; } - + /* add hidden bit */ or128(frac1_hi, frac1_lo, FLOAT128_HIDDEN_BIT_MASK_HI, FLOAT128_HIDDEN_BIT_MASK_LO, &frac1_hi, &frac1_lo); - + if (exp2 == 0) { /* denormalized */ @@ -388,15 +388,15 @@ &frac2_hi, &frac2_lo); } - + /* create some space for rounding */ lshift128(frac1_hi, frac1_lo, 6, &frac1_hi, &frac1_lo); lshift128(frac2_hi, frac2_lo, 6, &frac2_hi, &frac2_lo); - + if (expdiff > FLOAT128_FRACTION_SIZE + 1) goto done; - + rshift128(frac2_hi, frac2_lo, expdiff, &tmp_hi, &tmp_lo); sub128(frac1_hi, frac1_lo, tmp_hi, tmp_lo, &frac1_hi, &frac1_lo); - + done: /* TODO: find first nonzero digit and shift result and detect possibly underflow */ @@ -408,13 +408,13 @@ lshift128(frac1_hi, frac1_lo, 1, &frac1_hi, &frac1_lo); /* TODO: fix underflow - frac1 == 0 does not necessary means underflow... */ - + lshift128(FLOAT128_HIDDEN_BIT_MASK_HI, FLOAT128_HIDDEN_BIT_MASK_LO, 6, &tmp_hi, &tmp_lo); and128(frac1_hi, frac1_lo, tmp_hi, tmp_lo, &tmp_hi, &tmp_lo); } - + /* rounding - if first bit after fraction is set then round up */ add128(frac1_hi, frac1_lo, 0x0ll, 0x20ll, &frac1_hi, &frac1_lo); - + lshift128(FLOAT128_HIDDEN_BIT_MASK_HI, FLOAT128_HIDDEN_BIT_MASK_LO, 7, &tmp_hi, &tmp_lo); @@ -424,5 +424,5 @@ rshift128(frac1_hi, frac1_lo, 1, &frac1_hi, &frac1_lo); } - + /* Clear hidden bit and shift */ rshift128(frac1_hi, frac1_lo, 6, &frac1_hi, &frac1_lo); @@ -432,7 +432,7 @@ result.parts.frac_hi = tmp_hi; result.parts.frac_lo = tmp_lo; - + result.parts.exp = exp1; - + return result; } @@ -444,10 +444,10 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + float32_u res; - + if (ua.data.parts.sign != ub.data.parts.sign) { ub.data.parts.sign = !ub.data.parts.sign; @@ -455,5 +455,5 @@ } else res.data = sub_float32(ua.data, ub.data); - + return res.val; } @@ -463,10 +463,10 @@ float32_u ua; ua.val = a; - + float32_u ub; ub.val = b; - + float32_u res; - + if (ua.data.parts.sign != ub.data.parts.sign) { ub.data.parts.sign = !ub.data.parts.sign; @@ -474,5 +474,5 @@ } else res.data = sub_float32(ua.data, ub.data); - + return res.val; } @@ -486,10 +486,10 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + float64_u res; - + if (ua.data.parts.sign != ub.data.parts.sign) { ub.data.parts.sign = !ub.data.parts.sign; @@ -497,5 +497,5 @@ } else res.data = sub_float64(ua.data, ub.data); - + return res.val; } @@ -505,10 +505,10 @@ float64_u ua; ua.val = a; - + float64_u ub; ub.val = b; - + float64_u res; - + if (ua.data.parts.sign != ub.data.parts.sign) { ub.data.parts.sign = !ub.data.parts.sign; @@ -516,5 +516,5 @@ } else res.data = sub_float64(ua.data, ub.data); - + return res.val; } @@ -528,10 +528,10 @@ float128_u ua; ua.val = a; - + float128_u ub; ub.val = b; - + float128_u res; - + if (ua.data.parts.sign != ub.data.parts.sign) { ub.data.parts.sign = !ub.data.parts.sign; @@ -539,5 +539,5 @@ } else res.data = sub_float128(ua.data, ub.data); - + return res.val; }