From patchwork Fri Apr 30 01:15:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 429747 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2115633jao; Thu, 29 Apr 2021 18:38:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKFaUV3+aHBegWB4W9gWpCjupgNndUSFksJwmqAZi8Bsosy4CYQfEVyg68DVAPi4i0jZ9z X-Received: by 2002:a9d:1b63:: with SMTP id l90mr1709770otl.306.1619746723082; Thu, 29 Apr 2021 18:38:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619746723; cv=none; d=google.com; s=arc-20160816; b=VhM+XiDrc8ZQHlqIeoxivi0XlpGTcXoXb4aNuH7AccHglNo/VH2T2iA2qbSHzh6H8C wlBhlRHnO4ZRG8BR2DbhMbAR+DwDPCJgh+rZSW7fRDxLQLQiuiVLvQkwJQPAsidjxj93 xUywpZFeXTGad8tsCRfZ9efIwXfwdV361iWczc+nEtZkVNErzhEJzOWyc4bNWYM/ns8i a7dLG0gYMEH4rdsv/zCQ/rQEkCqE+SIhEe19IzegyGBe4jCaHFENLxYsyd9Bo3AzIIFt m/5SPP3zc92heVBOKVlwPbS/zSawd4GrGJ+OT+0AznsrQftT/QVGz9teVK8/ZoxKHZ4s R+EA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=YcK4JXJlH4dCJ4S4ufZcFbDwhd9ORD+at0xFGfdapcw=; b=iYVxwafM5ULF5v33EKCE6Gf57H40xQ8r09oqQwBWOkfRJr+ritaIz5gix4njxWSawQ /HD52jEhQJOtRvBsQjwtmyUK0S18/YdhWdzTYgb84e52sJqdK9crqtsR183x/nhE8IGi CK+d6l2xjl6QbB6zWNQEvXeJRGk3R6bm/b8TsTG3aLfVoKFQjCxB2UPWVVsHONWHFCyA bF/RjEqNOz9zcCkHnkJmLNwTU2g6bZBmRFpI7oqy92svym7Kek+gWYmmUURntDK9UiCq bQAkBz4aK36U22A/Jxc3KNSWkmgq0M3nf8q5/vq0aoMw8Crzxrxqk7yk5e4cm7aPl3TM UK+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tSESPIG2; 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 u9si1729345oif.142.2021.04.29.18.38.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Apr 2021 18:38:43 -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=tSESPIG2; 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 ([::1]:33780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcI78-0001nJ-I9 for patch@linaro.org; Thu, 29 Apr 2021 21:38:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcHla-0003QC-Tl for qemu-devel@nongnu.org; Thu, 29 Apr 2021 21:16:26 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:42897) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcHlC-0007cZ-1M for qemu-devel@nongnu.org; Thu, 29 Apr 2021 21:16:26 -0400 Received: by mail-pf1-x436.google.com with SMTP id n6so1574913pfv.9 for ; Thu, 29 Apr 2021 18:16:01 -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 :mime-version:content-transfer-encoding; bh=YcK4JXJlH4dCJ4S4ufZcFbDwhd9ORD+at0xFGfdapcw=; b=tSESPIG2P6hsHrWl/aaLaNRsKqYJn23yfoDpLzmqi+dgl8gDGu5ROnALt0ML+rN245 MEhSue0EVIw2DvrawBBw1V4GOqMzdB882ROrLvJ9zpx8GIgDrcLxtcyitqM3o1LOuVcs L8LGg4ZrGbGx7YyTy0UypVkL94fRvxhSsJKJjHp4ryg2M3h1u9iXTOhjJHGfNQgcfSkT qN+WLIWMKRe+AU4aDZWQllREElpek2a/5jYX84Q/eh8iqKiGY0Dl7irzHJrccI9Jsyx5 cHXtR2oNyM7Gt5xELY/gak62BizbjzFDOpWJHOAd3+nXkUFvUAcx31E0Etss+QDJCxjH Le8w== 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:mime-version:content-transfer-encoding; bh=YcK4JXJlH4dCJ4S4ufZcFbDwhd9ORD+at0xFGfdapcw=; b=reT1dtkPb80QZ7a4FXPlcp7wTydCVvWEWrmBQwMcsjqU7+BJc/urp9v+V6xMBsHHe/ IuG/NelrhsPUoYPv0VKy15z6Qd4lUY7soy5FbI/ueDKsLnDYqylv9Thb2RDxjT8lOfyp 7ffFqnaKGILnFaC0FXrVMLCZMrD+e1hzI012iPOPZgxXGHv70w1okTZSkRzXu76IZPr7 GX+cRuWJdDNrfB3WxbvOiszSNwESI8ri/7gpWy8wZt9/tZIRGRqDnuy2qLgmPLqlF6sw /8WJyvJJ3XffnfWkHqzqvHGHqkYix7TFRHX7oiAhR8MjnwmeMHgr7od93mQHZ1JdH9lg 5dXQ== X-Gm-Message-State: AOAM530c+tQhAVns4aB0aWVKrQ7OBcYDFRgy6dFZWEeFduxMYYP2HdOo rf9hDiXqjewHAJIUkgFEFnov9dTYG4ij3Q== X-Received: by 2002:a63:4423:: with SMTP id r35mr2411334pga.13.1619745360793; Thu, 29 Apr 2021 18:16:00 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id 1sm161277pjx.46.2021.04.29.18.16.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Apr 2021 18:16:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 24/30] target/ppc: Move page crossing check to ppc_tr_translate_insn Date: Thu, 29 Apr 2021 18:15:37 -0700 Message-Id: <20210430011543.1017113-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210430011543.1017113-1-richard.henderson@linaro.org> References: <20210430011543.1017113-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: f4bug@amsat.org, luis.pires@eldorado.org.br, qemu-ppc@nongnu.org, lagarcia@br.ibm.com, bruno.larsen@eldorado.org.br, matheus.ferst@eldorado.org.br, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" With prefixed instructions, the number of instructions remaining until the page crossing is no longer constant. Signed-off-by: Richard Henderson --- target/ppc/translate.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 65848463ea..d782a13d27 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -8019,9 +8019,6 @@ static void ppc_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) if (ctx->singlestep_enabled & (CPU_SINGLE_STEP | GDBSTUB_SINGLE_STEP)) { ctx->base.max_insns = 1; - } else { - int bound = -(ctx->base.pc_first | TARGET_PAGE_MASK) / 4; - ctx->base.max_insns = MIN(ctx->base.max_insns, bound); } } @@ -8098,6 +8095,11 @@ static void ppc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) handler->count++; #endif + /* End the TB when crossing a page boundary. */ + if (ctx->base.is_jmp == DISAS_NEXT && !(pc & ~TARGET_PAGE_MASK)) { + ctx->base.is_jmp = DISAS_TOO_MANY; + } + translator_loop_temp_check(&ctx->base); }