From patchwork Tue Mar 12 16:18:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160124 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13312470jad; Tue, 12 Mar 2019 09:38:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqzJzYEPEeAuK1FMuG1Qtb3j89t7/Qa1Xilpw2dyurJOBBfIvPD0gGBck7J1snsY7wWsUz7X X-Received: by 2002:a81:a1d0:: with SMTP id y199mr5250208ywg.246.1552408686698; Tue, 12 Mar 2019 09:38:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552408686; cv=none; d=google.com; s=arc-20160816; b=R3kX4wYD8VrVlutM28G0lmHZ6stpAW7Q+I35dPvpIKC0RAKle+FumuX55n7AMk9anz NRSX1Ys+AkDL70k4kW88e7p3JWFU7h7RYpiuZ2CFhTqVFmG4y4faMbl0Pjcd5s2LszmA 1Oicy3AjeV2mqLIWPCfy4xqciguS4QtSVgzMCnJ8ROAquETEFkXFezb7EWozP0Gt0EpV OISHNf4/xMw9/CZmzz2o3pCJZI7pD4EoZKA9Fp8sAqXvkBGvLOPyYXjNLrLcTclzvmWp 7oD6vj6ISmL0C4sQRRmBBwlrolIpFHC4gvun36CSr4OjrIt2rKfWs/eeuhX15/CRWcM9 kuEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=JBcKzip65zMWiQURMI3nn1U61H1/5KiDKQ/le/p+P/o=; b=eKdJsAp5WaEF3EySWxuA0BaWi1vRHTXw6KMMMazuThvX3vzo7gCTuy/mI2PIyN+K5h 1DS3j/GSiRg7CU94n35EMSRTaHrC8jNru3X+UxoeB28TYBzj3XEs7iYGDajVqjpFK3jW s5Ly1gRsmmK15Sp+hqWlahxbAe+vPGDKBISx/cmUMnSb3Ql3nfNd865i/OK6xXGaZq1t PoK8Cxo3mDx0Ia3URmLDsDgFz39QB5q9uC+c70poeiR/j4Puqgtret4w97+WxFAaUmyS EuIBMfvKLTlOe5H+FMVyt+2zXu6ObAGk1i7gaTPhnjpCuaDrnAEgbum3lWevS44AQg7d hBVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Hz7BuSj1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i130si5187557yba.322.2019.03.12.09.38.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 09:38:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Hz7BuSj1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:55515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kPm-0004Xd-5w for patch@linaro.org; Tue, 12 Mar 2019 12:38:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k7V-0005th-8g for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3k7T-0003qQ-1W for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:13 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:34666) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3k7S-0003oW-Ph for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:19:10 -0400 Received: by mail-pg1-x531.google.com with SMTP id v12so2217069pgq.1 for ; Tue, 12 Mar 2019 09:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JBcKzip65zMWiQURMI3nn1U61H1/5KiDKQ/le/p+P/o=; b=Hz7BuSj1ETnnWLFkFuE8Q6Cc5ZCkoYv2pEPaLT0TSeu3OxQABoRMZBdg289zxEph+N bXN3UOiFBTNeBaMVJ969C6gDl94vL0wgUqFCfLPrOWYU3JeDCsfzJPHI4noixGcTEsSB yy9ot4Ckc/QUGRUfZDPn/fI/hvcfypO2u02h89nbKy3xt/61LXU/GmiYXOix+OL9rM50 BkS00zfB9CMivQZRb6AA/1DzyJG6Gge6xAdfEwoXWZMahBPsFvCj35TiOKTgU2y/xhNM 5hhsIdn9zNXTKtnzm3PxEPTe8rsuzpquTapTyyrQGo6yhQNgfmlosJe1JK+zBoxJErOE Ulhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JBcKzip65zMWiQURMI3nn1U61H1/5KiDKQ/le/p+P/o=; b=BX2P1JKdnLzdHKXY1wGhNYVHehtC7/GQShNpZg76f6UvR38Fqe/8oDgJc9f51EEwVC xydBGKGRv2QE5gz9IPyoJIV4Cw6VKx/6eOC+7P7JR51e0lKlIMUirkLM/oFUfiChq1aK WV3NKPbA/lVo/10lJu/vRuzLaNKCcIa58kr/d1D3M+rcF2CIODkn2hB4NLRZgGm21DQZ dWVYWiZtkYPywbaXPJwZGuYhpTSEJrFDZB9tgB85A1xVAUBWbLk/FLJ4vL6386WLpkZT tmbA6PcNBYmUyI0v9ft6PzLIxtMwP+UFIasYATP5ldwAxCQIuIogeK1PSirIQavby0rh 33Rg== X-Gm-Message-State: APjAAAXy8QeOlghDFjeZAi9O8vpa3lw4bHmpyebgcaL+muQTzq7Q24Ed IlD4tMxB2QiLuQ9WMCPhSqSAKJPVpSo= X-Received: by 2002:a63:7843:: with SMTP id t64mr35859422pgc.178.1552407549191; Tue, 12 Mar 2019 09:19:09 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id q62sm12605644pga.32.2019.03.12.09.19.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:19:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 09:18:54 -0700 Message-Id: <20190312161904.31130-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190312161904.31130-1-richard.henderson@linaro.org> References: <20190312161904.31130-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::531 Subject: [Qemu-devel] [PULL 01/11] target/hppa: Check for page crossings in use_goto_tb 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We got away with eliding this check when target/hppa was user-only, but missed adding this check when adding system support. Fixes an early crash in the HP-UX 11 installer. Reported-by: Sven Schnelle Signed-off-by: Richard Henderson --- target/hppa/translate.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 2.17.2 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index dc5636fe94..6c815e05c2 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -816,12 +816,10 @@ static bool gen_illegal(DisasContext *ctx) static bool use_goto_tb(DisasContext *ctx, target_ureg dest) { - /* Suppress goto_tb in the case of single-steping and IO. */ - if ((tb_cflags(ctx->base.tb) & CF_LAST_IO) - || ctx->base.singlestep_enabled) { - return false; - } - return true; + /* Suppress goto_tb for page crossing, IO, or single-steping. */ + return !(((ctx->base.pc_first ^ dest) & TARGET_PAGE_MASK) + || (tb_cflags(ctx->base.tb) & CF_LAST_IO) + || ctx->base.singlestep_enabled); } /* If the next insn is to be nullified, and it's on the same page,