diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-26 22:35:02 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-26 22:35:02 +0000 |
| commit | 5592a750b913c859c738eb2774c26632dcac8350 (patch) | |
| tree | 54745b2164b81bdc447c769c48d89d928ce8cf82 | |
| parent | 7878ff6bc7c9bc4091d19a51a1dc4bac2df23560 (diff) | |
The other half of the mul64 rework. Sorry for the breakage, I committed
an incomplete version of what I tested.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3454 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | host-utils.c | 2 | ||||
| -rw-r--r-- | target-i386/helper.c | 6 | ||||
| -rw-r--r-- | target-mips/op.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/host-utils.c b/host-utils.c index d0d780e54e..a3c838f4dc 100644 --- a/host-utils.c +++ b/host-utils.c @@ -25,6 +25,8 @@ #include "vl.h" +//#define DEBUG_MULDIV + /* Long integer helpers */ static void add128 (uint64_t *plow, uint64_t *phigh, uint64_t a, uint64_t b) { diff --git a/target-i386/helper.c b/target-i386/helper.c index c5d4487a62..88aa82e42a 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -3724,7 +3724,7 @@ void helper_mulq_EAX_T0(void) { uint64_t r0, r1; - mulu64(&r1, &r0, EAX, T0); + mulu64(&r0, &r1, EAX, T0); EAX = r0; EDX = r1; CC_DST = r0; @@ -3735,7 +3735,7 @@ void helper_imulq_EAX_T0(void) { uint64_t r0, r1; - muls64(&r1, &r0, EAX, T0); + muls64(&r0, &r1, EAX, T0); EAX = r0; EDX = r1; CC_DST = r0; @@ -3746,7 +3746,7 @@ void helper_imulq_T0_T1(void) { uint64_t r0, r1; - muls64(&r1, &r0, T0, T1); + muls64(&r0, &r1, T0, T1); T0 = r0; CC_DST = r0; CC_SRC = ((int64_t)r1 != ((int64_t)r0 >> 63)); diff --git a/target-mips/op.c b/target-mips/op.c index 5c26d176c1..1ecec9a57a 100644 --- a/target-mips/op.c +++ b/target-mips/op.c @@ -876,13 +876,13 @@ void op_msubu (void) #if defined(TARGET_MIPSN32) || defined(TARGET_MIPS64) void op_dmult (void) { - CALL_FROM_TB4(muls64, &(env->HI[0][env->current_tc]), &(env->LO[0][env->current_tc]), T0, T1); + CALL_FROM_TB4(muls64, &(env->LO[0][env->current_tc]), &(env->HI[0][env->current_tc]), T0, T1); RETURN(); } void op_dmultu (void) { - CALL_FROM_TB4(mulu64, &(env->HI[0][env->current_tc]), &(env->LO[0][env->current_tc]), T0, T1); + CALL_FROM_TB4(mulu64, &(env->LO[0][env->current_tc]), &(env->HI[0][env->current_tc]), T0, T1); RETURN(); } #endif |