X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftv%2Ffltcalc.c;h=3230541c706bf8b3ecfabd1456179676cfb00f1a;hb=b50ba7aa16edbf7d978c182d90b2e5f08c6f6a56;hp=bb7b28ff951a3465394fc2a56c0151128a905896;hpb=32ea6ea0320f551448bb66e534e3351977464d42;p=libfirm

diff --git a/ir/tv/fltcalc.c b/ir/tv/fltcalc.c
index bb7b28ff9..3230541c7 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.
  *
@@ -28,6 +28,7 @@
 
 #include "fltcalc.h"
 #include "strcalc.h"
+#include "error.h"
 
 #include <math.h>
 /* undef some reused constants defined by math.h */
@@ -43,6 +44,19 @@
 
 #include "xmalloc.h"
 
+#ifndef HAVE_STRTOLD
+#define strtold(s, e) strtod(s, e)
+#endif
+
+#ifdef _MSC_VER
+#include <float.h>
+#define isnan(x)   _isnan(x)
+static inline int isinf(double x)
+{
+	return !_finite(x) && !_isnan(x);
+}
+#endif
+
 /** The number of extra precision rounding bits */
 #define ROUNDING_BITS 2
 
@@ -91,10 +105,10 @@ typedef union {
 #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])
@@ -155,18 +169,18 @@ static void *pack(const fp_value *int_float, void *packed)
 	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;
@@ -217,7 +231,7 @@ 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;
@@ -440,8 +454,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);
@@ -503,7 +517,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);
 	}
@@ -543,7 +557,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;
@@ -630,8 +644,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;
@@ -708,7 +722,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));
@@ -783,7 +797,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;
@@ -835,213 +849,28 @@ 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)
+void *fc_val_from_str(const char *str, size_t 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;
+	char *buffer;
 
-			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);
-
-	return result;
-#else
 	/* XXX excuse of an implementation to make things work */
 	LLDBL             val;
-	fp_value          *tmp = alloca(calc_buffer_size);
+	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)
@@ -1080,7 +909,7 @@ fp_value *fc_val_from_ieee754(LLDBL l, const ieee_descriptor_t *desc, fp_value *
 #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());
@@ -1098,8 +927,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;
@@ -1179,7 +1007,7 @@ LLDBL fc_val_to_ieee754(const fp_value *val)
 #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;
@@ -1223,7 +1051,7 @@ fp_value *fc_cast(const fp_value *value, const ieee_descriptor_t *desc, fp_value
 	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 &&
@@ -1239,7 +1067,7 @@ 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) {
+	else if (value->desc.clss == INF) {
 		if (value->sign == 0)
 			return fc_get_plusinf(desc, result);
 		else
@@ -1462,7 +1290,7 @@ 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);
+	mul_1 = (char*) alloca(calc_buffer_size);
 
 	switch (base) {
 	case FC_DEC:
@@ -1602,7 +1430,7 @@ 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
@@ -1654,7 +1482,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)
@@ -1727,10 +1555,7 @@ fp_value *fc_rnd(const fp_value *a, fp_value *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("fc_rnd() not yet implemented");
 }
 
 /*