X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftv%2Ftv.c;h=933c55f4f0ef2447f3765d6efeb41e58dd16b063;hb=8010ed3d640a15ac18138d8a96ea61f318aae2cb;hp=969e2fea57a494df647d193729148ec6fc1c8699;hpb=66752b5a7557a98b7655cf84678f1a07e082d728;p=libfirm

diff --git a/ir/tv/tv.c b/ir/tv/tv.c
index 969e2fea5..933c55f4f 100644
--- a/ir/tv/tv.c
+++ b/ir/tv/tv.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.
  *
@@ -36,10 +36,8 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 #include <stdlib.h>
+#include <strings.h>
 
 #include "bitfiddle.h"
 #include "tv_t.h"
@@ -78,8 +76,8 @@ static float_to_int_mode current_float_to_int_mode = TRUNCATE;
 #  define TARVAL_VERIFY(a) ((void)0)
 #endif
 
-#define INSERT_TARVAL(tv) ((tarval*)set_insert(tarvals, (tv), sizeof(tarval), hash_tv((tv))))
-#define FIND_TARVAL(tv) ((tarval*)set_find(tarvals, (tv), sizeof(tarval), hash_tv((tv))))
+#define INSERT_TARVAL(tv) ((ir_tarval*)set_insert(tarvals, (tv), sizeof(ir_tarval), hash_tv((tv))))
+#define FIND_TARVAL(tv) ((ir_tarval*)set_find(tarvals, (tv), sizeof(ir_tarval), hash_tv((tv))))
 
 #define INSERT_VALUE(val, size) (set_insert(values, (val), size, hash_val((val), size)))
 #define FIND_VALUE(val, size) (set_find(values, (val), size, hash_val((val), size)))
@@ -116,9 +114,9 @@ static const ieee_descriptor_t quad_desc     = { 15, 112, 0, NORMAL };
  *   private functions
  ****************************************************************************/
 #ifndef NDEBUG
-static int hash_val(const void *value, unsigned int length);
-static int hash_tv(tarval *tv);
-static void _fail_verify(tarval *tv, const char* file, int line)
+static unsigned hash_val(const void *value, size_t length);
+static unsigned hash_tv(ir_tarval *tv);
+static void _fail_verify(ir_tarval *tv, const char* file, int line)
 {
 	/* print a memory image of the tarval and throw an assertion */
 	if (tv)
@@ -127,10 +125,10 @@ static void _fail_verify(tarval *tv, const char* file, int line)
 		panic("%s:%d: Invalid tarval (null)", file, line);
 }
 #ifdef __GNUC__
-inline static void tarval_verify(tarval *tv) __attribute__ ((unused));
+inline static void tarval_verify(ir_tarval *tv) __attribute__ ((unused));
 #endif
 
