From: Philipp Tomsich <philipp.tomsich@vrull.eu> To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, Bin Meng <bin.meng@windriver.com>, Philipp Tomsich <philipp.tomsich@vrull.eu>, Greg Favor <gfavor@ventanamicro.com>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Kito Cheng <kito.cheng@sifive.com> Subject: [PATCH v2 1/2] target/riscv: iterate over a table of decoders Date: Thu, 13 Jan 2022 21:20:32 +0100 [thread overview] Message-ID: <20220113202033.3320854-1-philipp.tomsich@vrull.eu> (raw) To split up the decoder into multiple functions (both to support vendor-specific opcodes in separate files and to simplify maintenance of orthogonal extensions), this changes decode_op to iterate over a table of decoders predicated on guard functions. This commit only adds the new structure and the table, allowing for the easy addition of additional decoders in the future. Signed-off-by: Philipp Tomsich <philipp.tomsich@vrull.eu> --- Changes in v2: - (new patch) iterate over a table of guarded decoder functions target/riscv/translate.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 615048ec87..2cbf9cbb6f 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -116,6 +116,12 @@ static inline bool has_ext(DisasContext *ctx, uint32_t ext) return ctx->misa_ext & ext; } +static inline bool always_true_p(CPURISCVState *env __attribute__((__unused__)), + DisasContext *ctx __attribute__((__unused__))) +{ + return true; +} + #ifdef TARGET_RISCV32 #define get_xl(ctx) MXL_RV32 #elif defined(CONFIG_USER_ONLY) @@ -844,16 +850,28 @@ static uint32_t opcode_at(DisasContextBase *dcbase, target_ulong pc) static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opcode) { - /* check for compressed insn */ + /* If not handled, we'll raise an illegal instruction exception */ + bool handled = false; + + /* + * A table with predicate (i.e., guard) functions and decoder functions + * that are tested in-order until a decoder matches onto the opcode. + */ + const struct { + bool (*guard_func)(CPURISCVState *, DisasContext *); + bool (*decode_func)(DisasContext *, uint32_t); + } decoders[] = { + { always_true_p, decode_insn32 }, + }; + + /* Check for compressed insn */ if (extract16(opcode, 0, 2) != 3) { if (!has_ext(ctx, RVC)) { gen_exception_illegal(ctx); } else { ctx->opcode = opcode; ctx->pc_succ_insn = ctx->base.pc_next + 2; - if (!decode_insn16(ctx, opcode)) { - gen_exception_illegal(ctx); - } + handled = decode_insn16(ctx, opcode); } } else { uint32_t opcode32 = opcode; @@ -862,10 +880,18 @@ static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opcode) ctx->base.pc_next + 2)); ctx->opcode = opcode32; ctx->pc_succ_insn = ctx->base.pc_next + 4; - if (!decode_insn32(ctx, opcode32)) { - gen_exception_illegal(ctx); + + for (size_t i = 0; i < ARRAY_SIZE(decoders); ++i) { + if (!decoders[i].guard_func(env, ctx)) + continue; + + if ((handled = decoders[i].decode_func(ctx, opcode32))) + break; } } + + if (!handled) + gen_exception_illegal(ctx); } static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) -- 2.33.1
WARNING: multiple messages have this Message-ID (diff)
From: Philipp Tomsich <philipp.tomsich@vrull.eu> To: qemu-devel@nongnu.org Cc: Greg Favor <gfavor@ventanamicro.com>, Alistair Francis <alistair.francis@wdc.com>, Kito Cheng <kito.cheng@sifive.com>, Philipp Tomsich <philipp.tomsich@vrull.eu>, Bin Meng <bin.meng@windriver.com>, Palmer Dabbelt <palmer@dabbelt.com>, qemu-riscv@nongnu.org Subject: [PATCH v2 1/2] target/riscv: iterate over a table of decoders Date: Thu, 13 Jan 2022 21:20:32 +0100 [thread overview] Message-ID: <20220113202033.3320854-1-philipp.tomsich@vrull.eu> (raw) To split up the decoder into multiple functions (both to support vendor-specific opcodes in separate files and to simplify maintenance of orthogonal extensions), this changes decode_op to iterate over a table of decoders predicated on guard functions. This commit only adds the new structure and the table, allowing for the easy addition of additional decoders in the future. Signed-off-by: Philipp Tomsich <philipp.tomsich@vrull.eu> --- Changes in v2: - (new patch) iterate over a table of guarded decoder functions target/riscv/translate.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 615048ec87..2cbf9cbb6f 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -116,6 +116,12 @@ static inline bool has_ext(DisasContext *ctx, uint32_t ext) return ctx->misa_ext & ext; } +static inline bool always_true_p(CPURISCVState *env __attribute__((__unused__)), + DisasContext *ctx __attribute__((__unused__))) +{ + return true; +} + #ifdef TARGET_RISCV32 #define get_xl(ctx) MXL_RV32 #elif defined(CONFIG_USER_ONLY) @@ -844,16 +850,28 @@ static uint32_t opcode_at(DisasContextBase *dcbase, target_ulong pc) static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opcode) { - /* check for compressed insn */ + /* If not handled, we'll raise an illegal instruction exception */ + bool handled = false; + + /* + * A table with predicate (i.e., guard) functions and decoder functions + * that are tested in-order until a decoder matches onto the opcode. + */ + const struct { + bool (*guard_func)(CPURISCVState *, DisasContext *); + bool (*decode_func)(DisasContext *, uint32_t); + } decoders[] = { + { always_true_p, decode_insn32 }, + }; + + /* Check for compressed insn */ if (extract16(opcode, 0, 2) != 3) { if (!has_ext(ctx, RVC)) { gen_exception_illegal(ctx); } else { ctx->opcode = opcode; ctx->pc_succ_insn = ctx->base.pc_next + 2; - if (!decode_insn16(ctx, opcode)) { - gen_exception_illegal(ctx); - } + handled = decode_insn16(ctx, opcode); } } else { uint32_t opcode32 = opcode; @@ -862,10 +880,18 @@ static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opcode) ctx->base.pc_next + 2)); ctx->opcode = opcode32; ctx->pc_succ_insn = ctx->base.pc_next + 4; - if (!decode_insn32(ctx, opcode32)) { - gen_exception_illegal(ctx); + + for (size_t i = 0; i < ARRAY_SIZE(decoders); ++i) { + if (!decoders[i].guard_func(env, ctx)) + continue; + + if ((handled = decoders[i].decode_func(ctx, opcode32))) + break; } } + + if (!handled) + gen_exception_illegal(ctx); } static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) -- 2.33.1
next reply other threads:[~2022-01-13 20:22 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-13 20:20 Philipp Tomsich [this message] 2022-01-13 20:20 ` [PATCH v2 1/2] target/riscv: iterate over a table of decoders Philipp Tomsich 2022-01-13 20:20 ` [PATCH v2 2/2] target/riscv: Add XVentanaCondOps custom extension Philipp Tomsich 2022-01-13 20:20 ` Philipp Tomsich 2022-01-18 22:53 ` Alistair Francis 2022-01-18 22:53 ` Alistair Francis 2022-01-18 23:21 ` Philipp Tomsich 2022-01-18 23:21 ` Philipp Tomsich 2022-01-19 1:19 ` Alistair Francis 2022-01-19 1:19 ` Alistair Francis 2022-01-19 1:30 ` Alistair Francis 2022-01-19 1:30 ` Alistair Francis 2022-01-20 15:37 ` Philipp Tomsich 2022-01-20 15:37 ` Philipp Tomsich 2022-01-21 3:02 ` Alistair Francis 2022-01-21 3:02 ` Alistair Francis 2022-01-19 11:17 ` Philippe Mathieu-Daudé via 2022-01-19 11:17 ` Philippe Mathieu-Daudé 2022-01-20 15:24 ` Philipp Tomsich 2022-01-20 15:24 ` Philipp Tomsich 2022-01-25 21:42 ` Richard Henderson 2022-01-19 11:30 ` [PATCH v2 1/2] target/riscv: iterate over a table of decoders Philippe Mathieu-Daudé via 2022-01-19 11:30 ` Philippe Mathieu-Daudé 2022-01-20 20:05 ` Philipp Tomsich 2022-01-20 20:05 ` Philipp Tomsich 2022-01-25 21:28 ` Richard Henderson
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=20220113202033.3320854-1-philipp.tomsich@vrull.eu \ --to=philipp.tomsich@vrull.eu \ --cc=alistair.francis@wdc.com \ --cc=bin.meng@windriver.com \ --cc=gfavor@ventanamicro.com \ --cc=kito.cheng@sifive.com \ --cc=palmer@dabbelt.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-riscv@nongnu.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.