Let the length of tarval be of type size_t.

[libfirm] / ir / be / arm / arm_emitter.c

diff --git a/ir/be/arm/arm_emitter.c b/ir/be/arm/arm_emitter.c
index de458a0..febba2f 100644 (file)
--- a/ir/be/arm/arm_emitter.c
+++ b/ir/be/arm/arm_emitter.c
@@ -62,8 +62,8 @@
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
-static const arm_code_gen_t *cg;
-static set                  *sym_or_tv;
+static set       *sym_or_tv;
+static arm_isa_t *isa;
 
 /**
  * Returns the register at in position pos.
@@ -84,7 +84,7 @@ static const arch_register_t *get_in_reg(const ir_node *irn, int pos)
        assert(reg && "no in register found");
 
        /* in case of a joker register: just return a valid register */
-       if (arch_register_type_is(reg, joker)) {
+       if (reg->type & arch_register_type_joker) {
                const arch_register_req_t *req = arch_get_register_req(irn, pos);
 
                if (arch_register_req_is(req, limited)) {
@@ -247,7 +247,7 @@ static void emit_shf_mod_name(arm_shift_modifier_t mod)
 
 void arm_emit_shifter_operand(const ir_node *node)
 {
-       const arm_shifter_operand_t *attr = get_irn_generic_attr_const(node);
+       const arm_shifter_operand_t *attr = get_arm_shifter_operand_attr_const(node);
 
        switch (attr->shift_modifier) {
        case ARM_SHF_REG:
@@ -296,7 +296,7 @@ void arm_emit_shifter_operand(const ir_node *node)
 typedef struct sym_or_tv_t {
        union {
                ir_entity  *entity;  /**< An entity. */
-               tarval     *tv;      /**< A tarval. */
+               ir_tarval  *tv;      /**< A tarval. */
                const void *generic; /**< For generic compare. */
        } u;
        unsigned label;      /**< the associated label. */
@@ -346,7 +346,7 @@ static void emit_arm_SymConst(const ir_node *irn)
 
 static void emit_arm_FrameAddr(const ir_node *irn)
 {
-       const arm_SymConst_attr_t *attr = get_irn_generic_attr_const(irn);
+       const arm_SymConst_attr_t *attr = get_arm_SymConst_attr_const(irn);
 
        be_emit_cstring("\tadd ");
        arm_emit_dest_register(irn, 0);
@@ -393,7 +393,7 @@ static void emit_arm_fConst(const ir_node *irn)
  */
 static ir_node *sched_next_block(const ir_node *block)
 {
-    return get_irn_link(block);
+    return (ir_node*)get_irn_link(block);
 }
 
 /**
@@ -401,7 +401,7 @@ static ir_node *sched_next_block(const ir_node *block)
  */
 static ir_node *get_cfop_target_block(const ir_node *irn)
 {
-       return get_irn_link(irn);
+       return (ir_node*)get_irn_link(irn);
 }
 
 /**
@@ -427,7 +427,7 @@ static void emit_arm_B(const ir_node *irn)
        ir_node *op1 = get_irn_n(irn, 0);
        const char *suffix;
        pn_Cmp pnc = get_arm_CondJmp_pnc(irn);
-       const arm_cmp_attr_t *cmp_attr = get_irn_generic_attr_const(op1);
+       const arm_cmp_attr_t *cmp_attr = get_arm_cmp_attr_const(op1);
        bool is_signed = !cmp_attr->is_unsigned;
 
        assert(is_arm_Cmp(op1) || is_arm_Tst(op1));
@@ -495,8 +495,8 @@ static void emit_arm_B(const ir_node *irn)
 /** Sort register in ascending order. */
 static int reg_cmp(const void *a, const void *b)
 {
-       const arch_register_t * const *ra = a;
-       const arch_register_t * const *rb = b;
+       const arch_register_t * const *ra = (const arch_register_t**)a;
+       const arch_register_t * const *rb = (const arch_register_t**)b;
 
        return *ra < *rb ? -1 : (*ra != *rb);
 }
@@ -506,7 +506,7 @@ static int reg_cmp(const void *a, const void *b)
  */
 static void emit_arm_CopyB(const ir_node *irn)
 {
-       const arm_CopyB_attr_t *attr = get_irn_generic_attr_const(irn);
+       const arm_CopyB_attr_t *attr = get_arm_CopyB_attr_const(irn);
        unsigned size = attr->size;
 
        const char *tgt = arch_register_get_name(get_in_reg(irn, 0));
@@ -519,7 +519,7 @@ static void emit_arm_CopyB(const ir_node *irn)
        tmpregs[0] = get_in_reg(irn, 2);
        tmpregs[1] = get_in_reg(irn, 3);
        tmpregs[2] = get_in_reg(irn, 4);
-       tmpregs[3] = &arm_gp_regs[REG_R12];
+       tmpregs[3] = &arm_registers[REG_R12];
 
        /* Note: R12 is always the last register because the RA did not assign higher ones */
        qsort((void *)tmpregs, 3, sizeof(tmpregs[0]), reg_cmp);
@@ -756,7 +756,7 @@ static void emit_be_Copy(const ir_node *irn)
        }
 
        if (mode_is_float(mode)) {
-               if (USE_FPA(cg->isa)) {
+               if (USE_FPA(isa)) {
                        be_emit_cstring("\tmvf");
                        be_emit_char(' ');
                        arm_emit_dest_register(irn, 0);
@@ -951,7 +951,8 @@ static void arm_emit_block_header(ir_node *block, ir_node *prev)
        int           n_cfgpreds;
        int           need_label;
        int           i, arity;
-       ir_exec_freq  *exec_freq = be_get_irg_exec_freq(cg->irg);
+       ir_graph      *irg       = get_irn_irg(block);
+       ir_exec_freq  *exec_freq = be_get_irg_exec_freq(irg);
 
        need_label = 0;
        n_cfgpreds = get_Block_n_cfgpreds(block);
@@ -1033,8 +1034,8 @@ static void arm_gen_labels(ir_node *block, void *env)
  */
 static int cmp_sym_or_tv(const void *elt, const void *key, size_t size)
 {
-       const sym_or_tv_t *p1 = elt;
-       const sym_or_tv_t *p2 = key;
+       const sym_or_tv_t *p1 = (const sym_or_tv_t*)elt;
+       const sym_or_tv_t *p2 = (const sym_or_tv_t*)key;
        (void) size;
 
        /* as an identifier NEVER can point to a tarval, it's enough
@@ -1042,14 +1043,15 @@ static int cmp_sym_or_tv(const void *elt, const void *key, size_t size)
        return p1->u.generic != p2->u.generic;
 }
 
-void arm_gen_routine(const arm_code_gen_t *arm_cg, ir_graph *irg)
+void arm_gen_routine(ir_graph *irg)
 {
-       ir_node   **blk_sched;
-       int       i, n;
-       ir_node   *last_block = NULL;
-       ir_entity *entity     = get_irg_entity(irg);
+       ir_node          *last_block = NULL;
+       ir_entity        *entity     = get_irg_entity(irg);
+       const arch_env_t *arch_env   = be_get_irg_arch_env(irg);
+       ir_node          **blk_sched;
+       int              i, n;
 
-       cg        = arm_cg;
+       isa = (arm_isa_t*) arch_env;
        sym_or_tv = new_set(cmp_sym_or_tv, 8);
 
        be_gas_elf_type_char = '%';
@@ -1085,7 +1087,7 @@ void arm_gen_routine(const arm_code_gen_t *arm_cg, ir_graph *irg)
 
                be_emit_cstring("\t.align 2\n");
 
-               foreach_set(sym_or_tv, entry) {
+               foreach_set(sym_or_tv, sym_or_tv_t*, entry) {
                        emit_constant_name(entry);
                        be_emit_cstring(":\n");
                        be_emit_write_line();
@@ -1096,7 +1098,7 @@ void arm_gen_routine(const arm_code_gen_t *arm_cg, ir_graph *irg)
                                be_emit_char('\n');
                                be_emit_write_line();
                        } else {
-                               tarval *tv = entry->u.tv;
+                               ir_tarval *tv = entry->u.tv;
                                int i, size = get_mode_size_bytes(get_tarval_mode(tv));
                                unsigned v;