diff options
| author | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-10 21:27:48 +0000 |
|---|---|---|
| committer | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-10 21:27:48 +0000 |
| commit | 1a1f7dbcf18c674bafd4536a8d125ce2ff987bf7 (patch) | |
| tree | 371b19653d87c3b54d231c35b559f51115635bdf | |
| parent | 8579095b81e985fdcdba923d7b3ad75ddf69cb87 (diff) | |
target-alpha: remove amask helper
The direct use of helper_amask in translate.c was bogus (as env is not
assigned). Directly code amask in tcg and remove the helper.
Signed-off-by: Tristan Gingold <gingold@adacore.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7075 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | target-alpha/helper.h | 1 | ||||
| -rw-r--r-- | target-alpha/op_helper.c | 15 | ||||
| -rw-r--r-- | target-alpha/translate.c | 15 |
3 files changed, 13 insertions, 18 deletions
diff --git a/target-alpha/helper.h b/target-alpha/helper.h index f62b1c2b55..a4faca248a 100644 --- a/target-alpha/helper.h +++ b/target-alpha/helper.h @@ -3,7 +3,6 @@ DEF_HELPER_0(tb_flush, void) DEF_HELPER_2(excp, void, int, int) -DEF_HELPER_1(amask, i64, i64) DEF_HELPER_0(load_pcc, i64) DEF_HELPER_0(rc, i64) DEF_HELPER_0(rs, i64) diff --git a/target-alpha/op_helper.c b/target-alpha/op_helper.c index 6b41d2bec5..82cb2d9f19 100644 --- a/target-alpha/op_helper.c +++ b/target-alpha/op_helper.c @@ -37,21 +37,6 @@ void helper_excp (int excp, int error) cpu_loop_exit(); } -uint64_t helper_amask (uint64_t arg) -{ - switch (env->implver) { - case IMPLVER_2106x: - /* EV4, EV45, LCA, LCA45 & EV5 */ - break; - case IMPLVER_21164: - case IMPLVER_21264: - case IMPLVER_21364: - arg &= ~env->amask; - break; - } - return arg; -} - uint64_t helper_load_pcc (void) { /* XXX: TODO */ diff --git a/target-alpha/translate.c b/target-alpha/translate.c index c68a6284d3..f8a946bbec 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -1160,9 +1160,20 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn) /* AMASK */ if (likely(rc != 31)) { if (islit) - tcg_gen_movi_i64(cpu_ir[rc], helper_amask(lit)); + tcg_gen_movi_i64(cpu_ir[rc], lit); else - gen_helper_amask(cpu_ir[rc], cpu_ir[rb]); + tcg_gen_mov_i64(cpu_ir[rc], cpu_ir[rb]); + switch (ctx->env->implver) { + case IMPLVER_2106x: + /* EV4, EV45, LCA, LCA45 & EV5 */ + break; + case IMPLVER_21164: + case IMPLVER_21264: + case IMPLVER_21364: + tcg_gen_andi_i64(cpu_ir[rc], cpu_ir[rc], + ~(uint64_t)ctx->amask); + break; + } } break; case 0x64: |