X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=fltpoint.c;h=fa1eb41ad9c78af887a63b444f099a4ecf184d95;hp=38bd0b59be21cd829b79cd8146c3d811caf587f3;hb=9153334781cd2e23750f4dc002e847606c07a1f0;hpb=29b32d134bc12831a8ddd098bf9aeeda26dcfe7c

diff --git a/fltpoint.c b/fltpoint.c
index 38bd0b5..fa1eb41 100644
--- a/fltpoint.c
+++ b/fltpoint.c
@@ -66,13 +66,13 @@
 
 uint32_t FloatToIEEE754(float f)
 {
-	uint32_t sign = (f < 0 ? 0x80000000 : 0);
+	uint32_t sign = (signbit(f) ? 0x80000000 : 0);
 
 	// Split the float into normalized mantissa (range: (-1, -0.5], 0,
 	// [+0.5, +1)) and base-2 exponent
 	// d = mantissa * (2 ^ exponent) *exactly* for FLT_RADIX=2
 	// Also, since we want the mantissa to be non-inverted (2's complemented),
-	// we make sure to pass in a positive number (floats/doubles are not 2's
+	// we make sure to pass in a positive number (floats/doubles are *not* 2's
 	// complemented) as we already captured the sign bit above.
 	int32_t exponent;
 	float mantissa = frexpf((f < 0 ? -f : f), &exponent);
@@ -104,14 +104,14 @@ uint32_t FloatToIEEE754(float f)
 
 uint64_t DoubleToIEEE754(double d)
 {
-	uint64_t sign = (d < 0 ? 0x8000000000000000LL : 0);
+	uint64_t sign = (signbit(d) ? 0x8000000000000000LL : 0);
 	int32_t exponent;
 
 	// Split double into normalized mantissa (range: (-1, -0.5], 0, [+0.5, +1))
 	// and base-2 exponent
 	// d = mantissa * (2 ^ exponent) *exactly* for FLT_RADIX=2
 	// Also, since we want the mantissa to be non-inverted (2's complemented),
-	// we make sure to pass in a positive number (floats/doubles are not 2's
+	// we make sure to pass in a positive number (floats/doubles are *not* 2's
 	// complemented) as we already captured the sign bit above.
 	double mantissa = frexp((d < 0 ? -d : d), &exponent);
 
@@ -141,9 +141,10 @@ uint64_t DoubleToIEEE754(double d)
 
 void DoubleToExtended(double d, uint8_t out[])
 {
+	int8_t sign = (signbit(d) ? 0x80 : 0);
 	int32_t exponent;
 	double mantissa = frexp((d < 0 ? -d : d), &exponent);
-	exponent += 0x3FFF;
+	exponent += 0x3FFE;
 
 	if (d == 0)
 		exponent = 0;
@@ -154,7 +155,7 @@ void DoubleToExtended(double d, uint8_t out[])
 	// Motorola extended floating point is 96 bits, so we pack it into the
 	// 12-byte array that's passed in. The format is as follows: 1 bit (sign),
 	// 15 bits (exponent w/$3FFF bias), 16 bits of zero, 64 bits of mantissa.
-	out[0] = (d < 0 ? 0x80 : 0x00) | ((exponent >> 8) & 0x7F);
+	out[0] = sign | ((exponent >> 8) & 0x7F);
 	out[1] = exponent & 0xFF;
 	out[2] = 0;
 	out[3] = 0;