X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firmode.c;h=a9923d2946a83c377478db9241b420e8779cd658;hb=5f05c97be1452a4fd611648879c1544a8af611c9;hp=8d4a1b85f1f55cd8882c7d4de7d0eca02aa8cf7f;hpb=a142727aca4ef56cf754045fc0129b6d1b840a63;p=libfirm

diff --git a/ir/ir/irmode.c b/ir/ir/irmode.c
index 8d4a1b85f..a9923d294 100644
--- a/ir/ir/irmode.c
+++ b/ir/ir/irmode.c
@@ -53,7 +53,7 @@
 static struct obstack modes;
 
 /** number of defined modes */
-static int num_modes;
+static int num_modes = 0;
 
 /* * *
  * local functions
@@ -132,7 +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_character:
+	case irms_reference:
 	case irms_int_number:
 	case irms_float_number:
 		mode->min  = get_tarval_min(mode);
@@ -140,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:
@@ -148,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:
@@ -200,8 +198,6 @@ ir_mode *mode_Lu;
 ir_mode *mode_LLs;  /* 128 bit */
 ir_mode *mode_LLu;
 
-ir_mode *mode_C;
-ir_mode *mode_U;
 ir_mode *mode_b;
 ir_mode *mode_P;
 
@@ -228,8 +224,6 @@ ir_mode *get_modeLs(void) { return mode_Ls; }
 ir_mode *get_modeLu(void) { return mode_Lu; }
 ir_mode *get_modeLLs(void){ return mode_LLs; }
 ir_mode *get_modeLLu(void){ return mode_LLu; }
-ir_mode *get_modeC(void) { return mode_C; }
-ir_mode *get_modeU(void) { return mode_U; }
 ir_mode *get_modeb(void) { return mode_b; }
 ir_mode *get_modeP(void) { return mode_P; }
 ir_mode *get_modeX(void) { return mode_X; }
