X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftv%2Ftv.c;h=c6056029c914a2a44cede791f962638b6539dff6;hb=cc73c2485f371de10db363869e5a324dbaf23e18;hp=c01aec0d89bf8e6a4dc12ee5aa9d031728a5127c;hpb=3af4232527b47ee49021698af08bdfc5faed0782;p=libfirm

diff --git a/ir/tv/tv.c b/ir/tv/tv.c
index c01aec0d8..c6056029c 100644
--- a/ir/tv/tv.c
+++ b/ir/tv/tv.c
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -23,7 +9,6 @@
  *           values.
  * @date     2003
  * @author   Mathias Heil
- * @version  $Id$
  * @brief
  *
  * Values are stored in a format depending upon chosen arithmetic
@@ -36,10 +21,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"
@@ -49,7 +32,7 @@
 #include "irnode.h"
 #include "strcalc.h"
 #include "fltcalc.h"
-#include "irtools.h"
+#include "util.h"
 #include "xmalloc.h"
 #include "firm_common.h"
 #include "error.h"
@@ -58,20 +41,6 @@
     target values */
 #define N_CONSTANTS 2048
 
-/* get the integer overflow mode */
-#define GET_OVERFLOW_MODE() int_overflow_mode
-
-/* unused, float to int doesn't work yet */
-enum float_to_int_mode {
-	TRUNCATE,
-	ROUND
-};
-
-#define GET_FLOAT_TO_INT_MODE() TRUNCATE
-
-#define SWITCH_NOINFINITY 0
-#define SWITCH_NODENORMALS 0
-
 /****************************************************************************
  *   local definitions and macros
  ****************************************************************************/
@@ -81,11 +50,11 @@ enum float_to_int_mode {
 #  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) (set_insert(ir_tarval, tarvals, (tv), sizeof(ir_tarval), hash_tv((tv))))
+#define FIND_TARVAL(tv) (set_find(ir_tarval, 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)))
+#define INSERT_VALUE(val, size) (set_insert(char, values, (val), size, hash_val((val), size)))
+#define FIND_VALUE(val, size) (set_find(char, values, (val), size, hash_val((val), size)))
 
 #define fail_verify(a) _fail_verify((a), __FILE__, __LINE__)
 
@@ -94,34 +63,16 @@ static struct set *tarvals = NULL;
 /** A set containing all existing values. */
 static struct set *values = NULL;
 
-/** The carry flag for SOME operations. -1 means UNDEFINED here */
-static int carry_flag = -1;
-
 /** The integer overflow mode. */
 static tarval_int_overflow_mode_t int_overflow_mode = TV_OVERFLOW_WRAP;
 
-/** if this is set non-zero, the constant folding for floating point is OFF */
-static int no_float = 0;
-
-/** IEEE-754r half precision */
-static const ieee_descriptor_t half_desc     = {  5,  10, 0, NORMAL };
-/** IEEE-754 single precision */
-static const ieee_descriptor_t single_desc   = {  8,  23, 0, NORMAL };
-/** IEEE-754 double precision */
-static const ieee_descriptor_t double_desc   = { 11,  52, 0, NORMAL };
-/** Intel x87 extended precision */
-static const ieee_descriptor_t extended_desc = { 15,  63, 1, NORMAL };
-
-/** IEEE-754r quad precision */
-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)
@@ -129,11 +80,12 @@ static void _fail_verify(tarval *tv, const char* file, int line)
 	else
 		panic("%s:%d: Invalid tarval (null)", file, line);
 }
+
+inline static
 #ifdef __GNUC__
-inline static void tarval_verify(tarval *tv) __attribute__ ((unused));
+	__attribute__((unused))
 #endif
