ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-arm: Use mul[us]2 and add2 in umlal et al 

Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Richard Henderson 2013-02-19 23:52:06 -08:00 committed by Blue Swirl
parent 831d7fe800
commit c9f10124a2
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target-arm/helper.c
View File

@ -2893,11 +2893,6 @@ uint32_t HELPER(sel_flags)(uint32_t flags, uint32_t a, uint32_t b)
return (a & mask) | (b & ~mask); return (a & mask) | (b & ~mask);
} }
uint32_t HELPER(logicq_cc)(uint64_t val)
{
return (val >> 32) | (val != 0);
}
/* VFP support. We follow the convention used for VFP instructions: /* VFP support. We follow the convention used for VFP instructions:
Single precision routines have a "s" suffix, double precision a Single precision routines have a "s" suffix, double precision a
"d" suffix. */ "d" suffix. */

2
target-arm/helper.h
View File

@ -46,8 +46,6 @@ DEF_HELPER_3(usat16, i32, env, i32, i32)
DEF_HELPER_FLAGS_2(usad8, TCG_CALL_NO_RWG_SE, i32, i32, i32) DEF_HELPER_FLAGS_2(usad8, TCG_CALL_NO_RWG_SE, i32, i32, i32)
DEF_HELPER_1(logicq_cc, i32, i64)
DEF_HELPER_FLAGS_3(sel_flags, TCG_CALL_NO_RWG_SE, DEF_HELPER_FLAGS_3(sel_flags, TCG_CALL_NO_RWG_SE,
i32, i32, i32, i32) i32, i32, i32, i32)
DEF_HELPER_2(exception, void, env, i32) DEF_HELPER_2(exception, void, env, i32)

26
target-arm/translate.c
View File

@ -6433,13 +6433,11 @@ static void gen_addq(DisasContext *s, TCGv_i64 val, int rlow, int rhigh)
tcg_temp_free_i64(tmp); tcg_temp_free_i64(tmp);
} }
/* Set N and Z flags from a 64-bit value. */ /* Set N and Z flags from hi|lo. */
static void gen_logicq_cc(TCGv_i64 val) static void gen_logicq_cc(TCGv lo, TCGv hi)
{ {
TCGv tmp = tcg_temp_new_i32(); tcg_gen_mov_i32(cpu_NF, hi);
gen_helper_logicq_cc(tmp, val); tcg_gen_or_i32(cpu_ZF, lo, hi);
gen_logic_CC(tmp);
tcg_temp_free_i32(tmp);
} }
/* Load/Store exclusive instructions are implemented by remembering /* Load/Store exclusive instructions are implemented by remembering
@ -7219,18 +7217,22 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)
tmp = load_reg(s, rs); tmp = load_reg(s, rs);
tmp2 = load_reg(s, rm); tmp2 = load_reg(s, rm);
if (insn & (1 << 22)) { if (insn & (1 << 22)) {
tmp64 = gen_muls_i64_i32(tmp, tmp2); tcg_gen_muls2_i32(tmp, tmp2, tmp, tmp2);
} else { } else {
tmp64 = gen_mulu_i64_i32(tmp, tmp2); tcg_gen_mulu2_i32(tmp, tmp2, tmp, tmp2);
} }
if (insn & (1 << 21)) { /* mult accumulate */ if (insn & (1 << 21)) { /* mult accumulate */
gen_addq(s, tmp64, rn, rd); TCGv al = load_reg(s, rn);
TCGv ah = load_reg(s, rd);
tcg_gen_add2_i32(tmp, tmp2, tmp, tmp2, al, ah);
tcg_temp_free(al);
tcg_temp_free(ah);
} }
if (insn & (1 << 20)) { if (insn & (1 << 20)) {
gen_logicq_cc(tmp64); gen_logicq_cc(tmp, tmp2);
} }
gen_storeq_reg(s, rn, rd, tmp64); store_reg(s, rn, tmp);
tcg_temp_free_i64(tmp64); store_reg(s, rd, tmp2);
break; break;
default: default:
goto illegal_op; goto illegal_op;