From: Alessandro Di Federico via <qemu-devel@nongnu.org>
To: qemu-devel@nongnu.org
Cc: tsimpson@quicinc.com, bcain@quicinc.com, babush@rev.ng,
nizzo@rev.ng, philmd@redhat.com, richard.henderson@linaro.org,
Alessandro Di Federico <ale@rev.ng>
Subject: [PATCH v3 07/12] target/hexagon: expose next PC in DisasContext
Date: Tue, 30 Mar 2021 16:37:45 +0200 [thread overview]
Message-ID: <20210330143750.3037824-8-ale.qemu@rev.ng> (raw)
In-Reply-To: <20210330143750.3037824-1-ale.qemu@rev.ng>
From: Paolo Montesel <babush@rev.ng>
Signed-off-by: Alessandro Di Federico <ale@rev.ng>
Signed-off-by: Paolo Montesel <babush@rev.ng>
---
target/hexagon/translate.c | 3 ++-
target/hexagon/translate.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c
index eeaad5f8ba..30ff3c5d51 100644
--- a/target/hexagon/translate.c
+++ b/target/hexagon/translate.c
@@ -503,11 +503,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(HEX_EXCP_INVALID_PACKET);
ctx->base.is_jmp = DISAS_NORETURN;
diff --git a/target/hexagon/translate.h b/target/hexagon/translate.h
index 938f7fbb9f..2195e20f4b 100644
--- a/target/hexagon/translate.h
+++ b/target/hexagon/translate.h
@@ -36,6 +36,7 @@ typedef struct DisasContext {
int preg_log_idx;
uint8_t store_width[STORES_MAX];
uint8_t s1_store_processed;
+ uint32_t npc;
} DisasContext;
static inline void ctx_log_reg_write(DisasContext *ctx, int rnum)
--
2.31.1
next prev parent reply other threads:[~2021-03-30 14:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-30 14:37 [PATCH v3 00/12] target/hexagon: introduce idef-parser Alessandro Di Federico via
2021-03-30 14:37 ` [PATCH v3 01/12] tcg: expose TCGCond manipulation routines Alessandro Di Federico via
2021-03-30 14:37 ` [PATCH v3 02/12] target/hexagon: update MAINTAINERS for idef-parser Alessandro Di Federico via
2021-03-30 14:37 ` [PATCH v3 03/12] target/hexagon: import README " Alessandro Di Federico via
2021-03-30 14:37 ` [PATCH v3 04/12] target/hexagon: make slot number an unsigned Alessandro Di Federico via
2021-03-30 14:37 ` [PATCH v3 05/12] target/hexagon: make helper functions non-static Alessandro Di Federico via
2021-03-30 14:37 ` [PATCH v3 06/12] target/hexagon: introduce new helper functions Alessandro Di Federico via
2021-03-30 14:37 ` Alessandro Di Federico via [this message]
2021-03-30 14:37 ` [PATCH v3 08/12] target/hexagon: prepare input for the idef-parser Alessandro Di Federico via
2021-03-30 14:37 ` [PATCH v3 09/12] target/hexagon: import lexer for idef-parser Alessandro Di Federico via
2021-04-27 2:11 ` Taylor Simpson
2021-04-28 10:40 ` Paolo Montesel
2021-04-28 15:47 ` Taylor Simpson
2021-03-30 14:37 ` [PATCH v3 10/12] target/hexagon: import parser " Alessandro Di Federico via
2021-03-30 14:37 ` [PATCH v3 11/12] target/hexagon: call idef-parser functions Alessandro Di Federico via
2021-03-30 14:37 ` [PATCH v3 12/12] target/hexagon: import additional tests Alessandro Di Federico via
2021-03-30 15:57 ` [PATCH v3 00/12] target/hexagon: introduce idef-parser no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210330143750.3037824-8-ale.qemu@rev.ng \
--to=qemu-devel@nongnu.org \
--cc=ale.qemu@rev.ng \
--cc=ale@rev.ng \
--cc=babush@rev.ng \
--cc=bcain@quicinc.com \
--cc=nizzo@rev.ng \
--cc=philmd@redhat.com \
--cc=richard.henderson@linaro.org \
--cc=tsimpson@quicinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).