rename create_Immediate() into ia32_create_Immediate()

[r25128]

diff --git a/ir/be/ia32/ia32_common_transform.c b/ir/be/ia32/ia32_common_transform.c
index 99803f0..b3eed81 100644 (file)
--- a/ir/be/ia32/ia32_common_transform.c
+++ b/ir/be/ia32/ia32_common_transform.c
@@ -162,7 +162,7 @@ ir_entity *create_float_const_entity(ir_node *cnst)
        return res;
 }
 
        return res;
 }
 

-ir_node *create_Immediate(ir_entity *symconst, int symconst_sign, long val)
+ir_node *ia32_create_Immediate(ir_entity *symconst, int symconst_sign, long val)

 {
        ir_graph *irg         = current_ir_graph;
        ir_node  *start_block = get_irg_start_block(irg);
 {
        ir_graph *irg         = current_ir_graph;
        ir_node  *start_block = get_irg_start_block(irg);


@@ -973,7 +973,7 @@ ir_node *try_create_Immediate(ir_node *node, char immediate_constraint_type)
                offset = tarval_neg(offset);
        }
 
                offset = tarval_neg(offset);
        }
 

-       new_node = create_Immediate(symconst_ent, symconst_sign, val);
+       new_node = ia32_create_Immediate(symconst_ent, symconst_sign, val);

 
        return new_node;
 }
 
        return new_node;
 }

diff --git a/ir/be/ia32/ia32_common_transform.h b/ir/be/ia32/ia32_common_transform.h
index 7cd3a7d..89f7c2f 100644 (file)
--- a/ir/be/ia32/ia32_common_transform.h
+++ b/ir/be/ia32/ia32_common_transform.h
@@ -61,7 +61,7 @@ ir_entity *create_float_const_entity(ir_node *cnst);
  * @param symconst_sign  sign for the symconst
  * @param val            integer value for the immediate
  */
  * @param symconst_sign  sign for the symconst
  * @param val            integer value for the immediate
  */

