From patchwork Sun Jun 9 02:36:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petar Jovanovic X-Patchwork-Id: 250002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EB30D2C0040 for ; Sun, 9 Jun 2013 12:37:53 +1000 (EST) Received: from localhost ([::1]:41753 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UlVVw-00056I-31 for incoming@patchwork.ozlabs.org; Sat, 08 Jun 2013 22:37:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UlVVf-000569-81 for qemu-devel@nongnu.org; Sat, 08 Jun 2013 22:37:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UlVVc-00079j-OK for qemu-devel@nongnu.org; Sat, 08 Jun 2013 22:37:35 -0400 Received: from multi.imgtec.com ([194.200.65.239]:17599) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UlVVc-00079e-IU for qemu-devel@nongnu.org; Sat, 08 Jun 2013 22:37:32 -0400 From: Petar Jovanovic To: Petar Jovanovic , "qemu-devel@nongnu.org" Thread-Topic: [PATCH] target-mips: fix multiplication in mipsdsp_rndq15_mul_q15_q15 Thread-Index: AQHOV9y+v0gHkOe/mkubVAmveDVIIpksxGHs Date: Sun, 9 Jun 2013 02:36:01 +0000 Message-ID: <56EA75BA695AE044ACFB41322F6D2BF40223026F@BADAG02.ba.imgtec.org> References: <1369330673-122946-1-git-send-email-petar.jovanovic@rt-rk.com> In-Reply-To: <1369330673-122946-1-git-send-email-petar.jovanovic@rt-rk.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.168.64.117] MIME-Version: 1.0 X-SEF-Processed: 7_3_0_01192__2013_06_09_03_37_31 X-detected-operating-system: by eggs.gnu.org: Windows XP X-Received-From: 194.200.65.239 Cc: "aurelien@aurel32.net" Subject: Re: [Qemu-devel] [PATCH] target-mips: fix multiplication in mipsdsp_rndq15_mul_q15_q15 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org ping http://patchwork.ozlabs.org/patch/245990/ diff --git a/target-mips/dsp_helper.c b/target-mips/dsp_helper.c index 4116de9..c718a78 100644 --- a/target-mips/dsp_helper.c +++ b/target-mips/dsp_helper.c @@ -390,7 +390,7 @@ static inline int32_t mipsdsp_mul_q15_q15_overflowflag21(uint16_t a, uint16_t b, temp = 0x7FFFFFFF; set_DSPControl_overflow_flag(1, 21, env); } else { - temp = ((int32_t)(int16_t)a * (int32_t)(int16_t)b) << 1; + temp = ((int16_t)a * (int16_t)b) << 1; } return temp; @@ -622,7 +622,7 @@ static inline int16_t mipsdsp_rndq15_mul_q15_q15(uint16_t a, uint16_t b, temp = 0x7FFF0000; set_DSPControl_overflow_flag(1, 21, env); } else { - temp = (a * b) << 1; + temp = ((int16_t)a * (int16_t)b) << 1; temp = temp + 0x00008000; } diff --git a/tests/tcg/mips/mips32-dsp/mulq_rs_ph.c b/tests/tcg/mips/mips32-dsp/mulq_rs_ph.c index c720603..370c2a8 100644 --- a/tests/tcg/mips/mips32-dsp/mulq_rs_ph.c +++ b/tests/tcg/mips/mips32-dsp/mulq_rs_ph.c @@ -12,7 +12,24 @@ int main() resultdsp = 1; __asm - ("mulq_rs.ph %0, %2, %3\n\t" + ("wrdsp $0\n\t" + "mulq_rs.ph %0, %2, %3\n\t" + "rddsp %1\n\t" + : "=r"(rd), "=r"(dsp) + : "r"(rs), "r"(rt) + ); + dsp = (dsp >> 21) & 0x01; + assert(rd == result); + assert(dsp == resultdsp); + + rs = 0x80011234; + rt = 0x80024321; + result = 0x7FFD098C; + resultdsp = 0; + + __asm + ("wrdsp $0\n\t" + "mulq_rs.ph %0, %2, %3\n\t" "rddsp %1\n\t" : "=r"(rd), "=r"(dsp) : "r"(rs), "r"(rt)