From patchwork Sun Mar 13 02:17:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 596694 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qN4Kb422Cz9s43 for ; Sun, 13 Mar 2016 13:17:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ZMkMJ1Dv; dkim-atps=neutral Received: from localhost ([::1]:34215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aevbN-0003Gg-71 for incoming@patchwork.ozlabs.org; Sat, 12 Mar 2016 21:17:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aevam-0002F1-LE for qemu-devel@nongnu.org; Sat, 12 Mar 2016 21:17:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aevaj-0005ZZ-Nq for qemu-devel@nongnu.org; Sat, 12 Mar 2016 21:17:16 -0500 Received: from mail-pf0-x22f.google.com ([2607:f8b0:400e:c00::22f]:35574) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aevaj-0005ZO-Gw for qemu-devel@nongnu.org; Sat, 12 Mar 2016 21:17:13 -0500 Received: by mail-pf0-x22f.google.com with SMTP id n5so72186825pfn.2 for ; Sat, 12 Mar 2016 18:17:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=GGqxhIZUXC8ItzXvex/YvE0tOXQ9/a5zLercoXY3lew=; b=ZMkMJ1DvSNxM635tN9JEL2rWdr9pcgEHMTra09fcLnvIEEV35QoKhGmjmbYiowRqfP ya54IqZZWHazCNSjSaVu3HQduv9rB6QtGIHe7+v4vHD1sDnUEsVZwiRfb1gAHA/pNnZy 49yFrMF9Qc2MU1bEcfF9Vh9lkthdoqXvSYurUuPO1pgdTp1+TNJDBmjiZjiy2sXXr0eT M2EIn/UspFjxDyfVB9Yu1z5+WjlIcwRv1Fs3xTnfYDEQDe40Zxn/hnBllDrdHWXqORlE 8MwtGjvuLE7FnQ1x0NUh7EhggGn8ctjcSdZLlPb0jS+ljrcUl0EWXESG8wSThe740rka LENQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=GGqxhIZUXC8ItzXvex/YvE0tOXQ9/a5zLercoXY3lew=; b=LtaWsNe1gEgmR9MNGTt6k2hVM0CSlGC5abm2yE1So6967VPHjAuiUaFd95kf28uJ3I O08lv/WVWrGDkoKy0P8R2KQoQULOPbPJnqXphQBLMhHEKdThuRK22vBtj5gmDLbpOcO9 NA4sLJ8NAibp5FUd7KTdkgUjgB5qDrt+N3cvFtS/ZHs5h5/wG2cXDBSazfFknPSOkM5o tE0HH8WxlYPjfAGMckgHY0g3SdrLqAO3IuE2PKhwZDVj2lwO6OZKm3X8n+FSwcWPH4r/ wGthv24PA/TDgKX+ugcLOMlgmEQk9kBmnWgY2+arPcWhDGxL/i0zKMM+TDkOQq5C9x3a m0WQ== X-Gm-Message-State: AD7BkJKXJq7lxO48QBq5OsaroiFGGsuvolmdvxyy3sA/DfyORaRzy4N7htNGbxuHndzOOQ== X-Received: by 10.98.18.28 with SMTP id a28mr19420656pfj.145.1457835432898; Sat, 12 Mar 2016 18:17:12 -0800 (PST) Received: from bigtime.twiddle.net (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by smtp.gmail.com with ESMTPSA id 16sm22445576pfk.28.2016.03.12.18.17.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Mar 2016 18:17:12 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 12 Mar 2016 18:17:03 -0800 Message-Id: <1457835429-17843-2-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457835429-17843-1-git-send-email-rth@twiddle.net> References: <1457835429-17843-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::22f Cc: peter.maydell@linaro.org, Paolo Bonzini Subject: [Qemu-devel] [PULL 1/7] target-i386: Avoid repeated calls to the bnd_jmp helper 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 From: Paolo Bonzini Two flags were tested the wrong way. Signed-off-by: Paolo Bonzini Message-Id: <1456845145-18891-1-git-send-email-pbonzini@redhat.com> Signed-off-by: Richard Henderson [rth: Fixed enable test as well.] --- target-i386/translate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 53dee79..cd214a6 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -2409,12 +2409,12 @@ static void gen_reset_hflag(DisasContext *s, uint32_t mask) /* Clear BND registers during legacy branches. */ static void gen_bnd_jmp(DisasContext *s) { - /* Do nothing if BND prefix present, MPX is disabled, or if the - BNDREGs are known to be in INIT state already. The helper - itself will check BNDPRESERVE at runtime. */ + /* Clear the registers only if BND prefix is missing, MPX is enabled, + and if the BNDREGs are known to be in use (non-zero) already. + The helper itself will check BNDPRESERVE at runtime. */ if ((s->prefix & PREFIX_REPNZ) == 0 - && (s->flags & HF_MPX_EN_MASK) == 0 - && (s->flags & HF_MPX_IU_MASK) == 0) { + && (s->flags & HF_MPX_EN_MASK) != 0 + && (s->flags & HF_MPX_IU_MASK) != 0) { gen_helper_bnd_jmp(cpu_env); } }