X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftv%2Ffltcalc.c;h=3371eddf013c7cd142a3b8ca4111b21c17cfa6fc;hb=51894b3a1df63952817e3f673e8760e64de971d7;hp=973faf7452ff1b9fcf0e4a0442a08b59cae8e611;hpb=b5bfe78cd888b9349d3dffd9e103da389a54ed09;p=libfirm

diff --git a/ir/tv/fltcalc.c b/ir/tv/fltcalc.c
index 973faf745..3371eddf0 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.
  *
@@ -24,21 +24,19 @@
  * @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)*/
+#include <math.h>
 /* undef some reused constants defined by math.h */
 #ifdef NAN
 #  undef NAN
 #endif
 
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
+#include <inttypes.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -46,58 +44,46 @@
 
 #include "xmalloc.h"
 
+#ifdef _MSC_VER
+#include <float.h>
+#define isnan(x)   _isnan(x)
+static inline int isinf(double x)
+{
+	return !_finite(x) && !_isnan(x);
+}
+#define strtold(s, e) strtod(s, e)
+#define SIZEOF_LONG_DOUBLE_8
+#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
+#ifndef SIZEOF_LONG_DOUBLE_8
+		uint32_t mid;
 #endif
-#else
 #ifdef WORDS_BIGENDIAN
-typedef union {
-	struct {
-		UINT32 high;
-		UINT32 low;
-	} val;
-	volatile double d;
-} value_t;
+		uint32_t low;
 #else
-typedef union {
-	struct {
-		UINT32 low;
-		UINT32 high;
+		uint32_t high;
+#endif
 	} val;
-	volatile double d;
+	volatile long double d;
 } value_t;
-#endif
-#endif
 
 #define CLEAR_BUFFER(buffer) memset(buffer, 0, calc_buffer_size)
 
 /* our floating point value */
-struct _fp_value {
+struct fp_value {
 	ieee_descriptor_t desc;
 	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])
@@ -136,38 +122,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);
+		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);
+		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,11 +187,12 @@ 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;
@@ -414,7 +389,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;
 
@@ -439,8 +415,8 @@ static void _fadd(const fp_value *a, const fp_value *b, fp_value *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);
@@ -502,7 +478,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);
 	}
@@ -532,7 +508,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 +518,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;
@@ -618,7 +595,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,8 +605,8 @@ 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;
@@ -705,7 +683,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 +695,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;
 
@@ -759,7 +738,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,7 +758,7 @@ 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)
 		result->desc = a->desc;
@@ -820,258 +800,69 @@ 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;
+void *fc_val_from_str(const char *str, size_t len, const ieee_descriptor_t *desc, void *result)
+{
+	char *buffer;
 
-			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);
-
-	return result;
-#else
 	/* XXX excuse of an implementation to make things work */
-	LLDBL             val;
-	fp_value          *tmp = alloca(calc_buffer_size);
+	long double        val;
+	fp_value          *tmp = (fp_value*) alloca(calc_buffer_size);
 	ieee_descriptor_t tmp_desc;
-	(void) len;
 
-#if defined(HAVE_LONG_DOUBLE) && !defined(__CYGWIN__)
-	val = strtold(str, NULL);
+	buffer = (char*) 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
+
+	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 ieee_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;
 
 	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 */
+#ifdef SIZEOF_LONG_DOUBLE_8
 	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));
+	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;
 #endif
 
 	if (result == NULL) result = calc_buffer;
-	temp = alloca(value_size);
+	temp = (char*) alloca(value_size);
 
 	/* CLEAR the buffer, else some bits might be uninitialized */
 	memset(result, 0, fc_get_buffer_length());
@@ -1089,8 +880,7 @@ fp_value *fc_val_from_ieee754(LLDBL l, const ieee_descriptor_t *desc, fp_value *
 		result->desc.clss = NAN;
 		TRACEPRINTF(("val_from_float resulted in NAN\n"));
 		return result;
-	}
-	else if (isinf(l)) {
+	} else if (isinf(l)) {
 		result->desc.clss = INF;
 		TRACEPRINTF(("val_from_float resulted in %sINF\n", (result->sign == 1) ? "-" : ""));
 		return result;
@@ -1141,35 +931,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;
 
-	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;
 	unsigned          mantissa_size;
 
-#ifdef HAVE_LONG_DOUBLE
-	desc.exponent_size = 15;
-	desc.mantissa_size = 63;
-	desc.explicit_one  = 1;
-	desc.clss          = NORMAL;
-#else
+#ifdef SIZEOF_LONG_DOUBLE_8
 	desc.exponent_size = 11;
 	desc.mantissa_size = 52;
 	desc.explicit_one  = 0;
 	desc.clss          = NORMAL;
+#else
+	desc.exponent_size = 15;
+	desc.mantissa_size = 63;
+	desc.explicit_one  = 1;
+	desc.clss          = NORMAL;
 #endif
 	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 +981,30 @@ 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 */
+#ifdef SIZEOF_LONG_DOUBLE_8
 	mantissa0 &= 0x000FFFFF;  /* get rid of garbage */
 	buildval.val.high = sign << 31;
 	buildval.val.high |= exponent << 20;
 	buildval.val.high |= mantissa0;
 	buildval.val.low = mantissa1;
+#else
+	buildval.val.high = sign << 15;
+	buildval.val.high |= exponent;
+	buildval.val.mid = mantissa0;
+	buildval.val.low = mantissa1;
 #endif
 
 	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 ieee_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 &&
@@ -1228,6 +1020,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;
@@ -1262,7 +1060,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;
@@ -1281,7 +1080,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);
@@ -1290,7 +1090,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;
@@ -1308,7 +1109,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;
@@ -1329,7 +1131,10 @@ 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;
@@ -1341,12 +1146,17 @@ fp_value *fc_get_plusinf(const ieee_descriptor_t *desc, fp_value *result) {
 
 	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);
@@ -1355,7 +1165,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;
 
 	/*
@@ -1402,31 +1213,37 @@ 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;
+	long double flt_val;
 
-	mul_1 = alloca(calc_buffer_size);
+	mul_1 = (char*) alloca(calc_buffer_size);
 
 	switch (base) {
 	case FC_DEC:
@@ -1442,12 +1259,8 @@ char *fc_print(const fp_value *val, char *buf, int buflen, unsigned base) {
 			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;
 
@@ -1464,11 +1277,7 @@ char *fc_print(const fp_value *val, char *buf, int buflen, unsigned base) {
 			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 +1290,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,18 +1304,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, const ieee_descriptor_t *desc) {
+int fc_can_lossless_conv_to(const fp_value *value, const ieee_descriptor_t *desc)
+{
 	int v;
 	int exp_bias;
 
@@ -1525,24 +1338,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 <= 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 +1375,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 +1391,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 +1408,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 +1417,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 +1429,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 +1442,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 +1455,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 +1469,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,43 +1482,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");
 		mantissa_size = a->desc.mantissa_size + ROUNDING_BITS;
 		shift         = exp_val - mantissa_size;
 
-		mantissa_size += a->desc.explicit_one;
+		if (tgt_bits < mantissa_size + 1)
+			tgt_bits = mantissa_size + 1;
 		if (shift > 0) {
-			sc_shlI(_mant(a),  shift, mantissa_size, 0, result);
+			sc_shlI(_mant(a),  shift, tgt_bits, 0, result);
 		} else {
-			sc_shrI(_mant(a), -shift, mantissa_size, 0, result);
+			sc_shrI(_mant(a), -shift, tgt_bits, 0, result);
 		}
 
 		/* check for overflow */
@@ -1744,13 +1562,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;
 }