From patchwork Fri Mar 8 18:59:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10845335 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BDBDD14E1 for ; Fri, 8 Mar 2019 19:00:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7F9A2E282 for ; Fri, 8 Mar 2019 19:00:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C0AB2E290; Fri, 8 Mar 2019 19:00:16 +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=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1B1AE2E282 for ; Fri, 8 Mar 2019 19:00:16 +0000 (UTC) Received: from localhost ([127.0.0.1]:48602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Kj9-0002RW-Fn for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Mar 2019 14:00:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2KiY-0001vS-6E for qemu-devel@nongnu.org; Fri, 08 Mar 2019 13:59:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2KiX-0001kf-Cg for qemu-devel@nongnu.org; Fri, 08 Mar 2019 13:59:38 -0500 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:44185) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h2KiX-0001jE-4i for qemu-devel@nongnu.org; Fri, 08 Mar 2019 13:59:37 -0500 Received: by mail-pf1-x441.google.com with SMTP id a3so14786226pff.11 for ; Fri, 08 Mar 2019 10:59:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=JBcKzip65zMWiQURMI3nn1U61H1/5KiDKQ/le/p+P/o=; b=dy4hvb8cT7VAOYGkvuFT4GCzXJ5WczfBBHH/L1Y3E5HjUpttcVASz+2jo/itYG1zxO mLPgycFNWYBQ5ejwBm7SZceCGEsKmfxKNHWTbG9iPJ3Fzsr7XWTb419AfG8Hmfq71nHX QWrot4v1fIetVCdYVTEvquxSZ5Xdm3M88KRiQHMsnuhP9VB/vmCUUsyYoDaX7jtNZEmE lom5kF+5TDQQAC6RS+vHy57oNU39Q+qxsnm4tm8kMI3DAojJ1i9fh6LQGbMRjFYf8QHv aEKEH+3Z7OZyjjyTB/oEY8L9xHOB9dcXsEh5A28Gw8eKasf3euuAndIXHauIpUV6l056 Hl5w== 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; bh=JBcKzip65zMWiQURMI3nn1U61H1/5KiDKQ/le/p+P/o=; b=jp8OX+iWcZlwht778AUq1P6DalnJi1nxUNuNFm4qABwNQzF2YY4jzDRv4FM0BwqYAj a9dAqQ7xqWhWFfqMVKSsy2Cz4L70i8g9hjwm9Kmm9m3g8Vg1HczEy8wwxUiwx+YzkWK9 wHoId0F0xKsC9WnJuLXP0Cd8n9Dr53OiIAwG13F1LRBK/v8AbecWbxw23xLCfx26x4X9 wLVwdkORsFfDKvm8zxFgO71LWMFd0lNXjdjEHNUyzDJZmYPy6xvKY7xhsmAl67l7PvYA lrEMlQwiTV3lmb1anNAvpzHJcdacJ0gSLs3bvVId16BY6XiIyK1SVPgVDnYW56iAnvC/ HOgg== X-Gm-Message-State: APjAAAVlXwdZuYO1N9WutNqzaFW7T59+mPOwVLAS0vTqbh+tYJbQ6gl6 sKYONPLUyD+Xd6Jrz3Xw3e7msfpLqrI= X-Google-Smtp-Source: APXvYqxwY+MyShNPqCPRqwnwTdvkGE+RvR2/PlNt2tShtlh7/HK7cDKhGaIKS5grForQwjWwqhOJBA== X-Received: by 2002:a17:902:7202:: with SMTP id ba2mr19906043plb.147.1552071574839; Fri, 08 Mar 2019 10:59:34 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id h126sm27314756pfc.135.2019.03.08.10.59.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Mar 2019 10:59:34 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 8 Mar 2019 10:59:32 -0800 Message-Id: <20190308185932.4954-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::441 Subject: [Qemu-devel] [PATCH] 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: svens@stackframe.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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,