- reenabled callgraph

[libfirm] / ir / ir / irmode.c

diff --git a/ir/ir/irmode.c b/ir/ir/irmode.c
index f4d029a..a9923d2 100644 (file)
--- a/ir/ir/irmode.c
+++ b/ir/ir/irmode.c
@@ -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:
@@ -411,7 +410,7 @@ int
        return _get_mode_sign(mode);
 }
 
-int
+mode_arithmetic
 (get_mode_arithmetic)(const ir_mode *mode) {
        return get_mode_arithmetic(mode);
 }
@@ -463,7 +462,7 @@ 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;
 }
@@ -486,6 +485,14 @@ get_mode_minus_one(ir_mode *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);
@@ -579,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;
 
@@ -620,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;
        }
@@ -656,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);