#include <mono/utils/mono-math.h>
#include "mini-hppa.h"
-#include "inssel.h"
#include "trace.h"
#include "cpu-hppa.h"
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 */
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"));
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) {
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);
}
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);
}
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;
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;
last_ins = ins;
}
bb->last_ins = last_ins;
- bb->max_vreg = cfg->rs->next_vreg;
+ bb->max_vreg = cfg->next_vreg;
}
* 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);
} 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)
#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)
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:
}
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;
};
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();
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);
}
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);
}
return NULL;
}
-MonoInst* mono_arch_get_thread_intrinsic (MonoCompile* cfg)
-{
- return NULL;
-}
-
gpointer
mono_arch_context_get_int_reg (MonoContext *ctx, int reg)
{