From patchwork Fri Feb 16 03:18:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 874271 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=braap.org header.i=@braap.org header.b="RH87N3jG"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="TFdjcDvX"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zjJKB00jWz9t3v for ; Fri, 16 Feb 2018 14:19:25 +1100 (AEDT) Received: from localhost ([::1]:60947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emWYW-0002xE-2O for incoming@patchwork.ozlabs.org; Thu, 15 Feb 2018 22:19:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emWXm-0002wJ-Ei for qemu-devel@nongnu.org; Thu, 15 Feb 2018 22:18:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emWXi-0002U6-FI for qemu-devel@nongnu.org; Thu, 15 Feb 2018 22:18:38 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:54255) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1emWXi-0002Tt-8E for qemu-devel@nongnu.org; Thu, 15 Feb 2018 22:18:34 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id DCC8E20C9D; Thu, 15 Feb 2018 22:18:32 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Thu, 15 Feb 2018 22:18:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=TcrC/4mE+WvdU3 7q4kMW1n2Yzj41wEwILZtJH7OXr7Q=; b=RH87N3jGvXcdQPwXDlQhvom1Uos2bX yZmSNF6SaetKDBx/erKfsyDhfyHUYe6h8q+0AHZdiiKoVA9yJYe7Qx0MShh2aR2o l2d9RSVd3qJ065Gp8ACTPYH8J1MJBtKdCnn1pi3Fzw+ZzRANSIR3RbjRxFGjBx0d RTuxxQEAysEh4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=TcrC/4mE+WvdU37q4kMW1n2Yzj41wEwILZtJH7OXr7Q=; b=TFdjcDvX M9wQ1W9NloXDxJiQkVrCePQEloSFbDFh625oLwQBn4u7KLxOgNWdtMV61PTjvPtE wKUEOKjQnNk265qPVqAvvUMZHom2EhM2bimRd1Iogof+kRhEbR8Lnl7ktXnDCBzG 70csF6bAxauL4Tc/iu2jp7uejh/nj6Vfo2xwPuIYjq2t/qkq/1NwYhEvV3afrX3r nYScHTCBMGNgQp/rK+Z4ZeOkulFCUxvhnb8WvcEncYKfWuQ0mdtRT+cB1tRfUmBF jA9lFNS5aRH/Me/pvQlosysE319/l8ERD5zGHN+gTodMVnD/WPcmnYjbX/nC3g7Z YOq5gY9YC7/tew== X-ME-Sender: Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 98B9B7E3D9; Thu, 15 Feb 2018 22:18:32 -0500 (EST) From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 22:18:24 -0500 Message-Id: <1518751105-17211-2-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518751105-17211-1-git-send-email-cota@braap.org> References: <1518751105-17211-1-git-send-email-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.29 Subject: [Qemu-devel] [PATCH 1/2] translator: pass max_insns to tb_start 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: Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" sh4 will need it. Signed-off-by: Emilio G. Cota Reviewed-by: Richard Henderson --- accel/tcg/translator.c | 2 +- include/exec/translator.h | 3 ++- target/alpha/translate.c | 3 ++- target/arm/translate-a64.c | 4 +++- target/arm/translate.c | 4 +++- target/hppa/translate.c | 4 +++- target/i386/translate.c | 3 ++- 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 23c6602..4ab6f8d 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -64,7 +64,7 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db, /* Start translating. */ gen_tb_start(db->tb); - ops->tb_start(db, cpu); + max_insns = ops->tb_start(db, cpu, max_insns); tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */ while (true) { diff --git a/include/exec/translator.h b/include/exec/translator.h index e2dc2a0..0182ada 100644 --- a/include/exec/translator.h +++ b/include/exec/translator.h @@ -81,6 +81,7 @@ typedef struct DisasContextBase { * @tb_start: * Emit any code required before the start of the main loop, * after the generic gen_tb_start(). + * Return max_insns, modified if necessary. * * @insn_start: * Emit the tcg_gen_insn_start opcode. @@ -108,7 +109,7 @@ typedef struct DisasContextBase { typedef struct TranslatorOps { int (*init_disas_context)(DisasContextBase *db, CPUState *cpu, int max_insns); - void (*tb_start)(DisasContextBase *db, CPUState *cpu); + int (*tb_start)(DisasContextBase *db, CPUState *cpu, int max_insns); void (*insn_start)(DisasContextBase *db, CPUState *cpu); bool (*breakpoint_check)(DisasContextBase *db, CPUState *cpu, const CPUBreakpoint *bp); diff --git a/target/alpha/translate.c b/target/alpha/translate.c index 73a1b5e..b603dbd 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -2963,8 +2963,9 @@ static int alpha_tr_init_disas_context(DisasContextBase *dcbase, return MIN(max_insns, bound); } -static void alpha_tr_tb_start(DisasContextBase *db, CPUState *cpu) +static int alpha_tr_tb_start(DisasContextBase *db, CPUState *cpu, int max_insns) { + return max_insns; } static void alpha_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 1c88539..7aa47ee 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -12080,9 +12080,11 @@ static int aarch64_tr_init_disas_context(DisasContextBase *dcbase, return max_insns; } -static void aarch64_tr_tb_start(DisasContextBase *db, CPUState *cpu) +static int aarch64_tr_tb_start(DisasContextBase *db, CPUState *cpu, + int max_insns) { tcg_clear_temp_count(); + return max_insns; } static void aarch64_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) diff --git a/target/arm/translate.c b/target/arm/translate.c index 1270022..bdee04e 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -12060,7 +12060,8 @@ static int arm_tr_init_disas_context(DisasContextBase *dcbase, return max_insns; } -static void arm_tr_tb_start(DisasContextBase *dcbase, CPUState *cpu) +static int arm_tr_tb_start(DisasContextBase *dcbase, CPUState *cpu, + int max_insns) { DisasContext *dc = container_of(dcbase, DisasContext, base); @@ -12102,6 +12103,7 @@ static void arm_tr_tb_start(DisasContextBase *dcbase, CPUState *cpu) store_cpu_field(tmp, condexec_bits); } tcg_clear_temp_count(); + return max_insns; } static void arm_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index b4b74a8..c816ad1 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -4726,7 +4726,8 @@ static int hppa_tr_init_disas_context(DisasContextBase *dcbase, return bound; } -static void hppa_tr_tb_start(DisasContextBase *dcbase, CPUState *cs) +static int hppa_tr_tb_start(DisasContextBase *dcbase, CPUState *cs, + int max_insns) { DisasContext *ctx = container_of(dcbase, DisasContext, base); @@ -4738,6 +4739,7 @@ static void hppa_tr_tb_start(DisasContextBase *dcbase, CPUState *cs) ctx->psw_n_nonzero = true; } ctx->null_lab = NULL; + return max_insns; } static void hppa_tr_insn_start(DisasContextBase *dcbase, CPUState *cs) diff --git a/target/i386/translate.c b/target/i386/translate.c index 0135415..7527e8d 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -8472,8 +8472,9 @@ static int i386_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cpu, return max_insns; } -static void i386_tr_tb_start(DisasContextBase *db, CPUState *cpu) +static int i386_tr_tb_start(DisasContextBase *db, CPUState *cpu, int max_insns) { + return max_insns; } static void i386_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) From patchwork Fri Feb 16 03:18:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 874273 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=braap.org header.i=@braap.org header.b="ZsZ3oRAt"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="VVw2tqJA"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zjJN5384Dz9t5R for ; Fri, 16 Feb 2018 14:21:57 +1100 (AEDT) Received: from localhost ([::1]:32783 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emWax-0005hj-G6 for incoming@patchwork.ozlabs.org; Thu, 15 Feb 2018 22:21:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emWXm-0002wL-Et for qemu-devel@nongnu.org; Thu, 15 Feb 2018 22:18:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emWXi-0002UH-Qu for qemu-devel@nongnu.org; Thu, 15 Feb 2018 22:18:38 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:53813) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1emWXi-0002Tv-LF for qemu-devel@nongnu.org; Thu, 15 Feb 2018 22:18:34 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 1FB72209DA; Thu, 15 Feb 2018 22:18:33 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Thu, 15 Feb 2018 22:18:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=n91cqSJhQ+Z1Uu fwjlKVOU8OIYE0T8nfJJv43PWeu3w=; b=ZsZ3oRAtHU/VgJW8RTPjTpj3S9HZ1l 10MzaMEuutm04G2/2+4AlzmaFh8xEZqbz3TnA9ugSGvtKdDehtVoabAx3DF+dwEq u5dC35Pb1SsvdifMy6p5CSUkv3hb3XsEH4p9MSeJZPrtgsUL9ejh4BGddsgynCDP +W4tnbML1TF5A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=n91cqSJhQ+Z1UufwjlKVOU8OIYE0T8nfJJv43PWeu3w=; b=VVw2tqJA rtjiVw2KVrzuoSoPlq0EXGJ8/EyW+Ipj3sUTc5nTqwH9zNzx2RquYHVoHs0JMdl3 SPIoBN1RlHuGyvaKlnOMgtUJlN5BKzFEZL0fnfN0ix4WXaAkq91Zn50ywZYbzO2Y eNdVHng4yQDhz/+fjkACofwmB61wvAfgN78dIflp3koqy2Z7DGBj6ukTqzGe90C+ 8D85rqy42Xnj2Ah4zBcyRploYH8Z8Z35xY6/crBoylX02Exos71t4bUu0K4glB8l 87pMDJuS8R/Mrq72hhDSObmnP8KwsCKKnnRgCVRU42GgCF5naHjQtbe5zCj7pVDA FRL2uSDErm7FuA== X-ME-Sender: Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id CB10E240DB; Thu, 15 Feb 2018 22:18:32 -0500 (EST) From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 22:18:25 -0500 Message-Id: <1518751105-17211-3-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518751105-17211-1-git-send-email-cota@braap.org> References: <1518751105-17211-1-git-send-email-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.29 Subject: [Qemu-devel] [PATCH 2/2] target/sh4: convert to TranslatorOps 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: Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This was fairly straightforward since it had already been converted to DisasContextBase; just had to add TARGET_TOO_MANY to the switch in tb_stop. Signed-off-by: Emilio G. Cota Reviewed-by: Richard Henderson --- target/sh4/translate.c | 175 +++++++++++++++++++++++++------------------------ 1 file changed, 90 insertions(+), 85 deletions(-) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 012156b..5a2274f 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -2258,126 +2258,131 @@ static int decode_gusa(DisasContext *ctx, CPUSH4State *env, int *pmax_insns) } #endif -void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) +static int sh4_tr_init_disas_context(DisasContextBase *dcbase, + CPUState *cs, int max_insns) { + DisasContext *ctx = container_of(dcbase, DisasContext, base); CPUSH4State *env = cs->env_ptr; - DisasContext ctx; - target_ulong pc_start; - int num_insns; - int max_insns; - - pc_start = tb->pc; - ctx.base.pc_next = pc_start; - ctx.tbflags = (uint32_t)tb->flags; - ctx.envflags = tb->flags & TB_FLAG_ENVFLAGS_MASK; - ctx.base.is_jmp = DISAS_NEXT; - ctx.memidx = (ctx.tbflags & (1u << SR_MD)) == 0 ? 1 : 0; + int bound; + + ctx->tbflags = (uint32_t)ctx->base.tb->flags; + ctx->envflags = ctx->base.tb->flags & TB_FLAG_ENVFLAGS_MASK; + ctx->memidx = (ctx->tbflags & (1u << SR_MD)) == 0 ? 1 : 0; /* We don't know if the delayed pc came from a dynamic or static branch, so assume it is a dynamic branch. */ - ctx.delayed_pc = -1; /* use delayed pc from env pointer */ - ctx.base.tb = tb; - ctx.base.singlestep_enabled = cs->singlestep_enabled; - ctx.features = env->features; - ctx.has_movcal = (ctx.tbflags & TB_FLAG_PENDING_MOVCA); - ctx.gbank = ((ctx.tbflags & (1 << SR_MD)) && - (ctx.tbflags & (1 << SR_RB))) * 0x10; - ctx.fbank = ctx.tbflags & FPSCR_FR ? 0x10 : 0; - - max_insns = tb_cflags(tb) & CF_COUNT_MASK; - if (max_insns == 0) { - max_insns = CF_COUNT_MASK; - } - max_insns = MIN(max_insns, TCG_MAX_INSNS); + ctx->delayed_pc = -1; /* use delayed pc from env pointer */ + ctx->features = env->features; + ctx->has_movcal = (ctx->tbflags & TB_FLAG_PENDING_MOVCA); + ctx->gbank = ((ctx->tbflags & (1 << SR_MD)) && + (ctx->tbflags & (1 << SR_RB))) * 0x10; + ctx->fbank = ctx->tbflags & FPSCR_FR ? 0x10 : 0; /* Since the ISA is fixed-width, we can bound by the number of instructions remaining on the page. */ - num_insns = -(ctx.base.pc_next | TARGET_PAGE_MASK) / 2; - max_insns = MIN(max_insns, num_insns); - - /* Single stepping means just that. */ - if (ctx.base.singlestep_enabled || singlestep) { - max_insns = 1; - } - - gen_tb_start(tb); - num_insns = 0; + bound = -(ctx->base.pc_next | TARGET_PAGE_MASK) / 2; + max_insns = MIN(max_insns, bound); + return max_insns; +} +static int sh4_tr_tb_start(DisasContextBase *dcbase, CPUState *cs, + int max_insns) +{ #ifdef CONFIG_USER_ONLY - if (ctx.tbflags & GUSA_MASK) { - num_insns = decode_gusa(&ctx, env, &max_insns); + DisasContext *ctx = container_of(dcbase, DisasContext, base); + CPUSH4State *env = cs->env_ptr; + + if (ctx->tbflags & GUSA_MASK) { + ctx->base.num_insns = decode_gusa(ctx, env, &max_insns); } #endif + return max_insns; +} - while (ctx.base.is_jmp == DISAS_NEXT - && num_insns < max_insns - && !tcg_op_buf_full()) { - tcg_gen_insn_start(ctx.base.pc_next, ctx.envflags); - num_insns++; +static void sh4_tr_insn_start(DisasContextBase *dcbase, CPUState *cs) +{ + DisasContext *ctx = container_of(dcbase, DisasContext, base); - if (unlikely(cpu_breakpoint_test(cs, ctx.base.pc_next, BP_ANY))) { - /* We have hit a breakpoint - make sure PC is up-to-date */ - gen_save_cpu_state(&ctx, true); - gen_helper_debug(cpu_env); - ctx.base.is_jmp = DISAS_NORETURN; - /* The address covered by the breakpoint must be included in - [tb->pc, tb->pc + tb->size) in order to for it to be - properly cleared -- thus we increment the PC here so that - the logic setting tb->size below does the right thing. */ - ctx.base.pc_next += 2; - break; - } + tcg_gen_insn_start(ctx->base.pc_next, ctx->envflags); +} - if (num_insns == max_insns && (tb_cflags(tb) & CF_LAST_IO)) { - gen_io_start(); - } +static bool sh4_tr_breakpoint_check(DisasContextBase *dcbase, CPUState *cs, + const CPUBreakpoint *bp) +{ + DisasContext *ctx = container_of(dcbase, DisasContext, base); - ctx.opcode = cpu_lduw_code(env, ctx.base.pc_next); - decode_opc(&ctx); - ctx.base.pc_next += 2; - } - if (tb_cflags(tb) & CF_LAST_IO) { - gen_io_end(); - } + /* We have hit a breakpoint - make sure PC is up-to-date */ + gen_save_cpu_state(ctx, true); + gen_helper_debug(cpu_env); + ctx->base.is_jmp = DISAS_NORETURN; + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + ctx->base.pc_next += 2; + return true; +} + +static void sh4_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) +{ + CPUSH4State *env = cs->env_ptr; + DisasContext *ctx = container_of(dcbase, DisasContext, base); + + ctx->opcode = cpu_lduw_code(env, ctx->base.pc_next); + decode_opc(ctx); + ctx->base.pc_next += 2; +} + +static void sh4_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) +{ + DisasContext *ctx = container_of(dcbase, DisasContext, base); - if (ctx.tbflags & GUSA_EXCLUSIVE) { + if (ctx->tbflags & GUSA_EXCLUSIVE) { /* Ending the region of exclusivity. Clear the bits. */ - ctx.envflags &= ~GUSA_MASK; + ctx->envflags &= ~GUSA_MASK; } - switch (ctx.base.is_jmp) { + switch (ctx->base.is_jmp) { case DISAS_STOP: - gen_save_cpu_state(&ctx, true); - if (ctx.base.singlestep_enabled) { + gen_save_cpu_state(ctx, true); + if (ctx->base.singlestep_enabled) { gen_helper_debug(cpu_env); } else { tcg_gen_exit_tb(0); } break; case DISAS_NEXT: - gen_save_cpu_state(&ctx, false); - gen_goto_tb(&ctx, 0, ctx.base.pc_next); + case DISAS_TOO_MANY: + gen_save_cpu_state(ctx, false); + gen_goto_tb(ctx, 0, ctx->base.pc_next); break; case DISAS_NORETURN: break; default: g_assert_not_reached(); } +} - gen_tb_end(tb, num_insns); +static void sh4_tr_disas_log(const DisasContextBase *dcbase, CPUState *cs) +{ + qemu_log("IN:\n"); /* , lookup_symbol(dcbase->pc_first)); */ + log_target_disas(cs, dcbase->pc_first, dcbase->tb->size); +} - tb->size = ctx.base.pc_next - pc_start; - tb->icount = num_insns; +static const TranslatorOps sh4_tr_ops = { + .init_disas_context = sh4_tr_init_disas_context, + .tb_start = sh4_tr_tb_start, + .insn_start = sh4_tr_insn_start, + .breakpoint_check = sh4_tr_breakpoint_check, + .translate_insn = sh4_tr_translate_insn, + .tb_stop = sh4_tr_tb_stop, + .disas_log = sh4_tr_disas_log, +}; + +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) +{ + DisasContext ctx; -#ifdef DEBUG_DISAS - if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) - && qemu_log_in_addr_range(pc_start)) { - qemu_log_lock(); - qemu_log("IN:\n"); /* , lookup_symbol(pc_start)); */ - log_target_disas(cs, pc_start, ctx.base.pc_next - pc_start); - qemu_log("\n"); - qemu_log_unlock(); - } -#endif + translator_loop(&sh4_tr_ops, &ctx.base, cs, tb); } void restore_state_to_opc(CPUSH4State *env, TranslationBlock *tb,