- added ir_bk_inner_trampoline: this allows to defer the construction of trampolines

[r25256]

diff --git a/include/libfirm/firm_types.h b/include/libfirm/firm_types.h
index 150f214..f06ae61 100644 (file)
--- a/include/libfirm/firm_types.h
+++ b/include/libfirm/firm_types.h
@@ -233,6 +233,7 @@ typedef enum {
        ir_bk_bswap,                  /**< byte swap */
        ir_bk_inport,                 /**< in port */
        ir_bk_outport,                /**< out port */
+       ir_bk_inner_trampoline,       /**< address of a trampoline for GCC inner functions */
 } ir_builtin_kind;
 
 #endif

diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c
index 593f25f..4c644e4 100644 (file)
--- a/ir/be/ia32/ia32_transform.c
+++ b/ir/be/ia32/ia32_transform.c
@@ -5026,6 +5026,61 @@ static ir_node *gen_inport(ir_node *node) {
        return res;
 }
 
+/**
+ * Transform a builtin inner trampoline
+ */
+static ir_node *gen_inner_trampoline(ir_node *node) {
+       ir_node  *ptr       = get_Builtin_param(node, 0);
+       ir_node  *callee    = be_transform_node(get_Builtin_param(node, 1));
+       ir_node  *env       = be_transform_node(get_Builtin_param(node, 2));
+       ir_node  *mem       = get_Builtin_mem(node);
+       ir_node  *block     = get_nodes_block(node);
+       ir_node  *new_block = be_transform_node(block);
+       ir_node  *val;
+       ir_node  *in[2];
+       dbg_info *dbgi      = get_irn_dbg_info(node);
+       ia32_address_t addr;
+
+       /* construct store address */
+       memset(&addr, 0, sizeof(addr));
+       ia32_create_address_mode(&addr, ptr, 0);
+
+       if (addr.base == NULL) {
+               addr.base = noreg_GP;
+       } else {
+               addr.base = be_transform_node(addr.base);
+       }
+
+       if (addr.index == NULL) {
+               addr.index = noreg_GP;
+       } else {
+               addr.index = be_transform_node(addr.index);
+       }
+       addr.mem = be_transform_node(mem);
+
+       /* mov  ecx, <env> */
+       val = ia32_create_Immediate(NULL, 0, 0xB9);
+       addr.mem = new_bd_ia32_Store8Bit(dbgi, new_block, addr.base,
+                                                addr.index, addr.mem, val);
+
+       addr.offset += 1;
+       addr.mem = new_bd_ia32_Store(dbgi, new_block, addr.base,
+                                            addr.index, addr.mem, env);
+       addr.offset += 4;
+
+       /* jmp  <callee> */
+       val = ia32_create_Immediate(NULL, 0, 0xE9);
+       addr.mem = new_bd_ia32_Store8Bit(dbgi, new_block, addr.base,
+                                                addr.index, addr.mem, val);
+       addr.offset += 1;
+       in[0] = new_bd_ia32_Store(dbgi, new_block, addr.base,
+                                     addr.index, addr.mem, callee);
+
+       in[1] = be_transform_node(ptr);
+
+       return new_Tuple(2, in);
+}
+
 /**
  * Transform Builtin node.
  */
@@ -5059,6 +5114,8 @@ static ir_node *gen_Builtin(ir_node *node) {
                return gen_outport(node);
        case ir_bk_inport:
                return gen_inport(node);
+       case ir_bk_inner_trampoline:
+               return gen_inner_trampoline(node);
        }
        panic("Builtin %s not implemented in IA32", get_builtin_kind_name(kind));
 }
@@ -5097,6 +5154,13 @@ static ir_node *gen_Proj_Builtin(ir_node *proj) {
                        return new_r_Proj(current_ir_graph, get_nodes_block(new_node),
                                new_node, mode_M, pn_ia32_Inport_M);
                }
+       case ir_bk_inner_trampoline:
+               if (get_Proj_proj(proj) == pn_Builtin_1_result) {
+                       return get_Tuple_pred(new_node, 1);
+               } else {
+                       assert(get_Proj_proj(proj) == pn_Builtin_M);
+                       return get_Tuple_pred(new_node, 0);
+               }
        }
        panic("Builtin %s not implemented in IA32", get_builtin_kind_name(kind));
 }

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index b8b6c21..d44f835 100644 (file)
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -1441,6 +1441,7 @@ const char *get_builtin_kind_name(ir_builtin_kind kind) {
                X(ir_bk_bswap);
                X(ir_bk_inport);
                X(ir_bk_outport);
+               X(ir_bk_inner_trampoline);
        }
        return "<unknown>";
 #undef X