@@ -271,8 +265,10 @@ static ir_mode *register_mode(const ir_mode *new_mode) {
 	mode = (ir_mode *)obstack_copy(&modes, new_mode, sizeof(*mode));
 
 	mode->kind = k_ir_mode;
-	if (num_modes >= irm_max) mode->code = num_modes;
-		num_modes++;
+	if (num_modes >= irm_max)  {
+		mode->code = num_modes;
+	}
+	num_modes++;
 
 	/* add the new mode to the irp list of modes */
 	add_irp_mode(mode);
@@ -320,7 +316,6 @@ ir_mode *new_ir_mode(const char *name, mode_sort sort, int bit_size, int sign,
 	case irms_float_number:
 	case irms_int_number:
 	case irms_reference:
-	case irms_character:
 		mode = register_mode(&mode_tmpl);
 	}
 	return mode;
@@ -366,7 +361,6 @@ ir_mode *new_ir_vector_mode(const char *name, mode_sort sort, int bit_size, unsi
 		break;
 
 	case irms_reference:
-	case irms_character:
 		assert(0 && "only integer and floating point modes can be vectorized");
 		break;
 
@@ -416,7 +410,7 @@ int
 	return _get_mode_sign(mode);
 }
 
-int
+mode_arithmetic
 (get_mode_arithmetic)(const ir_mode *mode) {
 	return get_mode_arithmetic(mode);
 }
@@ -449,7 +443,7 @@ void
 tarval *
 get_mode_min(ir_mode *mode) {
 	assert(mode);
-	assert(get_mode_modecode(mode) < num_modes);
+	assert(get_mode_modecode(mode) < (modecode) num_modes);
 	assert(mode_is_data(mode));
 
 	return mode->min;
@@ -458,7 +452,7 @@ get_mode_min(ir_mode *mode) {
 tarval *
 get_mode_max(ir_mode *mode) {
 	assert(mode);
-	assert(get_mode_modecode(mode) < num_modes);
+	assert(get_mode_modecode(mode) < (modecode) num_modes);
 	assert(mode_is_data(mode));
 
 	return mode->max;
@@ -467,8 +461,8 @@ get_mode_max(ir_mode *mode) {
 tarval *
 get_mode_null(ir_mode *mode) {
 	assert(mode);
-	assert(get_mode_modecode(mode) < num_modes);
-	assert(mode_is_data(mode));
+	assert(get_mode_modecode(mode) < (modecode) num_modes);
+	assert(mode_is_datab(mode));
 
 	return mode->null;
 }
@@ -476,7 +470,7 @@ get_mode_null(ir_mode *mode) {
 tarval *
 get_mode_one(ir_mode *mode) {
 	assert(mode);
-	assert(get_mode_modecode(mode) < num_modes);
+	assert(get_mode_modecode(mode) < (modecode) num_modes);
 	assert(mode_is_data(mode));
 
 	return mode->one;
@@ -485,16 +479,24 @@ get_mode_one(ir_mode *mode) {
 tarval *
 get_mode_minus_one(ir_mode *mode) {
 	assert(mode);
-	assert(get_mode_modecode(mode) < num_modes);
+	assert(get_mode_modecode(mode) < (modecode) num_modes);
 	assert(mode_is_data(mode));
 
 	return mode->minus_one;
 }
 
+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) < num_modes);
+	assert(get_mode_modecode(mode) < (modecode) num_modes);
 	assert(mode_is_float(mode));
 
 	return get_tarval_plus_inf(mode);
@@ -503,7 +505,7 @@ get_mode_infinite(ir_mode *mode) {
 tarval *
 get_mode_NAN(ir_mode *mode) {
 	assert(mode);
-	assert(get_mode_modecode(mode) < num_modes);
+	assert(get_mode_modecode(mode) < (modecode) num_modes);
 	assert(mode_is_float(mode));
 
 	return get_tarval_nan(mode);
@@ -532,11 +534,6 @@ int
 	return _mode_is_int(mode);
 }
 
-int
-(mode_is_character)(const ir_mode *mode) {
-	return _mode_is_character(mode);
-}
-
 int
 (mode_is_reference)(const ir_mode *mode) {
 	return _mode_is_reference(mode);
@@ -547,11 +544,6 @@ int
 	return _mode_is_num(mode);
 }
 
-int
-(mode_is_numP)(const ir_mode *mode) {
-	return _mode_is_numP(mode);
-}
-
 int
 (mode_is_data)(const ir_mode *mode) {
 	return _mode_is_data(mode);
@@ -594,23 +586,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;
 
@@ -635,6 +631,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;
 	}
@@ -671,7 +670,7 @@ void set_reference_mode_unsigned_eq(ir_mode *ref_mode, ir_mode *int_mode) {
 
 /* initialization, build the default modes */
 void
-init_mode (void) {
+init_mode(void) {
 	ir_mode newmode;
 
 	obstack_init(&modes);
@@ -870,29 +869,8 @@ init_mode (void) {
 
 	mode_LLu = register_mode(&newmode);
 
-	/* Character Modes */
-	newmode.sort         = irms_character;
-	newmode.arithmetic   = irma_twos_complement;
-	newmode.modulo_shift = 0;
-
-	/* Character */
-	newmode.name         = new_id_from_chars("C", 1);
-	newmode.code         = irm_C;
-	newmode.sign         = 0;
-	newmode.size         = 8;
-
-	mode_C = register_mode(&newmode);
-
-	/* Unicode character */
-	newmode.name         = new_id_from_chars("U", 1);
-	newmode.code         = irm_U;
-	newmode.sign         = 0;
-	newmode.size         = 16;
-
-	mode_U = register_mode(&newmode);
-
-	/* Reference Modes */
-	newmode.sort    = irms_reference;
+	/* Reference Mode */
+	newmode.sort       = irms_reference;
 	newmode.arithmetic = irma_twos_complement;
 
 	/* pointer */
@@ -998,11 +976,9 @@ void finish_mode(void) {
 	mode_Ls  = NULL;
 	mode_Lu  = NULL;
 
-	mode_C   = NULL;
-	mode_U   = NULL;
 	mode_b   = NULL;
-	mode_P   = NULL;
 
+	mode_P      = NULL;
 	mode_P_code = NULL;
 	mode_P_data = NULL;
 }