diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-05-29 18:23:31 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-05-29 18:23:31 +0000 |
| commit | 84774e8ea3259d05036678e29936013d6c7eeff7 (patch) | |
| tree | ae2a76536e234e3350337da34454b08101c0d4c8 /target-mips | |
| parent | e30b46789326eaa7fb1f870f0c7d964263851216 (diff) | |
Fix modulus result from MIPS DDIV & avoid overflowing division,
by Richard Sandiford.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4619 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-mips')
| -rw-r--r-- | target-mips/translate.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/target-mips/translate.c b/target-mips/translate.c index c18fe712c9..fefa2c2b44 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -1964,20 +1964,25 @@ static void gen_muldiv (DisasContext *ctx, uint32_t opc, tcg_gen_brcondi_tl(TCG_COND_EQ, cpu_T[1], 0, l1); { int l2 = gen_new_label(); - int l3 = gen_new_label(); tcg_gen_brcondi_tl(TCG_COND_NE, cpu_T[0], 1ULL << 63, l2); tcg_gen_brcondi_tl(TCG_COND_NE, cpu_T[1], -1ULL, l2); - tcg_gen_div_i64(cpu_T[0], cpu_T[0], cpu_T[1]); - tcg_gen_movi_tl(cpu_T[1], 0); - tcg_gen_br(l3); + { + tcg_gen_movi_tl(cpu_T[1], 0); + gen_store_LO(cpu_T[0], 0); + gen_store_HI(cpu_T[1], 0); + tcg_gen_br(l1); + } gen_set_label(l2); - tcg_gen_div_i64(cpu_T[0], cpu_T[0], cpu_T[1]); - tcg_gen_rem_i64(cpu_T[1], cpu_T[0], cpu_T[1]); - gen_set_label(l3); + { + TCGv r_tmp1 = tcg_temp_new(TCG_TYPE_I64); + TCGv r_tmp2 = tcg_temp_new(TCG_TYPE_I64); - gen_store_LO(cpu_T[0], 0); - gen_store_HI(cpu_T[1], 0); + tcg_gen_div_i64(r_tmp1, cpu_T[0], cpu_T[1]); + tcg_gen_rem_i64(r_tmp2, cpu_T[0], cpu_T[1]); + gen_store_LO(r_tmp1, 0); + gen_store_HI(r_tmp2, 0); + } } gen_set_label(l1); } |