From: Alistair Francis <alistair23@gmail.com>
To: Weiwei Li <liweiwei@iscas.ac.cn>
Cc: qemu-riscv@nongnu.org, qemu-devel@nongnu.org, palmer@dabbelt.com,
alistair.francis@wdc.com, bin.meng@windriver.com,
dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com,
wangjunqiang@iscas.ac.cn, lazyparser@gmail.com
Subject: Re: [PATCH v2 7/7] target/riscv: Remove pc_succ_insn from DisasContext
Date: Fri, 26 May 2023 12:28:46 +1000 [thread overview]
Message-ID: <CAKmqyKMaLZgZV250B7xap8f7bOYFCw7HZX-FFt1+AY964TO_zA@mail.gmail.com> (raw)
In-Reply-To: <20230523135939.299246-8-liweiwei@iscas.ac.cn>
On Wed, May 24, 2023 at 12:07 AM Weiwei Li <liweiwei@iscas.ac.cn> wrote:
>
> pc_succ_insn is no longer useful after the introduce of cur_insn_len
> and all pc related value use diff value instead of absolute value.
>
> Signed-off-by: Weiwei Li <liweiwei@iscas.ac.cn>
> Signed-off-by: Junqiang Wang <wangjunqiang@iscas.ac.cn>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> target/riscv/translate.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/target/riscv/translate.c b/target/riscv/translate.c
> index 538187f93b..37d731f9c5 100644
> --- a/target/riscv/translate.c
> +++ b/target/riscv/translate.c
> @@ -57,8 +57,6 @@ typedef enum {
>
> typedef struct DisasContext {
> DisasContextBase base;
> - /* pc_succ_insn points to the instruction following base.pc_next */
> - target_ulong pc_succ_insn;
> target_ulong cur_insn_len;
> target_ulong pc_save;
> target_ulong priv_ver;
> @@ -1147,7 +1145,6 @@ static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opcode)
> /* Check for compressed insn */
> if (ctx->cur_insn_len == 2) {
> ctx->opcode = opcode;
> - ctx->pc_succ_insn = ctx->base.pc_next + 2;
> /*
> * The Zca extension is added as way to refer to instructions in the C
> * extension that do not include the floating-point loads and stores
> @@ -1161,7 +1158,6 @@ static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opcode)
> translator_lduw(env, &ctx->base,
> ctx->base.pc_next + 2));
> ctx->opcode = opcode32;
> - ctx->pc_succ_insn = ctx->base.pc_next + 4;
>
> for (size_t i = 0; i < ARRAY_SIZE(decoders); ++i) {
> if (decoders[i].guard_func(ctx) &&
> @@ -1182,7 +1178,6 @@ static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs)
> uint32_t tb_flags = ctx->base.tb->flags;
>
> ctx->pc_save = ctx->base.pc_first;
> - ctx->pc_succ_insn = ctx->base.pc_first;
> ctx->priv = FIELD_EX32(tb_flags, TB_FLAGS, PRIV);
> ctx->mem_idx = FIELD_EX32(tb_flags, TB_FLAGS, MEM_IDX);
> ctx->mstatus_fs = FIELD_EX32(tb_flags, TB_FLAGS, FS);
> @@ -1235,7 +1230,7 @@ static void riscv_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
>
> ctx->ol = ctx->xl;
> decode_opc(env, ctx, opcode16);
> - ctx->base.pc_next = ctx->pc_succ_insn;
> + ctx->base.pc_next += ctx->cur_insn_len;
>
> /* Only the first insn within a TB is allowed to cross a page boundary. */
> if (ctx->base.is_jmp == DISAS_NEXT) {
> --
> 2.25.1
>
>
next prev parent reply other threads:[~2023-05-26 2:29 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-23 13:59 [PATCH v2 0/7] target/riscv: Add support for PC-relative translation Weiwei Li
2023-05-23 13:59 ` [PATCH v2 1/7] target/riscv: Fix target address to update badaddr Weiwei Li
2023-05-23 13:59 ` [PATCH v2 2/7] target/riscv: Introduce cur_insn_len into DisasContext Weiwei Li
2023-05-23 20:27 ` Richard Henderson
2023-05-26 2:02 ` Alistair Francis
2023-05-23 13:59 ` [PATCH v2 3/7] target/riscv: Change gen_goto_tb to work on displacements Weiwei Li
2023-05-23 20:29 ` Richard Henderson
2023-05-26 2:04 ` Alistair Francis
2023-05-23 13:59 ` [PATCH v2 4/7] target/riscv: Change gen_set_pc_imm to gen_update_pc Weiwei Li
2023-05-23 20:31 ` Richard Henderson
2023-05-26 2:21 ` Alistair Francis
2023-05-23 13:59 ` [PATCH v2 5/7] target/riscv: Use true diff for gen_pc_plus_diff Weiwei Li
2023-05-23 20:34 ` Richard Henderson
2023-05-26 2:23 ` Alistair Francis
2023-05-23 13:59 ` [PATCH v2 6/7] target/riscv: Enable PC-relative translation Weiwei Li
2023-05-23 20:42 ` Richard Henderson
2023-05-26 2:28 ` Alistair Francis
2023-05-23 13:59 ` [PATCH v2 7/7] target/riscv: Remove pc_succ_insn from DisasContext Weiwei Li
2023-05-23 20:43 ` Richard Henderson
2023-05-26 2:28 ` Alistair Francis [this message]
2023-05-26 3:38 ` [PATCH v2 0/7] target/riscv: Add support for PC-relative translation Alistair Francis
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=CAKmqyKMaLZgZV250B7xap8f7bOYFCw7HZX-FFt1+AY964TO_zA@mail.gmail.com \
--to=alistair23@gmail.com \
--cc=alistair.francis@wdc.com \
--cc=bin.meng@windriver.com \
--cc=dbarboza@ventanamicro.com \
--cc=lazyparser@gmail.com \
--cc=liweiwei@iscas.ac.cn \
--cc=palmer@dabbelt.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=wangjunqiang@iscas.ac.cn \
--cc=zhiwei_liu@linux.alibaba.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).