From patchwork Sun Oct 11 07:42:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 9044 X-Patchwork-Delegate: vapier@gentoo.org Received: (qmail 14139 invoked by alias); 11 Oct 2015 07:43:06 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 14101 invoked by uid 89); 11 Oct 2015 07:43:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sun, 11 Oct 2015 07:43:02 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id E587333F9D2 for ; Sun, 11 Oct 2015 07:43:00 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: bfin: handle negative left saturated shifts as ashifts [BZ #18407] Date: Sun, 11 Oct 2015 03:42:57 -0400 Message-Id: <1444549377-11752-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes When handling left saturated ashifts with negative immediates, they should be treated as right ashifts. This matches hardware behavior. Committed. Reported-by: Igor Rayak --- sim/bfin/ChangeLog | 6 ++++++ sim/bfin/bfin-sim.c | 6 +++++- sim/testsuite/sim/bfin/ChangeLog | 5 +++++ sim/testsuite/sim/bfin/ashift_left.s | 17 +++++++++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 sim/testsuite/sim/bfin/ashift_left.s diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index d0e91b3..2e62a74 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,9 @@ +2015-10-11 Mike Frysinger + + PR sim/18407 + * bfin-sim.c (decode_dsp32shiftimm_0): Call ashiftrt when count + is less than 0. + 2015-06-24 Mike Frysinger * interp.c (trace_register): Delete. diff --git a/sim/bfin/bfin-sim.c b/sim/bfin/bfin-sim.c index 8b19ead..b6acb4e 100644 --- a/sim/bfin/bfin-sim.c +++ b/sim/bfin/bfin-sim.c @@ -6083,7 +6083,11 @@ decode_dsp32shiftimm_0 (SIM_CPU *cpu, bu16 iw0, bu16 iw1) int count = imm6 (immag); TRACE_INSN (cpu, "R%i = R%i << %i (S);", dst0, src1, count); - STORE (DREG (dst0), lshift (cpu, DREG (src1), count, 32, 1, 1)); + + if (count < 0) + STORE (DREG (dst0), ashiftrt (cpu, DREG (src1), -count, 32)); + else + STORE (DREG (dst0), lshift (cpu, DREG (src1), count, 32, 1, 1)); } else if (sop == 2 && sopcde == 2) { diff --git a/sim/testsuite/sim/bfin/ChangeLog b/sim/testsuite/sim/bfin/ChangeLog index 89d2833..4fc604f 100644 --- a/sim/testsuite/sim/bfin/ChangeLog +++ b/sim/testsuite/sim/bfin/ChangeLog @@ -1,3 +1,8 @@ +2015-10-11 Mike Frysinger + + PR sim/18407 + * ashift_left.s: New test. + 2013-12-07 Mike Frysinger * run-tests.sh: Add +x file mode. diff --git a/sim/testsuite/sim/bfin/ashift_left.s b/sim/testsuite/sim/bfin/ashift_left.s new file mode 100644 index 0000000..04cfa40 --- /dev/null +++ b/sim/testsuite/sim/bfin/ashift_left.s @@ -0,0 +1,17 @@ +# Blackfin testcase for left ashift +# Dreg = Dreg << imm (S); +# mach: bfin + + .include "testutils.inc" + + .macro test in:req, shift:req, out:req, opt + imm32 r0, \in; + r1 = r0 >>> \shift \opt; + CHECKREG r1, \out; + .endm + + start + +test 2, 1, 1, (S); + + pass