-ir_node *create_Immediate(ir_entity *symconst, int symconst_sign, long val);
+ir_node *ia32_create_Immediate(ir_entity *symconst, int symconst_sign, long val);

 
 /**
  * returns register by name (used for determining clobber specifications in
 
 /**
  * returns register by name (used for determining clobber specifications in

diff --git a/ir/be/ia32/ia32_optimize.c b/ir/be/ia32/ia32_optimize.c
index e1b1704..4cdcb47 100644 (file)
--- a/ir/be/ia32/ia32_optimize.c
+++ b/ir/be/ia32/ia32_optimize.c
@@ -318,15 +318,15 @@ static void peephole_ia32_Test(ir_node *node)
                        if ((offset & 0xFFFFFF00) == 0) {
                                /* attr->am_offs += 0; */
                        } else if ((offset & 0xFFFF00FF) == 0) {
                        if ((offset & 0xFFFFFF00) == 0) {
                                /* attr->am_offs += 0; */
                        } else if ((offset & 0xFFFF00FF) == 0) {

-                               ir_node *imm = create_Immediate(NULL, 0, offset >>  8);
+                               ir_node *imm = ia32_create_Immediate(NULL, 0, offset >>  8);

                                set_irn_n(node, n_ia32_Test_right, imm);
                                attr->am_offs += 1;
                        } else if ((offset & 0xFF00FFFF) == 0) {
                                set_irn_n(node, n_ia32_Test_right, imm);
                                attr->am_offs += 1;
                        } else if ((offset & 0xFF00FFFF) == 0) {

-                               ir_node *imm = create_Immediate(NULL, 0, offset >> 16);
+                               ir_node *imm = ia32_create_Immediate(NULL, 0, offset >> 16);

                                set_irn_n(node, n_ia32_Test_right, imm);
                                attr->am_offs += 2;
                        } else if ((offset & 0x00FFFFFF) == 0) {
                                set_irn_n(node, n_ia32_Test_right, imm);
                                attr->am_offs += 2;
                        } else if ((offset & 0x00FFFFFF) == 0) {

-                               ir_node *imm = create_Immediate(NULL, 0, offset >> 24);
+                               ir_node *imm = ia32_create_Immediate(NULL, 0, offset >> 24);

                                set_irn_n(node, n_ia32_Test_right, imm);
                                attr->am_offs += 3;
                        } else {
                                set_irn_n(node, n_ia32_Test_right, imm);
                                attr->am_offs += 3;
                        } else {

diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c
index 6a585ec..593f25f 100644 (file)
--- a/ir/be/ia32/ia32_transform.c
+++ b/ir/be/ia32/ia32_transform.c
@@ -220,8 +220,8 @@ static ir_node *gen_Const(ir_node *node)
 #ifdef CONSTRUCT_SSE_CONST
                        } else if (tarval_is_one(tv)) {
                                int     cnst  = mode == mode_F ? 26 : 55;
 #ifdef CONSTRUCT_SSE_CONST
                        } else if (tarval_is_one(tv)) {
                                int     cnst  = mode == mode_F ? 26 : 55;

-                               ir_node *imm1 = create_Immediate(NULL, 0, cnst);
-                               ir_node *imm2 = create_Immediate(NULL, 0, 2);
+                               ir_node *imm1 = ia32_create_Immediate(NULL, 0, cnst);
+                               ir_node *imm2 = ia32_create_Immediate(NULL, 0, 2);

                                ir_node *pslld, *psrld;
 
                                load = new_bd_ia32_xAllOnes(dbgi, block);
                                ir_node *pslld, *psrld;
 
                                load = new_bd_ia32_xAllOnes(dbgi, block);


@@ -250,7 +250,7 @@ static ir_node *gen_Const(ir_node *node)
                                                (get_tarval_sub_bits(tv, 2) << 16) |
                                                (get_tarval_sub_bits(tv, 3) << 24);
                                        if (val == 0) {
                                                (get_tarval_sub_bits(tv, 2) << 16) |
                                                (get_tarval_sub_bits(tv, 3) << 24);
                                        if (val == 0) {

-                                               ir_node *imm32 = create_Immediate(NULL, 0, 32);
+                                               ir_node *imm32 = ia32_create_Immediate(NULL, 0, 32);

                                                ir_node *cnst, *psllq;
 
                                                /* fine, lower 32bit are zero, produce 32bit value */
                                                ir_node *cnst, *psllq;
 
                                                /* fine, lower 32bit are zero, produce 32bit value */


@@ -1466,7 +1466,7 @@ static ir_node *create_sex_32_64(dbg_info *dbgi, ir_node *block,
                be_dep_on_frame(pval);
                res = new_bd_ia32_Cltd(dbgi, block, val, pval);
        } else {
                be_dep_on_frame(pval);
                res = new_bd_ia32_Cltd(dbgi, block, val, pval);
        } else {

-               ir_node *imm31 = create_Immediate(NULL, 0, 31);
+               ir_node *imm31 = ia32_create_Immediate(NULL, 0, 31);

                res = new_bd_ia32_Sar(dbgi, block, val, imm31);
        }
        SET_IA32_ORIG_NODE(res, orig);
                res = new_bd_ia32_Sar(dbgi, block, val, imm31);
        }
        SET_IA32_ORIG_NODE(res, orig);


@@ -2417,7 +2417,7 @@ static ir_node *gen_float_const_Store(ir_node *node, ir_node *cns)
                        (get_tarval_sub_bits(tv, ofs + 1) <<  8) |
                        (get_tarval_sub_bits(tv, ofs + 2) << 16) |
                        (get_tarval_sub_bits(tv, ofs + 3) << 24);
                        (get_tarval_sub_bits(tv, ofs + 1) <<  8) |
                        (get_tarval_sub_bits(tv, ofs + 2) << 16) |
                        (get_tarval_sub_bits(tv, ofs + 3) << 24);

-               ir_node *imm = create_Immediate(NULL, 0, val);
+               ir_node *imm = ia32_create_Immediate(NULL, 0, val);

 
                ir_node *new_node = new_bd_ia32_Store(dbgi, new_block, addr.base,
                        addr.index, addr.mem, imm);
 
                ir_node *new_node = new_bd_ia32_Store(dbgi, new_block, addr.base,
                        addr.index, addr.mem, imm);


@@ -3399,7 +3399,7 @@ static ir_node *gen_x87_gp_to_fp(ir_node *node, ir_mode *src_mode)
        if (!mode_is_signed(mode)) {
                ir_node *in[2];
                /* store a zero */
        if (!mode_is_signed(mode)) {
                ir_node *in[2];
                /* store a zero */

-               ir_node *zero_const = create_Immediate(NULL, 0, 0);
+               ir_node *zero_const = ia32_create_Immediate(NULL, 0, 0);

 
                ir_node *zero_store = new_bd_ia32_Store(dbgi, block, get_irg_frame(irg),
                                                        noreg_GP, nomem, zero_const);
 
                ir_node *zero_store = new_bd_ia32_Store(dbgi, block, get_irg_frame(irg),
                                                        noreg_GP, nomem, zero_const);


@@ -4076,7 +4076,7 @@ static ir_node *gen_ia32_l_LLtoFloat(ir_node *node)
        if (! mode_is_signed(get_irn_mode(val_high))) {
                ia32_address_mode_t  am;
 
        if (! mode_is_signed(get_irn_mode(val_high))) {
                ia32_address_mode_t  am;
 

-               ir_node *count = create_Immediate(NULL, 0, 31);
+               ir_node *count = ia32_create_Immediate(NULL, 0, 31);

                ir_node *fadd;
 
                am.addr.base          = noreg_GP;
                ir_node *fadd;
 
                am.addr.base          = noreg_GP;


@@ -4782,7 +4782,7 @@ static ir_node *gen_ffs(ir_node *node)
        set_ia32_commutative(or);
 
        /* add 1 */
        set_ia32_commutative(or);
 
        /* add 1 */

-       return new_bd_ia32_Add(dbgi, block, noreg_GP, noreg_GP, nomem, or, create_Immediate(NULL, 0, 1));
+       return new_bd_ia32_Add(dbgi, block, noreg_GP, noreg_GP, nomem, or, ia32_create_Immediate(NULL, 0, 1));

 }
 
 /**
 }
 
 /**


@@ -4794,7 +4794,7 @@ static ir_node *gen_clz(ir_node *node)
        ir_node  *real  = skip_Proj(bsr);
        dbg_info *dbgi  = get_irn_dbg_info(real);
        ir_node  *block = get_nodes_block(real);
        ir_node  *real  = skip_Proj(bsr);
        dbg_info *dbgi  = get_irn_dbg_info(real);
        ir_node  *block = get_nodes_block(real);

-       ir_node  *imm   = create_Immediate(NULL, 0, 31);
+       ir_node  *imm   = ia32_create_Immediate(NULL, 0, 31);

 
        return new_bd_ia32_Xor(dbgi, block, noreg_GP, noreg_GP, nomem, bsr, imm);
 }
 
        return new_bd_ia32_Xor(dbgi, block, noreg_GP, noreg_GP, nomem, bsr, imm);
 }


@@ -4826,7 +4826,7 @@ static ir_node *gen_parity(ir_node *node)
 
        /* cmp param, 0 */
        match_arguments(&am, block, NULL, param, NULL, match_am);
 
        /* cmp param, 0 */
        match_arguments(&am, block, NULL, param, NULL, match_am);

-       imm = create_Immediate(NULL, 0, 0);
+       imm = ia32_create_Immediate(NULL, 0, 0);

        cmp = new_bd_ia32_Cmp(dbgi, new_block, addr->base, addr->index,
                              addr->mem, imm, am.new_op2, am.ins_permuted, 0);
        set_am_attributes(cmp, &am);
        cmp = new_bd_ia32_Cmp(dbgi, new_block, addr->base, addr->index,
                              addr->mem, imm, am.new_op2, am.ins_permuted, 0);
        set_am_attributes(cmp, &am);


@@ -4881,11 +4881,11 @@ static ir_node *gen_popcount(ir_node *node) {
        /* do the standard popcount algo */
 
        /* m1 = x & 0x55555555 */
        /* do the standard popcount algo */
 
        /* m1 = x & 0x55555555 */

-       imm = create_Immediate(NULL, 0, 0x55555555);
+       imm = ia32_create_Immediate(NULL, 0, 0x55555555);

        m1 = new_bd_ia32_And(dbgi, new_block, noreg_GP, noreg_GP, nomem, new_param, imm);
 
        /* s1 = x >> 1 */
        m1 = new_bd_ia32_And(dbgi, new_block, noreg_GP, noreg_GP, nomem, new_param, imm);
 
        /* s1 = x >> 1 */

-       simm = create_Immediate(NULL, 0, 1);
+       simm = ia32_create_Immediate(NULL, 0, 1);

        s1 = new_bd_ia32_Shl(dbgi, new_block, new_param, simm);
 
        /* m2 = s1 & 0x55555555 */
        s1 = new_bd_ia32_Shl(dbgi, new_block, new_param, simm);
 
        /* m2 = s1 & 0x55555555 */


@@ -4895,11 +4895,11 @@ static ir_node *gen_popcount(ir_node *node) {
        m3 = new_bd_ia32_Lea(dbgi, new_block, m2, m1);
 
        /* m4 = m3 & 0x33333333 */
        m3 = new_bd_ia32_Lea(dbgi, new_block, m2, m1);
 
        /* m4 = m3 & 0x33333333 */

-       imm = create_Immediate(NULL, 0, 0x33333333);
+       imm = ia32_create_Immediate(NULL, 0, 0x33333333);

        m4 = new_bd_ia32_And(dbgi, new_block, noreg_GP, noreg_GP, nomem, m3, imm);
 
        /* s2 = m3 >> 2 */
        m4 = new_bd_ia32_And(dbgi, new_block, noreg_GP, noreg_GP, nomem, m3, imm);
 
        /* s2 = m3 >> 2 */

-       simm = create_Immediate(NULL, 0, 2);
+       simm = ia32_create_Immediate(NULL, 0, 2);

        s2 = new_bd_ia32_Shl(dbgi, new_block, m3, simm);
 
        /* m5 = s2 & 0x33333333 */
        s2 = new_bd_ia32_Shl(dbgi, new_block, m3, simm);
 
        /* m5 = s2 & 0x33333333 */


@@ -4909,11 +4909,11 @@ static ir_node *gen_popcount(ir_node *node) {
        m6 = new_bd_ia32_Lea(dbgi, new_block, m4, m5);
 
        /* m7 = m6 & 0x0F0F0F0F */
        m6 = new_bd_ia32_Lea(dbgi, new_block, m4, m5);
 
        /* m7 = m6 & 0x0F0F0F0F */

-       imm = create_Immediate(NULL, 0, 0x0F0F0F0F);
+       imm = ia32_create_Immediate(NULL, 0, 0x0F0F0F0F);

        m7 = new_bd_ia32_And(dbgi, new_block, noreg_GP, noreg_GP, nomem, m6, imm);
 
        /* s3 = m6 >> 4 */
        m7 = new_bd_ia32_And(dbgi, new_block, noreg_GP, noreg_GP, nomem, m6, imm);
 
        /* s3 = m6 >> 4 */

-       simm = create_Immediate(NULL, 0, 4);
+       simm = ia32_create_Immediate(NULL, 0, 4);

        s3 = new_bd_ia32_Shl(dbgi, new_block, m6, simm);
 
        /* m8 = s3 & 0x0F0F0F0F */
        s3 = new_bd_ia32_Shl(dbgi, new_block, m6, simm);
 
        /* m8 = s3 & 0x0F0F0F0F */


@@ -4923,11 +4923,11 @@ static ir_node *gen_popcount(ir_node *node) {
        m9 = new_bd_ia32_Lea(dbgi, new_block, m7, m8);
 
        /* m10 = m9 & 0x00FF00FF */
        m9 = new_bd_ia32_Lea(dbgi, new_block, m7, m8);
 
        /* m10 = m9 & 0x00FF00FF */

-       imm = create_Immediate(NULL, 0, 0x00FF00FF);
+       imm = ia32_create_Immediate(NULL, 0, 0x00FF00FF);

        m10 = new_bd_ia32_And(dbgi, new_block, noreg_GP, noreg_GP, nomem, m9, imm);
 
        /* s4 = m9 >> 8 */
        m10 = new_bd_ia32_And(dbgi, new_block, noreg_GP, noreg_GP, nomem, m9, imm);
 
        /* s4 = m9 >> 8 */

-       simm = create_Immediate(NULL, 0, 8);
+       simm = ia32_create_Immediate(NULL, 0, 8);

        s4 = new_bd_ia32_Shl(dbgi, new_block, m9, simm);
 
        /* m11 = s4 & 0x00FF00FF */
        s4 = new_bd_ia32_Shl(dbgi, new_block, m9, simm);
 
        /* m11 = s4 & 0x00FF00FF */


@@ -4937,11 +4937,11 @@ static ir_node *gen_popcount(ir_node *node) {
        m12 = new_bd_ia32_Lea(dbgi, new_block, m10, m11);
 
        /* m13 = m12 & 0x0000FFFF */
        m12 = new_bd_ia32_Lea(dbgi, new_block, m10, m11);
 
        /* m13 = m12 & 0x0000FFFF */

-       imm = create_Immediate(NULL, 0, 0x0000FFFF);
+       imm = ia32_create_Immediate(NULL, 0, 0x0000FFFF);

        m13 = new_bd_ia32_And(dbgi, new_block, noreg_GP, noreg_GP, nomem, m12, imm);
 
        /* s5 = m12 >> 16 */
        m13 = new_bd_ia32_And(dbgi, new_block, noreg_GP, noreg_GP, nomem, m12, imm);
 
        /* s5 = m12 >> 16 */

-       simm = create_Immediate(NULL, 0, 16);
+       simm = ia32_create_Immediate(NULL, 0, 16);

        s5 = new_bd_ia32_Shl(dbgi, new_block, m12, simm);
 
        /* res = m13 + s5 */
        s5 = new_bd_ia32_Shl(dbgi, new_block, m12, simm);
 
        /* res = m13 + s5 */


@@ -4967,18 +4967,18 @@ static ir_node *gen_bswap(ir_node *node) {
                        /* swap available */
                        return new_bd_ia32_Bswap(dbgi, new_block, param);
                }
                        /* swap available */
                        return new_bd_ia32_Bswap(dbgi, new_block, param);
                }

-               s1 = new_bd_ia32_Shl(dbgi, new_block, param, create_Immediate(NULL, 0, 24));
-               s2 = new_bd_ia32_Shl(dbgi, new_block, param, create_Immediate(NULL, 0, 8));
+               s1 = new_bd_ia32_Shl(dbgi, new_block, param, ia32_create_Immediate(NULL, 0, 24));
+               s2 = new_bd_ia32_Shl(dbgi, new_block, param, ia32_create_Immediate(NULL, 0, 8));

 
 

-               m1 = new_bd_ia32_And(dbgi, new_block, noreg_GP, noreg_GP, nomem, s2, create_Immediate(NULL, 0, 0xFF00));
+               m1 = new_bd_ia32_And(dbgi, new_block, noreg_GP, noreg_GP, nomem, s2, ia32_create_Immediate(NULL, 0, 0xFF00));

                m2 = new_bd_ia32_Lea(dbgi, new_block, s1, m1);
 
                m2 = new_bd_ia32_Lea(dbgi, new_block, s1, m1);
 

-               s3 = new_bd_ia32_Shr(dbgi, new_block, param, create_Immediate(NULL, 0, 8));
+               s3 = new_bd_ia32_Shr(dbgi, new_block, param, ia32_create_Immediate(NULL, 0, 8));

 
 

-               m3 = new_bd_ia32_And(dbgi, new_block, noreg_GP, noreg_GP, nomem, s3, create_Immediate(NULL, 0, 0xFF0000));
+               m3 = new_bd_ia32_And(dbgi, new_block, noreg_GP, noreg_GP, nomem, s3, ia32_create_Immediate(NULL, 0, 0xFF0000));

                m4 = new_bd_ia32_Lea(dbgi, new_block, m2, m3);
 
                m4 = new_bd_ia32_Lea(dbgi, new_block, m2, m3);
 

-               s4 = new_bd_ia32_Shr(dbgi, new_block, param, create_Immediate(NULL, 0, 24));
+               s4 = new_bd_ia32_Shr(dbgi, new_block, param, ia32_create_Immediate(NULL, 0, 24));

                return new_bd_ia32_Lea(dbgi, new_block, m4, s4);
 
        case 16:
                return new_bd_ia32_Lea(dbgi, new_block, m4, s4);
 
        case 16: