projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Implement mono_arch_context_set_int_reg () for arm.
[mono.git] / mono / mini / mini-hppa.c
diff --git a/mono/mini/mini-hppa.c b/mono/mini/mini-hppa.c
index c164975190cbde68defca9e61fa1265e700c290e..264a86c78db9f018b6a613fb09695d4c0f3366cf 100644 (file)
--- a/mono/mini/mini-hppa.c
+++ b/mono/mini/mini-hppa.c
@@ -36,7 +36,6 @@
 #include <mono/utils/mono-math.h>
 
 #include "mini-hppa.h"
-#include "inssel.h"
 #include "trace.h"
 #include "cpu-hppa.h"
 
@@ -356,7 +355,7 @@ handle_enum:
                        
                case MONO_TYPE_VALUETYPE:
                        if (type->data.klass->enumtype) {
-                               type = type->data.klass->enum_basetype;
+                               type = mono_class_enum_basetype (type->data.klass);
                                goto handle_enum;
                        }
                        /* Fall through */
@@ -522,7 +521,7 @@ mono_arch_allocate_vars (MonoCompile *m)
        DEBUG_FUNC_ENTER();
        m->flags |= MONO_CFG_HAS_SPILLUP;
 
-       header = mono_method_get_header (m->method);
+       header = m->header;
 
        sig = mono_method_signature (m->method);
        DEBUG (printf ("Allocating locals - incoming params:\n"));
@@ -888,10 +887,6 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
        MonoInst *ins, *next, *temp, *last_ins = NULL;
        int imm;
 
-       /* setup the virtual reg allocator */
-       if (bb->max_vreg > cfg->rs->next_vreg)
-               cfg->rs->next_vreg = bb->max_vreg;
-
        MONO_BB_FOR_EACH_INS (bb, ins) {
 loop_start:
                switch (ins->opcode) {
@@ -900,7 +895,7 @@ loop_start:
                        if (!hppa_check_bits (ins->inst_imm, 11)) {
                                NEW_INS (cfg, temp, OP_ICONST);
                                temp->inst_c0 = ins->inst_imm;
-                               temp->dreg = mono_regstate_next_int (cfg->rs);
+                               temp->dreg = mono_alloc_ireg (cfg);
                                ins->sreg2 = temp->dreg;
                                ins->opcode = map_to_reg_reg_op (ins->opcode);
                        }
@@ -910,7 +905,7 @@ loop_start:
                        if (!hppa_check_bits (ins->inst_imm, 11)) {
                                NEW_INS (cfg, temp, OP_ICONST);
                                temp->inst_c0 = ins->inst_imm;
-                               temp->dreg = mono_regstate_next_int (cfg->rs);
+                               temp->dreg = mono_alloc_ireg (cfg);
                                ins->sreg2 = temp->dreg;
                                ins->opcode = map_to_reg_reg_op (ins->opcode);
                        }
@@ -933,7 +928,7 @@ loop_start:
                                break;
                        }
                        else {
-                               int tmp = mono_regstate_next_int (cfg->rs);
+                               int tmp = mono_alloc_ireg (cfg);
                                NEW_INS (cfg, temp, OP_ICONST);
                                temp->inst_c0 = ins->inst_c0;
                                temp->dreg = tmp;
@@ -946,8 +941,8 @@ loop_start:
                        break;
 
                case CEE_MUL: {
-                       int freg1 = mono_regstate_next_float (cfg->rs);
-                       int freg2 = mono_regstate_next_float (cfg->rs);
+                       int freg1 = mono_alloc_freg (cfg);
+                       int freg2 = mono_alloc_freg (cfg);
 
                        NEW_INS(cfg, temp, OP_STORE_MEMBASE_REG);
                        temp->sreg1 = ins->sreg1;
@@ -991,7 +986,7 @@ loop_start:
                last_ins = ins;
        }
        bb->last_ins = last_ins;
-       bb->max_vreg = cfg->rs->next_vreg;
+       bb->max_vreg = cfg->next_vreg;
        
 }
 
@@ -1117,7 +1112,7 @@ emit_memcpy (guint32 *code, int doff, int dreg, int soff, int sreg, int size)
  *  Determine the vtable slot used by a virtual call.
  */
 gpointer*
-mono_arch_get_vcall_slot_addr (guint8 *code8, gpointer *regs)
+mono_arch_get_vcall_slot_addr (guint8 *code8, mgreg_t *regs)
 {
        guint32 *code = (guint32*)((unsigned long)code8 & ~3);
 
@@ -1159,21 +1154,13 @@ mono_arch_get_vcall_slot_addr (guint8 *code8, gpointer *regs)
 } while (0)
 
 #define EMIT_COND_BRANCH_FLAGS(ins,r1,r2,b0,b1) do {\
-       if (ins->flags & MONO_INST_BRLABEL) { \
-               mono_add_patch_info (cfg, (guint8*)code - cfg->native_code, MONO_PATCH_INFO_LABEL, ins->inst_i0); \
-               if (b0) \
-                       hppa_combt (code, r1, r2, b1, 0); \
-               else \
-                       hppa_combf (code, r1, r2, b1, 0); \
-       } else { \
-               if (b0) \
-                       hppa_combf (code, r1, r2, b1, 2); \
-               else \
-                       hppa_combt (code, r1, r2, b1, 2); \
-               hppa_nop (code); \
-               mono_add_patch_info (cfg, (guint8*)code - cfg->native_code, MONO_PATCH_INFO_BB, ins->inst_true_bb); \
-               hppa_bl (code, 0, hppa_r0); \
-       } \
+       if (b0) \
+               hppa_combf (code, r1, r2, b1, 2); \
+       else \
+               hppa_combt (code, r1, r2, b1, 2); \
+       hppa_nop (code); \
+       mono_add_patch_info (cfg, (guint8*)code - cfg->native_code, MONO_PATCH_INFO_BB, ins->inst_true_bb); \
+       hppa_bl (code, 0, hppa_r0); \
        hppa_nop (code); \
 } while (0)
 
@@ -1182,10 +1169,7 @@ mono_arch_get_vcall_slot_addr (guint8 *code8, gpointer *regs)
 #define EMIT_FLOAT_COND_BRANCH_FLAGS(ins,r1,r2,b0) do {\
        hppa_fcmp (code, HPPA_FP_FMT_DBL, b0, r1, r2); \
        hppa_ftest (code, 0); \
-       if (ins->flags & MONO_INST_BRLABEL) \
-               mono_add_patch_info (cfg, (guint8*)code - cfg->native_code, MONO_PATCH_INFO_LABEL, ins->inst_i0); \
-       else \
-               mono_add_patch_info (cfg, (guint8*)code - cfg->native_code, MONO_PATCH_INFO_BB, ins->inst_true_bb); \
+       mono_add_patch_info (cfg, (guint8*)code - cfg->native_code, MONO_PATCH_INFO_BB, ins->inst_true_bb); \
        hppa_bl (code, 8, hppa_r0); \
        hppa_nop (code); \
 } while (0)
@@ -1288,6 +1272,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                mono_debug_record_line_number (cfg, ins, offset);
 
                switch (ins->opcode) {
+               case OP_RELAXED_NOP:
+                       break;
                case OP_STOREI1_MEMBASE_IMM:
                        EMIT_STORE_MEMBASE_IMM (ins, stb);
                        break;
@@ -1728,11 +1714,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_BR: {
                        guint32 target;
                        DEBUG (printf ("target: %p, next: %p, curr: %p, last: %p\n", ins->inst_target_bb, bb->next_bb, ins, bb->last_ins));
-                       if (ins->flags & MONO_INST_BRLABEL) {
-                               mono_add_patch_info (cfg, offset, MONO_PATCH_INFO_LABEL, ins->inst_i0);
-                       } else {
-                               mono_add_patch_info (cfg, offset, MONO_PATCH_INFO_BB, ins->inst_target_bb);
-                       }
+                       mono_add_patch_info (cfg, offset, MONO_PATCH_INFO_BB, ins->inst_target_bb);
                        hppa_bl (code, 8, hppa_r0); 
                        /* TODO: if the branch is too long, we may need to
                         * use a long-branch sequence:
@@ -2057,7 +2039,7 @@ mono_arch_register_lowlevel_calls (void)
 }
 
 void
-mono_arch_patch_code (MonoMethod *method, MonoDomain *domain, guint8 *code, MonoJumpInfo *ji, gboolean run_cctors)
+mono_arch_patch_code (MonoMethod *method, MonoDomain *domain, guint8 *code, MonoJumpInfo *ji, MonoCodeManager *dyn_code_mp, gboolean run_cctors)
 {
        MonoJumpInfo *patch_info;
 
@@ -2134,7 +2116,7 @@ enum {
 };
 
 void*
-mono_arch_instrument_epilog (MonoCompile *cfg, void *func, void *p, gboolean enable_arguments)
+mono_arch_instrument_epilog_full (MonoCompile *cfg, void *func, void *p, gboolean enable_arguments, gboolean preserve_argument_registers)
 {
        guint32 *code = (guint32*)p;
        DEBUG_FUNC_ENTER();
@@ -2870,7 +2852,7 @@ mono_arch_emit_this_vret_args (MonoCompile *cfg, MonoCallInst *inst, int this_re
                MONO_INST_NEW (cfg, this, OP_MOVE);
                this->type = this_type;
                this->sreg1 = this_reg;
-               this->dreg = mono_regstate_next_int (cfg->rs);
+               this->dreg = mono_alloc_ireg (cfg);
                mono_bblock_add_inst (cfg->cbb, this);
                mono_call_inst_add_outarg_reg (cfg, inst, this->dreg, hppa_r26, FALSE);
        }
@@ -2880,7 +2862,7 @@ mono_arch_emit_this_vret_args (MonoCompile *cfg, MonoCallInst *inst, int this_re
                MONO_INST_NEW (cfg, vtarg, OP_MOVE);
                vtarg->type = STACK_MP;
                vtarg->sreg1 = vt_reg;
-               vtarg->dreg = mono_regstate_next_int (cfg->rs);
+               vtarg->dreg = mono_alloc_ireg (cfg);
                mono_bblock_add_inst (cfg->cbb, vtarg);
                mono_call_inst_add_outarg_reg (cfg, inst, vtarg->dreg, hppa_r28, FALSE);
        }
@@ -2945,11 +2927,6 @@ MonoInst* mono_arch_get_domain_intrinsic (MonoCompile* cfg)
        return NULL;
 }
 
-MonoInst* mono_arch_get_thread_intrinsic (MonoCompile* cfg)
-{
-       return NULL;
-}
-
 gpointer
 mono_arch_context_get_int_reg (MonoContext *ctx, int reg)
 {
my mono mirror. check out Moved to http://github.com/mono/mono