From patchwork Sat Jul 15 09:42:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9842269 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 2F04960393 for ; Sat, 15 Jul 2017 10:00:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FBD22870B for ; Sat, 15 Jul 2017 10:00:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 144D12872A; Sat, 15 Jul 2017 10:00:01 +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 B645D28721 for ; Sat, 15 Jul 2017 10:00:00 +0000 (UTC) Received: from localhost ([::1]:41365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWJrj-0001Ef-SB for patchwork-qemu-devel@patchwork.kernel.org; Sat, 15 Jul 2017 05:59:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWJcC-0004lG-5U for qemu-devel@nongnu.org; Sat, 15 Jul 2017 05:44:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dWJcB-0003d7-Bm for qemu-devel@nongnu.org; Sat, 15 Jul 2017 05:43:56 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:33061) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dWJcB-0003cz-5z for qemu-devel@nongnu.org; Sat, 15 Jul 2017 05:43:55 -0400 Received: by mail-pg0-x244.google.com with SMTP id 123so1669002pgd.0 for ; Sat, 15 Jul 2017 02:43:55 -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=BjE7VVtGAEBD2JNqHzvOaUlT+zl5Z0KzSpupYg2dJIE=; b=MnBocNxOxKHor0Tasx00PqQNJyy7sCnY1SzlzoIwq984gTJ2ct56rIG7NGQOEv5Mli top5NBvYr+hLJdNCy73+K6BLhK+tY7qWc8540kJUQm/SfqdDA9C4OKXPmu0B1VbziBEQ H2gV0hBSPpyf+K0m/FNpPASaBrgaTcb6yxTRD0pI4STvqkEvWydBy6oFMg8l56wAeket xW/DxUquLYBWNOASR61+QksLmSekxSFU7+OlvHZJBIuOMe2qoxdd/3rCVZuRaau3SOIK C06bIqDJtsqHpI+pId4L2xUAAPetAA7xvdBgGbtJp0pcE2sbZSUnsukpJq+qsDJ6+fz1 043g== 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=BjE7VVtGAEBD2JNqHzvOaUlT+zl5Z0KzSpupYg2dJIE=; b=YvhX9mTWSP1XYFJ3IB8YGQL9m/IRLm+Ih2E2iD2ghQ/Qlt7EQKFIN5BEr6WCoouxOG 9eQD1KjaiSnWKTvUs75GCj+OLj0Dp35ZsIBeqWpMnS6aaGoAIMpam1Q/9Z6ZA8rSL/sP 0Te03WVxNcZ+yggyJPZASs2w9DpYjq3wMFcc/XyrFFgsj6yJHnzz6DYs74o+cGKoOTei rPhTPzw5zLOQsdPBn5Al+drzoZoUAnNZ89wiloIl302FVEjf7IpdDvnat1cVDtwjFhmq muPwj+XiniGSCRUlamBZaDaESnYZBMDkb4ZKPes3OmKTvGph3dZNDpE+FdP2B89NOQLt UZZg== X-Gm-Message-State: AIVw110nubn0/nqLBC4nCIaRqLBhsEtXCl/l5BYIKf7nkvn7w6ot7vem atht89JHKO+PBbPoR4o= X-Received: by 10.98.94.5 with SMTP id s5mr9542848pfb.138.1500111834086; Sat, 15 Jul 2017 02:43:54 -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.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Jul 2017 02:43:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 23:42:41 -1000 Message-Id: <20170715094243.28371-33-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::244 Subject: [Qemu-devel] [PATCH v14 32/34] target/arm: Move ss check 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 We can check for single-step just once. Signed-off-by: Richard Henderson Reviewed-by: Emilio G. Cota Reviewed-by: Lluís Vilanova --- target/arm/translate.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index 4b1230b..ebe1c1a 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -11845,6 +11845,11 @@ static int arm_tr_init_disas_context(DisasContextBase *dcbase, dc->next_page_start = (dc->base.pc_first & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE; + /* If architectural single step active, limit to 1. */ + if (is_singlestepping(dc)) { + max_insns = 1; + } + cpu_F0s = tcg_temp_new_i32(); cpu_F1s = tcg_temp_new_i32(); cpu_F0d = tcg_temp_new_i64(); @@ -12000,11 +12005,9 @@ static void arm_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) * Also stop translation when a page boundary is reached. This * ensures prefetch aborts occur at the right place. */ - if (is_singlestepping(dc)) { - dc->base.is_jmp = DISAS_TOO_MANY; - } else if ((dc->pc >= dc->next_page_start) || - ((dc->pc >= dc->next_page_start - 3) && - insn_crosses_page(env, dc))) { + if (dc->pc >= dc->next_page_start || + (dc->pc >= dc->next_page_start - 3 && + insn_crosses_page(env, dc))) { /* We want to stop the TB if the next insn starts in a new page, * or if it spans between this page and the next. This means that * if we're looking at the last halfword in the page we need to