-inline static void tarval_verify(tarval *tv)
+inline static void tarval_verify(ir_tarval *tv)
 {
 	assert(tv);
 	assert(tv->mode);
@@ -145,16 +143,16 @@ inline static void tarval_verify(tarval *tv)
 #endif /* NDEBUG */
 
 /** Hash a tarval. */
-static int hash_tv(tarval *tv)
+static unsigned hash_tv(ir_tarval *tv)
 {
-	return (PTR_TO_INT(tv->value) ^ PTR_TO_INT(tv->mode)) + tv->length;
+	return (unsigned)((PTR_TO_INT(tv->value) ^ PTR_TO_INT(tv->mode)) + tv->length);
 }
 
 /** Hash a value. Treat it as a byte array. */
-static int hash_val(const void *value, unsigned int length)
+static unsigned hash_val(const void *value, size_t length)
 {
-	unsigned int i;
-	unsigned int hash = 0;
+	size_t i;
+	unsigned hash = 0;
 
 	/* scramble the byte - array */
 	for (i = 0; i < length; ++i) {
@@ -167,8 +165,8 @@ static int hash_val(const void *value, unsigned int length)
 
 static int cmp_tv(const void *p1, const void *p2, size_t n)
 {
-	const tarval *tv1 = p1;
-	const tarval *tv2 = p2;
+	const ir_tarval *tv1 = (const ir_tarval*) p1;
+	const ir_tarval *tv2 = (const ir_tarval*) p2;
 	(void) n;
 
 	assert(tv1->kind == k_tarval);
@@ -190,9 +188,9 @@ static int cmp_tv(const void *p1, const void *p2, size_t n)
 }
 
 /** finds tarval with value/mode or creates new tarval */
-static tarval *get_tarval(const void *value, int length, ir_mode *mode)
+static ir_tarval *get_tarval(const void *value, size_t length, ir_mode *mode)
 {
-	tarval tv;
+	ir_tarval tv;
 
 	tv.kind   = k_tarval;
 	tv.mode   = mode;
@@ -200,7 +198,7 @@ static tarval *get_tarval(const void *value, int length, ir_mode *mode)
 	if (length > 0) {
 		/* if there already is such a value, it is returned, else value
 		 * is copied into the set */
-		char *temp = alloca(length);
+		char *temp = (char*) alloca(length);
 		memcpy(temp, value, length);
 		if (get_mode_arithmetic(mode) == irma_twos_complement) {
 			sign_extend(temp, mode);
@@ -211,20 +209,20 @@ static tarval *get_tarval(const void *value, int length, ir_mode *mode)
 	}
 	/* if there is such a tarval, it is returned, else tv is copied
 	 * into the set */
-	return (tarval *)INSERT_TARVAL(&tv);
+	return (ir_tarval *)INSERT_TARVAL(&tv);
 }
 
 /**
  * handle overflow
  */
-static tarval *get_tarval_overflow(const void *value, int length, ir_mode *mode)
+static ir_tarval *get_tarval_overflow(const void *value, size_t length, ir_mode *mode)
 {
 	char *temp;
 
 	switch (get_mode_sort(mode)) {
 	case irms_reference:
 		/* addresses always wrap around */
-		temp = alloca(sc_get_buffer_length());
+		temp = (char*) alloca(sc_get_buffer_length());
 		memcpy(temp, value, sc_get_buffer_length());
 		sc_truncate(get_mode_size_bits(mode), temp);
 		/* the sc_ module expects that all bits are set ... */
@@ -237,7 +235,7 @@ static tarval *get_tarval_overflow(const void *value, int length, ir_mode *mode)
 			case TV_OVERFLOW_SATURATE:
 				return get_mode_max(mode);
 			case TV_OVERFLOW_WRAP:
-				temp = alloca(sc_get_buffer_length());
+				temp = (char*) alloca(sc_get_buffer_length());
 				memcpy(temp, value, sc_get_buffer_length());
 				sc_truncate(get_mode_size_bits(mode), temp);
 				/* the sc_ module expects that all bits are set ... */
@@ -254,7 +252,7 @@ static tarval *get_tarval_overflow(const void *value, int length, ir_mode *mode)
 			case TV_OVERFLOW_SATURATE:
 				return get_mode_min(mode);
 			case TV_OVERFLOW_WRAP: {
-				char *temp = alloca(sc_get_buffer_length());
+				char *temp = (char*) alloca(sc_get_buffer_length());
 				memcpy(temp, value, sc_get_buffer_length());
 				sc_truncate(get_mode_size_bits(mode), temp);
 				return get_tarval(temp, length, mode);
@@ -269,14 +267,14 @@ static tarval *get_tarval_overflow(const void *value, int length, ir_mode *mode)
 
 	case irms_float_number:
 #ifdef SWITCH_NOINFINITY
-		if (fc_is_inf(value)) {
+		if (fc_is_inf((const fp_value*) value)) {
 			/* clip infinity to maximum value */
-			return fc_is_negative(value) ? get_mode_min(mode) : get_mode_max(mode);
+			return fc_is_negative((const fp_value*) value) ? get_mode_min(mode) : get_mode_max(mode);
 		}
 #endif
 
 #ifdef SWITCH_NODENORMALS
-		if (fc_is_subnormal(value)) {
+		if (fc_is_subnormal((const fp_value*) value)) {
 			/* clip denormals to zero */
 			return get_mode_null(mode);
 		}
@@ -292,14 +290,14 @@ static tarval *get_tarval_overflow(const void *value, int length, ir_mode *mode)
 /*
  *   public variables declared in tv.h
  */
-static tarval reserved_tv[6];
+static ir_tarval reserved_tv[6];
 
-tarval *tarval_b_false     = &reserved_tv[0];
-tarval *tarval_b_true      = &reserved_tv[1];
-tarval *tarval_bad         = &reserved_tv[2];
-tarval *tarval_undefined   = &reserved_tv[3];
-tarval *tarval_reachable   = &reserved_tv[4];
-tarval *tarval_unreachable = &reserved_tv[5];
+ir_tarval *tarval_b_false     = &reserved_tv[0];
+ir_tarval *tarval_b_true      = &reserved_tv[1];
+ir_tarval *tarval_bad         = &reserved_tv[2];
+ir_tarval *tarval_undefined   = &reserved_tv[3];
+ir_tarval *tarval_reachable   = &reserved_tv[4];
+ir_tarval *tarval_unreachable = &reserved_tv[5];
 
 /**
  * get the float descriptor for given mode.
@@ -321,8 +319,8 @@ static const ieee_descriptor_t *get_descriptor(const ir_mode *mode)
 	}
 }
 
-tarval *new_integer_tarval_from_str(const char *str, size_t len, char sign,
-                                    unsigned char base, ir_mode *mode)
+ir_tarval *new_integer_tarval_from_str(const char *str, size_t len, char sign,
+                                       unsigned char base, ir_mode *mode)
 {
 	void *buffer;
 	int   ok;
@@ -336,8 +334,8 @@ tarval *new_integer_tarval_from_str(const char *str, size_t len, char sign,
 	return get_tarval_overflow(buffer, sc_get_buffer_length(), mode);
 }
 
-static tarval *new_tarval_from_str_int(const char *str, size_t len,
-                                       ir_mode *mode)
+static ir_tarval *new_tarval_from_str_int(const char *str, size_t len,
+                                          ir_mode *mode)
 {
 	void    *buffer;
 	unsigned base = 10;
@@ -390,7 +388,7 @@ static tarval *new_tarval_from_str_int(const char *str, size_t len,
 /*
  * Constructors =============================================================
  */
-tarval *new_tarval_from_str(const char *str, size_t len, ir_mode *mode)
+ir_tarval *new_tarval_from_str(const char *str, size_t len, ir_mode *mode)
 {
 	const ieee_descriptor_t *desc;
 
@@ -432,7 +430,7 @@ tarval *new_tarval_from_str(const char *str, size_t len, ir_mode *mode)
 /*
  * helper function, create a tarval from long
  */
-tarval *new_tarval_from_long(long l, ir_mode *mode)
+ir_tarval *new_tarval_from_long(long l, ir_mode *mode)
 {
 	assert(mode);
 
@@ -456,7 +454,7 @@ tarval *new_tarval_from_long(long l, ir_mode *mode)
 }
 
 /* returns non-zero if can be converted to long */
-int tarval_is_long(tarval *tv)
+int tarval_is_long(ir_tarval *tv)
 {
 	if (!mode_is_int(tv->mode) && !mode_is_reference(tv->mode))
 		return 0;
@@ -473,14 +471,14 @@ int tarval_is_long(tarval *tv)
 }
 
 /* this might overflow the machine's long, so use only with small values */
-long get_tarval_long(tarval* tv)
+long get_tarval_long(ir_tarval* tv)
 {
 	assert(tarval_is_long(tv) && "tarval too big to fit in long");
 
 	return sc_val_to_long(tv->value);
 }
 
-tarval *new_tarval_from_double(long double d, ir_mode *mode)
+ir_tarval *new_tarval_from_long_double(long double d, ir_mode *mode)
 {
 	const ieee_descriptor_t *desc;
 
@@ -490,19 +488,29 @@ tarval *new_tarval_from_double(long double d, ir_mode *mode)
 	return get_tarval(fc_get_buffer(), fc_get_buffer_length(), mode);
 }
 
+ir_tarval *new_tarval_from_double(double d, ir_mode *mode)
+{
+	return new_tarval_from_long_double(d, mode);
+}
+
 /* returns non-zero if can be converted to double */
-int tarval_is_double(tarval *tv)
+int tarval_is_double(ir_tarval *tv)
 {
 	assert(tv);
 
 	return (get_mode_sort(tv->mode) == irms_float_number);
 }
 
-long double get_tarval_double(tarval *tv)
+long double get_tarval_long_double(ir_tarval *tv)
 {
 	assert(tarval_is_double(tv));
 
-	return fc_val_to_ieee754(tv->value);
+	return fc_val_to_ieee754((const fp_value*) tv->value);
+}
+
+double get_tarval_double(ir_tarval *tv)
+{
+	return get_tarval_long_double(tv);
 }
 
 
@@ -511,7 +519,7 @@ long double get_tarval_double(tarval *tv)
  */
 
 /* get the mode of the tarval */
-ir_mode *(get_tarval_mode)(const tarval *tv)
+ir_mode *(get_tarval_mode)(const ir_tarval *tv)
 {
 	return _get_tarval_mode(tv);
 }
@@ -526,37 +534,37 @@ ir_mode *(get_tarval_mode)(const tarval *tv)
  * therefore the irmode functions should be preferred to the functions below.
  */
 
-tarval *(get_tarval_bad)(void)
+ir_tarval *(get_tarval_bad)(void)
 {
 	return _get_tarval_bad();
 }
 
-tarval *(get_tarval_undefined)(void)
+ir_tarval *(get_tarval_undefined)(void)
 {
 	return _get_tarval_undefined();
 }
 
-tarval *(get_tarval_b_false)(void)
+ir_tarval *(get_tarval_b_false)(void)
 {
 	return _get_tarval_b_false();
 }
 
-tarval *(get_tarval_b_true)(void)
+ir_tarval *(get_tarval_b_true)(void)
 {
 	return _get_tarval_b_true();
 }
 
-tarval *(get_tarval_reachable)(void)
+ir_tarval *(get_tarval_reachable)(void)
 {
 	return _get_tarval_reachable();
 }
 
-tarval *(get_tarval_unreachable)(void)
+ir_tarval *(get_tarval_unreachable)(void)
 {
 	return _get_tarval_unreachable();
 }
 
-tarval *get_tarval_max(ir_mode *mode)
+ir_tarval *get_tarval_max(ir_mode *mode)
 {
 	const ieee_descriptor_t *desc;
 
@@ -588,7 +596,7 @@ tarval *get_tarval_max(ir_mode *mode)
 	return tarval_bad;
 }
 
-tarval *get_tarval_min(ir_mode *mode)
+ir_tarval *get_tarval_min(ir_mode *mode)
 {
 	const ieee_descriptor_t *desc;
 
@@ -623,7 +631,7 @@ tarval *get_tarval_min(ir_mode *mode)
 /** The bit pattern for the pointer NULL */
 static long _null_value = 0;
 
-tarval *get_tarval_null(ir_mode *mode)
+ir_tarval *get_tarval_null(ir_mode *mode)
 {
 	assert(mode);
 
@@ -651,7 +659,7 @@ tarval *get_tarval_null(ir_mode *mode)
 	return tarval_bad;
 }
 
-tarval *get_tarval_one(ir_mode *mode)
+ir_tarval *get_tarval_one(ir_mode *mode)
 {
 	assert(mode);
 
@@ -677,7 +685,7 @@ tarval *get_tarval_one(ir_mode *mode)
 	return tarval_bad;
 }
 
-tarval *get_tarval_all_one(ir_mode *mode)
+ir_tarval *get_tarval_all_one(ir_mode *mode)
 {
 	assert(mode);
 
@@ -702,7 +710,7 @@ tarval *get_tarval_all_one(ir_mode *mode)
 	return tarval_bad;
 }
 
-int tarval_is_constant(tarval *tv)
+int tarval_is_constant(ir_tarval *tv)
 {
 	int num_res = sizeof(reserved_tv) / sizeof(reserved_tv[0]);
 
@@ -711,7 +719,7 @@ int tarval_is_constant(tarval *tv)
 	return (tv < &reserved_tv[2] || tv > &reserved_tv[num_res - 1]);
 }
 
-tarval *get_tarval_minus_one(ir_mode *mode)
+ir_tarval *get_tarval_minus_one(ir_mode *mode)
 {
 	assert(mode);
 
@@ -737,7 +745,7 @@ tarval *get_tarval_minus_one(ir_mode *mode)
 	return tarval_bad;
 }
 
-tarval *get_tarval_nan(ir_mode *mode)
+ir_tarval *get_tarval_nan(ir_mode *mode)
 {
 	const ieee_descriptor_t *desc;
 
@@ -753,7 +761,7 @@ tarval *get_tarval_nan(ir_mode *mode)
 		panic("mode %F does not support NaN value", mode);
 }
 
-tarval *get_tarval_plus_inf(ir_mode *mode)
+ir_tarval *get_tarval_plus_inf(ir_mode *mode)
 {
 	assert(mode);
 	if (get_mode_n_vector_elems(mode) > 1)
@@ -767,7 +775,7 @@ tarval *get_tarval_plus_inf(ir_mode *mode)
 		panic("mode %F does not support +inf value", mode);
 }
 
-tarval *get_tarval_minus_inf(ir_mode *mode)
+ir_tarval *get_tarval_minus_inf(ir_mode *mode)
 {
 	assert(mode);
 
@@ -789,7 +797,7 @@ tarval *get_tarval_minus_inf(ir_mode *mode)
 /*
  * test if negative number, 1 means 'yes'
  */
-int tarval_is_negative(tarval *a)
+int tarval_is_negative(ir_tarval *a)
 {
 	if (get_mode_n_vector_elems(a->mode) > 1)
 		panic("vector arithmetic not implemented yet");
@@ -801,7 +809,7 @@ int tarval_is_negative(tarval *a)
 			return sc_comp(a->value, get_mode_null(a->mode)->value) == -1 ? 1 : 0;
 
 	case irms_float_number:
-		return fc_is_negative(a->value);
+		return fc_is_negative((const fp_value*) a->value);
 
 	default:
 		panic("mode %F does not support negation value", a->mode);
@@ -811,7 +819,7 @@ int tarval_is_negative(tarval *a)
 /*
  * test if null, 1 means 'yes'
  */
-int tarval_is_null(tarval *a)
+int tarval_is_null(ir_tarval *a)
 {
 	return
 		a != tarval_bad &&
@@ -821,14 +829,14 @@ int tarval_is_null(tarval *a)
 /*
  * test if one, 1 means 'yes'
  */
-int tarval_is_one(tarval *a)
+int tarval_is_one(ir_tarval *a)
 {
 	return
 		a != tarval_bad &&
 		a == get_mode_one(get_tarval_mode(a));
 }
 
-int tarval_is_all_one(tarval *tv)
+int tarval_is_all_one(ir_tarval *tv)
 {
 	return
 		tv != tarval_bad &&
@@ -838,7 +846,7 @@ int tarval_is_all_one(tarval *tv)
 /*
  * test if one, 1 means 'yes'
  */
-int tarval_is_minus_one(tarval *a)
+int tarval_is_minus_one(ir_tarval *a)
 {
 	return
 		a != tarval_bad &&
@@ -848,7 +856,7 @@ int tarval_is_minus_one(tarval *a)
 /*
  * comparison
  */
-pn_Cmp tarval_cmp(tarval *a, tarval *b)
+ir_relation tarval_cmp(ir_tarval *a, ir_tarval *b)
 {
 	carry_flag = -1;
 
@@ -857,10 +865,10 @@ pn_Cmp tarval_cmp(tarval *a, tarval *b)
 	}
 
 	if (a == tarval_undefined || b == tarval_undefined)
-		return pn_Cmp_False;
+		return ir_relation_false;
 
 	if (a->mode != b->mode)
-		return pn_Cmp_False;
+		return ir_relation_false;
 
 	if (get_mode_n_vector_elems(a->mode) > 1) {
 		/* vector arithmetic not implemented yet */
@@ -873,45 +881,42 @@ pn_Cmp tarval_cmp(tarval *a, tarval *b)
 	case irms_memory:
 	case irms_auxiliary:
 		if (a == b)
-			return pn_Cmp_Eq;
-		return pn_Cmp_False;
+			return ir_relation_equal;
+		return ir_relation_false;
 
 	case irms_float_number:
-		/* it should be safe to enable this even if other arithmetic is disabled */
-		/*if (no_float)
-			return pn_Cmp_False;*/
 		/*
 		 * BEWARE: we cannot compare a == b here, because
 		 * a NaN is always Unordered to any other value, even to itself!
 		 */
-		switch (fc_comp(a->value, b->value)) {
-		case -1: return pn_Cmp_Lt;
-		case  0: return pn_Cmp_Eq;
-		case  1: return pn_Cmp_Gt;
-		case  2: return pn_Cmp_Uo;
-		default: return pn_Cmp_False;
+		switch (fc_comp((const fp_value*) a->value, (const fp_value*) b->value)) {
+		case -1: return ir_relation_less;
+		case  0: return ir_relation_equal;
+		case  1: return ir_relation_greater;
+		case  2: return ir_relation_unordered;
+		default: return ir_relation_false;
 		}
 	case irms_reference:
 	case irms_int_number:
 		if (a == b)
-			return pn_Cmp_Eq;
-		return sc_comp(a->value, b->value) == 1 ? pn_Cmp_Gt : pn_Cmp_Lt;
+			return ir_relation_equal;
+		return sc_comp(a->value, b->value) == 1 ? ir_relation_greater : ir_relation_less;
 
 	case irms_internal_boolean:
 		if (a == b)
-			return pn_Cmp_Eq;
-		return a == tarval_b_true ? pn_Cmp_Gt : pn_Cmp_Lt;
+			return ir_relation_equal;
+		return a == tarval_b_true ? ir_relation_greater : ir_relation_less;
 	}
-	return pn_Cmp_False;
+	return ir_relation_false;
 }
 
 /*
  * convert to other mode
  */
-tarval *tarval_convert_to(tarval *src, ir_mode *dst_mode)
+ir_tarval *tarval_convert_to(ir_tarval *src, ir_mode *dst_mode)
 {
 	char                    *buffer;
-	fp_value                *res;
+	fp_value                *res = NULL;
 	const ieee_descriptor_t *desc;
 	int                      len;
 
@@ -939,19 +944,19 @@ tarval *tarval_convert_to(tarval *src, ir_mode *dst_mode)
 		switch (get_mode_sort(dst_mode)) {
 		case irms_float_number:
 			desc = get_descriptor(dst_mode);
-			fc_cast(src->value, desc, NULL);
+			fc_cast((const fp_value*) src->value, desc, NULL);
 			return get_tarval(fc_get_buffer(), fc_get_buffer_length(), dst_mode);
 
 		case irms_int_number:
 			switch (current_float_to_int_mode) {
 			case TRUNCATE:
-				res = fc_int(src->value, NULL);
+				res = fc_int((const fp_value*) src->value, NULL);
 				break;
 			case ROUND:
-				res = fc_rnd(src->value, NULL);
+				res = fc_rnd((const fp_value*) src->value, NULL);
 				break;
 			}
-			buffer = alloca(sc_get_buffer_length());
+			buffer = (char*) alloca(sc_get_buffer_length());
 			if (! fc_flt2int(res, buffer, dst_mode))
 				return tarval_bad;
 			return get_tarval(buffer, sc_get_buffer_length(), dst_mode);
@@ -968,7 +973,7 @@ tarval *tarval_convert_to(tarval *src, ir_mode *dst_mode)
 
 		case irms_reference:
 		case irms_int_number:
-			buffer = alloca(sc_get_buffer_length());
+			buffer = (char*) alloca(sc_get_buffer_length());
 			memcpy(buffer, src->value, sc_get_buffer_length());
 			sign_extend(buffer, dst_mode);
 			return get_tarval_overflow(buffer, src->length, dst_mode);
@@ -982,7 +987,7 @@ tarval *tarval_convert_to(tarval *src, ir_mode *dst_mode)
 			/* XXX floating point unit does not understand internal integer
 			 * representation, convert to string first, then create float from
 			 * string */
-			buffer = alloca(100);
+			buffer = (char*) alloca(100);
 			/* decimal string representation because hexadecimal output is
 			 * interpreted unsigned by fc_val_from_str, so this is a HACK */
 			len = snprintf(buffer, 100, "%s",
@@ -1005,7 +1010,7 @@ tarval *tarval_convert_to(tarval *src, ir_mode *dst_mode)
 
 	case irms_reference:
 		if (get_mode_sort(dst_mode) == irms_int_number) {
-			buffer = alloca(sc_get_buffer_length());
+			buffer = (char*) alloca(sc_get_buffer_length());
 			memcpy(buffer, src->value, sc_get_buffer_length());
 			sign_extend(buffer, src->mode);
 			return get_tarval_overflow(buffer, src->length, dst_mode);
@@ -1019,7 +1024,7 @@ tarval *tarval_convert_to(tarval *src, ir_mode *dst_mode)
 /*
  * bitwise negation
  */
-tarval *tarval_not(tarval *a)
+ir_tarval *tarval_not(ir_tarval *a)
 {
 	char *buffer;
 
@@ -1030,7 +1035,7 @@ tarval *tarval_not(tarval *a)
 	switch (get_mode_sort(a->mode)) {
 	case irms_reference:
 	case irms_int_number:
-		buffer = alloca(sc_get_buffer_length());
+		buffer = (char*) alloca(sc_get_buffer_length());
 		sc_not(a->value, buffer);
 		return get_tarval(buffer, a->length, a->mode);
 
@@ -1049,7 +1054,7 @@ tarval *tarval_not(tarval *a)
 /*
  * arithmetic negation
  */
-tarval *tarval_neg(tarval *a)
+ir_tarval *tarval_neg(ir_tarval *a)
 {
 	char *buffer;
 
@@ -1066,7 +1071,7 @@ tarval *tarval_neg(tarval *a)
 
 	switch (get_mode_sort(a->mode)) {
 	case irms_int_number:
-		buffer = alloca(sc_get_buffer_length());
+		buffer = (char*) alloca(sc_get_buffer_length());
 		sc_neg(a->value, buffer);
 		return get_tarval_overflow(buffer, a->length, a->mode);
 
@@ -1075,7 +1080,7 @@ tarval *tarval_neg(tarval *a)
 		/*if (no_float)
 			return tarval_bad;*/
 
-		fc_neg(a->value, NULL);
+		fc_neg((const fp_value*) a->value, NULL);
 		return get_tarval_overflow(fc_get_buffer(), fc_get_buffer_length(), a->mode);
 
 	default:
@@ -1086,7 +1091,7 @@ tarval *tarval_neg(tarval *a)
 /*
  * addition
  */
-tarval *tarval_add(tarval *a, tarval *b)
+ir_tarval *tarval_add(ir_tarval *a, ir_tarval *b)
 {
 	char *buffer;
 
@@ -1109,7 +1114,7 @@ tarval *tarval_add(tarval *a, tarval *b)
 	case irms_reference:
 	case irms_int_number:
 		/* modes of a,b are equal, so result has mode of a as this might be the character */
-		buffer = alloca(sc_get_buffer_length());
+		buffer = (char*) alloca(sc_get_buffer_length());
 		sc_add(a->value, b->value, buffer);
 		carry_flag = sc_get_bit_at(buffer, get_mode_size_bits(a->mode));
 		return get_tarval_overflow(buffer, a->length, a->mode);
@@ -1118,7 +1123,7 @@ tarval *tarval_add(tarval *a, tarval *b)
 		if (no_float)
 			return tarval_bad;
 
-		fc_add(a->value, b->value, NULL);
+		fc_add((const fp_value*) a->value, (const fp_value*) b->value, NULL);
 		return get_tarval_overflow(fc_get_buffer(), fc_get_buffer_length(), a->mode);
 
 	default:
@@ -1129,7 +1134,7 @@ tarval *tarval_add(tarval *a, tarval *b)
 /*
  * subtraction
  */
-tarval *tarval_sub(tarval *a, tarval *b, ir_mode *dst_mode)
+ir_tarval *tarval_sub(ir_tarval *a, ir_tarval *b, ir_mode *dst_mode)
 {
 	char    *buffer;
 
@@ -1152,7 +1157,7 @@ tarval *tarval_sub(tarval *a, tarval *b, ir_mode *dst_mode)
 	case irms_reference:
 	case irms_int_number:
 		/* modes of a,b are equal, so result has mode of a as this might be the character */
-		buffer = alloca(sc_get_buffer_length());
+		buffer = (char*) alloca(sc_get_buffer_length());
 		sc_sub(a->value, b->value, buffer);
 		carry_flag = sc_get_bit_at(buffer, get_mode_size_bits(a->mode));
 		return get_tarval_overflow(buffer, a->length, a->mode);
@@ -1161,7 +1166,7 @@ tarval *tarval_sub(tarval *a, tarval *b, ir_mode *dst_mode)
 		if (no_float)
 			return tarval_bad;
 
-		fc_sub(a->value, b->value, NULL);
+		fc_sub((const fp_value*) a->value, (const fp_value*) b->value, NULL);
 		return get_tarval_overflow(fc_get_buffer(), fc_get_buffer_length(), a->mode);
 
 	default:
@@ -1172,7 +1177,7 @@ tarval *tarval_sub(tarval *a, tarval *b, ir_mode *dst_mode)
 /*
  * multiplication
  */
-tarval *tarval_mul(tarval *a, tarval *b)
+ir_tarval *tarval_mul(ir_tarval *a, ir_tarval *b)
 {
 	char *buffer;
 
@@ -1188,7 +1193,7 @@ tarval *tarval_mul(tarval *a, tarval *b)
 	switch (get_mode_sort(a->mode)) {
 	case irms_int_number:
 		/* modes of a,b are equal */
-		buffer = alloca(sc_get_buffer_length());
+		buffer = (char*) alloca(sc_get_buffer_length());
 		sc_mul(a->value, b->value, buffer);
 		return get_tarval_overflow(buffer, a->length, a->mode);
 
@@ -1196,7 +1201,7 @@ tarval *tarval_mul(tarval *a, tarval *b)
 		if (no_float)
 			return tarval_bad;
 
-		fc_mul(a->value, b->value, NULL);
+		fc_mul((const fp_value*) a->value, (const fp_value*) b->value, NULL);
 		return get_tarval_overflow(fc_get_buffer(), fc_get_buffer_length(), a->mode);
 
 	default:
@@ -1205,53 +1210,41 @@ tarval *tarval_mul(tarval *a, tarval *b)
 }
 
 /*
- * floating point division
+ * division
+ * overflow is impossible, but look out for division by zero
  */
-tarval *tarval_quo(tarval *a, tarval *b)
+ir_tarval *tarval_div(ir_tarval *a, ir_tarval *b)
 {
-	assert((a->mode == b->mode) && mode_is_float(a->mode));
+	ir_mode *mode = a->mode;
+	assert(mode == b->mode);
 
 	carry_flag = -1;
 
-	if (no_float)
-		return tarval_bad;
-
-	if (get_mode_n_vector_elems(a->mode) > 1) {
+	if (get_mode_n_vector_elems(mode) > 1) {
 		/* vector arithmetic not implemented yet */
 		return tarval_bad;
 	}
 
-	fc_div(a->value, b->value, NULL);
-	return get_tarval_overflow(fc_get_buffer(), fc_get_buffer_length(), a->mode);
-}
-
-/*
- * integer division
- * overflow is impossible, but look out for division by zero
- */
-tarval *tarval_div(tarval *a, tarval *b)
-{
-	assert((a->mode == b->mode) && mode_is_int(a->mode));
-
-	carry_flag = -1;
+	if (mode_is_int(mode)) {
+		/* x/0 error */
+		if (b == get_mode_null(mode))
+			return tarval_bad;
 
-	if (get_mode_n_vector_elems(a->mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
+		/* modes of a,b are equal */
+		sc_div(a->value, b->value, NULL);
+		return get_tarval(sc_get_buffer(), sc_get_buffer_length(), a->mode);
+	} else {
+		assert(mode_is_float(mode));
+		fc_div((const fp_value*) a->value, (const fp_value*) b->value, NULL);
+		return get_tarval_overflow(fc_get_buffer(), fc_get_buffer_length(), mode);
 	}
-
-	/* x/0 error */
-	if (b == get_mode_null(b->mode)) return tarval_bad;
-	/* modes of a,b are equal */
-	sc_div(a->value, b->value, NULL);
-	return get_tarval(sc_get_buffer(), sc_get_buffer_length(), a->mode);
 }
 
 /*
  * remainder
  * overflow is impossible, but look out for division by zero
  */
-tarval *tarval_mod(tarval *a, tarval *b)
+ir_tarval *tarval_mod(ir_tarval *a, ir_tarval *b)
 {
 	assert((a->mode == b->mode) && mode_is_int(a->mode));
 
@@ -1273,11 +1266,11 @@ tarval *tarval_mod(tarval *a, tarval *b)
  * integer division AND remainder
  * overflow is impossible, but look out for division by zero
  */
-tarval *tarval_divmod(tarval *a, tarval *b, tarval **mod)
+ir_tarval *tarval_divmod(ir_tarval *a, ir_tarval *b, ir_tarval **mod)
 {
 	int len = sc_get_buffer_length();
-	char *div_res = alloca(len);
-	char *mod_res = alloca(len);
+	char *div_res = (char*) alloca(len);
+	char *mod_res = (char*) alloca(len);
 
 	assert((a->mode == b->mode) && mode_is_int(a->mode));
 
@@ -1300,7 +1293,7 @@ tarval *tarval_divmod(tarval *a, tarval *b, tarval **mod)
 /*
  * absolute value
  */
-tarval *tarval_abs(tarval *a)
+ir_tarval *tarval_abs(ir_tarval *a)
 {
 	char *buffer;
 
@@ -1315,7 +1308,7 @@ tarval *tarval_abs(tarval *a)
 	switch (get_mode_sort(a->mode)) {
 	case irms_int_number:
 		if (sc_comp(a->value, get_mode_null(a->mode)->value) == -1) {
-			buffer = alloca(sc_get_buffer_length());
+			buffer = (char*) alloca(sc_get_buffer_length());
 			sc_neg(a->value, buffer);
 			return get_tarval_overflow(buffer, a->length, a->mode);
 		}
@@ -1326,8 +1319,9 @@ tarval *tarval_abs(tarval *a)
 		/*if (no_float)
 			return tarval_bad;*/
 
-		if (fc_comp(a->value, get_mode_null(a->mode)->value) == -1) {
-			fc_neg(a->value, NULL);
+		if (fc_comp((const fp_value*) a->value,
+		    (const fp_value*) get_mode_null(a->mode)->value) == -1) {
+			fc_neg((const fp_value*) a->value, NULL);
 			return get_tarval_overflow(fc_get_buffer(), fc_get_buffer_length(), a->mode);
 		}
 		return a;
@@ -1341,7 +1335,7 @@ tarval *tarval_abs(tarval *a)
 /*
  * bitwise and
  */
-tarval *tarval_and(tarval *a, tarval *b)
+ir_tarval *tarval_and(ir_tarval *a, ir_tarval *b)
 {
 	assert(a->mode == b->mode);
 
@@ -1361,7 +1355,7 @@ tarval *tarval_and(tarval *a, tarval *b)
 	}
 }
 
-tarval *tarval_andnot(tarval *a, tarval *b)
+ir_tarval *tarval_andnot(ir_tarval *a, ir_tarval *b)
 {
 	assert(a->mode == b->mode);
 
@@ -1384,7 +1378,7 @@ tarval *tarval_andnot(tarval *a, tarval *b)
 /*
  * bitwise or
  */
-tarval *tarval_or(tarval *a, tarval *b)
+ir_tarval *tarval_or(ir_tarval *a, ir_tarval *b)
 {
 	assert(a->mode == b->mode);
 
@@ -1407,7 +1401,7 @@ tarval *tarval_or(tarval *a, tarval *b)
 /*
  * bitwise exclusive or (xor)
  */
-tarval *tarval_eor(tarval *a, tarval *b)
+ir_tarval *tarval_eor(ir_tarval *a, ir_tarval *b)
 {
 	assert((a->mode == b->mode));
 
@@ -1430,7 +1424,7 @@ tarval *tarval_eor(tarval *a, tarval *b)
 /*
  * bitwise left shift
  */
-tarval *tarval_shl(tarval *a, tarval *b)
+ir_tarval *tarval_shl(ir_tarval *a, ir_tarval *b)
 {
 	char *temp_val = NULL;
 
@@ -1444,7 +1438,7 @@ tarval *tarval_shl(tarval *a, tarval *b)
 	}
 
 	if (get_mode_modulo_shift(a->mode) != 0) {
-		temp_val = alloca(sc_get_buffer_length());
+		temp_val = (char*) alloca(sc_get_buffer_length());
 
 		sc_val_from_ulong(get_mode_modulo_shift(a->mode), temp_val);
 		sc_mod(b->value, temp_val, temp_val);
@@ -1458,7 +1452,7 @@ tarval *tarval_shl(tarval *a, tarval *b)
 /*
  * bitwise unsigned right shift
  */
-tarval *tarval_shr(tarval *a, tarval *b)
+ir_tarval *tarval_shr(ir_tarval *a, ir_tarval *b)
 {
 	char *temp_val = NULL;
 
@@ -1472,7 +1466,7 @@ tarval *tarval_shr(tarval *a, tarval *b)
 	}
 
 	if (get_mode_modulo_shift(a->mode) != 0) {
-		temp_val = alloca(sc_get_buffer_length());
+		temp_val = (char*) alloca(sc_get_buffer_length());
 
 		sc_val_from_ulong(get_mode_modulo_shift(a->mode), temp_val);
 		sc_mod(b->value, temp_val, temp_val);
@@ -1486,7 +1480,7 @@ tarval *tarval_shr(tarval *a, tarval *b)
 /*
  * bitwise signed right shift
  */
-tarval *tarval_shrs(tarval *a, tarval *b)
+ir_tarval *tarval_shrs(ir_tarval *a, ir_tarval *b)
 {
 	char *temp_val = NULL;
 
@@ -1500,7 +1494,7 @@ tarval *tarval_shrs(tarval *a, tarval *b)
 	}
 
 	if (get_mode_modulo_shift(a->mode) != 0) {
-		temp_val = alloca(sc_get_buffer_length());
+		temp_val = (char*) alloca(sc_get_buffer_length());
 
 		sc_val_from_ulong(get_mode_modulo_shift(a->mode), temp_val);
 		sc_mod(b->value, temp_val, temp_val);
@@ -1514,7 +1508,7 @@ tarval *tarval_shrs(tarval *a, tarval *b)
 /*
  * bitwise rotation to left
  */
-tarval *tarval_rotl(tarval *a, tarval *b)
+ir_tarval *tarval_rotl(ir_tarval *a, ir_tarval *b)
 {
 	char *temp_val = NULL;
 
@@ -1528,7 +1522,7 @@ tarval *tarval_rotl(tarval *a, tarval *b)
 	}
 
 	if (get_mode_modulo_shift(a->mode) != 0) {
-		temp_val = alloca(sc_get_buffer_length());
+		temp_val = (char*) alloca(sc_get_buffer_length());
 
 		sc_val_from_ulong(get_mode_modulo_shift(a->mode), temp_val);
 		sc_mod(b->value, temp_val, temp_val);
@@ -1552,7 +1546,7 @@ int tarval_carry(void)
 /*
  * Output of tarvals
  */
-int tarval_snprintf(char *buf, size_t len, tarval *tv)
+int tarval_snprintf(char *buf, size_t len, ir_tarval *tv)
 {
 	static const tarval_mode_info default_info = { TVO_NATIVE, NULL, NULL };
 
@@ -1561,7 +1555,7 @@ int tarval_snprintf(char *buf, size_t len, tarval *tv)
 	const tarval_mode_info *mode_info;
 	const char *prefix, *suffix;
 
-	mode_info = tv->mode->tv_priv;
+	mode_info = (const tarval_mode_info*) tv->mode->tv_priv;
 	if (! mode_info)
 		mode_info = &default_info;
 	prefix = mode_info->mode_prefix ? mode_info->mode_prefix : "";
@@ -1594,15 +1588,15 @@ int tarval_snprintf(char *buf, size_t len, tarval *tv)
 	case irms_float_number:
 		switch (mode_info->mode_output) {
 		case TVO_HEX:
-			return snprintf(buf, len, "%s%s%s", prefix, fc_print(tv->value, tv_buf, sizeof(tv_buf), FC_PACKED), suffix);
+			return snprintf(buf, len, "%s%s%s", prefix, fc_print((const fp_value*) tv->value, tv_buf, sizeof(tv_buf), FC_PACKED), suffix);
 
 		case TVO_HEXFLOAT:
-			return snprintf(buf, len, "%s%s%s", prefix, fc_print(tv->value, tv_buf, sizeof(tv_buf), FC_HEX), suffix);
+			return snprintf(buf, len, "%s%s%s", prefix, fc_print((const fp_value*) tv->value, tv_buf, sizeof(tv_buf), FC_HEX), suffix);
 
 		case TVO_FLOAT:
 		case TVO_NATIVE:
 		default:
-			return snprintf(buf, len, "%s%s%s", prefix, fc_print(tv->value, tv_buf, sizeof(tv_buf), FC_DEC), suffix);
+			return snprintf(buf, len, "%s%s%s", prefix, fc_print((const fp_value*) tv->value, tv_buf, sizeof(tv_buf), FC_DEC), suffix);
 		}
 		break;
 
@@ -1640,7 +1634,7 @@ int tarval_snprintf(char *buf, size_t len, tarval *tv)
 /**
  * Output of tarvals to stdio.
  */
-int tarval_printf(tarval *tv)
+int tarval_printf(ir_tarval *tv)
 {
 	char buf[1024];
 	int res;
@@ -1651,7 +1645,7 @@ int tarval_printf(tarval *tv)
 	return res;
 }
 
-char *get_tarval_bitpattern(tarval *tv)
+char *get_tarval_bitpattern(ir_tarval *tv)
 {
 	int i, j, pos = 0;
 	int n = get_mode_size_bits(tv->mode);
@@ -1674,13 +1668,13 @@ char *get_tarval_bitpattern(tarval *tv)
 /*
  * access to the bitpattern
  */
-unsigned char get_tarval_sub_bits(tarval *tv, unsigned byte_ofs)
+unsigned char get_tarval_sub_bits(ir_tarval *tv, unsigned byte_ofs)
 {
 	switch (get_mode_arithmetic(tv->mode)) {
 	case irma_twos_complement:
 		return sc_sub_bits(tv->value, get_mode_size_bits(tv->mode), byte_ofs);
 	case irma_ieee754:
-		return fc_sub_bits(tv->value, get_mode_size_bits(tv->mode), byte_ofs);
+		return fc_sub_bits((const fp_value*) tv->value, get_mode_size_bits(tv->mode), byte_ofs);
 	default:
 		panic("get_tarval_sub_bits(): arithmetic mode not supported");
 	}
@@ -1710,14 +1704,14 @@ const tarval_mode_info *get_tarval_mode_output_option(ir_mode *mode)
 {
 	assert(mode);
 
-	return mode->tv_priv;
+	return (const tarval_mode_info*) mode->tv_priv;
 }
 
 /*
  * Returns non-zero if a given (integer) tarval has only one single bit
  * set.
  */
-int tarval_is_single_bit(tarval *tv)
+int tarval_is_single_bit(ir_tarval *tv)
 {
 	int i, l;
 	int bits;
@@ -1743,7 +1737,7 @@ int tarval_is_single_bit(tarval *tv)
 /*
  * Return the number of set bits in a given (integer) tarval.
  */
-int get_tarval_popcount(tarval *tv)
+int get_tarval_popcount(ir_tarval *tv)
 {
 	int i, l;
 	int bits;
@@ -1767,7 +1761,7 @@ int get_tarval_popcount(tarval *tv)
  *
  * @return number of lowest set bit or -1 on error
  */
-int get_tarval_lowest_bit(tarval *tv)
+int get_tarval_lowest_bit(ir_tarval *tv)
 {
 	int i, l;
 
@@ -1788,27 +1782,27 @@ int get_tarval_lowest_bit(tarval *tv)
  * Returns non-zero if the mantissa of a floating point IEEE-754
  * tarval is zero (i.e. 1.0Exxx)
  */
-int tarval_ieee754_zero_mantissa(tarval *tv)
+int tarval_ieee754_zero_mantissa(ir_tarval *tv)
 {
 	assert(get_mode_arithmetic(tv->mode) == irma_ieee754);
-	return fc_zero_mantissa(tv->value);
+	return fc_zero_mantissa((const fp_value*) tv->value);
 }
 
 /* Returns the exponent of a floating point IEEE-754 tarval. */
-int tarval_ieee754_get_exponent(tarval *tv)
+int tarval_ieee754_get_exponent(ir_tarval *tv)
 {
 	assert(get_mode_arithmetic(tv->mode) == irma_ieee754);
-	return fc_get_exponent(tv->value);
+	return fc_get_exponent((const fp_value*) tv->value);
 }
 
 /*
  * Check if the tarval can be converted to the given mode without
  * precision loss.
  */
-int tarval_ieee754_can_conv_lossless(tarval *tv, ir_mode *mode)
+int tarval_ieee754_can_conv_lossless(ir_tarval *tv, ir_mode *mode)
 {
 	const ieee_descriptor_t *desc = get_descriptor(mode);
-	return fc_can_lossless_conv_to(tv->value, desc);
+	return fc_can_lossless_conv_to((const fp_value*) tv->value, desc);
 }
 
 /* Set the immediate precision for IEEE-754 results. */
@@ -1836,34 +1830,37 @@ unsigned tarval_ieee754_get_mantissa_size(const ir_mode *mode)
 }
 
 /* check if its the a floating point NaN */
-int tarval_is_NaN(tarval *tv)
+int tarval_is_NaN(ir_tarval *tv)
 {
 	if (! mode_is_float(tv->mode))
 		return 0;
-	return fc_is_nan(tv->value);
+	return fc_is_nan((const fp_value*) tv->value);
 }
 
 /* check if its the a floating point +inf */
-int tarval_is_plus_inf(tarval *tv)
+int tarval_is_plus_inf(ir_tarval *tv)
 {
 	if (! mode_is_float(tv->mode))
 		return 0;
-	return fc_is_inf(tv->value) && !fc_is_negative(tv->value);
+	return fc_is_inf((const fp_value*) tv->value)
+		&& !fc_is_negative((const fp_value*) tv->value);
 }
 
 /* check if its the a floating point -inf */
-int tarval_is_minus_inf(tarval *tv)
+int tarval_is_minus_inf(ir_tarval *tv)
 {
 	if (! mode_is_float(tv->mode))
 		return 0;
-	return fc_is_inf(tv->value) && fc_is_negative(tv->value);
+	return fc_is_inf((const fp_value*) tv->value)
+		&& fc_is_negative((const fp_value*) tv->value);
 }
 
 /* check if the tarval represents a finite value */
-int tarval_is_finite(tarval *tv)
+int tarval_is_finite(ir_tarval *tv)
 {
 	if (mode_is_float(tv->mode))
-		return !fc_is_nan(tv->value) && !fc_is_inf(tv->value);
+		return !fc_is_nan((const fp_value*) tv->value)
+			&& !fc_is_inf((const fp_value*) tv->value);
 	return 1;
 }
 
@@ -1977,7 +1974,3 @@ int (is_tarval)(const void *thing)
 {
 	return _is_tarval(thing);
 }
-
-/****************************************************************************
- *   end of tv.c
- ****************************************************************************/