From patchwork Fri Apr 24 14:42:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Clifton X-Patchwork-Id: 6427 Received: (qmail 20951 invoked by alias); 24 Apr 2015 14:42:50 -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 20939 invoked by uid 89); 24 Apr 2015 14:42:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.6 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 24 Apr 2015 14:42:49 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3OEgllQ001083 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 24 Apr 2015 10:42:47 -0400 Received: from littlehelper.redhat.com (vpn1-7-214.ams2.redhat.com [10.36.7.214]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3OEgjIp027516 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 24 Apr 2015 10:42:46 -0400 From: Nick Clifton To: gdb-patches@sourceware.org Subject: Commit: Obvious fixes for PR 18273 Date: Fri, 24 Apr 2015 15:42:44 +0100 Message-ID: <87k2x1egez.fsf@redhat.com> MIME-Version: 1.0 Hi Guys, PR 18273 has exposed some typos in the simulator code, and provides some simple. obvious fixes for them. So I have gone ahead and checked these fixes in. Cheers Nick sim/bfin/ChangeLog 2015-04-24 David Binderman Nick Clifton PR 18273 * bfin-sim.c (decode_dsp32alu_0): Remove spurious check for s == 1. sim/erc32/ChangeLog 2015-04-24 David Binderman Nick Clifton PR 18273 * exec.c (add32): Fix typo in check for overflow. sim/igen/ChangeLog 2015-04-24 David Binderman Nick Clifton PR 18273 * misc.c (a2i): Fix typos checking for uppercase letters. diff --git a/sim/bfin/bfin-sim.c b/sim/bfin/bfin-sim.c index 364ee29..24b29e7 100644 --- a/sim/bfin/bfin-sim.c +++ b/sim/bfin/bfin-sim.c @@ -4318,7 +4318,7 @@ decode_dsp32alu_0 (SIM_CPU *cpu, bu16 iw0, bu16 iw1) SET_AREG (1, 0); } else if ((aop == 0 || aop == 1 || aop == 2) && s == 1 && aopcde == 8 - && x == 0 && s == 1 && HL == 0) + && x == 0 && HL == 0) { bs40 acc0 = get_extended_acc (cpu, 0); bs40 acc1 = get_extended_acc (cpu, 1); diff --git a/sim/erc32/exec.c b/sim/erc32/exec.c index d31032b..0d87aa3 100644 --- a/sim/erc32/exec.c +++ b/sim/erc32/exec.c @@ -292,7 +292,7 @@ add32 (uint32 n1, uint32 n2, int *carry) { uint32 result = n1 + n2; - *carry = result < n1 || result < n1; + *carry = result < n1 || result < n2; return result; } diff --git a/sim/igen/misc.c b/sim/igen/misc.c index 71e34fb..6501352 100644 --- a/sim/igen/misc.c +++ b/sim/igen/misc.c @@ -102,7 +102,7 @@ a2i (const char *a) if (strcmp (a, "true") == 0 || strcmp (a, "TRUE") == 0) return 1; - if (strcmp (a, "false") == 0 || strcmp (a, "false") == 0) + if (strcmp (a, "false") == 0 || strcmp (a, "FALSE") == 0) return 0; if (*a == '-') @@ -118,7 +118,7 @@ a2i (const char *a) a += 2; base = 16; } - else if (a[1] == 'b' || a[1] == 'b') + else if (a[1] == 'b' || a[1] == 'B') { a += 2; base = 2;