-
-inline static void tarval_verify(tarval *tv)
+void tarval_verify(ir_tarval *tv)
 {
 	assert(tv);
 	assert(tv->mode);
@@ -148,14 +100,16 @@ inline static void tarval_verify(tarval *tv)
 #endif /* NDEBUG */
 
 /** Hash a tarval. */
-static int hash_tv(tarval *tv) {
-	return (PTR_TO_INT(tv->value) ^ PTR_TO_INT(tv->mode)) + tv->length;
+static unsigned hash_tv(ir_tarval *tv)
+{
+	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) {
-	unsigned int i;
-	unsigned int hash = 0;
+static unsigned hash_val(const void *value, size_t length)
+{
+	size_t i;
+	unsigned hash = 0;
 
 	/* scramble the byte - array */
 	for (i = 0; i < length; ++i) {
@@ -166,9 +120,10 @@ static int hash_val(const void *value, unsigned int length) {
 	return hash;
 }
 
-static int cmp_tv(const void *p1, const void *p2, size_t n) {
-	const tarval *tv1 = p1;
-	const tarval *tv2 = p2;
+static int cmp_tv(const void *p1, const void *p2, size_t n)
+{
+	const ir_tarval *tv1 = (const ir_tarval*) p1;
+	const ir_tarval *tv2 = (const ir_tarval*) p2;
 	(void) n;
 
 	assert(tv1->kind == k_tarval);
@@ -190,8 +145,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) {
-	tarval tv;
+static ir_tarval *get_tarval(const void *value, size_t length, ir_mode *mode)
+{
+	ir_tarval tv;
 
 	tv.kind   = k_tarval;
 	tv.mode   = mode;
@@ -199,7 +155,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);
@@ -210,20 +166,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 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 ... */
@@ -231,12 +187,12 @@ static tarval *get_tarval_overflow(const void *value, int length, ir_mode *mode)
 		return get_tarval(temp, length, mode);
 
 	case irms_int_number:
-		if (sc_comp(value, get_mode_max(mode)->value) == 1) {
-			switch (GET_OVERFLOW_MODE()) {
+		if (sc_comp(value, get_mode_max(mode)->value) == ir_relation_greater) {
+			switch (tarval_get_integer_overflow_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 ... */
@@ -248,12 +204,12 @@ static tarval *get_tarval_overflow(const void *value, int length, ir_mode *mode)
 				return get_tarval(value, length, mode);
 			}
 		}
-		if (sc_comp(value, get_mode_min(mode)->value) == -1) {
-			switch (GET_OVERFLOW_MODE()) {
+		if (sc_comp(value, get_mode_min(mode)->value) == ir_relation_less) {
+			switch (tarval_get_integer_overflow_mode()) {
 			case TV_OVERFLOW_SATURATE:
 				return get_mode_min(mode);
 			case TV_OVERFLOW_WRAP: {
-				char *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);
 				return get_tarval(temp, length, mode);
@@ -267,15 +223,6 @@ static tarval *get_tarval_overflow(const void *value, int length, ir_mode *mode)
 		break;
 
 	case irms_float_number:
-		if (SWITCH_NOINFINITY && fc_is_inf(value)) {
-			/* clip infinity to maximum value */
-			return fc_is_negative(value) ? get_mode_min(mode) : get_mode_max(mode);
-		}
-
-		if (SWITCH_NODENORMALS && fc_is_subnormal(value)) {
-			/* clip denormals to zero */
-			return get_mode_null(mode);
-		}
 		break;
 
 	default:
@@ -284,59 +231,103 @@ static tarval *get_tarval_overflow(const void *value, int length, ir_mode *mode)
 	return get_tarval(value, length, mode);
 }
 
-/*
- *   public variables declared in tv.h
- */
-static tarval reserved_tv[6];
+static ir_tarval reserved_tv[2];
+static ir_tarval nonconst_tvs[4];
 
-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         = &nonconst_tvs[0];
+ir_tarval *tarval_undefined   = &nonconst_tvs[1];
+ir_tarval *tarval_reachable   = &nonconst_tvs[2];
+ir_tarval *tarval_unreachable = &nonconst_tvs[3];
 
 /**
  * get the float descriptor for given mode.
  */
-static const ieee_descriptor_t *get_descriptor(const ir_mode *mode) {
-	switch (get_mode_size_bits(mode)) {
-	case 16:  return &half_desc;
-	case 32:  return &single_desc;
-	case 64:  return &double_desc;
-	case 80:
-	case 96:
-	case 128: return &extended_desc; /* FIXME: HACK for x86 where we have
-										sizeof(long double)==16 with 10 byte
-										real payload */
-	/* case 128: return &quad_desc; */
-	default:
-		panic("Unsupported mode in get_descriptor()");
-		return NULL;
-	}
+static const float_descriptor_t *get_descriptor(const ir_mode *mode)
+{
+	return &mode->float_desc;
 }
 
-/*
- *   public functions declared in tv.h
- */
+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;
 
-/*
- * Constructors =============================================================
- */
-tarval *new_tarval_from_str(const char *str, size_t len, ir_mode *mode)
+	buffer = alloca(sc_get_buffer_length());
+
+	ok = sc_val_from_str(sign, base, str, len, buffer);
+	if (!ok)
+		return tarval_bad;
+
+	return get_tarval_overflow(buffer, sc_get_buffer_length(), mode);
+}
+
+static ir_tarval *new_tarval_from_str_int(const char *str, size_t len,
+                                          ir_mode *mode)
 {
-	const ieee_descriptor_t *desc;
+	void    *buffer;
+	unsigned base = 10;
+	char     sign = 1;
+	int      ok;
+
+	/* skip leading spaces */
+	while (len > 0 && str[0] == ' ') {
+		++str;
+		--len;
+	}
+	if (len == 0)
+		return tarval_bad;
+
+	/* 1 sign character allowed */
+	if (str[0] == '-') {
+		sign = -1;
+		++str;
+		--len;
+	} else if (str[0] == '+') {
+		++str;
+		--len;
+	}
+
+	/* a number starting with '0x' is hexadeciaml,
+	 * a number starting with '0' (and at least 1 more char) is octal */
+	if (len >= 2 && str[0] == '0') {
+		if (str[1] == 'x' || str[1] == 'X') {
+			str += 2;
+			len -= 2;
+			base = 16;
+		} else if (str[1] == 'b' || str[1] == 'B') {
+			str += 2;
+			len -= 2;
+			base = 2;
+		} else {
+			++str;
+			--len;
+			base = 8;
+		}
+	}
+	if (len == 0)
+		return tarval_bad;
+
+	buffer = alloca(sc_get_buffer_length());
+
+	ok = sc_val_from_str(sign, base, str, len, buffer);
+	if (!ok)
+		return tarval_bad;
+
+	return get_tarval_overflow(buffer, sc_get_buffer_length(), mode);
+}
+
+ir_tarval *new_tarval_from_str(const char *str, size_t len, ir_mode *mode)
+{
+	const float_descriptor_t *desc;
 
 	assert(str);
 	assert(len);
 	assert(mode);
 
 	switch (get_mode_sort(mode)) {
-	case irms_control_flow:
-	case irms_memory:
-	case irms_auxiliary:
-		panic("Unsupported tarval creation with mode %F", mode);
-
 	case irms_internal_boolean:
 		/* match [tT][rR][uU][eE]|[fF][aA][lL][sS][eE] */
 		if (!strcasecmp(str, "true"))
@@ -357,16 +348,14 @@ tarval *new_tarval_from_str(const char *str, size_t len, ir_mode *mode)
 			return get_tarval_null(mode);
 		/* FALLTHROUGH */
 	case irms_int_number:
-		sc_val_from_str(str, len, NULL, mode);
-		return get_tarval(sc_get_buffer(), sc_get_buffer_length(), mode);
+		return new_tarval_from_str_int(str, len, mode);
+	default:
+		panic("Unsupported tarval creation with mode %F", mode);
 	}
-	panic("Unsupported tarval creation with mode %F", 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);
 
 	switch (get_mode_sort(mode))   {
@@ -384,20 +373,19 @@ tarval *new_tarval_from_long(long l, ir_mode *mode) {
 		return new_tarval_from_double((long double)l, mode);
 
 	default:
-		assert(0 && "unsupported mode sort");
+		panic("unsupported mode sort");
 	}
-	return NULL;
 }
 
-/* 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;
 
 	if (get_mode_size_bits(tv->mode) > (int) (sizeof(long) << 3)) {
 		/* the value might be too big to fit in a long */
 		sc_max_from_bits(sizeof(long) << 3, 0, NULL);
-		if (sc_comp(sc_get_buffer(), tv->value) == -1) {
+		if (sc_comp(sc_get_buffer(), tv->value) == ir_relation_less) {
 			/* really doesn't fit */
 			return 0;
 		}
@@ -405,15 +393,16 @@ int tarval_is_long(tarval *tv) {
 	return 1;
 }
 
-/* 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) {
-	const ieee_descriptor_t *desc;
+ir_tarval *new_tarval_from_long_double(long double d, ir_mode *mode)
+{
+	const float_descriptor_t *desc;
 
 	assert(mode && (get_mode_sort(mode) == irms_float_number));
 	desc = get_descriptor(mode);
@@ -421,26 +410,32 @@ tarval *new_tarval_from_double(long double d, ir_mode *mode) {
 	return get_tarval(fc_get_buffer(), fc_get_buffer_length(), mode);
 }
 
-/* returns non-zero if can be converted to double */
-int tarval_is_double(tarval *tv) {
+ir_tarval *new_tarval_from_double(double d, ir_mode *mode)
+{
+	return new_tarval_from_long_double(d, mode);
+}
+
+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);
+}
 
-/*
- * Access routines for tarval fields ========================================
- */
-
-/* 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);
 }
 
@@ -454,45 +449,41 @@ 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) {
-	const ieee_descriptor_t *desc;
-
-	assert(mode);
-	if (get_mode_n_vector_elems(mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
+ir_tarval *get_tarval_max(ir_mode *mode)
+{
+	const float_descriptor_t *desc;
 
 	switch (get_mode_sort(mode)) {
-	case irms_control_flow:
-	case irms_memory:
-	case irms_auxiliary:
-		panic("mode %F does not support maximum value", mode);
-
 	case irms_internal_boolean:
 		return tarval_b_true;
 
@@ -505,25 +496,16 @@ tarval *get_tarval_max(ir_mode *mode) {
 	case irms_int_number:
 		sc_max_from_bits(get_mode_size_bits(mode), mode_is_signed(mode), NULL);
 		return get_tarval(sc_get_buffer(), sc_get_buffer_length(), mode);
+	default:
+		panic("mode %F does not support maximum value", mode);
 	}
-	return tarval_bad;
 }
 
-tarval *get_tarval_min(ir_mode *mode) {
-	const ieee_descriptor_t *desc;
-
-	assert(mode);
-	if (get_mode_n_vector_elems(mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
+ir_tarval *get_tarval_min(ir_mode *mode)
+{
+	const float_descriptor_t *desc;
 
 	switch (get_mode_sort(mode)) {
-	case irms_control_flow:
-	case irms_memory:
-	case irms_auxiliary:
-		panic("mode %F does not support minimum value", mode);
-
 	case irms_internal_boolean:
 		return tarval_b_false;
 
@@ -536,27 +518,17 @@ tarval *get_tarval_min(ir_mode *mode) {
 	case irms_int_number:
 		sc_min_from_bits(get_mode_size_bits(mode), mode_is_signed(mode), NULL);
 		return get_tarval(sc_get_buffer(), sc_get_buffer_length(), mode);
+	default:
+		panic("mode %F does not support minimum value", mode);
 	}
-	return tarval_bad;
 }
 
 /** The bit pattern for the pointer NULL */
 static long _null_value = 0;
 
-tarval *get_tarval_null(ir_mode *mode) {
-	assert(mode);
-
-	if (get_mode_n_vector_elems(mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
-
+ir_tarval *get_tarval_null(ir_mode *mode)
+{
 	switch (get_mode_sort(mode)) {
-	case irms_control_flow:
-	case irms_memory:
-	case irms_auxiliary:
-		panic("mode %F does not support null value", mode);
-
 	case irms_float_number:
 		return new_tarval_from_double(0.0, mode);
 
@@ -566,22 +538,14 @@ tarval *get_tarval_null(ir_mode *mode) {
 
 	case irms_reference:
 		return new_tarval_from_long(_null_value, mode);
+	default:
+		panic("mode %F does not support null value", mode);
 	}
-	return tarval_bad;
 }
 
-tarval *get_tarval_one(ir_mode *mode) {
-	assert(mode);
-
-	if (get_mode_n_vector_elems(mode) > 1)
-		panic("vector arithmetic not implemented yet");
-
+ir_tarval *get_tarval_one(ir_mode *mode)
+{
 	switch (get_mode_sort(mode)) {
-	case irms_control_flow:
-	case irms_memory:
-	case irms_auxiliary:
-		panic("mode %F does not support one value", mode);
-
 	case irms_internal_boolean:
 		return tarval_b_true;
 
@@ -591,55 +555,36 @@ tarval *get_tarval_one(ir_mode *mode) {
 	case irms_reference:
 	case irms_int_number:
 		return new_tarval_from_long(1l, mode);
+	default:
+		panic("mode %F does not support one value", mode);
 	}
-	return tarval_bad;
 }
 
-tarval *get_tarval_all_one(ir_mode *mode) {
-	assert(mode);
-
-	if (get_mode_n_vector_elems(mode) > 1)
-		panic("vector arithmetic not implemented yet");
-
+ir_tarval *get_tarval_all_one(ir_mode *mode)
+{
 	switch (get_mode_sort(mode)) {
-	case irms_control_flow:
-	case irms_memory:
-	case irms_auxiliary:
-		panic("mode %F does not support all-one value", mode);
-
 	case irms_int_number:
 	case irms_internal_boolean:
 	case irms_reference:
 		return tarval_not(get_mode_null(mode));
 
-
 	case irms_float_number:
 		return new_tarval_from_double(1.0, mode);
+
+	default:
+		panic("mode %F does not support all-one value", mode);
 	}
-	return tarval_bad;
 }
 
-int tarval_is_constant(tarval *tv) {
-	int num_res = sizeof(reserved_tv) / sizeof(reserved_tv[0]);
-
-	/* reserved tarvals are NOT constants. Note that although
-	   tarval_b_true and tarval_b_false are reserved, they are constants of course. */
-	return (tv < &reserved_tv[2] || tv > &reserved_tv[num_res - 1]);
+int tarval_is_constant(ir_tarval *tv)
+{
+	size_t const num_res = ARRAY_SIZE(nonconst_tvs);
+	return tv < &nonconst_tvs[0] || &nonconst_tvs[num_res] <= tv;
 }
 
-tarval *get_tarval_minus_one(ir_mode *mode) {
-	assert(mode);
-
-	if (get_mode_n_vector_elems(mode) > 1)
-		panic("vector arithmetic not implemented yet");
-
+ir_tarval *get_tarval_minus_one(ir_mode *mode)
+{
 	switch (get_mode_sort(mode)) {
-	case irms_control_flow:
-	case irms_memory:
-	case irms_auxiliary:
-	case irms_internal_boolean:
-		panic("mode %F does not support minus one value", mode);
-
 	case irms_reference:
 		return tarval_bad;
 
@@ -648,16 +593,15 @@ tarval *get_tarval_minus_one(ir_mode *mode) {
 
 	case irms_int_number:
 		return new_tarval_from_long(-1l, mode);
+
+	default:
+		panic("mode %F does not support minus one value", mode);
 	}
-	return tarval_bad;
 }
 
-tarval *get_tarval_nan(ir_mode *mode) {
-	const ieee_descriptor_t *desc;
-
-	assert(mode);
-	if (get_mode_n_vector_elems(mode) > 1)
-		panic("vector arithmetic not implemented yet");
+ir_tarval *get_tarval_nan(ir_mode *mode)
+{
+	const float_descriptor_t *desc;
 
 	if (get_mode_sort(mode) == irms_float_number) {
 		desc = get_descriptor(mode);
@@ -667,27 +611,20 @@ tarval *get_tarval_nan(ir_mode *mode) {
 		panic("mode %F does not support NaN value", mode);
 }
 
-tarval *get_tarval_plus_inf(ir_mode *mode) {
-	assert(mode);
-	if (get_mode_n_vector_elems(mode) > 1)
-		panic("vector arithmetic not implemented yet");
-
+ir_tarval *get_tarval_plus_inf(ir_mode *mode)
+{
 	if (get_mode_sort(mode) == irms_float_number) {
-		const ieee_descriptor_t *desc = get_descriptor(mode);
+		const float_descriptor_t *desc = get_descriptor(mode);
 		fc_get_plusinf(desc, NULL);
 		return get_tarval(fc_get_buffer(), fc_get_buffer_length(), mode);
 	} else
 		panic("mode %F does not support +inf value", mode);
 }
 
-tarval *get_tarval_minus_inf(ir_mode *mode) {
-	assert(mode);
-
-	if (get_mode_n_vector_elems(mode) > 1)
-		panic("vector arithmetic not implemented yet");
-
+ir_tarval *get_tarval_minus_inf(ir_mode *mode)
+{
 	if (get_mode_sort(mode) == irms_float_number) {
-		const ieee_descriptor_t *desc = get_descriptor(mode);
+		const float_descriptor_t *desc = get_descriptor(mode);
 		fc_get_minusinf(desc, NULL);
 		return get_tarval(fc_get_buffer(), fc_get_buffer_length(), mode);
 	} else
@@ -698,129 +635,93 @@ tarval *get_tarval_minus_inf(ir_mode *mode) {
  * Arithmetic operations on tarvals ========================================
  */
 
-/*
- * test if negative number, 1 means 'yes'
- */
-int tarval_is_negative(tarval *a) {
-	if (get_mode_n_vector_elems(a->mode) > 1)
-		panic("vector arithmetic not implemented yet");
-
+int tarval_is_negative(ir_tarval *a)
+{
 	switch (get_mode_sort(a->mode)) {
 	case irms_int_number:
 		if (!mode_is_signed(a->mode)) return 0;
 		else
-			return sc_comp(a->value, get_mode_null(a->mode)->value) == -1 ? 1 : 0;
+			return sc_comp(a->value, get_mode_null(a->mode)->value) == ir_relation_less ? 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);
 	}
 }
 
-/*
- * test if null, 1 means 'yes'
- */
-int tarval_is_null(tarval *a) {
+int tarval_is_null(ir_tarval *a)
+{
 	return
 		a != tarval_bad &&
 		a == get_mode_null(get_tarval_mode(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 &&
 		tv == get_mode_all_one(get_tarval_mode(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 &&
 		a == get_mode_minus_one(get_tarval_mode(a));
 }
 
-/*
- * comparison
- */
-pn_Cmp tarval_cmp(tarval *a, tarval *b) {
-	carry_flag = -1;
-
+ir_relation tarval_cmp(ir_tarval *a, ir_tarval *b)
+{
 	if (a == tarval_bad || b == tarval_bad) {
 		panic("Comparison with tarval_bad");
-		return pn_Cmp_False;
 	}
 
 	if (a == tarval_undefined || b == tarval_undefined)
-		return pn_Cmp_False;
+		return ir_relation_false;
 
 	if (a->mode != b->mode)
-		return pn_Cmp_False;
-
-	if (get_mode_n_vector_elems(a->mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		assert(0 && "cmp not implemented for vector modes");
-	}
+		return ir_relation_false;
 
 	/* Here the two tarvals are unequal and of the same mode */
 	switch (get_mode_sort(a->mode)) {
-	case irms_control_flow:
-	case irms_memory:
-	case irms_auxiliary:
-		if (a == b)
-			return pn_Cmp_Eq;
-		return pn_Cmp_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;
-		}
+		return fc_comp((fp_value const*)a->value, (fp_value const*)b->value);
+
 	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);
 
 	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;
+
+	default:
+		panic("can't compare values of mode %F", a->mode);
 	}
-	return pn_Cmp_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;
-	const ieee_descriptor_t *desc;
-
-	carry_flag = -1;
+	fp_value                *res = NULL;
+	const float_descriptor_t *desc;
+	int                      len;
 
 	assert(src);
 	assert(dst_mode);
@@ -828,47 +729,27 @@ tarval *tarval_convert_to(tarval *src, ir_mode *dst_mode) {
 	if (src->mode == dst_mode)
 		return src;
 
-	if (get_mode_n_vector_elems(src->mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
-
 	switch (get_mode_sort(src->mode)) {
-	case irms_control_flow:
-	case irms_memory:
-	case irms_auxiliary:
-		break;
-
-		/* cast float to something */
+	/* cast float to something */
 	case irms_float_number:
 		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 (GET_FLOAT_TO_INT_MODE()) {
-			case TRUNCATE:
-				res = fc_int(src->value, NULL);
-				break;
-			case ROUND:
-				res = fc_rnd(src->value, NULL);
-				break;
-			default:
-				panic("Unsupported float to int conversion mode in tarval_convert_to()");
-				break;
-			}
-			buffer = alloca(sc_get_buffer_length());
+			res     = fc_int((const fp_value*) src->value, NULL);
+			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);
 
 		default:
-			/* the rest can't be converted */
-			return tarval_bad;
+			break;
 		}
-		break;
+		/* the rest can't be converted */
+		return tarval_bad;
 
 	/* cast int/characters to something */
 	case irms_int_number:
@@ -876,9 +757,8 @@ 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);
 
 		case irms_internal_boolean:
@@ -890,14 +770,14 @@ 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 */
-			snprintf(buffer, 100, "%s",
+			len = snprintf(buffer, 100, "%s",
 				sc_print(src->value, get_mode_size_bits(src->mode), SC_DEC, mode_is_signed(src->mode)));
 			buffer[100 - 1] = '\0';
 			desc = get_descriptor(dst_mode);
-			fc_val_from_str(buffer, 0, desc, NULL);
+			fc_val_from_str(buffer, len, desc, NULL);
 			return get_tarval(fc_get_buffer(), fc_get_buffer_length(), dst_mode);
 
 		default:
@@ -913,31 +793,27 @@ 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);
 		}
 		break;
+	default:
+		return tarval_bad;
 	}
 
 	return tarval_bad;
 }
 
-/*
- * bitwise negation
- */
-tarval *tarval_not(tarval *a) {
+ir_tarval *tarval_not(ir_tarval *a)
+{
 	char *buffer;
 
-	carry_flag = -1;
-
-	/* works for vector mode without changes */
-
 	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);
 
@@ -949,40 +825,26 @@ tarval *tarval_not(tarval *a) {
 		return tarval_bad;
 
 	default:
-		assert(0 && "bitwise negation is only allowed for integer and boolean");
-		return tarval_bad;
+		panic("bitwise negation is only allowed for integer and boolean");
 	}
 }
 
-/*
- * arithmetic negation
- */
-tarval *tarval_neg(tarval *a) {
+ir_tarval *tarval_neg(ir_tarval *a)
+{
 	char *buffer;
 
 	assert(mode_is_num(a->mode)); /* negation only for numerical values */
 
-	carry_flag = -1;
-
 	/* note: negation is allowed even for unsigned modes. */
 
-	if (get_mode_n_vector_elems(a->mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
-
 	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);
 
 	case irms_float_number:
-		/* it should be safe to enable this even if other arithmetic is disabled */
-		/*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:
@@ -990,19 +852,10 @@ 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;
 
-	carry_flag = -1;
-
-	if (get_mode_n_vector_elems(a->mode) > 1 || get_mode_n_vector_elems(b->mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
-
 	if (mode_is_reference(a->mode) && a->mode != b->mode) {
 		b = tarval_convert_to(b, a->mode);
 	} else if (mode_is_reference(b->mode) && b->mode != a->mode) {
@@ -1015,16 +868,12 @@ 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);
 
 	case irms_float_number:
-		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:
@@ -1032,19 +881,10 @@ 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;
 
-	carry_flag = -1;
-
-	if (get_mode_n_vector_elems(a->mode) > 1 || get_mode_n_vector_elems(b->mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
-
 	if (dst_mode != NULL) {
 		if (a->mode != dst_mode)
 			a = tarval_convert_to(a, dst_mode);
@@ -1057,16 +897,12 @@ 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);
 
 	case irms_float_number:
-		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:
@@ -1074,33 +910,21 @@ 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;
 
 	assert(a->mode == b->mode);
 
-	carry_flag = -1;
-
-	if (get_mode_n_vector_elems(a->mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
-
 	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);
 
 	case irms_float_number:
-		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:
@@ -1108,61 +932,30 @@ tarval *tarval_mul(tarval *a, tarval *b) {
 	}
 }
 
-/*
- * floating point division
- */
-tarval *tarval_quo(tarval *a, tarval *b) {
-	assert((a->mode == b->mode) && mode_is_float(a->mode));
-
-	carry_flag = -1;
-
-	if (no_float)
-		return tarval_bad;
-
-	if (get_mode_n_vector_elems(a->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));
+ir_tarval *tarval_div(ir_tarval *a, ir_tarval *b)
+{
+	ir_mode *mode = a->mode;
+	assert(mode == b->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));
 
-	carry_flag = -1;
-
-	if (get_mode_n_vector_elems(a->mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
-
 	/* x/0 error */
 	if (b == get_mode_null(b->mode)) return tarval_bad;
 	/* modes of a,b are equal */
@@ -1170,25 +963,14 @@ tarval *tarval_mod(tarval *a, tarval *b) {
 	return get_tarval(sc_get_buffer(), sc_get_buffer_length(), a->mode);
 }
 
-/*
- * 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));
 
-	carry_flag = -1;
-
-	if (get_mode_n_vector_elems(a->mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
-
-
 	/* x/0 error */
 	if (b == get_mode_null(b->mode)) return tarval_bad;
 	/* modes of a,b are equal */
@@ -1197,153 +979,114 @@ tarval *tarval_divmod(tarval *a, tarval *b, tarval **mod) {
 	return get_tarval(div_res, len, a->mode);
 }
 
-/*
- * absolute value
- */
-tarval *tarval_abs(tarval *a) {
+ir_tarval *tarval_abs(ir_tarval *a)
+{
 	char *buffer;
 
-	carry_flag = -1;
 	assert(mode_is_num(a->mode));
 
-	if (get_mode_n_vector_elems(a->mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
-
 	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());
+		if (sc_comp(a->value, get_mode_null(a->mode)->value) == ir_relation_less) {
+			buffer = (char*) alloca(sc_get_buffer_length());
 			sc_neg(a->value, buffer);
 			return get_tarval_overflow(buffer, a->length, a->mode);
 		}
 		return a;
 
 	case irms_float_number:
-		/* it should be safe to enable this even if other arithmetic is disabled */
-		/*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_is_negative((fp_value const*)a)) {
+			fc_neg((const fp_value*) a->value, NULL);
 			return get_tarval_overflow(fc_get_buffer(), fc_get_buffer_length(), a->mode);
 		}
 		return a;
 
 	default:
-		return tarval_bad;
+		break;
 	}
 	return tarval_bad;
 }
 
-/*
- * bitwise and
- */
-tarval *tarval_and(tarval *a, tarval *b) {
+ir_tarval *tarval_and(ir_tarval *a, ir_tarval *b)
+{
 	assert(a->mode == b->mode);
 
-	/* works even for vector modes */
-	carry_flag = 0;
-
 	switch (get_mode_sort(a->mode)) {
 	case irms_internal_boolean:
 		return (a == tarval_b_false) ? a : b;
 
+	case irms_reference:
 	case irms_int_number:
 		sc_and(a->value, b->value, NULL);
 		return get_tarval(sc_get_buffer(), sc_get_buffer_length(), a->mode);
 
 	default:
-		assert(0 && "operation not defined on mode");
-		return tarval_bad;
+		panic("operation not defined on mode");
 	}
 }
 
-tarval *tarval_andnot(tarval *a, tarval *b)
+ir_tarval *tarval_andnot(ir_tarval *a, ir_tarval *b)
 {
 	assert(a->mode == b->mode);
 
-	/* works even for vector modes */
-	carry_flag = 0;
-
 	switch (get_mode_sort(a->mode)) {
 	case irms_internal_boolean:
 		return a == tarval_b_true && b == tarval_b_false ? tarval_b_true : tarval_b_false;
 
+	case irms_reference:
 	case irms_int_number:
 		sc_andnot(a->value, b->value, NULL);
 		return get_tarval(sc_get_buffer(), sc_get_buffer_length(), a->mode);
 
 	default:
-		assert(0 && "operation not defined on mode");
-		return tarval_bad;
+		panic("operation not defined on mode");
 	}
 }
 
-/*
- * bitwise or
- */
-tarval *tarval_or(tarval *a, tarval *b) {
+ir_tarval *tarval_or(ir_tarval *a, ir_tarval *b)
+{
 	assert(a->mode == b->mode);
 
-	/* works even for vector modes */
-	carry_flag = 0;
-
 	switch (get_mode_sort(a->mode)) {
 	case irms_internal_boolean:
 		return (a == tarval_b_true) ? a : b;
 
+	case irms_reference:
 	case irms_int_number:
 		sc_or(a->value, b->value, NULL);
 		return get_tarval(sc_get_buffer(), sc_get_buffer_length(), a->mode);
 
 	default:
-		assert(0 && "operation not defined on mode");
-		return tarval_bad;
+		panic("operation not defined on mode");
 	}
 }
 
-/*
- * 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));
 
-	/* works even for vector modes */
-	carry_flag = 0;
-
 	switch (get_mode_sort(a->mode)) {
 	case irms_internal_boolean:
 		return (a == b)? tarval_b_false : tarval_b_true;
 
+	case irms_reference:
 	case irms_int_number:
 		sc_xor(a->value, b->value, NULL);
 		return get_tarval(sc_get_buffer(), sc_get_buffer_length(), a->mode);
 
 	default:
-		assert(0 && "operation not defined on mode");
-		return tarval_bad;;
+		panic("operation not defined on mode");
 	}
 }
 
-/*
- * bitwise left shift
- */
-tarval *tarval_shl(tarval *a, tarval *b) {
+ir_tarval *tarval_shl(ir_tarval *a, ir_tarval *b)
+{
 	char *temp_val = NULL;
 
 	assert(mode_is_int(a->mode) && mode_is_int(b->mode));
 
-	carry_flag = -1;
-
-	if (get_mode_n_vector_elems(a->mode) > 1 || get_mode_n_vector_elems(a->mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
-
 	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);
@@ -1354,23 +1097,25 @@ tarval *tarval_shl(tarval *a, tarval *b) {
 	return get_tarval(sc_get_buffer(), sc_get_buffer_length(), a->mode);
 }
 
-/*
- * bitwise unsigned right shift
- */
-tarval *tarval_shr(tarval *a, tarval *b) {
+ir_tarval *tarval_shl_unsigned(ir_tarval *a, unsigned b)
+{
+	ir_mode *mode   = a->mode;
+	unsigned modulo = get_mode_modulo_shift(mode);
+	if (modulo != 0)
+		b %= modulo;
+	assert((unsigned)(long)b==b);
+	sc_shlI(a->value, (long)b, get_mode_size_bits(mode), mode_is_signed(mode), NULL);
+	return get_tarval(sc_get_buffer(), sc_get_buffer_length(), mode);
+}
+
+ir_tarval *tarval_shr(ir_tarval *a, ir_tarval *b)
+{
 	char *temp_val = NULL;
 
 	assert(mode_is_int(a->mode) && mode_is_int(b->mode));
 
-	carry_flag = -1;
-
-	if (get_mode_n_vector_elems(a->mode) > 1 || get_mode_n_vector_elems(a->mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
-
 	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);
@@ -1381,23 +1126,25 @@ tarval *tarval_shr(tarval *a, tarval *b) {
 	return get_tarval(sc_get_buffer(), sc_get_buffer_length(), a->mode);
 }
 
-/*
- * bitwise signed right shift
- */
-tarval *tarval_shrs(tarval *a, tarval *b) {
+ir_tarval *tarval_shr_unsigned(ir_tarval *a, unsigned b)
+{
+	ir_mode *mode   = a->mode;
+	unsigned modulo = get_mode_modulo_shift(mode);
+	if (modulo != 0)
+		b %= modulo;
+	assert((unsigned)(long)b==b);
+	sc_shrI(a->value, (long)b, get_mode_size_bits(mode), mode_is_signed(mode), NULL);
+	return get_tarval(sc_get_buffer(), sc_get_buffer_length(), mode);
+}
+
+ir_tarval *tarval_shrs(ir_tarval *a, ir_tarval *b)
+{
 	char *temp_val = NULL;
 
 	assert(mode_is_int(a->mode) && mode_is_int(b->mode));
 
-	carry_flag = -1;
-
-	if (get_mode_n_vector_elems(a->mode) > 1 || get_mode_n_vector_elems(a->mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
-
 	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);
@@ -1408,23 +1155,25 @@ tarval *tarval_shrs(tarval *a, tarval *b) {
 	return get_tarval(sc_get_buffer(), sc_get_buffer_length(), a->mode);
 }
 
-/*
- * bitwise rotation to left
- */
-tarval *tarval_rotl(tarval *a, tarval *b) {
+ir_tarval *tarval_shrs_unsigned(ir_tarval *a, unsigned b)
+{
+	ir_mode *mode   = a->mode;
+	unsigned modulo = get_mode_modulo_shift(mode);
+	if (modulo != 0)
+		b %= modulo;
+	assert((unsigned)(long)b==b);
+	sc_shrsI(a->value, (long)b, get_mode_size_bits(mode), mode_is_signed(mode), NULL);
+	return get_tarval(sc_get_buffer(), sc_get_buffer_length(), mode);
+}
+
+ir_tarval *tarval_rotl(ir_tarval *a, ir_tarval *b)
+{
 	char *temp_val = NULL;
 
 	assert(mode_is_int(a->mode) && mode_is_int(b->mode));
 
-	carry_flag = -1;
-
-	if (get_mode_n_vector_elems(a->mode) > 1 || get_mode_n_vector_elems(a->mode) > 1) {
-		/* vector arithmetic not implemented yet */
-		return tarval_bad;
-	}
-
 	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);
@@ -1435,19 +1184,8 @@ tarval *tarval_rotl(tarval *a, tarval *b) {
 	return get_tarval(sc_get_buffer(), sc_get_buffer_length(), a->mode);
 }
 
-/*
- * carry flag of the last operation
- */
-int tarval_carry(void) {
-	if (carry_flag == -1)
-		panic("Carry undefined for the last operation");
-	return carry_flag;
-}
-
-/*
- * 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 };
 
 	const char *str;
@@ -1455,7 +1193,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 : "";
@@ -1488,17 +1226,16 @@ 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;
 
 	case irms_internal_boolean:
 		switch (mode_info->mode_output) {
@@ -1514,27 +1251,22 @@ int tarval_snprintf(char *buf, size_t len, tarval *tv) {
 			return snprintf(buf, len, "%s%s%s", prefix, (tv == tarval_b_true) ? "true" : "false", suffix);
 		}
 
-	case irms_control_flow:
-	case irms_memory:
-	case irms_auxiliary:
+	default:
 		if (tv == tarval_bad)
 			return snprintf(buf, len, "<TV_BAD>");
-		if (tv == tarval_undefined)
-			return snprintf(buf, len, "<TV_UNDEF>");
-		if (tv == tarval_unreachable)
-			return snprintf(buf, len, "<TV_UNREACHABLE>");
-		if (tv == tarval_reachable)
+		else if (tv == tarval_undefined)
+			return snprintf(buf, len, "<TV_UNDEFINED>");
+		else if (tv == tarval_reachable)
 			return snprintf(buf, len, "<TV_REACHABLE>");
-		return snprintf(buf, len, "<TV_??""?>");
+		else if (tv == tarval_unreachable)
+			return snprintf(buf, len, "<TV_UNREACHABLE>");
+		else
+			return snprintf(buf, len, "<TV_??""?>");
 	}
-
-	return 0;
 }
 
-/**
- * Output of tarvals to stdio.
- */
-int tarval_printf(tarval *tv) {
+int tarval_printf(ir_tarval *tv)
+{
 	char buf[1024];
 	int res;
 
@@ -1544,17 +1276,18 @@ 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);
 	int bytes = (n + 7) / 8;
 	char *res = XMALLOCN(char, n + 1);
 	unsigned char byte;
 
-	for(i = 0; i < bytes; i++) {
+	for (i = 0; i < bytes; i++) {
 		byte = get_tarval_sub_bits(tv, i);
-		for(j = 1; j < 256; j <<= 1)
-			if(pos < n)
+		for (j = 1; j < 256; j <<= 1)
+			if (pos < n)
 				res[pos++] = j & byte ? '1' : '0';
 	}
 
@@ -1563,50 +1296,36 @@ char *get_tarval_bitpattern(tarval *tv) {
 	return res;
 }
 
-/*
- * 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);
+	case irma_x86_extended_float:
+		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");
+		panic("arithmetic mode not supported");
 	}
 }
 
-/*
- * Specify the output options of one mode.
- *
- * This functions stores the modinfo, so DO NOT DESTROY it.
- *
- * Returns zero on success.
- */
-int  set_tarval_mode_output_option(ir_mode *mode, const tarval_mode_info *modeinfo) {
+int  set_tarval_mode_output_option(ir_mode *mode, const tarval_mode_info *modeinfo)
+{
 	assert(mode);
 
 	mode->tv_priv = modeinfo;
 	return 0;
 }
 
-/*
- * Returns the output options of one mode.
- *
- * This functions returns the mode info of a given mode.
- */
-const tarval_mode_info *get_tarval_mode_output_option(ir_mode *mode) {
+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;
 
@@ -1628,10 +1347,7 @@ int tarval_is_single_bit(tarval *tv) {
 	return bits;
 }
 
-/*
- * Return the number of set bits in a given (integer) tarval.
- */
-int get_tarval_popcnt(tarval *tv)
+int get_tarval_popcount(ir_tarval *tv)
 {
 	int i, l;
 	int bits;
@@ -1643,19 +1359,12 @@ int get_tarval_popcnt(tarval *tv)
 	for (bits = 0, i = l - 1; i >= 0; --i) {
 		unsigned char v = get_tarval_sub_bits(tv, (unsigned)i);
 
-		bits += popcnt(v);
+		bits += popcount(v);
 	}
 	return bits;
 }
 
-/**
- * Return the number of the lowest set bit in a given (integer) tarval.
- *
- * @param tv    the tarval
- *
- * @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;
 
@@ -1672,100 +1381,72 @@ int get_tarval_lowest_bit(tarval *tv)
 	return -1;
 }
 
-/*
- * 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) {
-	assert(get_mode_arithmetic(tv->mode) == irma_ieee754);
-	return fc_zero_mantissa(tv->value);
-}
-
-/* Returns the exponent of a floating point IEEE-754 tarval. */
-int tarval_ieee754_get_exponent(tarval *tv) {
-	assert(get_mode_arithmetic(tv->mode) == irma_ieee754);
-	return fc_get_exponent(tv->value);
+int tarval_zero_mantissa(ir_tarval *tv)
+{
+	assert(get_mode_arithmetic(tv->mode) == irma_ieee754
+	       || get_mode_arithmetic(tv->mode) == irma_x86_extended_float);
+	return fc_zero_mantissa((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) {
-	const ieee_descriptor_t *desc = get_descriptor(mode);
-	return fc_can_lossless_conv_to(tv->value, desc);
+int tarval_get_exponent(ir_tarval *tv)
+{
+	assert(get_mode_arithmetic(tv->mode) == irma_ieee754
+	       || get_mode_arithmetic(tv->mode) == irma_x86_extended_float);
+	return fc_get_exponent((const fp_value*) tv->value);
 }
 
-/* Set the immediate precision for IEEE-754 results. */
-unsigned tarval_ieee754_set_immediate_precision(unsigned bits) {
-	return fc_set_immediate_precision(bits);
+int tarval_ieee754_can_conv_lossless(ir_tarval *tv, ir_mode *mode)
+{
+	const float_descriptor_t *desc = get_descriptor(mode);
+	return fc_can_lossless_conv_to((const fp_value*) tv->value, desc);
 }
 
-/* Returns non-zero if the result of the last IEEE-754 operation was exact. */
-unsigned tarval_ieee754_get_exact(void) {
+unsigned tarval_ieee754_get_exact(void)
+{
 	return fc_is_exact();
 }
 
-/* Return the size of the mantissa in bits (including possible
-   implicit bits) for the given mode. */
-unsigned tarval_ieee754_get_mantissa_size(const ir_mode *mode) {
-	const ieee_descriptor_t *desc;
-
-	assert(get_mode_arithmetic(mode) == irma_ieee754);
-	desc = get_descriptor(mode);
-
-	return desc->mantissa_size + desc->explicit_one;
-}
-
-/* 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;
 }
 
-/*
- * Sets the overflow mode for integer operations.
- */
-void tarval_set_integer_overflow_mode(tarval_int_overflow_mode_t ov_mode) {
+void tarval_set_integer_overflow_mode(tarval_int_overflow_mode_t ov_mode)
+{
 	int_overflow_mode = ov_mode;
 }
 
-/* Get the overflow mode for integer operations. */
-tarval_int_overflow_mode_t tarval_get_integer_overflow_mode(void) {
+tarval_int_overflow_mode_t tarval_get_integer_overflow_mode(void)
+{
 	return int_overflow_mode;
 }
 
-/* Enable/Disable floating point constant folding. */
-void tarval_enable_fp_ops(int enable) {
-	no_float = !enable;
-}
-
-int tarval_fp_ops_enabled(void) {
-	return !no_float;
-}
-
 /**
  * default mode_info for output as HEX
  */
@@ -1775,14 +1456,8 @@ static const tarval_mode_info hex_output = {
 	NULL,
 };
 
-/*
- * Initialization of the tarval module: called before init_mode()
- */
-void init_tarval_1(long null_value, int support_quad_precision) {
-	/* if these assertion fail, tarval_is_constant() will follow ... */
-	assert(tarval_b_false == &reserved_tv[0] && "b_false MUST be the first reserved tarval!");
-	assert(tarval_b_true  == &reserved_tv[1] && "b_true MUST be the second reserved tarval!");
-
+void init_tarval_1(long null_value, int support_quad_precision)
+{
 	_null_value = null_value;
 
 	/* initialize the sets holding the tarvals with a comparison function and
@@ -1793,33 +1468,25 @@ void init_tarval_1(long null_value, int support_quad_precision) {
 	init_fltcalc(support_quad_precision ? 112 : 64);
 }
 
-/*
- * Initialization of the tarval module: called after init_mode()
- */
-void init_tarval_2(void) {
+void init_tarval_2(void)
+{
 	tarval_bad->kind          = k_tarval;
 	tarval_bad->mode          = mode_BAD;
-	tarval_bad->value         = INT_TO_PTR(resid_tarval_bad);
 
 	tarval_undefined->kind    = k_tarval;
 	tarval_undefined->mode    = mode_ANY;
-	tarval_undefined->value   = INT_TO_PTR(resid_tarval_undefined);
 
 	tarval_b_true->kind       = k_tarval;
 	tarval_b_true->mode       = mode_b;
-	tarval_b_true->value      = INT_TO_PTR(resid_tarval_b_true);
 
 	tarval_b_false->kind      = k_tarval;
 	tarval_b_false->mode      = mode_b;
-	tarval_b_false->value     = INT_TO_PTR(resid_tarval_b_false);
 
 	tarval_unreachable->kind  = k_tarval;
 	tarval_unreachable->mode  = mode_X;
-	tarval_unreachable->value = INT_TO_PTR(resid_tarval_unreachable);
 
 	tarval_reachable->kind    = k_tarval;
 	tarval_reachable->mode    = mode_X;
-	tarval_reachable->value   = INT_TO_PTR(resid_tarval_reachable);
 
 	/*
 	 * assign output modes that are compatible with the
@@ -1836,18 +1503,15 @@ void init_tarval_2(void) {
 	set_tarval_mode_output_option(mode_P,  &hex_output);
 }
 
-/* free all memory occupied by tarval. */
-void finish_tarval(void) {
+void finish_tarval(void)
+{
 	finish_strcalc();
 	finish_fltcalc();
 	del_set(tarvals); tarvals = NULL;
 	del_set(values);  values = NULL;
 }
 
-int (is_tarval)(const void *thing) {
+int (is_tarval)(const void *thing)
+{
 	return _is_tarval(thing);
 }
-
-/****************************************************************************
- *   end of tv.c
- ****************************************************************************/