X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftv%2Ffltcalc.c;h=893b93079ff0b38bb0d0c0055aac11bdc579a410;hb=7c36344d22a7c306a4e216f135c974bdb9f6b943;hp=600e0aebffe19302ce319c0e6ea1b4ea8183b46b;hpb=964efc67014fba97653e6c00f725202fc60008b1;p=libfirm

diff --git a/ir/tv/fltcalc.c b/ir/tv/fltcalc.c
index 600e0aebf..893b93079 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-2010 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -24,35 +24,32 @@
  * @author   Mathias Heil
  * @version  $Id$
  */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "fltcalc.h"
 #include "strcalc.h"
+#include "error.h"
 
-#include <math.h>    /* need isnan() and isinf() (will be changed)*/
+#include <math.h>
 /* undef some reused constants defined by math.h */
 #ifdef NAN
 #  undef NAN
 #endif
 
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <inttypes.h>
+#include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
 
 #include "xmalloc.h"
 
-/** The number of extra precesion rounding bits */
+#if !defined(HAVE_LONG_DOUBLE) || defined(__CYGWIN__)
+/* No strtold on windows and no replacement yet */
+#define strtold(s, e) strtod(s, e)
+#endif
+
+/** The number of extra precision rounding bits */
 #define ROUNDING_BITS 2
 
 typedef uint32_t UINT32;
@@ -143,7 +140,8 @@ static int max_precision;
 static int fc_exact = 1;
 
 #if 0
