X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firmode.c;h=7d5a78f7a8e045146ac01991098ee7c598224c78;hb=8f355cb9b3d20c10f71d1b1e17cbf59a51ced83b;hp=f4d029a9fdca3355879c34737ae5270532494ae0;hpb=00245e0ad8d3992a00ae63fda651dd560f2b2b0f;p=libfirm

diff --git a/ir/ir/irmode.c b/ir/ir/irmode.c
index f4d029a9f..7d5a78f7a 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.
  *
@@ -132,6 +132,7 @@ static ir_mode *find_mode(const ir_mode *m) {
  */
 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 +140,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 +153,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:
@@ -376,43 +375,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) {
+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) {
+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);
 }
 
-int
-(get_mode_arithmetic)(const ir_mode *mode) {
+mode_arithmetic (get_mode_arithmetic)(const ir_mode *mode) {
 	return get_mode_arithmetic(mode);
 }
 
@@ -421,28 +412,23 @@ int
  *  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(mode_is_data(mode));
@@ -450,8 +436,7 @@ get_mode_min(ir_mode *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(mode_is_data(mode));
@@ -459,17 +444,15 @@ get_mode_max(ir_mode *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(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));
@@ -477,8 +460,7 @@ get_mode_one(ir_mode *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(mode_is_data(mode));
@@ -486,8 +468,14 @@ get_mode_minus_one(ir_mode *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(mode_is_data(mode) || mode == mode_b);
+	return mode->all_one;
+}
+
+tarval *get_mode_infinite(ir_mode *mode) {
 	assert(mode);
 	assert(get_mode_modecode(mode) < (modecode) num_modes);
 	assert(mode_is_float(mode));
@@ -495,8 +483,7 @@ get_mode_infinite(ir_mode *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(mode_is_float(mode));
@@ -504,67 +491,55 @@ get_mode_NAN(ir_mode *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 +554,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;
 
@@ -620,6 +599,9 @@ smaller_mode(const ir_mode *sm, const ir_mode *lm) {
 		/* do exist machines out there with different pointer lenghts ?*/
 		return 0;
 
+	case irms_internal_boolean:
+		return mode_is_int(lm);
+
 	default:
 		break;
 	}
@@ -655,8 +637,7 @@ 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);