diff options
| -rw-r--r-- | target-alpha/helper.h | 4 | ||||
| -rw-r--r-- | target-alpha/op_helper.c | 20 | ||||
| -rw-r--r-- | target-alpha/translate.c | 38 |
3 files changed, 30 insertions, 32 deletions
diff --git a/target-alpha/helper.h b/target-alpha/helper.h index 8004aa18a3..8db73b0df4 100644 --- a/target-alpha/helper.h +++ b/target-alpha/helper.h @@ -17,12 +17,8 @@ DEF_HELPER_1(ctpop, i64, i64) DEF_HELPER_1(ctlz, i64, i64) DEF_HELPER_1(cttz, i64, i64) -DEF_HELPER_2(mskbl, i64, i64, i64) -DEF_HELPER_2(mskwl, i64, i64, i64) -DEF_HELPER_2(mskll, i64, i64, i64) DEF_HELPER_2(zap, i64, i64, i64) DEF_HELPER_2(zapnot, i64, i64, i64) -DEF_HELPER_2(mskql, i64, i64, i64) DEF_HELPER_2(mskwh, i64, i64, i64) DEF_HELPER_2(inswh, i64, i64, i64) DEF_HELPER_2(msklh, i64, i64, i64) diff --git a/target-alpha/op_helper.c b/target-alpha/op_helper.c index d2e43a5e7b..591adbdc8f 100644 --- a/target-alpha/op_helper.c +++ b/target-alpha/op_helper.c @@ -175,21 +175,6 @@ static inline uint64_t byte_zap(uint64_t op, uint8_t mskb) return op & ~mask; } -uint64_t helper_mskbl(uint64_t val, uint64_t mask) -{ - return byte_zap(val, 0x01 << (mask & 7)); -} - -uint64_t helper_mskwl(uint64_t val, uint64_t mask) -{ - return byte_zap(val, 0x03 << (mask & 7)); -} - -uint64_t helper_mskll(uint64_t val, uint64_t mask) -{ - return byte_zap(val, 0x0F << (mask & 7)); -} - uint64_t helper_zap(uint64_t val, uint64_t mask) { return byte_zap(val, mask); @@ -200,11 +185,6 @@ uint64_t helper_zapnot(uint64_t val, uint64_t mask) return byte_zap(val, ~mask); } -uint64_t helper_mskql(uint64_t val, uint64_t mask) -{ - return byte_zap(val, 0xFF << (mask & 7)); -} - uint64_t helper_mskwh(uint64_t val, uint64_t mask) { return byte_zap(val, (0x03 << (mask & 7)) >> 8); diff --git a/target-alpha/translate.c b/target-alpha/translate.c index 5cb620347f..ebab95d65d 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -655,6 +655,32 @@ static inline void gen_ins_l(int ra, int rb, int rc, int islit, } } +/* MSKBL, MSKWL, MSKLL, MSKQL */ +static inline void gen_msk_l(int ra, int rb, int rc, int islit, + uint8_t lit, uint8_t byte_mask) +{ + if (unlikely(rc == 31)) + return; + else if (unlikely(ra == 31)) + tcg_gen_movi_i64(cpu_ir[rc], 0); + else if (islit) { + gen_zapnoti (cpu_ir[rc], cpu_ir[ra], ~(byte_mask << (lit & 7))); + } else { + TCGv shift = tcg_temp_new(); + TCGv mask = tcg_temp_new(); + + tcg_gen_andi_i64(shift, cpu_ir[rb], 7); + tcg_gen_shli_i64(shift, shift, 3); + tcg_gen_movi_i64(mask, zapnot_mask (byte_mask)); + tcg_gen_shl_i64(mask, mask, shift); + + tcg_gen_andc_i64(cpu_ir[rc], cpu_ir[ra], mask); + + tcg_temp_free(mask); + tcg_temp_free(shift); + } +} + /* Code to call arith3 helpers */ #define ARITH3(name) \ static inline void glue(gen_, name)(int ra, int rb, int rc, int islit,\ @@ -686,10 +712,6 @@ ARITH3(addlv) ARITH3(sublv) ARITH3(addqv) ARITH3(subqv) -ARITH3(mskbl) -ARITH3(mskwl) -ARITH3(mskll) -ARITH3(mskql) ARITH3(mskwh) ARITH3(inswh) ARITH3(msklh) @@ -1314,7 +1336,7 @@ static inline int translate_one(DisasContext *ctx, uint32_t insn) switch (fn7) { case 0x02: /* MSKBL */ - gen_mskbl(ra, rb, rc, islit, lit); + gen_msk_l(ra, rb, rc, islit, lit, 0x01); break; case 0x06: /* EXTBL */ @@ -1326,7 +1348,7 @@ static inline int translate_one(DisasContext *ctx, uint32_t insn) break; case 0x12: /* MSKWL */ - gen_mskwl(ra, rb, rc, islit, lit); + gen_msk_l(ra, rb, rc, islit, lit, 0x03); break; case 0x16: /* EXTWL */ @@ -1338,7 +1360,7 @@ static inline int translate_one(DisasContext *ctx, uint32_t insn) break; case 0x22: /* MSKLL */ - gen_mskll(ra, rb, rc, islit, lit); + gen_msk_l(ra, rb, rc, islit, lit, 0x0f); break; case 0x26: /* EXTLL */ @@ -1358,7 +1380,7 @@ static inline int translate_one(DisasContext *ctx, uint32_t insn) break; case 0x32: /* MSKQL */ - gen_mskql(ra, rb, rc, islit, lit); + gen_msk_l(ra, rb, rc, islit, lit, 0xff); break; case 0x34: /* SRL */ |