From patchwork Fri Aug 4 05:28:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9880495 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 876896031B for ; Fri, 4 Aug 2017 05:29:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83EB8289A2 for ; Fri, 4 Aug 2017 05:29:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 78C71289A6; Fri, 4 Aug 2017 05:29:59 +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 05068289A2 for ; Fri, 4 Aug 2017 05:29:58 +0000 (UTC) Received: from localhost ([::1]:35723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddVBO-0007Vz-1s for patchwork-qemu-devel@patchwork.kernel.org; Fri, 04 Aug 2017 01:29:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddVA9-0007TK-Ip for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:28:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddVA6-000158-C3 for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:28:41 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:35539) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddVA6-00014A-5z for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:28:38 -0400 Received: by mail-pg0-x241.google.com with SMTP id l64so793248pge.2 for ; Thu, 03 Aug 2017 22:28:38 -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=OFW6a+M+cVqKCoKjSTYNr3GSrffXDMXbwBXWGjpQnDd1DmAOQvi1Mes7d4LfTNcNry V2ZnSg0mpkxW31rxC81CreNqBO0ilAx5tXfOB7adRbqFBKG2Hsn1UQHECzS3w1nylBCl 4AGVzmzUvbpnQ0snrd9ReKmhb74JhtVWd08AKjZsDDURbLqA97sctusRpiko4QJ6sglI zAH75n+We3gdt/YYt8VWjp2z+Xvm8aMqWD9oCw7mqbiKrIOBJZbjQrsD5BsS3s7f+bHi LF2cBTWplU+72+AloXah8EPtOeQFbQ4pHbZCY9rh18gcQkeU1L7rrECU1zunRvCsyDAk F3zQ== 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=kKcI8vI9SbJeuKhIo+sgZ2OQEi2FG03RJ+TQiJbWjeaEY0CZogpJIn7uhZfhp2p+iW 179/RBkU8MK4jOtZr39e0dE0K812MAYt/05IghZedevXU8KzYnIIf9/utFw2HphksrLn SSqiRjmvCCZdMBAoIZMqfs6n5ZQLMLjxbm5Tgb88K5tvl18VtbeMTZAnL9uEsYHqTwLd /VDSMPYGvhjTByfQzNxF1+/0jnZuFZ3cJwNNS0CeWoSshvZ0fPUab6qW0WYhb7mh8b6p VWS3PgpjidGRW5hCLv2qh9cF/tfXvP/NivQVKq/JIFyIDndSK/BBmzTdoBR/F6J1Mamh c5iQ== X-Gm-Message-State: AIVw113e+pKucupOBLaeCQ2D3UA1d4dB0/Pbm724PMqF5CHFsLtUQasb 6upRCa9X9FfVpnZVrts= X-Received: by 10.84.151.68 with SMTP id i62mr1367424pli.225.1501824517184; Thu, 03 Aug 2017 22:28:37 -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 m5sm1053099pfg.22.2017.08.03.22.28.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Aug 2017 22:28:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 3 Aug 2017 22:28:23 -0700 Message-Id: <20170804052833.10187-2-rth@twiddle.net> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170804052833.10187-1-rth@twiddle.net> References: <20170804052833.10187-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::241 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: borntraeger@de.ibm.com, cohuck@redhat.com, agraf@suse.de 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) {