X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftv%2Ffltcalc.c;h=1c6512c13194426dd154c587ae1c31efd6a3e751;hb=ad04ca468b29491e0e82bf0b11dda4f8114468a2;hp=a11c6f811206b9a285fa30b71485435d8404c79c;hpb=14c762ccfb8fa5f2ac8ebea5d4ab2c8dc37e79f3;p=libfirm

diff --git a/ir/tv/fltcalc.c b/ir/tv/fltcalc.c
index a11c6f811..1c6512c13 100644
--- a/ir/tv/fltcalc.c
+++ b/ir/tv/fltcalc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -22,82 +22,97 @@
  * @brief    tarval floating point calculations
  * @date     2003
  * @author   Mathias Heil
- * @version  $Id$
  */
-
 #include "config.h"
 
 #include "fltcalc.h"
 #include "strcalc.h"
+#include "error.h"
 
-#include <math.h>    /* need isnan() and isinf() (will be changed)*/
-/* undef some reused constants defined by math.h */
-#ifdef NAN
-#  undef NAN
-#endif
-
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
+#include <math.h>
+#include <inttypes.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
+#include <stdbool.h>
 
 #include "xmalloc.h"
 
+/*
+ * portability stuff (why do we even care about the msvc people with their C89?)
+ */
+
+
+static long double string_to_long_double(const char *str)
+{
+#if __STDC_VERSION__ >= 199901L || _POSIX_C_SOURCE >= 200112L
+	return strtold(str, NULL);
+#else
+	return strtod(str, NULL);
+#endif
+}
+
+static bool my_isnan(long double val)
+{
+#if __STDC_VERSION__ >= 199901L
+	return isnan(val);
+#else
+	/* hopefully the compiler does not optimize aggressively (=incorrect) */
+	return val != val;
+#endif
+}
+
+static bool my_isinf(long double val)
+{
+#if __STDC_VERSION__ >= 199901L
+	return isinf(val);
+#else
+	/* hopefully the compiler does not optimize aggressively (=incorrect) */
+	return my_isnan(val-val) && !my_isnan(val);
+#endif
+}
+
 /** The number of extra precision rounding bits */
 #define ROUNDING_BITS 2
 
-typedef uint32_t UINT32;
-
-#ifdef HAVE_LONG_DOUBLE
-#ifdef WORDS_BIGENDIAN
 typedef union {
 	struct {
-		UINT32 high;
-		UINT32 mid;
-		UINT32 low;
-	} val;
-	volatile long double d;
-} value_t;
+#ifdef WORDS_BIGENDIAN
+		uint32_t high;
 #else
-typedef union {
-	struct {
-		UINT32 low;
-		UINT32 mid;
-		UINT32 high;
-	} val;
-	volatile long double d;
-} value_t;
+		uint32_t low;
 #endif
-#else
+		uint32_t mid;
 #ifdef WORDS_BIGENDIAN
-typedef union {
-	struct {
-		UINT32 high;
-		UINT32 low;
-	} val;
-	volatile double d;
-} value_t;
+		uint32_t low;
 #else
-typedef union {
+		uint32_t high;
+#endif
+	} val_ld12;
 	struct {
-		UINT32 low;
-		UINT32 high;
-	} val;
-	volatile double d;
-} value_t;
+#ifdef WORDS_BIGENDIAN
+		uint32_t high;
+#else
+		uint32_t low;
 #endif
+#ifdef WORDS_BIGENDIAN
+		uint32_t low;
+#else
+		uint32_t high;
 #endif
+	} val_ld8;
+	volatile long double d;
+} value_t;
 
 #define CLEAR_BUFFER(buffer) memset(buffer, 0, calc_buffer_size)
 
 /* our floating point value */