-static void fail_char(const char *str, unsigned int len, int pos) {
+static void fail_char(const char *str, unsigned int len, int pos)
+{
 	if (*(str+pos))
 		printf("ERROR: Unexpected character '%c'\n", *(str + pos));
 	else
@@ -156,7 +154,8 @@ static void fail_char(const char *str, unsigned int len, int pos) {
 #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;
@@ -182,6 +181,8 @@ static void *pack(const fp_value *int_float, void *packed) {
 	default:
 		break;
 	}
+	assert(int_float->desc.explicit_one <= 1);
+
 	/* pack sign: move it to the left after exponent AND mantissa */
 	sc_val_from_ulong(int_float->sign, temp);
 
@@ -217,7 +218,8 @@ 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;
@@ -397,16 +399,19 @@ static int normalize(const fp_value *in_val, fp_value *out_val, int sticky) {
 }
 
 /**
- * Operations involving NaN's must return NaN
+ * Operations involving NaN's must return NaN.
+ * They are NOT exact.
  */
 #define handle_NAN(a, b, result) \
 do {                                                      \
   if (a->desc.clss == NAN) {                              \
     if (a != result) memcpy(result, a, calc_buffer_size); \
+    fc_exact = 0;                                         \
     return;                                               \
   }                                                       \
   if (b->desc.clss == NAN) {                              \
     if (b != result) memcpy(result, b, calc_buffer_size); \
+    fc_exact = 0;                                         \
     return;                                               \
   }                                                       \
 }while (0)
@@ -415,7 +420,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;
 
@@ -435,6 +441,7 @@ static void _fadd(const fp_value *a, const fp_value *b, fp_value *result) {
 
 	/* produce NaN on inf - inf */
 	if (sign && (a->desc.clss == INF) && (b->desc.clss == INF)) {
+		fc_exact = 0;
 		fc_get_qnan(&a->desc, result);
 		return;
 	}
@@ -474,12 +481,14 @@ static void _fadd(const fp_value *a, const fp_value *b, fp_value *result) {
 	if (a->desc.clss == ZERO || b->desc.clss == INF) {
 		if (b != result)
 			memcpy(result, b, calc_buffer_size);
+		fc_exact = b->desc.clss == NORMAL;
 		result->sign = res_sign;
 		return;
 	}
 	if (b->desc.clss == ZERO || a->desc.clss == INF) {
 		if (a != result)
 			memcpy(result, a, calc_buffer_size);
+		fc_exact = a->desc.clss == NORMAL;
 		result->sign = res_sign;
 		return;
 	}
@@ -530,7 +539,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;
@@ -548,9 +558,10 @@ static void _fmul(const fp_value *a, const fp_value *b, fp_value *result) {
 
 	/* produce NaN on 0 * inf */
 	if (a->desc.clss == ZERO) {
-		if (b->desc.clss == INF)
+		if (b->desc.clss == INF) {
 			fc_get_qnan(&a->desc, result);
-		else {
+			fc_exact = 0;
+		} else {
 			if (a != result)
 				memcpy(result, a, calc_buffer_size);
 			result->sign = res_sign;
@@ -558,9 +569,10 @@ 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 (a->desc.clss == INF) {
 			fc_get_qnan(&a->desc, result);
-		else {
+			fc_exact = 0;
+		} else {
 			if (b != result)
 				memcpy(result, b, calc_buffer_size);
 			result->sign = res_sign;
@@ -569,12 +581,14 @@ static void _fmul(const fp_value *a, const fp_value *b, fp_value *result) {
 	}
 
 	if (a->desc.clss == INF) {
+		fc_exact = 0;
 		if (a != result)
 			memcpy(result, a, calc_buffer_size);
 		result->sign = res_sign;
 		return;
 	}
 	if (b->desc.clss == INF) {
+		fc_exact = 0;
 		if (b != result)
 			memcpy(result, b, calc_buffer_size);
 		result->sign = res_sign;
@@ -612,7 +626,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;
@@ -631,10 +646,11 @@ static void _fdiv(const fp_value *a, const fp_value *b, fp_value *result) {
 
 	/* produce NAN on 0/0 and inf/inf */
 	if (a->desc.clss == ZERO) {
-		if (b->desc.clss == ZERO)
+		if (b->desc.clss == ZERO) {
 			/* 0/0 -> NaN */
 			fc_get_qnan(&a->desc, result);
-		else {
+			fc_exact = 0;
+		} else {
 			/* 0/x -> a */
 			if (a != result)
 				memcpy(result, a, calc_buffer_size);
@@ -644,10 +660,11 @@ static void _fdiv(const fp_value *a, const fp_value *b, fp_value *result) {
 	}
 
 	if (b->desc.clss == INF) {
-		if (a->desc.clss == INF)
+		fc_exact = 0;
+		if (a->desc.clss == INF) {
 			/* inf/inf -> NaN */
 			fc_get_qnan(&a->desc, result);
-		else {
+		} else {
 			/* x/inf -> 0 */
 			sc_val_from_ulong(0, NULL);
 			_save_result(_exp(result));
@@ -658,6 +675,7 @@ static void _fdiv(const fp_value *a, const fp_value *b, fp_value *result) {
 	}
 
 	if (a->desc.clss == INF) {
+		fc_exact = 0;
 		/* inf/x -> inf */
 		if (a != result)
 			memcpy(result, a, calc_buffer_size);
@@ -665,6 +683,7 @@ static void _fdiv(const fp_value *a, const fp_value *b, fp_value *result) {
 		return;
 	}
 	if (b->desc.clss == ZERO) {
+		fc_exact = 0;
 		/* division by zero */
 		if (result->sign)
 			fc_get_minusinf(&a->desc, result);
@@ -707,7 +726,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, ieee_descriptor_t *desc, char *result)
+{
 	char *build;
 	char *temp;
 
@@ -749,7 +769,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
@@ -801,233 +822,56 @@ static void _trunc(const fp_value *a, fp_value *result) {
 	/* and the mask and return the result */
 	sc_and(_mant(a), temp, _mant(result));
 
-	if (a != result) memcpy(_exp(result), _exp(a), value_size);
+	if (a != result) {
+		memcpy(_exp(result), _exp(a), value_size);
+		result->sign = a->sign;
+	}
 }
 
 /********
  * 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;
+void *fc_val_from_str(const char *str, unsigned int len, const ieee_descriptor_t *desc, void *result)
+{
+	char *buffer;
 
-			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);
-
-	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;
 
-#ifdef HAVE_LONG_DOUBLE
-	val = strtold(str, NULL);
+	buffer = alloca(len+1);
+	memcpy(buffer, str, len);
+	buffer[len] = '\0';
+	val = strtold(buffer, 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
 }
 
-fp_value *fc_val_from_ieee754(LLDBL l, const ieee_descriptor_t *desc, fp_value *result) {
-	char *temp;
-	int bias_res, bias_val, mant_val;
+fp_value *fc_val_from_ieee754(LLDBL l, const ieee_descriptor_t *desc, fp_value *result)
+{
+	char    *temp;
+	int     bias_res, bias_val, mant_val;
 	value_t srcval;
-	UINT32 sign, exponent, mantissa0, mantissa1;
+	char    sign;
+	UINT32  exponent, mantissa0, mantissa1;
 
 	srcval.d = l;
 	bias_res = ((1 << (desc->exponent_size - 1)) - 1);
@@ -1127,7 +971,8 @@ 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) {
+LLDBL fc_val_to_ieee754(const fp_value *val)
+{
 	fp_value *value;
 	fp_value *temp = NULL;
 
@@ -1140,6 +985,7 @@ LLDBL fc_val_to_ieee754(const fp_value *val) {
 
 	value_t           buildval;
 	ieee_descriptor_t desc;
+	unsigned          mantissa_size;
 
 #ifdef HAVE_LONG_DOUBLE
 	desc.exponent_size = 15;
@@ -1152,6 +998,7 @@ LLDBL fc_val_to_ieee754(const fp_value *val) {
 	desc.explicit_one  = 0;
 	desc.clss          = NORMAL;
 #endif
+	mantissa_size = desc.mantissa_size + desc.explicit_one;
 
 	temp = alloca(calc_buffer_size);
 	value = fc_cast(val, &desc, temp);
@@ -1169,10 +1016,10 @@ LLDBL fc_val_to_ieee754(const fp_value *val) {
 	mantissa1 = 0;
 
 	for (byte_offset = 0; byte_offset < 4; byte_offset++)
-		mantissa1 |= sc_sub_bits(_mant(value), desc.mantissa_size, byte_offset) << (byte_offset<<3);
+		mantissa1 |= sc_sub_bits(_mant(value), mantissa_size, byte_offset) << (byte_offset << 3);
 
 	for (; (byte_offset<<3) < desc.mantissa_size; byte_offset++)
-		mantissa0 |= sc_sub_bits(_mant(value), desc.mantissa_size, byte_offset) << ((byte_offset-4)<<3);
+		mantissa0 |= sc_sub_bits(_mant(value), mantissa_size, byte_offset) << ((byte_offset - 4) << 3);
 
 #ifdef HAVE_LONG_DOUBLE
 	buildval.val.high = sign << 15;
@@ -1191,7 +1038,8 @@ LLDBL fc_val_to_ieee754(const fp_value *val) {
 	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 ieee_descriptor_t *desc, fp_value *result)
+{
 	char *temp;
 	int exp_offset, val_bias, res_bias;
 
@@ -1212,6 +1060,12 @@ fp_value *fc_cast(const fp_value *value, const ieee_descriptor_t *desc, fp_value
 		else
 			return fc_get_snan(desc, result);
 	}
+	else if (value->desc.clss == 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;
@@ -1246,7 +1100,8 @@ 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 ieee_descriptor_t *desc, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
 	result->desc.exponent_size = desc->exponent_size;
@@ -1265,7 +1120,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 ieee_descriptor_t *desc, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
 	fc_get_max(desc, result);
@@ -1274,7 +1130,8 @@ 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 ieee_descriptor_t *desc, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
 	result->desc.exponent_size = desc->exponent_size;
@@ -1292,7 +1149,8 @@ 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 ieee_descriptor_t *desc, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
 	result->desc.exponent_size = desc->exponent_size;
@@ -1313,24 +1171,32 @@ 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) {
+fp_value *fc_get_plusinf(const ieee_descriptor_t *desc, fp_value *result)
+{
+	char *mant;
+
 	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.clss          = 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 ieee_descriptor_t *desc, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
 	fc_get_plusinf(desc, result);
@@ -1339,7 +1205,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;
 
 	/*
@@ -1386,28 +1253,35 @@ int fc_comp(const fp_value *val_a, const fp_value *val_b) {
 	}
 }
 
-int fc_is_zero(const fp_value *a) {
+int fc_is_zero(const fp_value *a)
+{
 	return a->desc.clss == 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) {
+int fc_is_inf(const fp_value *a)
+{
 	return a->desc.clss == INF;
 }
 
-int fc_is_nan(const fp_value *a) {
+int fc_is_nan(const fp_value *a)
+{
 	return a->desc.clss == NAN;
 }
 
-int fc_is_subnormal(const fp_value *a) {
+int fc_is_subnormal(const fp_value *a)
+{
 	return a->desc.clss == 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;
 
 	mul_1 = alloca(calc_buffer_size);
 
@@ -1415,22 +1289,21 @@ char *fc_print(const fp_value *val, char *buf, int buflen, unsigned base) {
 	case FC_DEC:
 		switch ((value_class_t)val->desc.clss) {
 		case INF:
-			if (buflen >= 8 + val->sign) sprintf(buf, "%sINFINITY", val->sign ? "-":"");
-			else snprintf(buf, buflen, "%sINF", val->sign ? "-":NULL);
+			snprintf(buf, buflen, "%cINF", val->sign ? '-' : '+');
 			break;
 		case NAN:
-			snprintf(buf, buflen, "NAN");
+			snprintf(buf, buflen, "NaN");
 			break;
 		case ZERO:
 			snprintf(buf, buflen, "0.0");
 			break;
 		default:
-			/* XXX to be implemented */
+			flt_val = fc_val_to_ieee754(val);
 #ifdef HAVE_LONG_DOUBLE
 			/* XXX 30 is arbitrary */
-			snprintf(buf, buflen, "%.30LE", fc_val_to_ieee754(val));
+			snprintf(buf, buflen, "%.30LE", flt_val);
 #else
-			snprintf(buf, buflen, "%.18E", fc_val_to_ieee754(val));
+			snprintf(buf, buflen, "%.18E", flt_val);
 #endif
 		}
 		break;
@@ -1438,8 +1311,7 @@ char *fc_print(const fp_value *val, char *buf, int buflen, unsigned base) {
 	case FC_HEX:
 		switch ((value_class_t)val->desc.clss) {
 		case INF:
-			if (buflen >= 8+val->sign) sprintf(buf, "%sINFINITY", val->sign?"-":"");
-			else snprintf(buf, buflen, "%sINF", val->sign?"-":NULL);
+			snprintf(buf, buflen, "%cINF", val->sign ? '-' : '+');
 			break;
 		case NAN:
 			snprintf(buf, buflen, "NAN");
@@ -1448,10 +1320,11 @@ char *fc_print(const fp_value *val, char *buf, int buflen, unsigned base) {
 			snprintf(buf, buflen, "0.0");
 			break;
 		default:
+			flt_val = fc_val_to_ieee754(val);
 #ifdef HAVE_LONG_DOUBLE
-			snprintf(buf, buflen, "%LA", fc_val_to_ieee754(val));
+			snprintf(buf, buflen, "%LA", flt_val);
 #else
-			snprintf(buf, buflen, "%A", fc_val_to_ieee754(val));
+			snprintf(buf, buflen, "%A", flt_val);
 #endif
 		}
 		break;
@@ -1465,11 +1338,12 @@ 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;
 
-	if (packed_value == NULL) packed_value = xmalloc(value_size);
+	if (packed_value == NULL) packed_value = XMALLOCN(char, value_size);
 
 	if (value != NULL)
 		pack(value, packed_value);
@@ -1478,18 +1352,21 @@ 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, char exp_size, char mant_size) {
+int fc_can_lossless_conv_to(const fp_value *value, const ieee_descriptor_t *desc)
+{
 	int v;
 	int exp_bias;
 
@@ -1504,38 +1381,41 @@ int fc_can_lossless_conv_to(const fp_value *value, char exp_size, char mant_size
 	}
 
 	/* check if the exponent can be encoded: note, 0 and all ones are reserved for the exponent */
-	exp_bias = (1 << (exp_size - 1)) - 1;
+	exp_bias = (1 << (desc->exponent_size - 1)) - 1;
 	v = fc_get_exponent(value) + exp_bias;
-	if (0 < v && v < (1 << exp_size) - 1) {
-		/* check the mantissa */
+	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 < mant_size;
+		return v <= 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;
 
-		init_strcalc(precision + 4);
+		init_strcalc(precision + 2 + ROUNDING_BITS);
 
-		/* needs additionally two bits to round, a bit as explicit 1., and one for
+		/* needs additionally rounding bits, one bit as explicit 1., and one for
 		 * addition overflow */
-		max_precision = sc_get_precision() - 4;
+		max_precision = sc_get_precision() - (2 + ROUNDING_BITS);
 		if (max_precision < precision)
 			printf("WARNING: not enough precision available, using %d\n", max_precision);
 
@@ -1559,7 +1439,8 @@ void init_fltcalc(int precision) {
 	}
 }
 
-void finish_fltcalc (void) {
+void finish_fltcalc (void)
+{
 	free(calc_buffer); calc_buffer = NULL;
 }
 
@@ -1568,7 +1449,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)));
@@ -1584,7 +1466,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;
@@ -1604,7 +1487,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)));
@@ -1616,7 +1500,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)));
@@ -1628,7 +1513,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)));
@@ -1641,7 +1527,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)));
@@ -1653,40 +1540,48 @@ fp_value *fc_int(const fp_value *a, fp_value *result) {
 	return result;
 }
 
-fp_value *fc_rnd(const fp_value *a, fp_value *result) {
+fp_value *fc_rnd(const fp_value *a, fp_value *result)
+{
 	if (result == NULL) result = calc_buffer;
 
 	(void) a;
 	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("fc_rnd() not yet implemented");
 }
 
 /*
  * convert a floating point value into an sc value ...
  */
-int fc_flt2int(const fp_value *a, void *result, ir_mode *dst_mode) {
+int fc_flt2int(const fp_value *a, void *result, ir_mode *dst_mode)
+{
 	if (a->desc.clss == 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;
+		int mantissa_size;
+		int tgt_bits;
 
 		if (a->sign && !mode_is_signed(dst_mode)) {
 			/* FIXME: for now we cannot convert this */
 			return 0;
 		}
 
+		tgt_bits = get_mode_size_bits(dst_mode);
+		if (mode_is_signed(dst_mode))
+			--tgt_bits;
+
 		assert(exp_val >= 0 && "floating point value not integral before fc_flt2int() call");
-		shift = exp_val - (a->desc.mantissa_size + ROUNDING_BITS);
+		mantissa_size = a->desc.mantissa_size + ROUNDING_BITS;
+		shift         = exp_val - mantissa_size;
 
+		if (tgt_bits < mantissa_size + 1)
+			tgt_bits = mantissa_size + 1;
 		if (shift > 0) {
-			sc_shlI(_mant(a),  shift, 64, 0, result);
+			sc_shlI(_mant(a),  shift, tgt_bits, 0, result);
 		} else {
-			sc_shrI(_mant(a), -shift, 64, 0, result);
+			sc_shrI(_mant(a), -shift, tgt_bits, 0, result);
 		}
 
 		/* check for overflow */
@@ -1725,13 +1620,15 @@ int fc_flt2int(const fp_value *a, void *result, ir_mode *dst_mode) {
 }
 
 
-unsigned fc_set_immediate_precision(unsigned bits) {
+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;
 }