- C99 features removed
[libfirm] / ir / be / ia32 / bearch_ia32.c
index ac2811c..4bcedb1 100644 (file)
@@ -89,6 +89,8 @@
 
 #ifdef FIRM_GRGEN_BE
 #include "ia32_pbqp_transform.h"
+
+transformer_t be_transformer = TRANSFORMER_DEFAULT;
 #endif
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
@@ -119,7 +121,7 @@ static ia32_intrinsic_env_t intrinsic_env = {
 
 typedef ir_node *(*create_const_node_func) (dbg_info *dbg, ir_graph *irg, ir_node *block);
 
-static INLINE ir_node *create_const(ia32_code_gen_t *cg, ir_node **place,
+static inline ir_node *create_const(ia32_code_gen_t *cg, ir_node **place,
                                     create_const_node_func func,
                                     const arch_register_t* reg)
 {
@@ -247,57 +249,11 @@ static const arch_register_req_t *ia32_get_irn_reg_req(const ir_node *node,
        }
 
        /* unknowns should be transformed already */
-       assert(!is_Unknown(node));
        return arch_no_register_req;
 }
 
-static void ia32_set_irn_reg(ir_node *irn, const arch_register_t *reg)
-{
-       int    pos = 0;
-
-       if (get_irn_mode(irn) == mode_X) {
-               return;
-       }
-
-       if (is_Proj(irn)) {
-               pos = get_Proj_proj(irn);
-               irn = skip_Proj(irn);
-       }
-
-       if (is_ia32_irn(irn)) {
-               const arch_register_t **slots;
-
-               slots      = get_ia32_slots(irn);
-               slots[pos] = reg;
-       } else {
-               ia32_set_firm_reg(irn, reg, cur_reg_set);
-       }
-}
-
-static const arch_register_t *ia32_get_irn_reg(const ir_node *irn)
-{
-       int pos = 0;
-
-       if (is_Proj(irn)) {
-               if (get_irn_mode(irn) == mode_X) {
-                       return NULL;
-               }
-
-               pos = get_Proj_proj(irn);
-               irn = skip_Proj_const(irn);
-       }
-
-       if (is_ia32_irn(irn)) {
-               const arch_register_t **slots = get_ia32_slots(irn);
-               assert(pos < get_ia32_n_res(irn));
-               return slots[pos];
-       } else {
-               return ia32_get_firm_reg(irn, cur_reg_set);
-       }
-}
-
 static arch_irn_class_t ia32_classify(const ir_node *irn) {
-       arch_irn_class_t classification = arch_irn_class_normal;
+       arch_irn_class_t classification = 0;
 
        irn = skip_Proj_const(irn);
 
@@ -305,13 +261,7 @@ static arch_irn_class_t ia32_classify(const ir_node *irn) {
                classification |= arch_irn_class_branch;
 
        if (! is_ia32_irn(irn))
-               return classification & ~arch_irn_class_normal;
-
-       if (is_ia32_Ld(irn))
-               classification |= arch_irn_class_load;
-
-       if (is_ia32_St(irn))
-               classification |= arch_irn_class_store;
+               return classification;
 
        if (is_ia32_is_reload(irn))
                classification |= arch_irn_class_reload;
@@ -325,29 +275,6 @@ static arch_irn_class_t ia32_classify(const ir_node *irn) {
        return classification;
 }
 
-static arch_irn_flags_t ia32_get_flags(const ir_node *irn) {
-       arch_irn_flags_t flags = arch_irn_flags_none;
-
-       if (is_Unknown(irn))
-               return arch_irn_flags_ignore;
-
-       if(is_Proj(irn) && mode_is_datab(get_irn_mode(irn))) {
-               ir_node *pred = get_Proj_pred(irn);
-
-               if(is_ia32_irn(pred)) {
-                       flags = get_ia32_out_flags(pred, get_Proj_proj(irn));
-               }
-
-               irn = pred;
-       }
-
-       if (is_ia32_irn(irn)) {
-               flags |= get_ia32_flags(irn);
-       }
-
-       return flags;
-}
-
 /**
  * The IA32 ABI callback object.
  */
@@ -397,19 +324,6 @@ static int ia32_get_sp_bias(const ir_node *node)
        return 0;
 }
 
-/**
- * Put all registers which are saved by the prologue/epilogue in a set.
- *
- * @param self  The callback object.
- * @param s     The result set.
- */
-static void ia32_abi_dont_save_regs(void *self, pset *s)
-{
-       ia32_abi_env_t *env = self;
-       if(env->flags.try_omit_fp)
-               pset_insert_ptr(s, env->aenv->bp);
-}
-
 /**
  * Generate the routine prologue.
  *
@@ -429,15 +343,16 @@ static const arch_register_t *ia32_abi_prologue(void *self, ir_node **mem, pmap
        const arch_env_t *arch_env = env->aenv;
 
        if (! env->flags.try_omit_fp) {
-               ir_graph *irg     =env->irg;
+               ir_graph *irg     = env->irg;
                ir_node  *bl      = get_irg_start_block(irg);
                ir_node  *curr_sp = be_abi_reg_map_get(reg_map, arch_env->sp);
                ir_node  *curr_bp = be_abi_reg_map_get(reg_map, arch_env->bp);
-               ir_node  *noreg = ia32_new_NoReg_gp(cg);
+               ir_node  *noreg   = ia32_new_NoReg_gp(cg);
                ir_node  *push;
 
-               /* ALL nodes representing bp must be set to ignore. */
-               be_node_set_flags(get_Proj_pred(curr_bp), BE_OUT_POS(get_Proj_proj(curr_bp)), arch_irn_flags_ignore);
+               /* mark bp register as ignore */
+               be_set_constr_single_reg_out(get_Proj_pred(curr_bp),
+                               get_Proj_proj(curr_bp), arch_env->bp, arch_register_req_type_ignore);
 
                /* push ebp */
                push    = new_rd_ia32_Push(NULL, irg, bl, noreg, noreg, *mem, curr_bp, curr_sp);
@@ -446,22 +361,19 @@ static const arch_register_t *ia32_abi_prologue(void *self, ir_node **mem, pmap
 
                /* the push must have SP out register */
                arch_set_irn_register(curr_sp, arch_env->sp);
-               set_ia32_flags(push, arch_irn_flags_ignore);
 
                /* this modifies the stack bias, because we pushed 32bit */
                *stack_bias -= 4;
 
                /* move esp to ebp */
-               curr_bp  = be_new_Copy(arch_env->bp->reg_class, irg, bl, curr_sp);
-               be_set_constr_single_reg(curr_bp, BE_OUT_POS(0), arch_env->bp);
-               arch_set_irn_register(curr_bp, arch_env->bp);
-               be_node_set_flags(curr_bp, BE_OUT_POS(0), arch_irn_flags_ignore);
+               curr_bp = be_new_Copy(arch_env->bp->reg_class, irg, bl, curr_sp);
+               be_set_constr_single_reg_out(curr_bp, 0, arch_env->bp,
+                                            arch_register_req_type_ignore);
 
                /* beware: the copy must be done before any other sp use */
                curr_sp = be_new_CopyKeep_single(arch_env->sp->reg_class, irg, bl, curr_sp, curr_bp, get_irn_mode(curr_sp));
-               be_set_constr_single_reg(curr_sp, BE_OUT_POS(0), arch_env->sp);
-               arch_set_irn_register(curr_sp, arch_env->sp);
-               be_node_set_flags(curr_sp, BE_OUT_POS(0), arch_irn_flags_ignore);
+               be_set_constr_single_reg_out(curr_sp, 0, arch_env->sp,
+                                                    arch_register_req_type_produces_sp);
 
                be_abi_reg_map_set(reg_map, arch_env->sp, curr_sp);
                be_abi_reg_map_set(reg_map, arch_env->bp, curr_bp);
@@ -501,7 +413,6 @@ static void ia32_abi_epilogue(void *self, ir_node *bl, ir_node **mem, pmap *reg_
 
                        /* leave */
                        leave   = new_rd_ia32_Leave(NULL, irg, bl, curr_bp);
-                       set_ia32_flags(leave, arch_irn_flags_ignore);
                        curr_bp = new_r_Proj(irg, bl, leave, mode_bp, pn_ia32_Leave_frame);
                        curr_sp = new_r_Proj(irg, bl, leave, get_irn_mode(curr_sp), pn_ia32_Leave_stack);
                } else {
@@ -514,11 +425,11 @@ static void ia32_abi_epilogue(void *self, ir_node *bl, ir_node **mem, pmap *reg_
                        /* copy ebp to esp */
                        curr_sp = be_new_Copy(&ia32_reg_classes[CLASS_ia32_gp], irg, bl, curr_bp);
                        arch_set_irn_register(curr_sp, arch_env->sp);
-                       be_node_set_flags(curr_sp, BE_OUT_POS(0), arch_irn_flags_ignore);
+                       be_set_constr_single_reg_out(curr_sp, 0, arch_env->sp,
+                                                        arch_register_req_type_ignore);
 
                        /* pop ebp */
-                       pop     = new_rd_ia32_Pop(NULL, env->irg, bl, *mem, curr_sp);
-                       set_ia32_flags(pop, arch_irn_flags_ignore);
+                       pop     = new_rd_ia32_PopEbp(NULL, env->irg, bl, *mem, curr_sp);
                        curr_bp = new_r_Proj(irg, bl, pop, mode_bp, pn_ia32_Pop_res);
                        curr_sp = new_r_Proj(irg, bl, pop, get_irn_mode(curr_sp), pn_ia32_Pop_stack);
 
@@ -902,7 +813,6 @@ static const be_abi_callbacks_t ia32_abi_callbacks = {
        ia32_abi_init,
        ia32_abi_done,
        ia32_abi_get_between_type,
-       ia32_abi_dont_save_regs,
        ia32_abi_prologue,
        ia32_abi_epilogue
 };
@@ -911,10 +821,7 @@ static const be_abi_callbacks_t ia32_abi_callbacks = {
 
 static const arch_irn_ops_t ia32_irn_ops = {
        ia32_get_irn_reg_req,
-       ia32_set_irn_reg,
-       ia32_get_irn_reg,
        ia32_classify,
-       ia32_get_flags,
        ia32_get_frame_entity,
        ia32_set_frame_entity,
        ia32_set_frame_offset,
@@ -963,8 +870,6 @@ static void ia32_before_abi(void *self) {
        }
 }
 
-transformer_t be_transformer = TRANSFORMER_DEFAULT;
-
 /**
  * Transforms the standard firm graph into
  * an ia32 firm graph
@@ -987,20 +892,21 @@ static void ia32_prepare_graph(void *self) {
                be_dump(cg->irg, "-pre_transform", dump_ir_block_graph_sched);
 
        switch (be_transformer) {
-               case TRANSFORMER_DEFAULT:
-                       /* transform remaining nodes into assembler instructions */
-                       ia32_transform_graph(cg);
-                       break;
+       case TRANSFORMER_DEFAULT:
+               /* transform remaining nodes into assembler instructions */
+               ia32_transform_graph(cg);
+               break;
 
 #ifdef FIRM_GRGEN_BE
-               case TRANSFORMER_PBQP:
-               case TRANSFORMER_RAND:
-                       /* transform nodes into assembler instructions by PBQP magic */
-                       ia32_transform_graph_by_pbqp(cg);
-                       break;
+       case TRANSFORMER_PBQP:
+       case TRANSFORMER_RAND:
+               /* transform nodes into assembler instructions by PBQP magic */
+               ia32_transform_graph_by_pbqp(cg);
+               break;
 #endif
 
-               default: panic("invalid transformer");
+       default:
+               panic("invalid transformer");
        }
 
        /* do local optimizations (mainly CSE) */
@@ -1012,9 +918,6 @@ static void ia32_prepare_graph(void *self) {
        /* optimize address mode */
        ia32_optimize_graph(cg);
 
-       if (cg->dump)
-               be_dump(cg->irg, "-am", dump_ir_block_graph_sched);
-
        /* do code placement, to optimize the position of constants */
        place_code(cg->irg);
 
@@ -1022,13 +925,6 @@ static void ia32_prepare_graph(void *self) {
                be_dump(cg->irg, "-place", dump_ir_block_graph_sched);
 }
 
-/**
- * Dummy functions for hooks we don't need but which must be filled.
- */
-static void ia32_before_sched(void *self) {
-       (void) self;
-}
-
 ir_node *turn_back_am(ir_node *node)
 {
        ir_graph *irg   = current_ir_graph;
@@ -1193,9 +1089,9 @@ static void transform_to_Load(ia32_code_gen_t *cg, ir_node *node) {
 
        /* copy the register from the old node to the new Load */
        reg = arch_get_irn_register(node);
-       arch_set_irn_register(new_op, reg);
+       arch_set_irn_register(proj, reg);
 
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node));
+       SET_IA32_ORIG_NODE(new_op, node);
 
        exchange(node, proj);
 }
@@ -1252,7 +1148,7 @@ static void transform_to_Store(ia32_code_gen_t *cg, ir_node *node) {
        set_ia32_frame_ent(store, ent);
        set_ia32_use_frame(store);
        set_ia32_is_spill(store);
-       SET_IA32_ORIG_NODE(store, ia32_get_old_node_name(cg, node));
+       SET_IA32_ORIG_NODE(store, node);
        DBG_OPT_SPILL2ST(node, store);
 
        if (sched_point) {
@@ -1322,19 +1218,18 @@ static ir_node* create_spproj(ir_node *node, ir_node *pred, int pos)
  * push/pop into/from memory cascades. This is possible without using
  * any registers.
  */
-static void transform_MemPerm(ia32_code_gen_t *cg, ir_node *node) {
-       ir_graph *irg = get_irn_irg(node);
-       ir_node *block = get_nodes_block(node);
-       ir_node *in[1];
-       ir_node *keep;
-       int i, arity;
-       ir_node *sp = be_abi_get_ignore_irn(cg->birg->abi, &ia32_gp_regs[REG_ESP]);
+static void transform_MemPerm(ia32_code_gen_t *cg, ir_node *node)
+{
+       ir_graph        *irg   = get_irn_irg(node);
+       ir_node         *block = get_nodes_block(node);
+       ir_node         *sp    = be_abi_get_ignore_irn(cg->birg->abi, &ia32_gp_regs[REG_ESP]);
+       int              arity = be_get_MemPerm_entity_arity(node);
+       ir_node        **pops  = ALLOCAN(ir_node*, arity);
+       ir_node         *in[1];
+       ir_node         *keep;
+       int              i;
        const ir_edge_t *edge;
        const ir_edge_t *next;
-       ir_node **pops;
-
-       arity = be_get_MemPerm_entity_arity(node);
-       pops = alloca(arity * sizeof(pops[0]));
 
        /* create Pushs */
        for(i = 0; i < arity; ++i) {
@@ -1439,52 +1334,73 @@ static void ia32_after_ra_walker(ir_node *block, void *env) {
  */
 static void ia32_collect_frame_entity_nodes(ir_node *node, void *data)
 {
-       be_fec_env_t *env = data;
+       be_fec_env_t  *env = data;
+       const ir_mode *mode;
+       int            align;
 
        if (be_is_Reload(node) && be_get_frame_entity(node) == NULL) {
-               const ir_mode *mode = get_spill_mode_mode(get_irn_mode(node));
-               int align = get_mode_size_bytes(mode);
-               be_node_needs_frame_entity(env, node, mode, align);
-       } else if(is_ia32_irn(node) && get_ia32_frame_ent(node) == NULL
-                 && is_ia32_use_frame(node)) {
-               if (is_ia32_need_stackent(node) || is_ia32_Load(node)) {
-                       const ir_mode     *mode  = get_ia32_ls_mode(node);
-                       const ia32_attr_t *attr  = get_ia32_attr_const(node);
-                       int                align;
-
-                       if (is_ia32_is_reload(node)) {
-                               mode = get_spill_mode_mode(mode);
+               mode  = get_spill_mode_mode(get_irn_mode(node));
+               align = get_mode_size_bytes(mode);
+       } else if (is_ia32_irn(node)         &&
+                       get_ia32_frame_ent(node) == NULL &&
+                       is_ia32_use_frame(node)) {
+               if (is_ia32_need_stackent(node))
+                       goto need_stackent;
+
+               switch (get_ia32_irn_opcode(node)) {
+need_stackent:
+                       case iro_ia32_Load: {
+                               const ia32_attr_t *attr = get_ia32_attr_const(node);
+
+                               if (attr->data.need_32bit_stackent) {
+                                       mode = mode_Is;
+                               } else if (attr->data.need_64bit_stackent) {
+                                       mode = mode_Ls;
+                               } else {
+                                       mode = get_ia32_ls_mode(node);
+                                       if (is_ia32_is_reload(node))
+                                               mode = get_spill_mode_mode(mode);
+                               }
+                               align = get_mode_size_bytes(mode);
+                               break;
                        }
 
-                       if(attr->data.need_64bit_stackent) {
-                               mode = mode_Ls;
+                       case iro_ia32_vfild:
+                       case iro_ia32_vfld:
+                       case iro_ia32_xLoad: {
+                               mode  = get_ia32_ls_mode(node);
+                               align = 4;
+                               break;
                        }
-                       if(attr->data.need_32bit_stackent) {
-                               mode = mode_Is;
+
+                       case iro_ia32_FldCW: {
+                               /* although 2 byte would be enough 4 byte performs best */
+                               mode  = mode_Iu;
+                               align = 4;
+                               break;
                        }
-                       align = get_mode_size_bytes(mode);
-                       be_node_needs_frame_entity(env, node, mode, align);
-               } else if (is_ia32_vfild(node) || is_ia32_xLoad(node)
-                          || is_ia32_vfld(node)) {
-                       const ir_mode *mode  = get_ia32_ls_mode(node);
-                       int            align = 4;
-                       be_node_needs_frame_entity(env, node, mode, align);
-               } else if(is_ia32_FldCW(node)) {
-                       /* although 2 byte would be enough 4 byte performs best */
-                       const ir_mode *mode  = mode_Iu;
-                       int            align = 4;
-                       be_node_needs_frame_entity(env, node, mode, align);
-               } else {
+
+                       default:
 #ifndef NDEBUG
-                       assert(is_ia32_St(node) ||
-                                  is_ia32_xStoreSimple(node) ||
-                                  is_ia32_vfst(node) ||
-                                  is_ia32_vfist(node) ||
-                                  is_ia32_vfisttp(node) ||
-                              is_ia32_FnstCW(node));
+                               panic("unexpected frame user while collection frame entity nodes");
+
+                       case iro_ia32_FnstCW:
+                       case iro_ia32_Store8Bit:
+                       case iro_ia32_Store:
+                       case iro_ia32_fst:
+                       case iro_ia32_fstp:
+                       case iro_ia32_vfist:
+                       case iro_ia32_vfisttp:
+                       case iro_ia32_vfst:
+                       case iro_ia32_xStore:
+                       case iro_ia32_xStoreSimple:
 #endif
+                               return;
                }
+       } else {
+               return;
        }
+       be_node_needs_frame_entity(env, node, mode, align);
 }
 
 /**
@@ -1577,7 +1493,6 @@ static const arch_code_generator_if_t ia32_code_gen_if = {
        ia32_before_abi,     /* before abi introduce hook */
        ia32_prepare_graph,
        NULL,                /* spill */
-       ia32_before_sched,   /* before scheduling hook */
        ia32_before_ra,      /* before register allocation hook */
        ia32_after_ra,       /* after register allocation hook */
        ia32_finish,         /* called before codegen */
@@ -1595,7 +1510,6 @@ static void *ia32_cg_init(be_irg_t *birg) {
        cg->irg       = birg->irg;
        cg->reg_set   = new_set(ia32_cmp_irn_reg_assoc, 1024);
        cg->isa       = isa;
-       cg->arch_env  = birg->main_env->arch_env;
        cg->birg      = birg;
        cg->blk_sched = NULL;
        cg->dump      = (birg->main_env->options->dump_flags & DUMP_BE) ? 1 : 0;
@@ -1780,7 +1694,6 @@ static arch_env_t *ia32_init(FILE *file_handle) {
 
        /* enter the ISA object into the intrinsic environment */
        intrinsic_env.isa = isa;
-       ia32_handle_intrinsics();
 
        /* emit asm includes */
        n = get_irp_n_asms();
@@ -2136,8 +2049,43 @@ static void ia32_mark_remat(const void *self, ir_node *node) {
        }
 }
 
+/**
+ * Check for Abs or Nabs.
+ */
+static int is_Abs_or_Nabs(ir_node *cmp, ir_node *sel, ir_node *t, ir_node *f) {
+       ir_node *l, *r;
+       pn_Cmp  pnc;
+
+       if (cmp == NULL)
+               return 0;
+
+       /* must be <, <=, >=, > */
+       pnc = get_Proj_proj(sel);
+       if (pnc != pn_Cmp_Ge && pnc != pn_Cmp_Gt &&
+               pnc != pn_Cmp_Le && pnc != pn_Cmp_Lt)
+               return 0;
+
+       l = get_Cmp_left(cmp);
+       r = get_Cmp_right(cmp);
+
+       /* must be x cmp 0 */
+       if ((l != t && l != f) || !is_Const(r) || !is_Const_null(r))
+               return 0;
+
+       if ((!is_Minus(t) || get_Minus_op(t) != f) &&
+               (!is_Minus(f) || get_Minus_op(f) != t))
+               return 0;
+       return 1;
+}
+
 /**
  * Allows or disallows the creation of Psi nodes for the given Phi nodes.
+ *
+ * @param sel        A selector of a Cond.
+ * @param phi_list   List of Phi nodes about to be converted (linked via get_Phi_next() field)
+ * @param i          First data predecessor involved in if conversion
+ * @param j          Second data predecessor involved in if conversion
+ *
  * @return 1 if allowed, 0 otherwise
  */
 static int ia32_is_psi_allowed(ir_node *sel, ir_node *phi_list, int i, int j)
@@ -2145,7 +2093,7 @@ static int ia32_is_psi_allowed(ir_node *sel, ir_node *phi_list, int i, int j)
        ir_node *phi;
        ir_node *cmp = NULL;
 
-       /* we can't handle psis with 64bit compares yet */
+       /* we can't handle Psis with 64bit compares yet */
        if (is_Proj(sel)) {
                cmp = get_Proj_pred(sel);
                if (is_Cmp(cmp)) {
@@ -2195,7 +2143,13 @@ static int ia32_is_psi_allowed(ir_node *sel, ir_node *phi_list, int i, int j)
                        for (phi = phi_list; phi; phi = get_Phi_next(phi)) {
                                ir_mode *mode = get_irn_mode(phi);
 
-                               if (mode_is_float(mode) || get_mode_size_bits(mode) > 32)
+                               if (mode_is_float(mode)) {
+                                       ir_node *t = get_Phi_pred(phi, i);
+                                       ir_node *f = get_Phi_pred(phi, j);
+
+                                       if (! is_Abs_or_Nabs(cmp, sel, t, f))
+                                               return 0;
+                               } else if (get_mode_size_bits(mode) > 32)
                                        return 0;
                        }
                }
@@ -2205,7 +2159,7 @@ static int ia32_is_psi_allowed(ir_node *sel, ir_node *phi_list, int i, int j)
                ir_node *cl, *cr;
                pn_Cmp  pn;
 
-               /* No cmov, only some special cases */
+               /* No Cmov, only some special cases */
                if (cmp == NULL)
                        return 0;
 
@@ -2222,9 +2176,14 @@ static int ia32_is_psi_allowed(ir_node *sel, ir_node *phi_list, int i, int j)
                        t = get_Phi_pred(phi, i);
                        f = get_Phi_pred(phi, j);
 
-                       /* no floating point and no 64bit yet */
-                       if (mode_is_float(mode) || get_mode_size_bits(mode) > 32)
+                       if (mode_is_float(mode)) {
+                               /* only abs or nabs supported */
+                               if (! is_Abs_or_Nabs(cmp, sel, t, f))
+                                       return 0;
+                       } else if (get_mode_size_bits(mode) > 32) {
+                               /* no 64bit yet */
                                return 0;
+                       }
 
                        if (is_Const(t) && is_Const(f)) {
                                if ((is_Const_null(t) && is_Const_one(f)) || (is_Const_one(t) && is_Const_null(f))) {
@@ -2340,22 +2299,24 @@ static lc_opt_enum_int_var_t gas_var = {
        (int*) &be_gas_flavour, gas_items
 };
 
+#ifdef FIRM_GRGEN_BE
 static const lc_opt_enum_int_items_t transformer_items[] = {
        { "default", TRANSFORMER_DEFAULT },
-#ifdef FIRM_GRGEN_BE
        { "pbqp",    TRANSFORMER_PBQP    },
        { "random",  TRANSFORMER_RAND    },
-#endif
        { NULL,      0                   }
 };
 
 static lc_opt_enum_int_var_t transformer_var = {
        (int*)&be_transformer, transformer_items
 };
+#endif
 
 static const lc_opt_table_entry_t ia32_options[] = {
        LC_OPT_ENT_ENUM_INT("gasmode", "set the GAS compatibility mode", &gas_var),
+#ifdef FIRM_GRGEN_BE
        LC_OPT_ENT_ENUM_INT("transformer", "the transformer used for code selection", &transformer_var),
+#endif
        LC_OPT_ENT_INT("stackalign", "set power of two stack alignment for calls",
                       &ia32_isa_template.arch_env.stack_alignment),
        LC_OPT_LAST
@@ -2364,6 +2325,7 @@ static const lc_opt_table_entry_t ia32_options[] = {
 const arch_isa_if_t ia32_isa_if = {
        ia32_init,
        ia32_done,
+       ia32_handle_intrinsics,
        ia32_get_n_reg_class,
        ia32_get_reg_class,
        ia32_get_reg_class_for_mode,
@@ -2381,12 +2343,6 @@ const arch_isa_if_t ia32_isa_if = {
        ia32_is_valid_clobber
 };
 
-void ia32_init_emitter(void);
-void ia32_init_finish(void);
-void ia32_init_optimize(void);
-void ia32_init_transform(void);
-void ia32_init_x87(void);
-
 void be_init_arch_ia32(void)
 {
        lc_opt_entry_t *be_grp   = lc_opt_get_grp(firm_opt_get_root(), "be");