| Message ID | 20210619093713.1845446-8-ale.qemu@rev.ng (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/hexagon: introduce idef-parser | expand |
> -----Original Message----- > From: Alessandro Di Federico <ale.qemu@rev.ng> > Sent: Saturday, June 19, 2021 3:37 AM > To: qemu-devel@nongnu.org > Cc: Taylor Simpson <tsimpson@quicinc.com>; Brian Cain > <bcain@quicinc.com>; babush@rev.ng; nizzo@rev.ng; philmd@redhat.com; > richard.henderson@linaro.org; Alessandro Di Federico <ale@rev.ng> > Subject: [PATCH v5 07/14] target/hexagon: expose next PC in DisasContext > > From: Paolo Montesel <babush@rev.ng> > > Signed-off-by: Alessandro Di Federico <ale@rev.ng> > Signed-off-by: Paolo Montesel <babush@rev.ng> > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/hexagon/translate.c | 3 ++- > target/hexagon/translate.h | 1 + > 2 files changed, 3 insertions(+), 1 deletion(-) Reviewed-by: Taylor Simpson <tsimpson@quicinc.com>
diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index 9a37644182..34c3bc5222 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -516,11 +516,12 @@ static void decode_and_translate_packet(CPUHexagonState *env, DisasContext *ctx) if (decode_packet(nwords, words, &pkt, false) > 0) { HEX_DEBUG_PRINT_PKT(&pkt); gen_start_packet(ctx, &pkt); + ctx->npc = ctx->base.pc_next + pkt.encod_pkt_size_in_bytes; for (i = 0; i < pkt.num_insns; i++) { gen_insn(env, ctx, &pkt.insn[i], &pkt); } gen_commit_packet(ctx, &pkt); - ctx->base.pc_next += pkt.encod_pkt_size_in_bytes; + ctx->base.pc_next = ctx->npc; } else { gen_exception_end_tb(ctx, HEX_EXCP_INVALID_PACKET); } diff --git a/target/hexagon/translate.h b/target/hexagon/translate.h index 703fd1345f..d5a7fece31 100644 --- a/target/hexagon/translate.h +++ b/target/hexagon/translate.h @@ -37,6 +37,7 @@ typedef struct DisasContext { DECLARE_BITMAP(pregs_written, NUM_PREGS); uint8_t store_width[STORES_MAX]; bool s1_store_processed; + uint32_t npc; } DisasContext; static inline void ctx_log_reg_write(DisasContext *ctx, int rnum)