diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-05-24 19:06:07 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-05-24 19:06:07 +0000 |
| commit | 2784847001ba054a2912460f9735fd4497327d02 (patch) | |
| tree | f50cb3ad2e68266f6d432c78fac7ab949b29a4af /target-mips | |
| parent | b101234a8e81fbe47249d2625445ffed37ddd49b (diff) | |
| download | qemu-2784847001ba054a2912460f9735fd4497327d02.tar.gz | |
Un-break MIPS conditional moves, by Richard Sandiford.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4562 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-mips')
| -rw-r--r-- | target-mips/translate.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/target-mips/translate.c b/target-mips/translate.c index 0773f4067c..9c91f7ef48 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -5547,10 +5547,6 @@ static void gen_cp1 (DisasContext *ctx, uint32_t opc, int rt, int fs) static void gen_movci (DisasContext *ctx, int rd, int rs, int cc, int tf) { - TCGv r_ptr = tcg_temp_new(TCG_TYPE_PTR); - TCGv r_tmp = new_tmp(); - TCGv t0 = tcg_temp_new(TCG_TYPE_TL); - TCGv t1 = tcg_temp_new(TCG_TYPE_TL); int l1 = gen_new_label(); uint32_t ccbit; TCGCond cond; @@ -5560,20 +5556,26 @@ static void gen_movci (DisasContext *ctx, int rd, int rs, int cc, int tf) else ccbit = 1 << 23; if (tf) - cond = TCG_COND_NE; - else cond = TCG_COND_EQ; + else + cond = TCG_COND_NE; + + gen_load_gpr(cpu_T[0], rd); + gen_load_gpr(cpu_T[1], rs); + { + TCGv r_ptr = tcg_temp_new(TCG_TYPE_PTR); + TCGv r_tmp = new_tmp(); + + tcg_gen_ld_ptr(r_ptr, cpu_env, offsetof(CPUState, fpu)); + tcg_gen_ld_i32(r_tmp, r_ptr, offsetof(CPUMIPSFPUContext, fcr31)); + tcg_gen_andi_i32(r_tmp, r_tmp, ccbit); + tcg_gen_brcondi_i32(cond, r_tmp, 0, l1); + dead_tmp(r_tmp); + } + tcg_gen_mov_tl(cpu_T[0], cpu_T[1]); - gen_load_gpr(t0, rd); - gen_load_gpr(t1, rs); - tcg_gen_ld_ptr(r_ptr, cpu_env, offsetof(CPUState, fpu)); - tcg_gen_ld_i32(r_tmp, r_ptr, offsetof(CPUMIPSFPUContext, fcr31)); - tcg_gen_andi_i32(r_tmp, r_tmp, ccbit); - tcg_gen_brcondi_i32(cond, r_tmp, 0, l1); - tcg_gen_mov_tl(t0, t1); gen_set_label(l1); - dead_tmp(r_tmp); - gen_store_gpr(t0, rd); + gen_store_gpr(cpu_T[0], rd); } #define GEN_MOVCF(fmt) \ |