From nobody Wed Nov 5 10:36:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499394223000576.822268895161; Thu, 6 Jul 2017 19:23:43 -0700 (PDT) Received: from localhost ([::1]:54108 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTIvk-0001vx-O5 for importer@patchew.org; Thu, 06 Jul 2017 22:23:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33877) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTItz-0000w1-Vw for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:21:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTItz-0007ec-5T for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:21:51 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:33153) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dTItz-0007eI-0r for qemu-devel@nongnu.org; Thu, 06 Jul 2017 22:21:51 -0400 Received: by mail-qt0-x244.google.com with SMTP id c20so2720716qte.0 for ; Thu, 06 Jul 2017 19:21:50 -0700 (PDT) Received: from bigtime.twiddle.net.com (rrcs-66-91-136-156.west.biz.rr.com. [66.91.136.156]) by smtp.gmail.com with ESMTPSA id i85sm1407176qke.66.2017.07.06.19.21.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jul 2017 19:21:49 -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=PZrno5MYEEtXeyo7k1KUeDTCUW0wCtymyIQ7hF7N1e0=; b=j3YuIYvk2BWlFaGvGtcEPUkvyCU41jfuPN0L+KIN1UEAJshJWDQM9i4RlrFnZ6IHye inLWbL+Kk+j9kHSb9pObpN/UJw7/s1cklMtVGOdOguI4oES2XbcdZBe4zRKlyUkNJNGS bMLPjVziZbx/2bpEcDMzf1ICkL35okXYkqfACFZm4SfdvIptPkbVZpFarJ4TGchOVNCT D/PXxcIR4D5BfelVBxu0vHj9kTybS1yDyYFoVntMIIipPPX6l2XlqtM78t6L87cHBOHA TwHLjsEWqTLQi4PmUrdJ/7KGzFdgO8kEQJJ3S5hGthlmQII6SoJdNjVjTRS4Qgdrceuv g+Rg== 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=PZrno5MYEEtXeyo7k1KUeDTCUW0wCtymyIQ7hF7N1e0=; b=XqYy/fKrfbBhsz7qcIUa327i6/aEUeeDinqYMDHpuSB8sXkKcEktpLRebHXlOh95nq 1iOdZsxkQsolr2QtuWLskeg20xafOnA/AV74uxRzo/9VQr09P0HsFzP4zlwHyID6NrLr +XpU0ty/8H4P45V3keKekFsAHG04QPtFDleGDZrGaIG/3YkRuBMe4DuVZNk4al1axDIQ OVALrbmE+XabvETXc/HVr3DSdp4pw9PdD8CjmCdZnDI56K2gWxTfVpsPmsR2Y24ZLhDw Ia5aTllUXFCfv+obTtZstV5/UZjZhSamI2GUkufJ1lO4VJ+tD4nWiGegob7zgM1WH0uV DItg== X-Gm-Message-State: AKS2vOwyiVpnJLA2NePRPUwRTAKc7aptW/0xDbU5TdZdHY/Ka3U81bT+ H/NrDP9gxnCqPdgedfg= X-Received: by 10.237.39.33 with SMTP id n30mr67844087qtd.149.1499394110294; Thu, 06 Jul 2017 19:21:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 6 Jul 2017 16:20:46 -1000 Message-Id: <20170707022111.21836-3-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170707022111.21836-1-rth@twiddle.net> References: <20170707022111.21836-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v2 02/27] target/sh4: Consolidate end-of-TB tests 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: bruno@clisp.org, laurent@vivier.eu, aurelien@aurel32.net, glaubitz@debian.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We can fold 3 different tests within the decode loop into a more accurate computation of max_insns to start. Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- target/sh4/translate.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 82d4d69..663b5c0 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -1848,7 +1848,6 @@ void gen_intermediate_code(CPUSH4State * env, struct = TranslationBlock *tb) ctx.features =3D env->features; ctx.has_movcal =3D (ctx.tbflags & TB_FLAG_PENDING_MOVCA); =20 - num_insns =3D 0; max_insns =3D tb->cflags & CF_COUNT_MASK; if (max_insns =3D=3D 0) { max_insns =3D CF_COUNT_MASK; @@ -1856,9 +1855,23 @@ void gen_intermediate_code(CPUSH4State * env, struct= TranslationBlock *tb) if (max_insns > TCG_MAX_INSNS) { max_insns =3D TCG_MAX_INSNS; } + /* Since the ISA is fixed-width, we can bound by the number + of instructions remaining on the page. */ + num_insns =3D (TARGET_PAGE_SIZE - (ctx.pc & (TARGET_PAGE_SIZE - 1))) /= 2; + if (max_insns > num_insns) { + max_insns =3D num_insns; + } + /* Single stepping means just that. */ + if (ctx.singlestep_enabled || singlestep) { + max_insns =3D 1; + } =20 gen_tb_start(tb); - while (ctx.bstate =3D=3D BS_NONE && !tcg_op_buf_full()) { + num_insns =3D 0; + + while (ctx.bstate =3D=3D BS_NONE + && num_insns < max_insns + && !tcg_op_buf_full()) { tcg_gen_insn_start(ctx.pc, ctx.envflags); num_insns++; =20 @@ -1882,18 +1895,10 @@ void gen_intermediate_code(CPUSH4State * env, struc= t TranslationBlock *tb) ctx.opcode =3D cpu_lduw_code(env, ctx.pc); decode_opc(&ctx); ctx.pc +=3D 2; - if ((ctx.pc & (TARGET_PAGE_SIZE - 1)) =3D=3D 0) - break; - if (cs->singlestep_enabled) { - break; - } - if (num_insns >=3D max_insns) - break; - if (singlestep) - break; } - if (tb->cflags & CF_LAST_IO) + if (tb->cflags & CF_LAST_IO) { gen_io_end(); + } if (cs->singlestep_enabled) { gen_save_cpu_state(&ctx, true); gen_helper_debug(cpu_env); --=20 2.9.4