From nobody Tue Feb 10 16:18:15 2026 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; 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 1524250846450838.4701172577147; Fri, 20 Apr 2018 12:00:46 -0700 (PDT) Received: from localhost ([::1]:52845 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9bH3-0001Jq-Gw for importer@patchew.org; Fri, 20 Apr 2018 15:00:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9bBr-0005cx-Uz for qemu-devel@nongnu.org; Fri, 20 Apr 2018 14:55:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9bBo-0001zI-ET for qemu-devel@nongnu.org; Fri, 20 Apr 2018 14:55:23 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:38123) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f9bBn-0001yL-Oa for qemu-devel@nongnu.org; Fri, 20 Apr 2018 14:55:19 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 5E49121C1A; Fri, 20 Apr 2018 14:55:19 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 20 Apr 2018 14:55:19 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 13F4FE4350; Fri, 20 Apr 2018 14:55:19 -0400 (EDT) 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=CQLEMvhC+ynKvl 0OBSR7hQg3Q9ivVWNg2kwzhRNJsqY=; b=mf4n5wePmYeFqVI+vlwthPQXaZPYrf rl1VfL3OjjUh6a10AVmt4NeGWS+9BynvNsOf4WKot0oK+MmlZKAXuJAtS+1wJ2qi J3XZaE4hFku0dBpvOy4Zz9qILvTYtzYOr/z3pmlK3NBMRHZXnfGnqgrKWo737cxd N3qWiw+rwK4Nw= 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=CQLEMvhC+ynKvl0OBSR7hQg3Q9ivVWNg2kwzhRNJsqY=; b=EXNs8KYe C52I7rtKYLmojuN7gdXLKbC1hibutA4w9RYoBh53onIHS7Lk8HB2Qpbj2YYeZuOd 9kK8uOKLL0C6o3MMIImyLpyeNRWLrl0/5+pjrgabQvn1QXuHcyneibAZIQJTXXl+ mvJ7JipCCFJ97vp4knx+JTuugglV+tJdH/WDHkiKJWwyu4IjXWFCwZZxa+gJbUb3 Y5emZn6zm6zjWMP/EHtaTsew/ZA8IJgakKvb2tiBprd0G9tOzWpsSveQnD/1ItNK mFitL799Md3zecYhMlIjO6829uxIUBnBK76qAp7nRmfiI2AcNObqKYFCKMPLMULX qLbuzBWWSmXBEg== X-ME-Sender: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Fri, 20 Apr 2018 14:55:02 -0400 Message-Id: <1524250517-28032-4-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524250517-28032-1-git-send-email-cota@braap.org> References: <1524250517-28032-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.27 Subject: [Qemu-devel] [PATCH 03/18] target/sparc: convert to DisasJumpType 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: Mark Cave-Ayland , Richard Henderson , Artyom Tarasenko Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Cc: Mark Cave-Ayland Cc: Artyom Tarasenko Signed-off-by: Emilio G. Cota --- target/sparc/translate.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 5aa367a..03c6510 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -30,6 +30,7 @@ #include "exec/helper-gen.h" =20 #include "trace-tcg.h" +#include "exec/translator.h" #include "exec/log.h" #include "asi.h" =20 @@ -69,7 +70,7 @@ typedef struct DisasContext { target_ulong pc; /* current Program Counter: integer or DYNAMIC_PC = */ target_ulong npc; /* next PC: integer or DYNAMIC_PC or JUMP_PC */ target_ulong jump_pc[2]; /* used when JUMP_PC pc value is used */ - int is_br; + DisasJumpType is_jmp; int mem_idx; bool fpu_enabled; bool address_mask_32bit; @@ -995,7 +996,7 @@ static void gen_branch_a(DisasContext *dc, target_ulong= pc1) gen_set_label(l1); gen_goto_tb(dc, 1, npc + 4, npc + 8); =20 - dc->is_br =3D 1; + dc->is_jmp =3D DISAS_NORETURN; } =20 static void gen_branch_n(DisasContext *dc, target_ulong pc1) @@ -1078,7 +1079,7 @@ static void gen_exception(DisasContext *dc, int which) t =3D tcg_const_i32(which); gen_helper_raise_exception(cpu_env, t); tcg_temp_free_i32(t); - dc->is_br =3D 1; + dc->is_jmp =3D DISAS_NORETURN; } =20 static void gen_check_align(TCGv addr, int mask) @@ -3351,7 +3352,7 @@ static void disas_sparc_insn(DisasContext * dc, unsig= ned int insn) =20 if (cond =3D=3D 8) { /* An unconditional trap ends the TB. */ - dc->is_br =3D 1; + dc->is_jmp =3D DISAS_NORETURN; goto jmp_insn; } else { /* A conditional trap falls through to the next insn. = */ @@ -4331,7 +4332,7 @@ static void disas_sparc_insn(DisasContext * dc, unsig= ned int insn) save_state(dc); gen_op_next_insn(); tcg_gen_exit_tb(0); - dc->is_br =3D 1; + dc->is_jmp =3D DISAS_NORETURN; break; case 0x6: /* V9 wrfprs */ tcg_gen_xor_tl(cpu_tmp0, cpu_src1, cpu_src= 2); @@ -4340,7 +4341,7 @@ static void disas_sparc_insn(DisasContext * dc, unsig= ned int insn) save_state(dc); gen_op_next_insn(); tcg_gen_exit_tb(0); - dc->is_br =3D 1; + dc->is_jmp =3D DISAS_NORETURN; break; case 0xf: /* V9 sir, nop if user */ #if !defined(CONFIG_USER_ONLY) @@ -4468,7 +4469,7 @@ static void disas_sparc_insn(DisasContext * dc, unsig= ned int insn) save_state(dc); gen_op_next_insn(); tcg_gen_exit_tb(0); - dc->is_br =3D 1; + dc->is_jmp =3D DISAS_NORETURN; #endif } break; @@ -4624,7 +4625,7 @@ static void disas_sparc_insn(DisasContext * dc, unsig= ned int insn) save_state(dc); gen_op_next_insn(); tcg_gen_exit_tb(0); - dc->is_br =3D 1; + dc->is_jmp =3D DISAS_NORETURN; break; case 1: // htstate // XXX gen_op_wrhtstate(); @@ -5690,7 +5691,7 @@ static void disas_sparc_insn(DisasContext * dc, unsig= ned int insn) } else if (dc->npc =3D=3D JUMP_PC) { /* we can do a static jump */ gen_branch2(dc, dc->jump_pc[0], dc->jump_pc[1], cpu_cond); - dc->is_br =3D 1; + dc->is_jmp =3D DISAS_NORETURN; } else { dc->pc =3D dc->npc; dc->npc =3D dc->npc + 4; @@ -5752,6 +5753,7 @@ void gen_intermediate_code(CPUState *cs, TranslationB= lock * tb) pc_start =3D tb->pc; dc->pc =3D pc_start; last_pc =3D dc->pc; + dc->is_jmp =3D DISAS_NEXT; dc->npc =3D (target_ulong) tb->cs_base; dc->cc_op =3D CC_OP_DYNAMIC; dc->mem_idx =3D tb->flags & TB_FLAG_MMU_MASK; @@ -5796,7 +5798,7 @@ void gen_intermediate_code(CPUState *cs, TranslationB= lock * tb) } gen_helper_debug(cpu_env); tcg_gen_exit_tb(0); - dc->is_br =3D 1; + dc->is_jmp =3D DISAS_NORETURN; goto exit_gen_loop; } =20 @@ -5808,8 +5810,9 @@ void gen_intermediate_code(CPUState *cs, TranslationB= lock * tb) =20 disas_sparc_insn(dc, insn); =20 - if (dc->is_br) + if (dc->is_jmp =3D=3D DISAS_NORETURN) { break; + } /* if the next PC is different, we abort now */ if (dc->pc !=3D (last_pc + 4)) break; @@ -5830,7 +5833,7 @@ void gen_intermediate_code(CPUState *cs, TranslationB= lock * tb) if (tb_cflags(tb) & CF_LAST_IO) { gen_io_end(); } - if (!dc->is_br) { + if (dc->is_jmp !=3D DISAS_NORETURN) { if (dc->pc !=3D DYNAMIC_PC && (dc->npc !=3D DYNAMIC_PC && dc->npc !=3D JUMP_PC)) { /* static PC and NPC: we can use direct chaining */ --=20 2.7.4