From nobody Tue Feb 10 13:01:43 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 1524251617094748.9653326405836; Fri, 20 Apr 2018 12:13:37 -0700 (PDT) Received: from localhost ([::1]:53654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9bTU-00048B-6K for importer@patchew.org; Fri, 20 Apr 2018 15:13:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9bBw-0005f9-UK for qemu-devel@nongnu.org; Fri, 20 Apr 2018 14:55:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9bBr-00022D-GM for qemu-devel@nongnu.org; Fri, 20 Apr 2018 14:55:28 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:59807) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f9bBr-00021O-08 for qemu-devel@nongnu.org; Fri, 20 Apr 2018 14:55:23 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 805BC20FE0; Fri, 20 Apr 2018 14:55:22 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 20 Apr 2018 14:55:22 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 2BC6AE4350; Fri, 20 Apr 2018 14:55:22 -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=yP2U5PDDPLhKlW pGbZyjuG7eDn2z5T40RXmiBE8dscs=; b=tCum+NP80JU4an7EsWq4O6lkdvBFU7 xa2gA62vizUK2ZH9f1ADK3mPuEaOwEKhOmqevHzr0F6IFKi06uRATI8Lan7z9UDh 9lJxbUS0WwLLWB9osfLWSgC5imgINpeOPBdL/YlrvqBbz5Gd0yA6Vfxyr4FbHCfg AiQw6rx1v1ZCA= 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=yP2U5PDDPLhKlWpGbZyjuG7eDn2z5T40RXmiBE8dscs=; b=CcbIRAUn JP34eYfQUpNbvZs+gQsm5AOfKWmrg4gyB9Oku9+ZF43uigHtKleSzBkiLjn54R5b +cxgMXBbFlWLXGlIiL8X8lIyK49GKZ2ZHYacsBmU66Got8DzQtUqczm/VFbjbgOx i3pw/4CZwxAHPvKVjFBxh6gRo6Ee2wj/GqVA1gpIhJmF3+eHWqDOjGLUXBMxygaU oAP1e2m/ei0pCdajygqNBFT7lCms05svy4JRnuwcRSDyy2nime812aRkidi0Y7xD 1tnovgBaeAPUe/PBo5sLc7lwq0O+OTM297l5Ny/lzjYAljBmeAe/5l38W8h9/mrs 0+SGYvXZD2z5zA== X-ME-Sender: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Fri, 20 Apr 2018 14:55:16 -0400 Message-Id: <1524250517-28032-18-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 17/18] target/riscv: convert to DisasContextBase 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: Bastian Koppelmann , Michael Clark , Richard Henderson , Sagar Karandikar , Palmer Dabbelt 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" Notes: - Did not convert {num,max}_insns, since the corresponding code will go away in the next patch. - ctx->pc becomes ctx->base.pc_next, and ctx->next_pc becomes ctx->pc_succ_insn. While at it, convert the remaining tb->cflags readers to tb_cflags(). Reviewed-by: Richard Henderson Cc: Michael Clark Cc: Palmer Dabbelt Cc: Sagar Karandikar Cc: Bastian Koppelmann Signed-off-by: Emilio G. Cota --- target/riscv/translate.c | 129 +++++++++++++++++++++++--------------------= ---- 1 file changed, 64 insertions(+), 65 deletions(-) diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 08388b3..18ec1a7 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -40,14 +40,12 @@ static TCGv load_val; #include "exec/gen-icount.h" =20 typedef struct DisasContext { - struct TranslationBlock *tb; - target_ulong pc; - target_ulong next_pc; + DisasContextBase base; + /* pc_succ_insn points to the instruction following base.pc_next */ + target_ulong pc_succ_insn; uint32_t opcode; uint32_t flags; uint32_t mem_idx; - int singlestep_enabled; - DisasJumpType is_jmp; /* Remember the rounding mode encoded in the previous fp instruction, which we have already installed into env->fp_status. Or -1 for no previous fp instruction. Note that we exit the TB when writing @@ -78,21 +76,21 @@ static const int tcg_memop_lookup[8] =3D { =20 static void generate_exception(DisasContext *ctx, int excp) { - tcg_gen_movi_tl(cpu_pc, ctx->pc); + tcg_gen_movi_tl(cpu_pc, ctx->base.pc_next); TCGv_i32 helper_tmp =3D tcg_const_i32(excp); gen_helper_raise_exception(cpu_env, helper_tmp); tcg_temp_free_i32(helper_tmp); - ctx->is_jmp =3D DISAS_NORETURN; + ctx->base.is_jmp =3D DISAS_NORETURN; } =20 static void generate_exception_mbadaddr(DisasContext *ctx, int excp) { - tcg_gen_movi_tl(cpu_pc, ctx->pc); + tcg_gen_movi_tl(cpu_pc, ctx->base.pc_next); tcg_gen_st_tl(cpu_pc, cpu_env, offsetof(CPURISCVState, badaddr)); TCGv_i32 helper_tmp =3D tcg_const_i32(excp); gen_helper_raise_exception(cpu_env, helper_tmp); tcg_temp_free_i32(helper_tmp); - ctx->is_jmp =3D DISAS_NORETURN; + ctx->base.is_jmp =3D DISAS_NORETURN; } =20 static void gen_exception_debug(void) @@ -114,12 +112,12 @@ static void gen_exception_inst_addr_mis(DisasContext = *ctx) =20 static inline bool use_goto_tb(DisasContext *ctx, target_ulong dest) { - if (unlikely(ctx->singlestep_enabled)) { + if (unlikely(ctx->base.singlestep_enabled)) { return false; } =20 #ifndef CONFIG_USER_ONLY - return (ctx->tb->pc & TARGET_PAGE_MASK) =3D=3D (dest & TARGET_PAGE_MAS= K); + return (ctx->base.tb->pc & TARGET_PAGE_MASK) =3D=3D (dest & TARGET_PAG= E_MASK); #else return true; #endif @@ -131,10 +129,10 @@ static void gen_goto_tb(DisasContext *ctx, int n, tar= get_ulong dest) /* chaining is only allowed when the jump is to the same page */ tcg_gen_goto_tb(n); tcg_gen_movi_tl(cpu_pc, dest); - tcg_gen_exit_tb((uintptr_t)ctx->tb + n); + tcg_gen_exit_tb((uintptr_t)ctx->base.tb + n); } else { tcg_gen_movi_tl(cpu_pc, dest); - if (ctx->singlestep_enabled) { + if (ctx->base.singlestep_enabled) { gen_exception_debug(); } else { tcg_gen_exit_tb(0); @@ -514,7 +512,7 @@ static void gen_jal(CPURISCVState *env, DisasContext *c= tx, int rd, target_ulong next_pc; =20 /* check misaligned: */ - next_pc =3D ctx->pc + imm; + next_pc =3D ctx->base.pc_next + imm; if (!riscv_has_ext(env, RVC)) { if ((next_pc & 0x3) !=3D 0) { gen_exception_inst_addr_mis(ctx); @@ -522,11 +520,11 @@ static void gen_jal(CPURISCVState *env, DisasContext = *ctx, int rd, } } if (rd !=3D 0) { - tcg_gen_movi_tl(cpu_gpr[rd], ctx->next_pc); + tcg_gen_movi_tl(cpu_gpr[rd], ctx->pc_succ_insn); } =20 - gen_goto_tb(ctx, 0, ctx->pc + imm); /* must use this for safety */ - ctx->is_jmp =3D DISAS_NORETURN; + gen_goto_tb(ctx, 0, ctx->base.pc_next + imm); /* must use this for saf= ety */ + ctx->base.is_jmp =3D DISAS_NORETURN; } =20 static void gen_jalr(CPURISCVState *env, DisasContext *ctx, uint32_t opc, @@ -549,7 +547,7 @@ static void gen_jalr(CPURISCVState *env, DisasContext *= ctx, uint32_t opc, } =20 if (rd !=3D 0) { - tcg_gen_movi_tl(cpu_gpr[rd], ctx->next_pc); + tcg_gen_movi_tl(cpu_gpr[rd], ctx->pc_succ_insn); } tcg_gen_exit_tb(0); =20 @@ -557,7 +555,7 @@ static void gen_jalr(CPURISCVState *env, DisasContext *= ctx, uint32_t opc, gen_set_label(misaligned); gen_exception_inst_addr_mis(ctx); } - ctx->is_jmp =3D DISAS_NORETURN; + ctx->base.is_jmp =3D DISAS_NORETURN; break; =20 default: @@ -603,15 +601,15 @@ static void gen_branch(CPURISCVState *env, DisasConte= xt *ctx, uint32_t opc, tcg_temp_free(source1); tcg_temp_free(source2); =20 - gen_goto_tb(ctx, 1, ctx->next_pc); + gen_goto_tb(ctx, 1, ctx->pc_succ_insn); gen_set_label(l); /* branch taken */ - if (!riscv_has_ext(env, RVC) && ((ctx->pc + bimm) & 0x3)) { + if (!riscv_has_ext(env, RVC) && ((ctx->base.pc_next + bimm) & 0x3)) { /* misaligned */ gen_exception_inst_addr_mis(ctx); } else { - gen_goto_tb(ctx, 0, ctx->pc + bimm); + gen_goto_tb(ctx, 0, ctx->base.pc_next + bimm); } - ctx->is_jmp =3D DISAS_NORETURN; + ctx->base.is_jmp =3D DISAS_NORETURN; } =20 static void gen_load(DisasContext *ctx, uint32_t opc, int rd, int rs1, @@ -837,7 +835,7 @@ static void gen_atomic(DisasContext *ctx, uint32_t opc, if (rl) { tcg_gen_mb(TCG_MO_ALL | TCG_BAR_STRL); } - if (tb_cflags(ctx->tb) & CF_PARALLEL) { + if (tb_cflags(ctx->base.tb) & CF_PARALLEL) { l1 =3D gen_new_label(); gen_set_label(l1); } else { @@ -854,7 +852,7 @@ static void gen_atomic(DisasContext *ctx, uint32_t opc, tcg_gen_qemu_ld_tl(dat, src1, ctx->mem_idx, mop); tcg_gen_movcond_tl(cond, src2, dat, src2, dat, src2); =20 - if (tb_cflags(ctx->tb) & CF_PARALLEL) { + if (tb_cflags(ctx->base.tb) & CF_PARALLEL) { /* Parallel context. Make this operation atomic by verifying that the memory didn't change while we computed the result.= */ tcg_gen_atomic_cmpxchg_tl(src2, src1, dat, src2, ctx->mem_idx,= mop); @@ -1318,7 +1316,7 @@ static void gen_system(CPURISCVState *env, DisasConte= xt *ctx, uint32_t opc, rs1_pass =3D tcg_temp_new(); imm_rs1 =3D tcg_temp_new(); gen_get_gpr(source1, rs1); - tcg_gen_movi_tl(cpu_pc, ctx->pc); + tcg_gen_movi_tl(cpu_pc, ctx->base.pc_next); tcg_gen_movi_tl(rs1_pass, rs1); tcg_gen_movi_tl(csr_store, csr); /* copy into temp reg to feed to help= er */ =20 @@ -1339,12 +1337,12 @@ static void gen_system(CPURISCVState *env, DisasCon= text *ctx, uint32_t opc, /* always generates U-level ECALL, fixed in do_interrupt handl= er */ generate_exception(ctx, RISCV_EXCP_U_ECALL); tcg_gen_exit_tb(0); /* no chaining */ - ctx->is_jmp =3D DISAS_NORETURN; + ctx->base.is_jmp =3D DISAS_NORETURN; break; case 0x1: /* EBREAK */ generate_exception(ctx, RISCV_EXCP_BREAKPOINT); tcg_gen_exit_tb(0); /* no chaining */ - ctx->is_jmp =3D DISAS_NORETURN; + ctx->base.is_jmp =3D DISAS_NORETURN; break; #ifndef CONFIG_USER_ONLY case 0x002: /* URET */ @@ -1354,7 +1352,7 @@ static void gen_system(CPURISCVState *env, DisasConte= xt *ctx, uint32_t opc, if (riscv_has_ext(env, RVS)) { gen_helper_sret(cpu_pc, cpu_env, cpu_pc); tcg_gen_exit_tb(0); /* no chaining */ - ctx->is_jmp =3D DISAS_NORETURN; + ctx->base.is_jmp =3D DISAS_NORETURN; } else { gen_exception_illegal(ctx); } @@ -1365,13 +1363,13 @@ static void gen_system(CPURISCVState *env, DisasCon= text *ctx, uint32_t opc, case 0x302: /* MRET */ gen_helper_mret(cpu_pc, cpu_env, cpu_pc); tcg_gen_exit_tb(0); /* no chaining */ - ctx->is_jmp =3D DISAS_NORETURN; + ctx->base.is_jmp =3D DISAS_NORETURN; break; case 0x7b2: /* DRET */ gen_exception_illegal(ctx); break; case 0x105: /* WFI */ - tcg_gen_movi_tl(cpu_pc, ctx->next_pc); + tcg_gen_movi_tl(cpu_pc, ctx->pc_succ_insn); gen_helper_wfi(cpu_env); break; case 0x104: /* SFENCE.VM */ @@ -1410,9 +1408,9 @@ static void gen_system(CPURISCVState *env, DisasConte= xt *ctx, uint32_t opc, } gen_set_gpr(rd, dest); /* end tb since we may be changing priv modes, to get mmu_index ri= ght */ - tcg_gen_movi_tl(cpu_pc, ctx->next_pc); + tcg_gen_movi_tl(cpu_pc, ctx->pc_succ_insn); tcg_gen_exit_tb(0); /* no chaining */ - ctx->is_jmp =3D DISAS_NORETURN; + ctx->base.is_jmp =3D DISAS_NORETURN; break; } tcg_temp_free(source1); @@ -1730,7 +1728,7 @@ static void decode_RV32_64G(CPURISCVState *env, Disas= Context *ctx) break; /* NOP */ } tcg_gen_movi_tl(cpu_gpr[rd], (sextract64(ctx->opcode, 12, 20) << 1= 2) + - ctx->pc); + ctx->base.pc_next); break; case OPC_RISC_JAL: imm =3D GET_JAL_IMM(ctx->opcode); @@ -1803,9 +1801,9 @@ static void decode_RV32_64G(CPURISCVState *env, Disas= Context *ctx) if (ctx->opcode & 0x1000) { /* FENCE_I is a no-op in QEMU, * however we need to end the translation block */ - tcg_gen_movi_tl(cpu_pc, ctx->next_pc); + tcg_gen_movi_tl(cpu_pc, ctx->pc_succ_insn); tcg_gen_exit_tb(0); - ctx->is_jmp =3D DISAS_NORETURN; + ctx->base.is_jmp =3D DISAS_NORETURN; } else { /* FENCE is a full memory barrier. */ tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); @@ -1829,11 +1827,11 @@ static void decode_opc(CPURISCVState *env, DisasCon= text *ctx) if (!riscv_has_ext(env, RVC)) { gen_exception_illegal(ctx); } else { - ctx->next_pc =3D ctx->pc + 2; + ctx->pc_succ_insn =3D ctx->base.pc_next + 2; decode_RV32_64C(env, ctx); } } else { - ctx->next_pc =3D ctx->pc + 4; + ctx->pc_succ_insn =3D ctx->base.pc_next + 4; decode_RV32_64G(env, ctx); } } @@ -1842,26 +1840,26 @@ void gen_intermediate_code(CPUState *cs, Translatio= nBlock *tb) { CPURISCVState *env =3D cs->env_ptr; DisasContext ctx; - target_ulong pc_start; target_ulong page_start; int num_insns; int max_insns; - pc_start =3D tb->pc; - page_start =3D pc_start & TARGET_PAGE_MASK; - ctx.pc =3D pc_start; =20 + ctx.base.pc_first =3D tb->pc; + ctx.base.pc_next =3D ctx.base.pc_first; /* once we have GDB, the rest of the translate.c implementation should= be ready for singlestep */ - ctx.singlestep_enabled =3D cs->singlestep_enabled; + ctx.base.singlestep_enabled =3D cs->singlestep_enabled; + ctx.base.tb =3D tb; + ctx.base.is_jmp =3D DISAS_NEXT; =20 - ctx.tb =3D tb; - ctx.is_jmp =3D DISAS_NEXT; + page_start =3D ctx.base.pc_first & TARGET_PAGE_MASK; + ctx.pc_succ_insn =3D ctx.base.pc_first; ctx.flags =3D tb->flags; ctx.mem_idx =3D tb->flags & TB_FLAGS_MMU_MASK; ctx.frm =3D -1; /* unknown rounding mode */ =20 num_insns =3D 0; - max_insns =3D tb->cflags & CF_COUNT_MASK; + max_insns =3D tb_cflags(ctx.base.tb) & CF_COUNT_MASK; if (max_insns =3D=3D 0) { max_insns =3D CF_COUNT_MASK; } @@ -1870,45 +1868,45 @@ void gen_intermediate_code(CPUState *cs, Translatio= nBlock *tb) } gen_tb_start(tb); =20 - while (ctx.is_jmp =3D=3D DISAS_NEXT) { - tcg_gen_insn_start(ctx.pc); + while (ctx.base.is_jmp =3D=3D DISAS_NEXT) { + tcg_gen_insn_start(ctx.base.pc_next); num_insns++; =20 - if (unlikely(cpu_breakpoint_test(cs, ctx.pc, BP_ANY))) { - tcg_gen_movi_tl(cpu_pc, ctx.pc); - ctx.is_jmp =3D DISAS_NORETURN; + if (unlikely(cpu_breakpoint_test(cs, ctx.base.pc_next, BP_ANY))) { + tcg_gen_movi_tl(cpu_pc, ctx.base.pc_next); + ctx.base.is_jmp =3D DISAS_NORETURN; gen_exception_debug(); /* 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.pc +=3D 4; + ctx.base.pc_next +=3D 4; goto done_generating; } =20 - if (num_insns =3D=3D max_insns && (tb->cflags & CF_LAST_IO)) { + if (num_insns =3D=3D max_insns && (tb_cflags(ctx.base.tb) & CF_LAS= T_IO)) { gen_io_start(); } =20 - ctx.opcode =3D cpu_ldl_code(env, ctx.pc); + ctx.opcode =3D cpu_ldl_code(env, ctx.base.pc_next); decode_opc(env, &ctx); - ctx.pc =3D ctx.next_pc; + ctx.base.pc_next =3D ctx.pc_succ_insn; =20 - if (ctx.is_jmp =3D=3D DISAS_NEXT && + if (ctx.base.is_jmp =3D=3D DISAS_NEXT && (cs->singlestep_enabled || - ctx.pc - page_start >=3D TARGET_PAGE_SIZE || + ctx.base.pc_next - page_start >=3D TARGET_PAGE_SIZE || tcg_op_buf_full() || num_insns >=3D max_insns || singlestep)) { - ctx.is_jmp =3D DISAS_TOO_MANY; + ctx.base.is_jmp =3D DISAS_TOO_MANY; } } - if (tb->cflags & CF_LAST_IO) { + if (tb_cflags(ctx.base.tb) & CF_LAST_IO) { gen_io_end(); } - switch (ctx.is_jmp) { + switch (ctx.base.is_jmp) { case DISAS_TOO_MANY: - tcg_gen_movi_tl(cpu_pc, ctx.pc); + tcg_gen_movi_tl(cpu_pc, ctx.base.pc_next); if (cs->singlestep_enabled) { gen_exception_debug(); } else { @@ -1922,14 +1920,15 @@ void gen_intermediate_code(CPUState *cs, Translatio= nBlock *tb) } done_generating: gen_tb_end(tb, num_insns); - tb->size =3D ctx.pc - pc_start; + tb->size =3D ctx.base.pc_next - ctx.base.pc_first; tb->icount =3D num_insns; =20 #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) - && qemu_log_in_addr_range(pc_start)) { - qemu_log("IN: %s\n", lookup_symbol(pc_start)); - log_target_disas(cs, pc_start, ctx.pc - pc_start); + && qemu_log_in_addr_range(ctx.base.pc_first)) { + qemu_log("IN: %s\n", lookup_symbol(ctx.base.pc_first)); + log_target_disas(cs, ctx.base.pc_first, + ctx.base.pc_next - ctx.base.pc_first); qemu_log("\n"); } #endif --=20 2.7.4