falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-mips: Fix accumulator arguments to gen_helper_dmult(u) 

gen_muldiv was passing int accumulator arguments directly
to gen_helper_dmult(u).  This patch fixes it to use TCGs,
via the gen_helper_0e2i wrapper.

Fixes an --enable-debug-tcg build failure reported by Juergen Lock.

Signed-off-by: Richard Sandiford <rdsandiford@googlemail.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Richard Sandiford 2013-05-04 15:01:31 +01:00 committed by Michael Roth
parent d10d2510b9
commit 074dd56a01
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target-mips/helper.h
View File

@ -24,8 +24,8 @@ DEF_HELPER_FLAGS_1(clz, TCG_CALL_NO_RWG_SE, tl, tl)
#ifdef TARGET_MIPS64 #ifdef TARGET_MIPS64
DEF_HELPER_FLAGS_1(dclo, TCG_CALL_NO_RWG_SE, tl, tl) DEF_HELPER_FLAGS_1(dclo, TCG_CALL_NO_RWG_SE, tl, tl)
DEF_HELPER_FLAGS_1(dclz, TCG_CALL_NO_RWG_SE, tl, tl) DEF_HELPER_FLAGS_1(dclz, TCG_CALL_NO_RWG_SE, tl, tl)
DEF_HELPER_4(dmult, void, env, int, tl, tl) DEF_HELPER_4(dmult, void, env, tl, tl, int)
DEF_HELPER_4(dmultu, void, env, int, tl, tl) DEF_HELPER_4(dmultu, void, env, tl, tl, int)
#endif #endif
DEF_HELPER_3(muls, tl, env, tl, tl) DEF_HELPER_3(muls, tl, env, tl, tl)

8
target-mips/op_helper.c
View File

@ -268,14 +268,14 @@ target_ulong helper_mulshiu(CPUMIPSState *env, target_ulong arg1,
} }
#ifdef TARGET_MIPS64 #ifdef TARGET_MIPS64
void helper_dmult(CPUMIPSState *env, int acc, target_ulong arg1, void helper_dmult(CPUMIPSState *env, target_ulong arg1,
target_ulong arg2) target_ulong arg2, int acc)
{ {
muls64(&(env->active_tc.LO[acc]), &(env->active_tc.HI[acc]), arg1, arg2); muls64(&(env->active_tc.LO[acc]), &(env->active_tc.HI[acc]), arg1, arg2);
} }
void helper_dmultu(CPUMIPSState *env, int acc, target_ulong arg1, void helper_dmultu(CPUMIPSState *env, target_ulong arg1,
target_ulong arg2) target_ulong arg2, int acc)
{ {
mulu64(&(env->active_tc.LO[acc]), &(env->active_tc.HI[acc]), arg1, arg2); mulu64(&(env->active_tc.LO[acc]), &(env->active_tc.HI[acc]), arg1, arg2);
} }

4
target-mips/translate.c
View File

@ -2777,11 +2777,11 @@ static void gen_muldiv(DisasContext *ctx, uint32_t opc,
opn = "ddivu"; opn = "ddivu";
break; break;
case OPC_DMULT: case OPC_DMULT:
gen_helper_dmult(cpu_env, acc, t0, t1); gen_helper_0e2i(dmult, t0, t1, acc);
opn = "dmult"; opn = "dmult";
break; break;
case OPC_DMULTU: case OPC_DMULTU:
gen_helper_dmultu(cpu_env, acc, t0, t1); gen_helper_0e2i(dmultu, t0, t1, acc);
opn = "dmultu"; opn = "dmultu";
break; break;
#endif #endif