From b1ca31d7ce648a10e3513bb4b5e7f89a8702aec7 Mon Sep 17 00:00:00 2001 From: Petar Jovanovic Date: Mon, 15 Apr 2013 13:54:07 +0200 Subject: target-mips: fix mipsdsp_mul_q15_q15 and tests for MAQ_SA_W_PHL/PHR The operands for MAQ_SA_W.PHL/MAQ_SA_W.PHR must in specified format. Otherwise, the results are unpredictable. Once the operands were corrected in the tests (part of this change), a bug in mipsdsp_mul_q15_q15 became visible. This change corrects the tests for MAQ_SA_W.PHL/MAQ_SA_W.PHR and fixes sign-related issue in mipsdsp_mul_q15_q15. It also removes unnecessary comment. Signed-off-by: Petar Jovanovic --- target-mips/dsp_helper.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'target-mips') diff --git a/target-mips/dsp_helper.c b/target-mips/dsp_helper.c index c7df595c9b..f975da08c4 100644 --- a/target-mips/dsp_helper.c +++ b/target-mips/dsp_helper.c @@ -269,18 +269,6 @@ static inline int32_t mipsdsp_sat32_acc_q31(int32_t acc, int32_t a, temp31 = (temp_sum >> 31) & 0x01; result = temp_sum & 0xFFFFFFFF; - /* FIXME - This sat function may wrong, because user manual wrote: - temp127..0 ← temp + ( (signA) || a31..0 - if ( temp32 ≠ temp31 ) then - if ( temp32 = 0 ) then - temp31..0 ← 0x80000000 - else - temp31..0 ← 0x7FFFFFFF - endif - DSPControlouflag:16+acc ← 1 - endif - */ if (temp32 != temp31) { if (temp32 == 0) { result = 0x7FFFFFFF; @@ -578,7 +566,7 @@ static inline int32_t mipsdsp_mul_q15_q15(int32_t ac, uint16_t a, uint16_t b, temp = 0x7FFFFFFF; set_DSPControl_overflow_flag(1, 16 + ac, env); } else { - temp = ((uint32_t)a * (uint32_t)b) << 1; + temp = ((int16_t)a * (int16_t)b) << 1; } return temp; -- cgit v1.2.3