Good day and welcome to the FIRM XMALLOC*() macros. These macros are provided for...

[libfirm] / ir / be / ia32 / ia32_x87.c

diff --git a/ir/be/ia32/ia32_x87.c b/ir/be/ia32/ia32_x87.c
index a0e6bca..080d331 100644 (file)
--- a/ir/be/ia32/ia32_x87.c
+++ b/ir/be/ia32/ia32_x87.c
@@ -39,6 +39,7 @@
 #include "irgwalk.h"
 #include "obst.h"
 #include "pmap.h"
+#include "array_t.h"
 #include "pdeq.h"
 #include "irprintf.h"
 #include "debug.h"
@@ -1237,7 +1238,7 @@ static int sim_store(x87_state *state, ir_node *n, ir_op *op, ir_op *op_p) {
                                set_ia32_frame_ent(vfld, get_ia32_frame_ent(n));
                                if (is_ia32_use_frame(n))
                                        set_ia32_use_frame(vfld);
-                               set_ia32_op_type(vfld, ia32_am_Source);
+                               set_ia32_op_type(vfld, ia32_AddrModeS);
                                add_ia32_am_offs_int(vfld, get_ia32_am_offs_int(n));
                                set_ia32_am_sc(vfld, get_ia32_am_sc(n));
                                set_ia32_ls_mode(vfld, get_ia32_ls_mode(n));
@@ -1795,14 +1796,14 @@ static int sim_Copy(x87_state *state, ir_node *n) {
        ir_node                     *pred;
        const arch_register_t       *out;
        const arch_register_t       *op1;
-       const arch_register_class_t *class;
+       const arch_register_class_t *cls;
        ir_node                     *node, *next;
        ia32_x87_attr_t             *attr;
        int                         op1_idx, out_idx;
        unsigned                    live;
 
-       class = arch_get_irn_reg_class(sim->arch_env, n, -1);
-       if (class->regs != ia32_vfp_regs)
+       cls = arch_get_irn_reg_class(sim->arch_env, n, -1);
+       if (cls->regs != ia32_vfp_regs)
                return 0;
 
        pred = get_irn_n(n, 0);
@@ -2346,7 +2347,6 @@ static void x87_init_simulator(x87_simulator *sim, ir_graph *irg,
        sim->arch_env   = arch_env;
        sim->n_idx      = get_irg_last_idx(irg);
        sim->live       = obstack_alloc(&sim->obst, sizeof(*sim->live) * sim->n_idx);
-       sim->isa        = (ia32_isa_t *)arch_env->isa;
 
        DB((dbg, LEVEL_1, "--------------------------------\n"
                "x87 Simulator started for %+F\n", irg));