From patchwork Thu Aug 3 18:12:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9879609 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3E7A160360 for ; Thu, 3 Aug 2017 18:15:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1294F2894D for ; Thu, 3 Aug 2017 18:15:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06B3928952; Thu, 3 Aug 2017 18:15:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8890528950 for ; Thu, 3 Aug 2017 18:15:27 +0000 (UTC) Received: from localhost ([::1]:38504 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddKec-0008Dv-Pk for patchwork-qemu-devel@patchwork.kernel.org; Thu, 03 Aug 2017 14:15:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddKbm-0006OA-BK for qemu-devel@nongnu.org; Thu, 03 Aug 2017 14:12:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddKbk-0003BO-7X for qemu-devel@nongnu.org; Thu, 03 Aug 2017 14:12:30 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:38685) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddKbk-0003AT-1m for qemu-devel@nongnu.org; Thu, 03 Aug 2017 14:12:28 -0400 Received: by mail-pg0-x242.google.com with SMTP id 123so2155625pga.5 for ; Thu, 03 Aug 2017 11:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=LK6jCXZlW11PmWP2G3sEq1hN5ofU9z75iA45nh/Sjyk=; b=a99qyx6T4f+Uji+FEmrj2d78SrhaJ6N7v+C0rdcOaEh4Wu7WwN3A/P5Xb0rf2fabr3 zNKS7UnTTbi+F9MBPPLZG2oZHURPsPkIRMBQQSxnVZ1BZ6M7wPQSxkY+2YQ4iku/PIsS 5eBAtmNVB6VqEeMHo0N1N12AZwNzBs91cgY3j+9GE5+1B+lEZ3AUtPxYNK2uMRae40vt yJ+37OLtGnCmunYKN0/9aTshebBA+HAYNmgOuLw3N0qC8avc7Uw7bJKc49IYZRKWAV6N +qBUKOxhAm7RAy9yjVXCOUreMoZ8VVi+sPZXemJ8n2kqssOhGtT1hY1xHpjvppTG3N3L MM4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=LK6jCXZlW11PmWP2G3sEq1hN5ofU9z75iA45nh/Sjyk=; b=hK2hvjiV2+yA0gjAVaxggK+8RXFhfo3KzWMUSOVLhv14KWbYnutkRfMXDjeCtcWyNr ZHer8EyjAkZu2J3jQkS2Ike3EvwFypmFSOHgN0X5jNAn5KQ2JWjJ3sfMSJv8bBrfeYrG ++l8SdRazk1hHul1Iz2tR1UYXTE+233Os2zUG6Med8iUlsDydHwscZjXvljqt/VAK4lC l4qJVR6GdwNjNrwK/g9AuYlyziWkyVSID0ljzEV/AE9LxydEf6GdTjK6MlrIU3kxWyPc s6Ju/H4U0CYc3ashdQkT35VWlSZuU0t+Ep8Ih+HZLod3KgSfXHf5ezslWvRjQVpgj/ou VgVw== X-Gm-Message-State: AIVw112O1FjzHgeLadYTrAChy42IumyouuN0uM9KafAjpDh5PxaU2ePI 54inEVpQG+Mgy0y5XHE= X-Received: by 10.98.195.26 with SMTP id v26mr2548878pfg.118.1501783946648; Thu, 03 Aug 2017 11:12:26 -0700 (PDT) Received: from bigtime.twiddle.net (97-126-108-236.tukw.qwest.net. [97.126.108.236]) by smtp.gmail.com with ESMTPSA id 133sm16410964pge.29.2017.08.03.11.12.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Aug 2017 11:12:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 3 Aug 2017 11:12:22 -0700 Message-Id: <20170803181224.21748-2-rth@twiddle.net> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170803181224.21748-1-rth@twiddle.net> References: <20170803181224.21748-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PULL for-2.10 1/3] tcg/arm: Fix runtime overalignment test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Patch 85aa80813dd changed the IF emitting the TST instruction, but failed to change the ?: converting CMP to CMPEQ, so the result of the TST is ignored. Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.inc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c index d1793ec77d..37efcf06af 100644 --- a/tcg/arm/tcg-target.inc.c +++ b/tcg/arm/tcg-target.inc.c @@ -1223,7 +1223,7 @@ static TCGReg tcg_out_tlb_read(TCGContext *s, TCGReg addrlo, TCGReg addrhi, /* Load the tlb addend. */ tcg_out_ld32_12(s, COND_AL, TCG_REG_R2, TCG_REG_R2, add_off); - tcg_out_dat_reg(s, (s_bits ? COND_EQ : COND_AL), ARITH_CMP, 0, + tcg_out_dat_reg(s, (a_bits ? COND_EQ : COND_AL), ARITH_CMP, 0, TCG_REG_R0, TCG_REG_TMP, SHIFT_IMM_LSL(TARGET_PAGE_BITS)); if (TARGET_LONG_BITS == 64) {