X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firmode.c;h=0a41285e50e34e61949c90f04e35349778992551;hb=077eace885a7e700b3189f8d65acd04e689d4292;hp=8ac2be9d4ba50ff1f03fe61261bbae0832f3bcb8;hpb=6b2e03272c0f65da27ae547028ab6cf157d395c4;p=libfirm

diff --git a/ir/ir/irmode.c b/ir/ir/irmode.c
index 8ac2be9d4..0a41285e5 100644
--- a/ir/ir/irmode.c
+++ b/ir/ir/irmode.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -43,21 +43,16 @@
 # include "obst.h"
 # include "irhooks.h"
 # include "irtools.h"
+# include "array.h"
 
-/* * *
- * local values
- * * */
-
-
-/** dynamic array to hold all modes */
+/** Obstack to hold all modes. */
 static struct obstack modes;
 
-/** number of defined modes */
+/** Number of defined modes. */
 static int num_modes = 0;
 
-/* * *
- * local functions
- * * */
+/** The list of all currently existing modes. */
+static ir_mode **mode_list;
 
 /**
  * Compare modes that don't need to have their code field
@@ -65,7 +60,7 @@ static int num_modes = 0;
  *
  * TODO: Add other fields
  **/
-INLINE static int modes_are_equal(const ir_mode *m, const ir_mode *n) {
+static INLINE int modes_are_equal(const ir_mode *m, const ir_mode *n) {
 	if (m == n) return 1;
 	if (m->sort         == n->sort &&
 		m->arithmetic   == n->arithmetic &&
@@ -78,60 +73,47 @@ INLINE static int modes_are_equal(const ir_mode *m, const ir_mode *n) {
 	return 0;
 }
 
-/*
- * calculates the next obstack address
- */
-static void *next_obstack_adr(struct obstack *o, void *p, size_t s) {
-	PTR_INT_TYPE adr = PTR_TO_INT((char *)p);
-	int mask = obstack_alignment_mask(o);
-
-	adr += s + mask;
-
-	return INT_TO_PTR(adr & ~mask);
-}
-
 /**
  * searches the modes obstack for the given mode and returns
  * a pointer on an equal mode already in the array, NULL if
  * none found
  */
 static ir_mode *find_mode(const ir_mode *m) {
-	ir_mode *n, *nn;
-	struct _obstack_chunk	*p;
-
-	p  = modes.chunk;
-	n  = (ir_mode *)p->contents;
-	nn = next_obstack_adr(&modes, n, sizeof(*n));
-	for (; (char *)nn <= modes.next_free;) {
-		assert(is_mode(n));
+	int i;
+	for (i = ARR_LEN(mode_list) - 1; i >= 0; --i) {
+		ir_mode *n = mode_list[i];
 		if (modes_are_equal(n, m))
 			return n;
-
-		n  = nn;
-		nn = next_obstack_adr(&modes, n, sizeof(*n));
 	}
+	return NULL;
+}
 
-	for (p = p->prev; p; p = p->prev) {
-		n  = (ir_mode *)p->contents;
-		nn = next_obstack_adr(&modes, n, sizeof(*n));
-		for (; (char *)nn < p->limit;) {
-			assert(is_mode(n));
-			if (modes_are_equal(n, m))
-				return n;
-
-			n  = nn;
-			nn = next_obstack_adr(&modes, n, sizeof(*n));
-		}
+#ifdef FIRM_STATISTICS
+/* return the mode index, only needed for statistics */
+int stat_find_mode_index(const ir_mode *m) {
+	int i;
+	for (i = ARR_LEN(mode_list) - 1; i >= 0; --i) {
+		ir_mode *n = mode_list[i];
+		if (modes_are_equal(n, m))
+			return i;
 	}
+	return -1;
+}
 
+/* return the mode for a given index, only needed for statistics */
+ir_mode *stat_mode_for_index(int idx) {
+	if (0 <= idx  && idx < ARR_LEN(mode_list))
+		return mode_list[idx];
 	return NULL;
 }
+#endif
 
 /**
  * sets special values of modes
  */
 static void set_mode_values(ir_mode* mode) {
 	switch (get_mode_sort(mode))    {
+	case irms_reference:
 	case irms_int_number:
 	case irms_float_number:
 		mode->min  = get_tarval_min(mode);
@@ -139,6 +121,11 @@ static void set_mode_values(ir_mode* mode) {
 		mode->null = get_tarval_null(mode);
 		mode->one  = get_tarval_one(mode);
 		mode->minus_one = get_tarval_minus_one(mode);
+		if(get_mode_sort(mode) != irms_float_number) {
+			mode->all_one = get_tarval_all_one(mode);
+		} else {
+			mode->all_one = tarval_bad;
+		}
 		break;
 
 	case irms_internal_boolean:
@@ -147,14 +134,7 @@ static void set_mode_values(ir_mode* mode) {
 		mode->null = tarval_b_false;
 		mode->one  = tarval_b_true;
 		mode->minus_one = tarval_bad;
-		break;
-
-	case irms_reference:
-		mode->min  = tarval_bad;
-		mode->max  = tarval_bad;
-		mode->null = get_tarval_null(mode);
-		mode->one  = tarval_bad;
-		mode->minus_one = tarval_bad;
+		mode->all_one = tarval_b_true;
 		break;
 
 	case irms_auxiliary:
@@ -264,6 +244,7 @@ static ir_mode *register_mode(const ir_mode *new_mode) {
 
 	/* copy mode struct to modes array */
 	mode = (ir_mode *)obstack_copy(&modes, new_mode, sizeof(*mode));
+	ARR_APP1(ir_mode*, mode_list, mode);
 
 	mode->kind = k_ir_mode;
 	if (num_modes >= irm_max)  {
@@ -283,8 +264,8 @@ static ir_mode *register_mode(const ir_mode *new_mode) {
 /*
  * Creates a new mode.
  */
-ir_mode *new_ir_mode(const char *name, mode_sort sort, int bit_size, int sign,
-                     mode_arithmetic arithmetic, unsigned int modulo_shift)
+ir_mode *new_ir_mode(const char *name, ir_mode_sort sort, int bit_size, int sign,
+                     ir_mode_arithmetic arithmetic, unsigned int modulo_shift)
 {
 	ir_mode mode_tmpl;
 	ir_mode *mode = NULL;
@@ -325,8 +306,8 @@ ir_mode *new_ir_mode(const char *name, mode_sort sort, int bit_size, int sign,
 /*
  * Creates a new vector mode.
  */
-ir_mode *new_ir_vector_mode(const char *name, mode_sort sort, int bit_size, unsigned num_of_elem, int sign,
-                            mode_arithmetic arithmetic, unsigned int modulo_shift)
+ir_mode *new_ir_vector_mode(const char *name, ir_mode_sort sort, int bit_size, unsigned num_of_elem, int sign,
+                            ir_mode_arithmetic arithmetic, unsigned int modulo_shift)
 {
 	ir_mode mode_tmpl;
 	ir_mode *mode = NULL;
@@ -376,43 +357,35 @@ ir_mode *new_ir_vector_mode(const char *name, mode_sort sort, int bit_size, unsi
 }
 
 /* Functions for the direct access to all attributes of an ir_mode */
-modecode
-(get_mode_modecode)(const ir_mode *mode) {
+ir_modecode (get_mode_modecode)(const ir_mode *mode) {
 	return _get_mode_modecode(mode);
 }
 
-ident *
-(get_mode_ident)(const ir_mode *mode) {
+ident *(get_mode_ident)(const ir_mode *mode) {
 	return _get_mode_ident(mode);
 }
 
-const char *
-get_mode_name(const ir_mode *mode) {
+const char *get_mode_name(const ir_mode *mode) {
 	return get_id_str(mode->name);
 }
 
-mode_sort
-(get_mode_sort)(const ir_mode* mode) {
+ir_mode_sort (get_mode_sort)(const ir_mode* mode) {
 	return _get_mode_sort(mode);
 }
 
-int
-(get_mode_size_bits)(const ir_mode *mode) {
+unsigned (get_mode_size_bits)(const ir_mode *mode) {
 	return _get_mode_size_bits(mode);
 }
 
-int
-(get_mode_size_bytes)(const ir_mode *mode) {
+unsigned (get_mode_size_bytes)(const ir_mode *mode) {
 	return _get_mode_size_bytes(mode);
 }
 
-int
-(get_mode_sign)(const ir_mode *mode) {
+int (get_mode_sign)(const ir_mode *mode) {
 	return _get_mode_sign(mode);
 }
 
-mode_arithmetic
-(get_mode_arithmetic)(const ir_mode *mode) {
+ir_mode_arithmetic (get_mode_arithmetic)(const ir_mode *mode) {
 	return get_mode_arithmetic(mode);
 }
 
@@ -421,150 +394,134 @@ mode_arithmetic
  *  whether shift applies modulo to value of bits to shift.  Asserts
  *  if mode is not irms_int_number.
  */
-unsigned int
-(get_mode_modulo_shift)(const ir_mode *mode) {
+unsigned int (get_mode_modulo_shift)(const ir_mode *mode) {
 	return _get_mode_modulo_shift(mode);
 }
 
-unsigned int
-(get_mode_n_vector_elems)(const ir_mode *mode) {
+unsigned int (get_mode_n_vector_elems)(const ir_mode *mode) {
 	return _get_mode_vector_elems(mode);
 }
 
-void *
-(get_mode_link)(const ir_mode *mode) {
+void *(get_mode_link)(const ir_mode *mode) {
 	return _get_mode_link(mode);
 }
 
-void
-(set_mode_link)(ir_mode *mode, void *l) {
+void (set_mode_link)(ir_mode *mode, void *l) {
 	_set_mode_link(mode, l);
 }
 
-tarval *
-get_mode_min(ir_mode *mode) {
+tarval *get_mode_min(ir_mode *mode) {
 	assert(mode);
-	assert(get_mode_modecode(mode) < (modecode) num_modes);
+	assert(get_mode_modecode(mode) < (ir_modecode) num_modes);
 	assert(mode_is_data(mode));
 
 	return mode->min;
 }
 
-tarval *
-get_mode_max(ir_mode *mode) {
+tarval *get_mode_max(ir_mode *mode) {
 	assert(mode);
-	assert(get_mode_modecode(mode) < (modecode) num_modes);
+	assert(get_mode_modecode(mode) < (ir_modecode) num_modes);
 	assert(mode_is_data(mode));
 
 	return mode->max;
 }
 
-tarval *
-get_mode_null(ir_mode *mode) {
+tarval *get_mode_null(ir_mode *mode) {
 	assert(mode);
-	assert(get_mode_modecode(mode) < (modecode) num_modes);
-	assert(mode_is_data(mode));
+	assert(get_mode_modecode(mode) < (ir_modecode) num_modes);
+	assert(mode_is_datab(mode));
 
 	return mode->null;
 }
 
-tarval *
-get_mode_one(ir_mode *mode) {
+tarval *get_mode_one(ir_mode *mode) {
 	assert(mode);
-	assert(get_mode_modecode(mode) < (modecode) num_modes);
-	assert(mode_is_data(mode));
+	assert(get_mode_modecode(mode) < (ir_modecode) num_modes);
+	assert(mode_is_datab(mode));
 
 	return mode->one;
 }
 
-tarval *
-get_mode_minus_one(ir_mode *mode) {
+tarval *get_mode_minus_one(ir_mode *mode) {
 	assert(mode);
-	assert(get_mode_modecode(mode) < (modecode) num_modes);
+	assert(get_mode_modecode(mode) < (ir_modecode) num_modes);
 	assert(mode_is_data(mode));
 
 	return mode->minus_one;
 }
 
-tarval *
-get_mode_infinite(ir_mode *mode) {
+tarval *get_mode_all_one(ir_mode *mode) {
 	assert(mode);
-	assert(get_mode_modecode(mode) < (modecode) num_modes);
+	assert(get_mode_modecode(mode) < (ir_modecode) num_modes);
+	assert(mode_is_datab(mode));
+	return mode->all_one;
+}
+
+tarval *get_mode_infinite(ir_mode *mode) {
+	assert(mode);
+	assert(get_mode_modecode(mode) < (ir_modecode) num_modes);
 	assert(mode_is_float(mode));
 
 	return get_tarval_plus_inf(mode);
 }
 
-tarval *
-get_mode_NAN(ir_mode *mode) {
+tarval *get_mode_NAN(ir_mode *mode) {
 	assert(mode);
-	assert(get_mode_modecode(mode) < (modecode) num_modes);
+	assert(get_mode_modecode(mode) < (ir_modecode) num_modes);
 	assert(mode_is_float(mode));
 
 	return get_tarval_nan(mode);
 }
 
-int
-is_mode(void *thing) {
+int is_mode(void *thing) {
 	if (get_kind(thing) == k_ir_mode)
 		return 1;
 	else
 		return 0;
 }
 
-int
-(mode_is_signed)(const ir_mode *mode) {
+int (mode_is_signed)(const ir_mode *mode) {
 	return _mode_is_signed(mode);
 }
 
-int
-(mode_is_float)(const ir_mode *mode) {
+int (mode_is_float)(const ir_mode *mode) {
 	return _mode_is_float(mode);
 }
 
-int
-(mode_is_int)(const ir_mode *mode) {
+int (mode_is_int)(const ir_mode *mode) {
 	return _mode_is_int(mode);
 }
 
-int
-(mode_is_reference)(const ir_mode *mode) {
+int (mode_is_reference)(const ir_mode *mode) {
 	return _mode_is_reference(mode);
 }
 
-int
-(mode_is_num)(const ir_mode *mode) {
+int (mode_is_num)(const ir_mode *mode) {
 	return _mode_is_num(mode);
 }
 
-int
-(mode_is_data)(const ir_mode *mode) {
+int (mode_is_data)(const ir_mode *mode) {
 	return _mode_is_data(mode);
 }
 
-int
-(mode_is_datab)(const ir_mode *mode) {
+int (mode_is_datab)(const ir_mode *mode) {
 	return _mode_is_datab(mode);
 }
 
-int
-(mode_is_dataM)(const ir_mode *mode) {
+int (mode_is_dataM)(const ir_mode *mode) {
 	return _mode_is_dataM(mode);
 }
 
-int
-(mode_is_float_vector)(const ir_mode *mode) {
+int (mode_is_float_vector)(const ir_mode *mode) {
 	return _mode_is_float_vector(mode);
 }
 
-int
-(mode_is_int_vector)(const ir_mode *mode) {
+int (mode_is_int_vector)(const ir_mode *mode) {
 	return _mode_is_int_vector(mode);
 }
 
 /* Returns true if sm can be converted to lm without loss. */
-int
-smaller_mode(const ir_mode *sm, const ir_mode *lm) {
+int smaller_mode(const ir_mode *sm, const ir_mode *lm) {
 	int sm_bits, lm_bits;
 
 	assert(sm);
@@ -579,23 +536,27 @@ smaller_mode(const ir_mode *sm, const ir_mode *lm) {
 	case irms_int_number:
 		switch (get_mode_sort(lm)) {
 		case irms_int_number:
+			if(get_mode_arithmetic(sm) != get_mode_arithmetic(lm))
+				return 0;
+
+			/* only two complement implemented */
+			assert(get_mode_arithmetic(sm)==irma_twos_complement);
+
 			/* integers are convertable if
 			 *   - both have the same sign and lm is the larger one
 			 *   - lm is the signed one and is at least two bits larger
 			 *     (one for the sign, one for the highest bit of sm)
 			 *   - sm & lm are two_complement and lm has greater or equal number of bits
 			 */
-			if (   get_mode_arithmetic(sm) == get_mode_arithmetic(lm)
-				&& get_mode_arithmetic(sm) == irma_twos_complement) {
-				return lm_bits >= sm_bits;
-			} else if (mode_is_signed(sm)) {
-				if ( mode_is_signed(lm) && (lm_bits >= sm_bits) )
-					return 1;
-			} else if (mode_is_signed(lm)) {
-				if (lm_bits > sm_bits + 1)
-					return 1;
-			} else if (lm_bits >= sm_bits) {
-				return 1;
+			if(mode_is_signed(sm)) {
+				if(!mode_is_signed(lm))
+					return 0;
+				return sm_bits <= lm_bits;
+			} else {
+				if(mode_is_signed(lm)) {
+					return sm_bits < lm_bits;
+				}
+				return sm_bits <= lm_bits;
 			}
 			break;
 
@@ -658,11 +619,11 @@ void set_reference_mode_unsigned_eq(ir_mode *ref_mode, ir_mode *int_mode) {
 }
 
 /* initialization, build the default modes */
-void
-init_mode (void) {
+void init_mode(void) {
 	ir_mode newmode;
 
 	obstack_init(&modes);
+	mode_list = NEW_ARR_F(ir_mode*, 0);
 
 	num_modes  =  0;
 	/* initialize predefined modes */
@@ -944,6 +905,7 @@ int mode_wrap_around(const ir_mode *mode) {
 
 void finish_mode(void) {
 	obstack_free(&modes, 0);
+	DEL_ARR_F(mode_list);
 
 	mode_T   = NULL;
 	mode_X   = NULL;