diff options
| author | Richard Henderson <rth@twiddle.net> | 2014-09-16 12:55:12 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2015-08-18 11:08:59 -0700 |
| commit | 6c05d3ded7b51154e67c35e270c48784b7046883 (patch) | |
| tree | 943fc2805f8742909c49f7de54d89a23df176528 | |
| parent | 2f458b7c311f8d79028b04930f8c820b326fbcdd (diff) | |
target-alpha: Inline hw_ret
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | target-alpha/helper.h | 2 | ||||
| -rw-r--r-- | target-alpha/sys_helper.c | 8 | ||||
| -rw-r--r-- | target-alpha/translate.c | 15 |
3 files changed, 10 insertions, 15 deletions
diff --git a/target-alpha/helper.h b/target-alpha/helper.h index e7f04504ac..42bb247e32 100644 --- a/target-alpha/helper.h +++ b/target-alpha/helper.h @@ -91,8 +91,6 @@ DEF_HELPER_FLAGS_2(ieee_input_cmp, TCG_CALL_NO_WG, void, env, i64) DEF_HELPER_FLAGS_2(ieee_input_s, TCG_CALL_NO_WG, void, env, i64) #if !defined (CONFIG_USER_ONLY) -DEF_HELPER_2(hw_ret, void, env, i64) - DEF_HELPER_2(ldl_phys, i64, env, i64) DEF_HELPER_2(ldq_phys, i64, env, i64) DEF_HELPER_2(ldl_l_phys, i64, env, i64) diff --git a/target-alpha/sys_helper.c b/target-alpha/sys_helper.c index 380d6e4d57..1f0e1a9671 100644 --- a/target-alpha/sys_helper.c +++ b/target-alpha/sys_helper.c @@ -40,14 +40,6 @@ uint64_t helper_load_pcc(CPUAlphaState *env) /* PALcode support special instructions */ #ifndef CONFIG_USER_ONLY -void helper_hw_ret(CPUAlphaState *env, uint64_t a) -{ - env->pc = a & ~3; - env->intr_flag = 0; - env->lock_addr = -1; - env->pal_mode = a & 1; -} - void helper_tbia(CPUAlphaState *env) { tlb_flush(CPU(alpha_env_get_cpu(env)), 1); diff --git a/target-alpha/translate.c b/target-alpha/translate.c index 01e7f3577b..2849ede85c 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -2635,13 +2635,18 @@ static ExitStatus translate_one(DisasContext *ctx, uint32_t insn) /* Pre-EV6 CPUs interpreted this as HW_REI, loading the return address from EXC_ADDR. This turns out to be useful for our emulation PALcode, so continue to accept it. */ - tmp = tcg_temp_new(); - tcg_gen_ld_i64(tmp, cpu_env, offsetof(CPUAlphaState, exc_addr)); - gen_helper_hw_ret(cpu_env, tmp); - tcg_temp_free(tmp); + ctx->lit = vb = tcg_temp_new(); + tcg_gen_ld_i64(vb, cpu_env, offsetof(CPUAlphaState, exc_addr)); } else { - gen_helper_hw_ret(cpu_env, load_gpr(ctx, rb)); + vb = load_gpr(ctx, rb); } + tmp = tcg_temp_new(); + tcg_gen_movi_i64(tmp, 0); + tcg_gen_st8_i64(tmp, cpu_env, offsetof(CPUAlphaState, intr_flag)); + tcg_gen_movi_i64(cpu_lock_addr, -1); + tcg_gen_andi_i64(tmp, vb, 1); + tcg_gen_st8_i64(tmp, cpu_env, offsetof(CPUAlphaState, pal_mode)); + tcg_gen_andi_i64(cpu_pc, vb, ~3); ret = EXIT_PC_UPDATED; break; #else |