From patchwork Sat Jul 15 09:42:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9842283 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 2A2EE60212 for ; Sat, 15 Jul 2017 10:05:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16C4E28721 for ; Sat, 15 Jul 2017 10:05:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B6B52872C; Sat, 15 Jul 2017 10:05:09 +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 EDC7728721 for ; Sat, 15 Jul 2017 10:05:07 +0000 (UTC) Received: from localhost ([::1]:41389 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWJwh-0006nR-1x for patchwork-qemu-devel@patchwork.kernel.org; Sat, 15 Jul 2017 06:05:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWJcA-0004jc-FE for qemu-devel@nongnu.org; Sat, 15 Jul 2017 05:43:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dWJc9-0003c4-KS for qemu-devel@nongnu.org; Sat, 15 Jul 2017 05:43:54 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:33060) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dWJc9-0003bt-Eh for qemu-devel@nongnu.org; Sat, 15 Jul 2017 05:43:53 -0400 Received: by mail-pg0-x242.google.com with SMTP id 123so1668944pgd.0 for ; Sat, 15 Jul 2017 02:43:53 -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=egeu+YlPzYvIryMSwbo5grgbi5RzuGxh+QQaTCRWf7c=; b=ADOh6VJmJVlPKiKTedHSuEhQbtGGqu4IMu44ldZYj7OKy0Dv5tSJfsOhAdk884v0cB 0m8OUo+6yOfhGPNBp+EGF81CILcdxmyYtuyxIrcc904hTsTC9GdOJTU0HdgmbaLiI9PG KXnLlTN8ZLLxZBts6HTdbkUOt6+PUCzYseFUHXDpWalMtpWBQlTmGa9fPENXle385Nut 6w5lGOoMYmLKTNl0gpERblxea/rXvlCRnzcTwgnxvETjeJiOU3xLxuco6DTaT/fCYlv1 g7mgeYcWAyRP3Gwwj2/3WQnXf29UrG+lwQOpdKkJk2YaUew68hQbXeynO3WRCgkOIHQW Cfeg== 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=egeu+YlPzYvIryMSwbo5grgbi5RzuGxh+QQaTCRWf7c=; b=Up+YnIMgAFK4IYZUY/r52PD922lpQhswP2/qVXzZRuWKqG9zNAMNsU86yZao0CoLPM ApWXLUPhbey1MmXTi4u4Nr8cfQdlyqlEDc/lHxtQhWqom6pEc0xE0KEVAePC+hATc1OS VxmyQWwhg9Bxi93pplWUXcp74mfALM6IZx5H9RLpI7p6ltwB2sABt2d2S/MQ7XT1THlS PqfgKrbgiQ+AIx/cOtL54S8g3BoTSSZ9EfEnE63915is7tMC15fyI5vt6lsSEEIKPMaW MWeRTqViI/jpBYJZdifhSQD2hB9xa8kbikEC9p8g3NH0GvcPblQwjhRvYDq2O9b2QQDr l4uQ== X-Gm-Message-State: AIVw112buJoGGv2ZLRIQA9b/ZPcRkO5nKMuNYqZNlFNRR+19hq8r+4sw eHe/YBimbKzxMYYhvwU= X-Received: by 10.98.152.86 with SMTP id q83mr570820pfd.149.1500111832271; Sat, 15 Jul 2017 02:43:52 -0700 (PDT) Received: from bigtime.twiddle.net (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id c63sm27368589pfk.79.2017.07.15.02.43.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Jul 2017 02:43:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 23:42:40 -1000 Message-Id: <20170715094243.28371-32-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170715094243.28371-1-rth@twiddle.net> References: <20170715094243.28371-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::242 Subject: [Qemu-devel] [PATCH v14 31/34] target/arm: [a64] Move page and ss checks to init_disas_context 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: pbonzini@redhat.com, cota@braap.org, alex.bennee@linaro.org, vilanova@ac.upc.edu, crosthwaite.peter@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Since AArch64 uses a fixed-width ISA, we can pre-compute the number of insns remaining on the page. Also, we can check for single-step once. Signed-off-by: Richard Henderson Reviewed-by: Emilio G. Cota --- target/arm/translate-a64.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 1aa4c14..41e5cc3 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -11196,6 +11196,7 @@ static int aarch64_tr_init_disas_context(DisasContextBase *dcbase, DisasContext *dc = container_of(dcbase, DisasContext, base); CPUARMState *env = cpu->env_ptr; ARMCPU *arm_cpu = arm_env_get_cpu(env); + int bound; dc->pc = dc->base.pc_first; dc->condjmp = 0; @@ -11244,8 +11245,14 @@ static int aarch64_tr_init_disas_context(DisasContextBase *dcbase, dc->is_ldex = false; dc->ss_same_el = (arm_debug_target_el(env) == dc->current_el); - dc->next_page_start = - (dc->base.pc_first & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE; + /* Bound the number of insns to execute to those left on the page. */ + bound = -(dc->base.pc_first | TARGET_PAGE_MASK) / 4; + + /* If architectural single step active, limit to 1. */ + if (dc->ss_active) { + bound = 1; + } + max_insns = MIN(max_insns, bound); init_tmp_a64_array(dc); @@ -11313,12 +11320,6 @@ static void aarch64_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) disas_a64_insn(env, dc); } - if (dc->base.is_jmp == DISAS_NEXT) { - if (dc->ss_active || dc->pc >= dc->next_page_start) { - dc->base.is_jmp = DISAS_TOO_MANY; - } - } - dc->base.pc_next = dc->pc; translator_loop_temp_check(&dc->base); }