-struct _fp_value {
-	ieee_descriptor_t desc;
+struct fp_value {
+	float_descriptor_t desc;
+	unsigned char clss;
 	char sign;
-	char value[1];			/* exp[value_size] + mant[value_size] */
+	char value[1];        /* exp[value_size] + mant[value_size] */
 };
 
 #define _exp(a)  &((a)->value[0])
@@ -120,9 +135,6 @@ struct _fp_value {
 #  define TRACEPRINTF(x) ((void)0)
 #endif
 
-/** The immediate precision. */
-static unsigned immediate_prec = 0;
-
 /** A temporal buffer. */
 static fp_value *calc_buffer = NULL;
 
@@ -136,38 +148,26 @@ static int max_precision;
 /** Exact flag. */
 static int fc_exact = 1;
 
-#if 0
-static void fail_char(const char *str, unsigned int len, int pos) {
-	if (*(str+pos))
-		printf("ERROR: Unexpected character '%c'\n", *(str + pos));
-	else
-		printf("ERROR: Unexpected end of string\n");
-	while (len-- && *str) printf("%c", *str++); printf("\n");
-	while (pos--) printf(" "); printf("^\n");
-	/* the front end has to to check constant strings */
-	exit(-1);
-}
-#endif
-
 /** pack machine-like */
-static void *pack(const fp_value *int_float, void *packed) {
+static void *pack(const fp_value *int_float, void *packed)
+{
 	char     *shift_val;
 	char     *temp;
 	fp_value *val_buffer;
 	int      pos;
 
-	temp      = alloca(value_size);
-	shift_val = alloca(value_size);
+	temp      = (char*) alloca(value_size);
+	shift_val = (char*) alloca(value_size);
 
-	switch ((value_class_t)int_float->desc.clss) {
-	case NAN:
-		val_buffer = alloca(calc_buffer_size);
+	switch ((value_class_t)int_float->clss) {
+	case FC_NAN:
+		val_buffer = (fp_value*) alloca(calc_buffer_size);
 		fc_get_qnan(&int_float->desc, val_buffer);
 		int_float = val_buffer;
 		break;
 
-	case INF:
-		val_buffer = alloca(calc_buffer_size);
+	case FC_INF:
+		val_buffer = (fp_value*) alloca(calc_buffer_size);
 		fc_get_plusinf(&int_float->desc, val_buffer);
 		val_buffer->sign = int_float->sign;
 		int_float = val_buffer;
@@ -213,21 +213,22 @@ static void *pack(const fp_value *int_float, void *packed) {
  *
  * @return non-zero if result is exact
  */
-static int normalize(const fp_value *in_val, fp_value *out_val, int sticky) {
+static int normalize(const fp_value *in_val, fp_value *out_val, int sticky)
+{
 	int exact = 1;
 	int hsb;
 	char lsb, guard, round, round_dir = 0;
-	char *temp = alloca(value_size);
+	char *temp = (char*) alloca(value_size);
 
 	/* save rounding bits at the end */
 	hsb = ROUNDING_BITS + in_val->desc.mantissa_size - sc_get_highest_set_bit(_mant(in_val)) - 1;
 
 	if (in_val != out_val)   {
 		out_val->sign = in_val->sign;
-		memcpy(&out_val->desc, &in_val->desc, sizeof(out_val->desc));
+		out_val->desc = in_val->desc;
 	}
 
-	out_val->desc.clss = NORMAL;
+	out_val->clss = FC_NORMAL;
 
 	/* mantissa all zeros, so zero exponent (because of explicit one) */
 	if (hsb == ROUNDING_BITS + in_val->desc.mantissa_size)   {
@@ -273,7 +274,7 @@ static int normalize(const fp_value *in_val, fp_value *out_val, int sticky) {
 		/* denormalized means exponent of zero */
 		sc_val_from_ulong(0, _exp(out_val));
 
-		out_val->desc.clss = SUBNORMAL;
+		out_val->clss = FC_SUBNORMAL;
 	}
 
 	/* perform rounding by adding a value that clears the guard bit and the round bit
@@ -319,24 +320,24 @@ static int normalize(const fp_value *in_val, fp_value *out_val, int sticky) {
 	}
 
 	/* could have rounded down to zero */
-	if (sc_is_zero(_mant(out_val)) && (out_val->desc.clss == SUBNORMAL))
-		out_val->desc.clss = ZERO;
+	if (sc_is_zero(_mant(out_val)) && (out_val->clss == FC_SUBNORMAL))
+		out_val->clss = FC_ZERO;
 
 	/* check for rounding overflow */
 	hsb = ROUNDING_BITS + out_val->desc.mantissa_size - sc_get_highest_set_bit(_mant(out_val)) - 1;
-	if ((out_val->desc.clss != SUBNORMAL) && (hsb < -1)) {
+	if ((out_val->clss != FC_SUBNORMAL) && (hsb < -1)) {
 		sc_val_from_ulong(1, temp);
 		_shift_right(_mant(out_val), temp, _mant(out_val));
 		if (exact && sc_had_carry())
 			exact = 0;
 		sc_add(_exp(out_val), temp, _exp(out_val));
-	} else if ((out_val->desc.clss == SUBNORMAL) && (hsb == -1)) {
+	} else if ((out_val->clss == FC_SUBNORMAL) && (hsb == -1)) {
 		/* overflow caused the mantissa to be normal again,
 		 * so adapt the exponent accordingly */
 		sc_val_from_ulong(1, temp);
 		sc_add(_exp(out_val), temp, _exp(out_val));
 
-		out_val->desc.clss = NORMAL;
+		out_val->clss = FC_NORMAL;
 	}
 	/* no further rounding is needed, because rounding overflow means
 	 * the carry of the original rounding was propagated all the way
@@ -368,7 +369,7 @@ static int normalize(const fp_value *in_val, fp_value *out_val, int sticky) {
 			switch (rounding_mode) {
 			case FC_TONEAREST:
 			case FC_TOPOSITIVE:
-				out_val->desc.clss = INF;
+				out_val->clss = FC_INF;
 				break;
 
 			case FC_TONEGATIVE:
@@ -380,7 +381,7 @@ static int normalize(const fp_value *in_val, fp_value *out_val, int sticky) {
 			switch (rounding_mode) {
 			case FC_TONEAREST:
 			case FC_TONEGATIVE:
-				out_val->desc.clss = INF;
+				out_val->clss = FC_INF;
 				break;
 
 			case FC_TOPOSITIVE:
@@ -398,12 +399,12 @@ static int normalize(const fp_value *in_val, fp_value *out_val, int sticky) {
  */
 #define handle_NAN(a, b, result) \
 do {                                                      \
-  if (a->desc.clss == NAN) {                              \
+  if (a->clss == FC_NAN) {                                \
     if (a != result) memcpy(result, a, calc_buffer_size); \
     fc_exact = 0;                                         \
     return;                                               \
   }                                                       \
-  if (b->desc.clss == NAN) {                              \
+  if (b->clss == FC_NAN) {                                \
     if (b != result) memcpy(result, b, calc_buffer_size); \
     fc_exact = 0;                                         \
     return;                                               \
@@ -414,7 +415,8 @@ do {                                                      \
 /**
  * calculate a + b, where a is the value with the bigger exponent
  */
-static void _fadd(const fp_value *a, const fp_value *b, fp_value *result) {
+static void _fadd(const fp_value *a, const fp_value *b, fp_value *result)
+{
 	char *temp;
 	char *exp_diff;
 
@@ -433,14 +435,14 @@ static void _fadd(const fp_value *a, const fp_value *b, fp_value *result) {
 	sign = a->sign ^ b->sign;
 
 	/* produce NaN on inf - inf */
-	if (sign && (a->desc.clss == INF) && (b->desc.clss == INF)) {
+	if (sign && (a->clss == FC_INF) && (b->clss == FC_INF)) {
 		fc_exact = 0;
 		fc_get_qnan(&a->desc, result);
 		return;
 	}
 
-	temp     = alloca(value_size);
-	exp_diff = alloca(value_size);
+	temp     = (char*) alloca(value_size);
+	exp_diff = (char*) alloca(value_size);
 
 	/* get exponent difference */
 	sc_sub(_exp(a), _exp(b), exp_diff);
@@ -471,17 +473,17 @@ static void _fadd(const fp_value *a, const fp_value *b, fp_value *result) {
 	result->sign = res_sign;
 
 	/* sign has been taken care of, check for special cases */
-	if (a->desc.clss == ZERO || b->desc.clss == INF) {
+	if (a->clss == FC_ZERO || b->clss == FC_INF) {
 		if (b != result)
 			memcpy(result, b, calc_buffer_size);
-		fc_exact = b->desc.clss == NORMAL;
+		fc_exact = b->clss == FC_NORMAL;
 		result->sign = res_sign;
 		return;
 	}
-	if (b->desc.clss == ZERO || a->desc.clss == INF) {
+	if (b->clss == FC_ZERO || a->clss == FC_INF) {
 		if (a != result)
 			memcpy(result, a, calc_buffer_size);
-		fc_exact = a->desc.clss == NORMAL;
+		fc_exact = a->clss == FC_NORMAL;
 		result->sign = res_sign;
 		return;
 	}
@@ -489,7 +491,7 @@ static void _fadd(const fp_value *a, const fp_value *b, fp_value *result) {
 	/* shift the smaller value to the right to align the radix point */
 	/* subnormals have their radix point shifted to the right,
 	 * take care of this first */
-	if ((b->desc.clss == SUBNORMAL) && (a->desc.clss != SUBNORMAL)) {
+	if ((b->clss == FC_SUBNORMAL) && (a->clss != FC_SUBNORMAL)) {
 		sc_val_from_ulong(1, temp);
 		sc_sub(exp_diff, temp, exp_diff);
 	}
@@ -502,7 +504,7 @@ static void _fadd(const fp_value *a, const fp_value *b, fp_value *result) {
 		/* if subtracting a little more than the represented value or adding a little
 		 * more than the represented value to a negative value this, in addition to the
 		 * still set sticky bit, takes account of the 'little more' */
-		char *temp1 = alloca(calc_buffer_size);
+		char *temp1 = (char*) alloca(calc_buffer_size);
 		sc_val_from_ulong(1, temp1);
 		sc_add(temp, temp1, temp);
 	}
@@ -518,7 +520,7 @@ static void _fadd(const fp_value *a, const fp_value *b, fp_value *result) {
 
 	/* _normalize expects a 'normal' radix point, adding two subnormals
 	 * results in a subnormal radix point -> shifting before normalizing */
-	if ((a->desc.clss == SUBNORMAL) && (b->desc.clss == SUBNORMAL)) {
+	if ((a->clss == FC_SUBNORMAL) && (b->clss == FC_SUBNORMAL)) {
 		sc_val_from_ulong(1, NULL);
 		_shift_left(_mant(result), sc_get_buffer(), _mant(result));
 	}
@@ -532,7 +534,8 @@ static void _fadd(const fp_value *a, const fp_value *b, fp_value *result) {
 /**
  * calculate a * b
  */
-static void _fmul(const fp_value *a, const fp_value *b, fp_value *result) {
+static void _fmul(const fp_value *a, const fp_value *b, fp_value *result)
+{
 	int sticky;
 	char *temp;
 	char res_sign;
@@ -541,7 +544,7 @@ static void _fmul(const fp_value *a, const fp_value *b, fp_value *result) {
 
 	handle_NAN(a, b, result);
 
-	temp = alloca(value_size);
+	temp = (char*) alloca(value_size);
 
 	if (result != a && result != b)
 		result->desc = a->desc;
@@ -549,8 +552,8 @@ static void _fmul(const fp_value *a, const fp_value *b, fp_value *result) {
 	result->sign = res_sign = a->sign ^ b->sign;
 
 	/* produce NaN on 0 * inf */
-	if (a->desc.clss == ZERO) {
-		if (b->desc.clss == INF) {
+	if (a->clss == FC_ZERO) {
+		if (b->clss == FC_INF) {
 			fc_get_qnan(&a->desc, result);
 			fc_exact = 0;
 		} else {
@@ -560,8 +563,8 @@ static void _fmul(const fp_value *a, const fp_value *b, fp_value *result) {
 		}
 		return;
 	}
-	if (b->desc.clss == ZERO) {
-		if (a->desc.clss == INF) {
+	if (b->clss == FC_ZERO) {
+		if (a->clss == FC_INF) {
 			fc_get_qnan(&a->desc, result);
 			fc_exact = 0;
 		} else {
@@ -572,14 +575,14 @@ static void _fmul(const fp_value *a, const fp_value *b, fp_value *result) {
 		return;
 	}
 
-	if (a->desc.clss == INF) {
+	if (a->clss == FC_INF) {
 		fc_exact = 0;
 		if (a != result)
 			memcpy(result, a, calc_buffer_size);
 		result->sign = res_sign;
 		return;
 	}
-	if (b->desc.clss == INF) {
+	if (b->clss == FC_INF) {
 		fc_exact = 0;
 		if (b != result)
 			memcpy(result, b, calc_buffer_size);
@@ -594,7 +597,7 @@ static void _fmul(const fp_value *a, const fp_value *b, fp_value *result) {
 	sc_sub(_exp(result), temp, _exp(result));
 
 	/* mixed normal, subnormal values introduce an error of 1, correct it */
-	if ((a->desc.clss == SUBNORMAL) ^ (b->desc.clss == SUBNORMAL)) {
+	if ((a->clss == FC_SUBNORMAL) ^ (b->clss == FC_SUBNORMAL)) {
 		sc_val_from_ulong(1, temp);
 		sc_add(_exp(result), temp, _exp(result));
 	}
@@ -618,7 +621,8 @@ static void _fmul(const fp_value *a, const fp_value *b, fp_value *result) {
 /**
  * calculate a / b
  */
-static void _fdiv(const fp_value *a, const fp_value *b, fp_value *result) {
+static void _fdiv(const fp_value *a, const fp_value *b, fp_value *result)
+{
 	int sticky;
 	char *temp, *dividend;
 	char res_sign;
@@ -627,17 +631,17 @@ static void _fdiv(const fp_value *a, const fp_value *b, fp_value *result) {
 
 	handle_NAN(a, b, result);
 
-	temp = alloca(value_size);
-	dividend = alloca(value_size);
+	temp = (char*) alloca(value_size);
+	dividend = (char*) alloca(value_size);
 
 	if (result != a && result != b)
 		result->desc = a->desc;
 
 	result->sign = res_sign = a->sign ^ b->sign;
 
-	/* produce NAN on 0/0 and inf/inf */
-	if (a->desc.clss == ZERO) {
-		if (b->desc.clss == ZERO) {
+	/* produce FC_NAN on 0/0 and inf/inf */
+	if (a->clss == FC_ZERO) {
+		if (b->clss == FC_ZERO) {
 			/* 0/0 -> NaN */
 			fc_get_qnan(&a->desc, result);
 			fc_exact = 0;
@@ -650,9 +654,9 @@ static void _fdiv(const fp_value *a, const fp_value *b, fp_value *result) {
 		return;
 	}
 
-	if (b->desc.clss == INF) {
+	if (b->clss == FC_INF) {
 		fc_exact = 0;
-		if (a->desc.clss == INF) {
+		if (a->clss == FC_INF) {
 			/* inf/inf -> NaN */
 			fc_get_qnan(&a->desc, result);
 		} else {
@@ -660,12 +664,12 @@ static void _fdiv(const fp_value *a, const fp_value *b, fp_value *result) {
 			sc_val_from_ulong(0, NULL);
 			_save_result(_exp(result));
 			_save_result(_mant(result));
-			result->desc.clss = ZERO;
+			result->clss = FC_ZERO;
 		}
 		return;
 	}
 
-	if (a->desc.clss == INF) {
+	if (a->clss == FC_INF) {
 		fc_exact = 0;
 		/* inf/x -> inf */
 		if (a != result)
@@ -673,7 +677,7 @@ static void _fdiv(const fp_value *a, const fp_value *b, fp_value *result) {
 		result->sign = res_sign;
 		return;
 	}
-	if (b->desc.clss == ZERO) {
+	if (b->clss == FC_ZERO) {
 		fc_exact = 0;
 		/* division by zero */
 		if (result->sign)
@@ -689,7 +693,7 @@ static void _fdiv(const fp_value *a, const fp_value *b, fp_value *result) {
 	sc_add(_exp(result), temp, _exp(result));
 
 	/* mixed normal, subnormal values introduce an error of 1, correct it */
-	if ((a->desc.clss == SUBNORMAL) ^ (b->desc.clss == SUBNORMAL)) {
+	if ((a->clss == FC_SUBNORMAL) ^ (b->clss == FC_SUBNORMAL)) {
 		sc_val_from_ulong(1, temp);
 		sc_add(_exp(result), temp, _exp(result));
 	}
@@ -705,7 +709,7 @@ static void _fdiv(const fp_value *a, const fp_value *b, fp_value *result) {
 	_shift_left(_mant(a), temp, dividend);
 
 	{
-		char *divisor = alloca(calc_buffer_size);
+		char *divisor = (char*) alloca(calc_buffer_size);
 		sc_val_from_ulong(1, divisor);
 		_shift_right(_mant(b), divisor, divisor);
 		sc_div(dividend, divisor, _mant(result));
@@ -717,7 +721,8 @@ static void _fdiv(const fp_value *a, const fp_value *b, fp_value *result) {
 }
 
 #if 0
-static void _power_of_ten(int exp, ieee_descriptor_t *desc, char *result) {
+static void _power_of_ten(int exp, float_descriptor_t *desc, char *result)
+{
 	char *build;
 	char *temp;
 
@@ -759,7 +764,8 @@ static void _power_of_ten(int exp, ieee_descriptor_t *desc, char *result) {
  *
  * This does not clip to any integer range.
  */
-static void _trunc(const fp_value *a, fp_value *result) {
+static void _trunc(const fp_value *a, fp_value *result)
+{
 	/*
 	 * When exponent == 0 all bits left of the radix point
 	 * are the integral part of the value. For 15bit exp_size
@@ -778,10 +784,12 @@ static void _trunc(const fp_value *a, fp_value *result) {
 	/* fixme: can be exact */
 	fc_exact = 0;
 
-	temp = alloca(value_size);
+	temp = (char*) alloca(value_size);
 
-	if (a != result)
+	if (a != result) {
 		result->desc = a->desc;
+		result->clss = a->clss;
+	}
 
 	exp_bias = (1 << (a->desc.exponent_size - 1)) - 1;
 	exp_val  = sc_val_to_long(_exp(a)) - exp_bias;
@@ -790,12 +798,12 @@ static void _trunc(const fp_value *a, fp_value *result) {
 		sc_val_from_ulong(0, NULL);
 		_save_result(_exp(result));
 		_save_result(_mant(result));
-		result->desc.clss = ZERO;
+		result->clss = FC_ZERO;
 
 		return;
 	}
 
-	if (exp_val > a->desc.mantissa_size) {
+	if (exp_val > (long)a->desc.mantissa_size) {
 		if (a != result)
 			memcpy(result, a, calc_buffer_size);
 
@@ -820,278 +828,90 @@ static void _trunc(const fp_value *a, fp_value *result) {
 /********
  * functions defined in fltcalc.h
  ********/
-const void *fc_get_buffer(void) {
+const void *fc_get_buffer(void)
+{
 	return calc_buffer;
 }
 
-int fc_get_buffer_length(void) {
+int fc_get_buffer_length(void)
+{
 	return calc_buffer_size;
 }
 
-void *fc_val_from_str(const char *str, unsigned int len, const ieee_descriptor_t *desc, void *result) {
-#if 0
-	enum {
-		START,
-		LEFT_OF_DOT,
-		RIGHT_OF_DOT,
-		EXP_START,
-		EXPONENT,
-		END
-	};
-
-	char exp_sign;
-	int exp_int, hsb, state;
-
-	const char *old_str;
-
-	int pos;
-	char *mant_str, *exp_val, *power_val;
-
-	(void) len;
-	if (result == NULL) result = calc_buffer;
-
-	exp_val = alloca(value_size);
-	power_val = alloca(calc_buffer_size);
-	mant_str = alloca((len)?(len):(strlen(str)));
-
-	result->desc.exponent_size = desc->exponent_size;
-	result->desc.mantissa_size = desc->mantissa_size;
-	result->desc.explicit_one  = desc->explicit_one;
-	result->desc.clss          = NORMAL;
-
-	old_str = str;
-	pos = 0;
-	exp_int = 0;
-	state = START;
-
-	while (len == 0 || str-old_str < len) {
-		switch (state) {
-		case START:
-			switch (*str) {
-			case '+':
-				result->sign = 0;
-				state = LEFT_OF_DOT;
-				str++;
-				break;
-
-			case '-':
-				result->sign = 1;
-				state = LEFT_OF_DOT;
-				str++;
-				break;
-
-			case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-				result->sign = 0;
-				state = LEFT_OF_DOT;
-				break;
-
-			case '.':
-				result->sign = 0;
-				state = RIGHT_OF_DOT;
-				str++;
-				break;
-
-			case 'n':
-			case 'N':
-			case 'i':
-			case 'I':
-				break;
-
-			default:
-				fail_char(old_str, len, str - old_str);
-			}
-			break;
-
-		case LEFT_OF_DOT:
-			switch (*str) {
-			case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-				mant_str[pos++] = *(str++);
-				break;
-
-			case '.':
-				state = RIGHT_OF_DOT;
-				str++;
-				break;
-
-			case 'e':
-			case 'E':
-				state = EXP_START;
-				str++;
-				break;
-
-			case '\0':
-				mant_str[pos] = '\0';
-				goto done;
-
-			default:
-				fail_char(old_str, len, str - old_str);
-			}
-			break;
-
-		case RIGHT_OF_DOT:
-			switch (*str) {
-			case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-				mant_str[pos++] = *(str++);
-				exp_int++;
-				break;
-
-			case 'e':
-			case 'E':
-				state = EXP_START;
-				str++;
-				break;
-
-			case '\0':
-				mant_str[pos] = '\0';
-				goto done;
-
-			default:
-				fail_char(old_str, len, str - old_str);
-			}
-			break;
-
-		case EXP_START:
-			switch (*str) {
-			case '-':
-				exp_sign = 1;
-				/* fall through */
-			case '+':
-				if (*(str-1) != 'e' && *(str-1) != 'E') fail_char(old_str, len, str - old_str);
-				str++;
-				break;
-
-			case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-				mant_str[pos] = '\0';
-				pos = 1;
-				str++;
-				state = EXPONENT;
-				break;
-
-			default:
-				fail_char(old_str, len, str - old_str);
-			}
-			break;
-
-		case EXPONENT:
-			switch (*str) {
-			case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-				pos++;
-				str++;
-				break;
-
-			case '\0': goto done;
-
-			default:
-				fail_char(old_str, len, str - old_str);
-			}
-		}
-	} /*  switch(state) */
-
-done:
-	sc_val_from_str(mant_str, strlen(mant_str), _mant(result));
-
-	/* shift to put value left of radix point */
-	sc_val_from_ulong(mant_size + ROUNDING_BITS, exp_val);
-
-	_shift_left(_mant(result), exp_val, _mant(result));
-
-	sc_val_from_ulong((1 << (exp_size - 1)) - 1, _exp(result));
-
-	_normalize(result, result, 0);
-
-	if (state == EXPONENT) {
-		exp_int -= atoi(str-pos);
-	}
-
-	_power_of_ten(exp_int, &result->desc, power_val);
-
-	_fdiv(result, power_val, result);
+void *fc_val_from_str(const char *str, size_t len,
+                      const float_descriptor_t *desc, void *result)
+{
+	char *buffer;
 
-	return result;
-#else
 	/* XXX excuse of an implementation to make things work */
-	LLDBL             val;
-	fp_value          *tmp = alloca(calc_buffer_size);
-	ieee_descriptor_t tmp_desc;
-	(void) len;
+	long double        val;
+	fp_value          *tmp = (fp_value*) alloca(calc_buffer_size);
+	float_descriptor_t tmp_desc;
+
+	buffer = (char*) alloca(len+1);
+	memcpy(buffer, str, len);
+	buffer[len] = '\0';
+	val = string_to_long_double(buffer);
 
-#if defined(HAVE_LONG_DOUBLE) && !defined(__CYGWIN__)
-	val = strtold(str, NULL);
 	DEBUGPRINTF(("val_from_str(%s)\n", str));
 	tmp_desc.exponent_size = 15;
 	tmp_desc.mantissa_size = 63;
 	tmp_desc.explicit_one  = 1;
-	tmp_desc.clss          = NORMAL;
-	fc_val_from_ieee754(val, &tmp_desc, tmp);
-#else
-	val = strtod(str, NULL);
-	DEBUGPRINTF(("val_from_str(%s)\n", str));
-	tmp_desc.exponent_size = 11;
-	tmp_desc.mantissa_size = 52;
-	tmp_desc.explicit_one  = 0;
-	tmp_desc.clss          = NORMAL;
 	fc_val_from_ieee754(val, &tmp_desc, tmp);
-#endif /* HAVE_LONG_DOUBLE */
-	return fc_cast(tmp, desc, result);
-#endif
+
+	return fc_cast(tmp, desc, (fp_value*) result);
 }
 
-fp_value *fc_val_from_ieee754(LLDBL l, const ieee_descriptor_t *desc, fp_value *result) {
+fp_value *fc_val_from_ieee754(long double l, const float_descriptor_t *desc,
+                              fp_value *result)
+{
 	char    *temp;
-	int     bias_res, bias_val, mant_val;
-	value_t srcval;
-	char    sign;
-	UINT32  exponent, mantissa0, mantissa1;
+	int      bias_res, bias_val, mant_val;
+	value_t  srcval;
+	char     sign;
+	uint32_t exponent, mantissa0, mantissa1;
+	size_t   long_double_size = sizeof(long double);
 
 	srcval.d = l;
 	bias_res = ((1 << (desc->exponent_size - 1)) - 1);
 
-#ifdef HAVE_LONG_DOUBLE
-	mant_val  = 63;
-	bias_val  = 0x3fff;
-	sign      = (srcval.val.high & 0x00008000) != 0;
-	exponent  = (srcval.val.high & 0x00007FFF) ;
-	mantissa0 = srcval.val.mid;
-	mantissa1 = srcval.val.low;
-#else /* no long double */
-	mant_val  = 52;
-	bias_val  = 0x3ff;
-	sign      = (srcval.val.high & 0x80000000) != 0;
-	exponent  = (srcval.val.high & 0x7FF00000) >> 20;
-	mantissa0 = srcval.val.high & 0x000FFFFF;
-	mantissa1 = srcval.val.low;
-#endif
-
-#ifdef HAVE_LONG_DOUBLE
-	TRACEPRINTF(("val_from_float(%.8X%.8X%.8X)\n", ((int*)&l)[2], ((int*)&l)[1], ((int*)&l)[0]));/* srcval.val.high, srcval.val.mid, srcval.val.low)); */
-	DEBUGPRINTF(("(%d-%.4X-%.8X%.8X)\n", sign, exponent, mantissa0, mantissa1));
-#else
-	TRACEPRINTF(("val_from_float(%.8X%.8X)\n", srcval.val.high, srcval.val.low));
-	DEBUGPRINTF(("(%d-%.3X-%.5X%.8X)\n", sign, exponent, mantissa0, mantissa1));
-#endif
+	if (long_double_size == 8) {
+		mant_val  = 52;
+		bias_val  = 0x3ff;
+		sign      = (srcval.val_ld8.high & 0x80000000) != 0;
+		exponent  = (srcval.val_ld8.high & 0x7FF00000) >> 20;
+		mantissa0 = srcval.val_ld8.high & 0x000FFFFF;
+		mantissa1 = srcval.val_ld8.low;
+	} else {
+		/* we assume an x86-like 80bit representation of the value... */
+		assert(sizeof(long double)==12 || sizeof(long double)==16);
+		mant_val  = 63;
+		bias_val  = 0x3fff;
+		sign      = (srcval.val_ld12.high & 0x00008000) != 0;
+		exponent  = (srcval.val_ld12.high & 0x00007FFF) ;
+		mantissa0 = srcval.val_ld12.mid;
+		mantissa1 = srcval.val_ld12.low;
+	}
 
-	if (result == NULL) result = calc_buffer;
-	temp = alloca(value_size);
+	if (result == NULL)
+		result = calc_buffer;
+	temp = (char*) alloca(value_size);
 
 	/* CLEAR the buffer, else some bits might be uninitialized */
 	memset(result, 0, fc_get_buffer_length());
 
-	result->desc.exponent_size = desc->exponent_size;
-	result->desc.mantissa_size = desc->mantissa_size;
-	result->desc.explicit_one  = desc->explicit_one;
-
-	/* extract sign */
+	result->desc = *desc;
+	result->clss = FC_NORMAL;
 	result->sign = sign;
 
 	/* sign and flag suffice to identify NaN or inf, no exponent/mantissa
 	 * encoding is needed. the function can return immediately in these cases */
-	if (isnan(l)) {
-		result->desc.clss = NAN;
+	if (my_isnan(l)) {
+		result->clss = FC_NAN;
 		TRACEPRINTF(("val_from_float resulted in NAN\n"));
 		return result;
-	}
-	else if (isinf(l)) {
-		result->desc.clss = INF;
+	} else if (my_isinf(l)) {
+		result->clss = FC_INF;
 		TRACEPRINTF(("val_from_float resulted in %sINF\n", (result->sign == 1) ? "-" : ""));
 		return result;
 	}
@@ -1141,35 +961,36 @@ fp_value *fc_val_from_ieee754(LLDBL l, const ieee_descriptor_t *desc, fp_value *
 	return result;
 }
 
-LLDBL fc_val_to_ieee754(const fp_value *val) {
+long double fc_val_to_ieee754(const fp_value *val)
+{
 	fp_value *value;
 	fp_value *temp = NULL;
 
-	int byte_offset;
+	unsigned byte_offset;
 
-	UINT32 sign;
-	UINT32 exponent;
-	UINT32 mantissa0;
-	UINT32 mantissa1;
+	uint32_t sign;
+	uint32_t exponent;
+	uint32_t mantissa0;
+	uint32_t mantissa1;
 
 	value_t           buildval;
-	ieee_descriptor_t desc;
+	float_descriptor_t desc;
 	unsigned          mantissa_size;
 
-#ifdef HAVE_LONG_DOUBLE
-	desc.exponent_size = 15;
-	desc.mantissa_size = 63;
-	desc.explicit_one  = 1;
-	desc.clss          = NORMAL;
-#else
-	desc.exponent_size = 11;
-	desc.mantissa_size = 52;
-	desc.explicit_one  = 0;
-	desc.clss          = NORMAL;
-#endif
+	size_t            long_double_size = sizeof(long double);
+
+	if (long_double_size == 8) {
+		desc.exponent_size = 11;
+		desc.mantissa_size = 52;
+		desc.explicit_one  = 0;
+	} else {
+		desc.exponent_size = 15;
+		desc.mantissa_size = 63;
+		desc.explicit_one  = 1;
+	}
 	mantissa_size = desc.mantissa_size + desc.explicit_one;
 
-	temp = alloca(calc_buffer_size);
+	temp = (fp_value*) alloca(calc_buffer_size);
 	value = fc_cast(val, &desc, temp);
 
 	sign = value->sign;
@@ -1190,29 +1011,31 @@ LLDBL fc_val_to_ieee754(const fp_value *val) {
 	for (; (byte_offset<<3) < desc.mantissa_size; byte_offset++)
 		mantissa0 |= sc_sub_bits(_mant(value), mantissa_size, byte_offset) << ((byte_offset - 4) << 3);
 
-#ifdef HAVE_LONG_DOUBLE
-	buildval.val.high = sign << 15;
-	buildval.val.high |= exponent;
-	buildval.val.mid = mantissa0;
-	buildval.val.low = mantissa1;
-#else /* no long double */
-	mantissa0 &= 0x000FFFFF;  /* get rid of garbage */
-	buildval.val.high = sign << 31;
-	buildval.val.high |= exponent << 20;
-	buildval.val.high |= mantissa0;
-	buildval.val.low = mantissa1;
-#endif
+	if (long_double_size == 8) {
+		mantissa0 &= 0x000FFFFF;  /* get rid of garbage */
+		buildval.val_ld8.high = sign << 31;
+		buildval.val_ld8.high |= exponent << 20;
+		buildval.val_ld8.high |= mantissa0;
+		buildval.val_ld8.low = mantissa1;
+	} else {
+		buildval.val_ld12.high = sign << 15;
+		buildval.val_ld12.high |= exponent;
+		buildval.val_ld12.mid = mantissa0;
+		buildval.val_ld12.low = mantissa1;
+	}
 
 	TRACEPRINTF(("val_to_float: %d-%x-%x%x\n", sign, exponent, mantissa0, mantissa1));
 	return buildval.d;
 }
 
-fp_value *fc_cast(const fp_value *value, const ieee_descriptor_t *desc, fp_value *result) {
+fp_value *fc_cast(const fp_value *value, const float_descriptor_t *desc,
+                  fp_value *result)
+{
 	char *temp;
 	int exp_offset, val_bias, res_bias;
 
 	if (result == NULL) result = calc_buffer;
-	temp = alloca(value_size);
+	temp = (char*) alloca(value_size);
 
 	if (value->desc.exponent_size == desc->exponent_size &&
 		value->desc.mantissa_size == desc->mantissa_size &&
@@ -1222,19 +1045,22 @@ fp_value *fc_cast(const fp_value *value, const ieee_descriptor_t *desc, fp_value
 		return result;
 	}
 
-	if (value->desc.clss == NAN) {
+	if (value->clss == FC_NAN) {
 		if (sc_get_highest_set_bit(_mant(value)) == value->desc.mantissa_size + 1)
 			return fc_get_qnan(desc, result);
 		else
 			return fc_get_snan(desc, result);
 	}
+	else if (value->clss == FC_INF) {
+		if (value->sign == 0)
+			return fc_get_plusinf(desc, result);
+		else
+			return fc_get_minusinf(desc, result);
+	}
 
 	/* set the descriptor of the new value */
-	result->desc.exponent_size = desc->exponent_size;
-	result->desc.mantissa_size = desc->mantissa_size;
-	result->desc.explicit_one  = desc->explicit_one;
-	result->desc.clss          = value->desc.clss;
-
+	result->desc = *desc;
+	result->clss = value->clss;
 	result->sign = value->sign;
 
 	/* when the mantissa sizes differ normalizing has to shift to align it.
@@ -1248,7 +1074,7 @@ fp_value *fc_cast(const fp_value *value, const ieee_descriptor_t *desc, fp_value
 	sc_add(_exp(value), temp, _exp(result));
 
 	/* _normalize expects normalized radix point */
-	if (value->desc.clss == SUBNORMAL) {
+	if (value->clss == FC_SUBNORMAL) {
 		sc_val_from_ulong(1, NULL);
 		_shift_left(_mant(value), sc_get_buffer(), _mant(result));
 	} else if (value != result) {
@@ -1262,14 +1088,12 @@ fp_value *fc_cast(const fp_value *value, const ieee_descriptor_t *desc, fp_value
 	return result;
 }
 
-fp_value *fc_get_max(const ieee_descriptor_t *desc, fp_value *result) {
+fp_value *fc_get_max(const float_descriptor_t *desc, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
-	result->desc.exponent_size = desc->exponent_size;
-	result->desc.mantissa_size = desc->mantissa_size;
-	result->desc.explicit_one  = desc->explicit_one;
-	result->desc.clss          = NORMAL;
-
+	result->desc = *desc;
+	result->clss = FC_NORMAL;
 	result->sign = 0;
 
 	sc_val_from_ulong((1 << desc->exponent_size) - 2, _exp(result));
@@ -1281,7 +1105,8 @@ fp_value *fc_get_max(const ieee_descriptor_t *desc, fp_value *result) {
 	return result;
 }
 
-fp_value *fc_get_min(const ieee_descriptor_t *desc, fp_value *result) {
+fp_value *fc_get_min(const float_descriptor_t *desc, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
 	fc_get_max(desc, result);
@@ -1290,14 +1115,12 @@ fp_value *fc_get_min(const ieee_descriptor_t *desc, fp_value *result) {
 	return result;
 }
 
-fp_value *fc_get_snan(const ieee_descriptor_t *desc, fp_value *result) {
+fp_value *fc_get_snan(const float_descriptor_t *desc, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
-	result->desc.exponent_size = desc->exponent_size;
-	result->desc.mantissa_size = desc->mantissa_size;
-	result->desc.explicit_one  = desc->explicit_one;
-	result->desc.clss          = NAN;
-
+	result->desc = *desc;
+	result->clss = FC_NAN;
 	result->sign = 0;
 
 	sc_val_from_ulong((1 << desc->exponent_size) - 1, _exp(result));
@@ -1308,14 +1131,12 @@ fp_value *fc_get_snan(const ieee_descriptor_t *desc, fp_value *result) {
 	return result;
 }
 
-fp_value *fc_get_qnan(const ieee_descriptor_t *desc, fp_value *result) {
+fp_value *fc_get_qnan(const float_descriptor_t *desc, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
-	result->desc.exponent_size = desc->exponent_size;
-	result->desc.mantissa_size = desc->mantissa_size;
-	result->desc.explicit_one  = desc->explicit_one;
-	result->desc.clss          = NAN;
-
+	result->desc = *desc;
+	result->clss = FC_NAN;
 	result->sign = 0;
 
 	sc_val_from_ulong((1 << desc->exponent_size) - 1, _exp(result));
@@ -1329,24 +1150,29 @@ fp_value *fc_get_qnan(const ieee_descriptor_t *desc, fp_value *result) {
 	return result;
 }
 
-fp_value *fc_get_plusinf(const ieee_descriptor_t *desc, fp_value *result) {
-	if (result == NULL) result = calc_buffer;
+fp_value *fc_get_plusinf(const float_descriptor_t *desc, fp_value *result)
+{
+	char *mant;
 
-	result->desc.exponent_size = desc->exponent_size;
-	result->desc.mantissa_size = desc->mantissa_size;
-	result->desc.explicit_one  = desc->explicit_one;
-	result->desc.clss          = INF;
+	if (result == NULL) result = calc_buffer;
 
+	result->desc = *desc;
+	result->clss = FC_INF;
 	result->sign = 0;
 
 	sc_val_from_ulong((1 << desc->exponent_size) - 1, _exp(result));
 
-	sc_val_from_ulong(0, _mant(result));
+	mant = _mant(result);
+	sc_val_from_ulong(0, mant);
+	if (desc->explicit_one) {
+		sc_set_bit_at(mant, result->desc.mantissa_size + ROUNDING_BITS);
+	}
 
 	return result;
 }
 
-fp_value *fc_get_minusinf(const ieee_descriptor_t *desc, fp_value *result) {
+fp_value *fc_get_minusinf(const float_descriptor_t *desc, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
 	fc_get_plusinf(desc, result);
@@ -1355,7 +1181,8 @@ fp_value *fc_get_minusinf(const ieee_descriptor_t *desc, fp_value *result) {
 	return result;
 }
 
-int fc_comp(const fp_value *val_a, const fp_value *val_b) {
+int fc_comp(const fp_value *val_a, const fp_value *val_b)
+{
 	int mul = 1;
 
 	/*
@@ -1363,14 +1190,14 @@ int fc_comp(const fp_value *val_a, const fp_value *val_b) {
 	 * Unordered if NaN or equal
 	 */
 	if (val_a == val_b)
-		return val_a->desc.clss == NAN ? 2 : 0;
+		return val_a->clss == FC_NAN ? 2 : 0;
 
 	/* unordered if one is a NaN */
-	if (val_a->desc.clss == NAN || val_b->desc.clss == NAN)
+	if (val_a->clss == FC_NAN || val_b->clss == FC_NAN)
 		return 2;
 
 	/* zero is equal independent of sign */
-	if ((val_a->desc.clss == ZERO) && (val_b->desc.clss == ZERO))
+	if ((val_a->clss == FC_ZERO) && (val_b->clss == FC_ZERO))
 		return 0;
 
 	/* different signs make compare easy */
@@ -1380,13 +1207,13 @@ int fc_comp(const fp_value *val_a, const fp_value *val_b) {
 	mul = val_a->sign ? -1 : 1;
 
 	/* both infinity means equality */
-	if ((val_a->desc.clss == INF) && (val_b->desc.clss == INF))
+	if ((val_a->clss == FC_INF) && (val_b->clss == FC_INF))
 		return 0;
 
 	/* infinity is bigger than the rest */
-	if (val_a->desc.clss == INF)
+	if (val_a->clss == FC_INF)
 		return  1 * mul;
-	if (val_b->desc.clss == INF)
+	if (val_b->clss == FC_INF)
 		return -1 * mul;
 
 	/* check first exponent, that mantissa if equal */
@@ -1402,73 +1229,71 @@ int fc_comp(const fp_value *val_a, const fp_value *val_b) {
 	}
 }
 
-int fc_is_zero(const fp_value *a) {
-	return a->desc.clss == ZERO;
+int fc_is_zero(const fp_value *a)
+{
+	return a->clss == FC_ZERO;
 }
 
-int fc_is_negative(const fp_value *a) {
+int fc_is_negative(const fp_value *a)
+{
 	return a->sign;
 }
 
-int fc_is_inf(const fp_value *a) {
-	return a->desc.clss == INF;
+int fc_is_inf(const fp_value *a)
+{
+	return a->clss == FC_INF;
 }
 
-int fc_is_nan(const fp_value *a) {
-	return a->desc.clss == NAN;
+int fc_is_nan(const fp_value *a)
+{
+	return a->clss == FC_NAN;
 }
 
-int fc_is_subnormal(const fp_value *a) {
-	return a->desc.clss == SUBNORMAL;
+int fc_is_subnormal(const fp_value *a)
+{
+	return a->clss == FC_SUBNORMAL;
 }
 
-char *fc_print(const fp_value *val, char *buf, int buflen, unsigned base) {
+char *fc_print(const fp_value *val, char *buf, int buflen, unsigned base)
+{
 	char *mul_1;
-	LLDBL flt_val;
+	long double flt_val;
 
-	mul_1 = alloca(calc_buffer_size);
+	mul_1 = (char*) alloca(calc_buffer_size);
 
 	switch (base) {
 	case FC_DEC:
-		switch ((value_class_t)val->desc.clss) {
-		case INF:
+		switch ((value_class_t)val->clss) {
+		case FC_INF:
 			snprintf(buf, buflen, "%cINF", val->sign ? '-' : '+');
 			break;
-		case NAN:
+		case FC_NAN:
 			snprintf(buf, buflen, "NaN");
 			break;
-		case ZERO:
+		case FC_ZERO:
 			snprintf(buf, buflen, "0.0");
 			break;
 		default:
 			flt_val = fc_val_to_ieee754(val);
-#ifdef HAVE_LONG_DOUBLE
 			/* XXX 30 is arbitrary */
 			snprintf(buf, buflen, "%.30LE", flt_val);
-#else
-			snprintf(buf, buflen, "%.18E", flt_val);
-#endif
 		}
 		break;
 
 	case FC_HEX:
-		switch ((value_class_t)val->desc.clss) {
-		case INF:
+		switch ((value_class_t)val->clss) {
+		case FC_INF:
 			snprintf(buf, buflen, "%cINF", val->sign ? '-' : '+');
 			break;
-		case NAN:
-			snprintf(buf, buflen, "NAN");
+		case FC_NAN:
+			snprintf(buf, buflen, "NaN");
 			break;
-		case ZERO:
+		case FC_ZERO:
 			snprintf(buf, buflen, "0.0");
 			break;
 		default:
 			flt_val = fc_val_to_ieee754(val);
-#ifdef HAVE_LONG_DOUBLE
 			snprintf(buf, buflen, "%LA", flt_val);
-#else
-			snprintf(buf, buflen, "%A", flt_val);
-#endif
 		}
 		break;
 
@@ -1481,7 +1306,8 @@ char *fc_print(const fp_value *val, char *buf, int buflen, unsigned base) {
 	return buf;
 }
 
-unsigned char fc_sub_bits(const fp_value *value, unsigned num_bits, unsigned byte_ofs) {
+unsigned char fc_sub_bits(const fp_value *value, unsigned num_bits, unsigned byte_ofs)
+{
 	/* this is used to cache the packed version of the value */
 	static char *packed_value = NULL;
 
@@ -1494,26 +1320,29 @@ unsigned char fc_sub_bits(const fp_value *value, unsigned num_bits, unsigned byt
 }
 
 /* Returns non-zero if the mantissa is zero, i.e. 1.0Exxx */
-int fc_zero_mantissa(const fp_value *value) {
+int fc_zero_mantissa(const fp_value *value)
+{
 	return sc_get_lowest_set_bit(_mant(value)) == ROUNDING_BITS + value->desc.mantissa_size;
 }
 
 /* Returns the exponent of a value. */
-int fc_get_exponent(const fp_value *value) {
+int fc_get_exponent(const fp_value *value)
+{
 	int exp_bias = (1 << (value->desc.exponent_size - 1)) - 1;
 	return sc_val_to_long(_exp(value)) - exp_bias;
 }
 
 /* Return non-zero if a given value can be converted lossless into another precision */
-int fc_can_lossless_conv_to(const fp_value *value, const ieee_descriptor_t *desc) {
+int fc_can_lossless_conv_to(const fp_value *value, const float_descriptor_t *desc)
+{
 	int v;
 	int exp_bias;
 
 	/* handle some special cases first */
-	switch (value->desc.clss) {
-	case ZERO:
-	case INF:
-	case NAN:
+	switch (value->clss) {
+	case FC_ZERO:
+	case FC_INF:
+	case FC_NAN:
 		return 1;
 	default:
 		break;
@@ -1525,24 +1354,27 @@ int fc_can_lossless_conv_to(const fp_value *value, const ieee_descriptor_t *desc
 	if (0 < v && v < (1 << desc->exponent_size) - 1) {
 		/* exponent can be encoded, now check the mantissa */
 		v = value->desc.mantissa_size + ROUNDING_BITS - sc_get_lowest_set_bit(_mant(value));
-		return v <= desc->mantissa_size;
+		return v <= (int)desc->mantissa_size;
 	}
 	return 0;
 }
 
 
-fc_rounding_mode_t fc_set_rounding_mode(fc_rounding_mode_t mode) {
+fc_rounding_mode_t fc_set_rounding_mode(fc_rounding_mode_t mode)
+{
 	if (mode == FC_TONEAREST || mode == FC_TOPOSITIVE || mode == FC_TONEGATIVE || mode == FC_TOZERO)
 		rounding_mode = mode;
 
 	return rounding_mode;
 }
 
-fc_rounding_mode_t fc_get_rounding_mode(void) {
+fc_rounding_mode_t fc_get_rounding_mode(void)
+{
 	return rounding_mode;
 }
 
-void init_fltcalc(int precision) {
+void init_fltcalc(int precision)
+{
 	if (calc_buffer == NULL) {
 		/* does nothing if already init */
 		if (precision == 0) precision = FC_DEFAULT_PRECISION;
@@ -1559,23 +1391,14 @@ void init_fltcalc(int precision) {
 		value_size       = sc_get_buffer_length();
 		calc_buffer_size = sizeof(fp_value) + 2*value_size - 1;
 
-		calc_buffer = xmalloc(calc_buffer_size);
+		calc_buffer = (fp_value*) xmalloc(calc_buffer_size);
 		memset(calc_buffer, 0, calc_buffer_size);
 		DEBUGPRINTF(("init fltcalc:\n\tVALUE_SIZE = %d\ntCALC_BUFFER_SIZE = %d\n\tcalc_buffer = %p\n\n", value_size, calc_buffer_size, calc_buffer));
-#ifdef HAVE_LONG_DOUBLE
-		DEBUGPRINTF(("\tUsing long double (1-15-64) interface\n"));
-#else
-		DEBUGPRINTF(("\tUsing double (1-11-52) interface\n"));
-#endif
-#ifdef WORDS_BIGENDIAN
-		DEBUGPRINTF(("\tWord order is big endian\n\n"));
-#else
-		DEBUGPRINTF(("\tWord order is little endian\n\n"));
-#endif
 	}
 }
 
-void finish_fltcalc (void) {
+void finish_fltcalc (void)
+{
 	free(calc_buffer); calc_buffer = NULL;
 }
 
@@ -1584,7 +1407,8 @@ static char buffer[100];
 #endif
 
 /* definition of interface functions */
-fp_value *fc_add(const fp_value *a, const fp_value *b, fp_value *result) {
+fp_value *fc_add(const fp_value *a, const fp_value *b, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
 	TRACEPRINTF(("%s ", fc_print(a, buffer, sizeof(buffer), FC_PACKED)));
@@ -1600,7 +1424,8 @@ fp_value *fc_add(const fp_value *a, const fp_value *b, fp_value *result) {
 	return result;
 }
 
-fp_value *fc_sub(const fp_value *a, const fp_value *b, fp_value *result) {
+fp_value *fc_sub(const fp_value *a, const fp_value *b, fp_value *result)
+{
 	fp_value *temp;
 
 	if (result == NULL) result = calc_buffer;
@@ -1608,7 +1433,7 @@ fp_value *fc_sub(const fp_value *a, const fp_value *b, fp_value *result) {
 	TRACEPRINTF(("%s ", fc_print(a, buffer, sizeof(buffer), FC_PACKED)));
 	TRACEPRINTF(("- %s ", fc_print(b, buffer, sizeof(buffer), FC_PACKED)));
 
-	temp = alloca(calc_buffer_size);
+	temp = (fp_value*) alloca(calc_buffer_size);
 	memcpy(temp, b, calc_buffer_size);
 	temp->sign = !b->sign;
 	if (sc_comp(_exp(a), _exp(temp)) == -1)
@@ -1620,7 +1445,8 @@ fp_value *fc_sub(const fp_value *a, const fp_value *b, fp_value *result) {
 	return result;
 }
 
-fp_value *fc_mul(const fp_value *a, const fp_value *b, fp_value *result) {
+fp_value *fc_mul(const fp_value *a, const fp_value *b, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
 	TRACEPRINTF(("%s ", fc_print(a, buffer, sizeof(buffer), FC_PACKED)));
@@ -1632,7 +1458,8 @@ fp_value *fc_mul(const fp_value *a, const fp_value *b, fp_value *result) {
 	return result;
 }
 
-fp_value *fc_div(const fp_value *a, const fp_value *b, fp_value *result) {
+fp_value *fc_div(const fp_value *a, const fp_value *b, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
 	TRACEPRINTF(("%s ", fc_print(a, buffer, sizeof(buffer), FC_PACKED)));
@@ -1644,7 +1471,8 @@ fp_value *fc_div(const fp_value *a, const fp_value *b, fp_value *result) {
 	return result;
 }
 
-fp_value *fc_neg(const fp_value *a, fp_value *result) {
+fp_value *fc_neg(const fp_value *a, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
 	TRACEPRINTF(("- %s ", fc_print(a, buffer, sizeof(buffer), FC_PACKED)));
@@ -1657,7 +1485,8 @@ fp_value *fc_neg(const fp_value *a, fp_value *result) {
 	return result;
 }
 
-fp_value *fc_int(const fp_value *a, fp_value *result) {
+fp_value *fc_int(const fp_value *a, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
 	TRACEPRINTF(("%s ", fc_print(a, buffer, sizeof(buffer), FC_PACKED)));
@@ -1669,17 +1498,14 @@ fp_value *fc_int(const fp_value *a, fp_value *result) {
 	return result;
 }
 
-fp_value *fc_rnd(const fp_value *a, fp_value *result) {
-	if (result == NULL) result = calc_buffer;
-
-	(void) a;
+fp_value *fc_rnd(const fp_value *a, fp_value *result)
+{
+	(void)a;
+	(void)result;
 	TRACEPRINTF(("%s ", fc_print(a, buffer, sizeof(buffer), FC_PACKED)));
 	TRACEPRINTF(("rounded to integer "));
 
-	assert(!"fc_rnd() not yet implemented");
-
-	TRACEPRINTF(("= %s\n", fc_print(result, buffer, sizeof(buffer), FC_PACKED)));
-	return result;
+	panic("not yet implemented");
 }
 
 /*
@@ -1687,7 +1513,7 @@ fp_value *fc_rnd(const fp_value *a, fp_value *result) {
  */
 int fc_flt2int(const fp_value *a, void *result, ir_mode *dst_mode)
 {
-	if (a->desc.clss == NORMAL) {
+	if (a->clss == FC_NORMAL) {
 		int exp_bias = (1 << (a->desc.exponent_size - 1)) - 1;
 		int exp_val  = sc_val_to_long(_exp(a)) - exp_bias;
 		int shift, highest;
@@ -1742,22 +1568,14 @@ int fc_flt2int(const fp_value *a, void *result, ir_mode *dst_mode)
 			sc_neg(result, result);
 
 		return 1;
-	}
-	else if (a->desc.clss == ZERO) {
+	} else if (a->clss == FC_ZERO) {
 		sc_zero(result);
 		return 1;
 	}
 	return 0;
 }
 
-
-unsigned fc_set_immediate_precision(unsigned bits) {
-	unsigned old = immediate_prec;
-
-	immediate_prec = bits;
-	return old;
-}
-
-int fc_is_exact(void) {
+int fc_is_exact(void)
+{
 	return fc_exact;
 }