diff mbox series

[v6,30/35] target/riscv: Remove decode_RV32_64G()

Message ID 20190123092538.8004-31-kbastian@mail.uni-paderborn.de
State New
Headers show
Series target/riscv: Convert to decodetree | expand

Commit Message

Bastian Koppelmann Jan. 23, 2019, 9:25 a.m. UTC 
decodetree handles all instructions now so the fallback is not necessary
anymore.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Signed-off-by: Peer Adelt <peer.adelt@hni.uni-paderborn.de>
---
 target/riscv/translate.c | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

Comments

Alistair Francis Jan. 25, 2019, 10:29 p.m. UTC | #1 
On 1/23/19 1:25 AM, Bastian Koppelmann wrote:
> decodetree handles all instructions now so the fallback is not necessary
> anymore.
> 
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
> Signed-off-by: Peer Adelt <peer.adelt@hni.uni-paderborn.de>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>   target/riscv/translate.c | 23 +----------------------
>   1 file changed, 1 insertion(+), 22 deletions(-)
> 
> diff --git a/target/riscv/translate.c b/target/riscv/translate.c
> index 0e37beb68e..b0251b3518 100644
> --- a/target/riscv/translate.c
> +++ b/target/riscv/translate.c
> @@ -600,26 +600,6 @@ bool decode_insn16(DisasContext *ctx, uint16_t insn);
>   #include "decode_insn16.inc.c"
>   #include "insn_trans/trans_rvc.inc.c"
>   
> -static void decode_RV32_64G(CPURISCVState *env, DisasContext *ctx)
> -{
> -    uint32_t op;
> -
> -    /* We do not do misaligned address check here: the address should never be
> -     * misaligned at this point. Instructions that set PC must do the check,
> -     * since epc must be the address of the instruction that caused us to
> -     * perform the misaligned instruction fetch */
> -
> -    op = MASK_OP_MAJOR(ctx->opcode);
> -
> -    switch (op) {
> -    case OPC_RISC_SYSTEM:
> -        break;
> -    default:
> -        gen_exception_illegal(ctx);
> -        break;
> -    }
> -}
> -
>   static void decode_opc(DisasContext *ctx)
>   {
>       /* check for compressed insn */
> @@ -636,8 +616,7 @@ static void decode_opc(DisasContext *ctx)
>       } else {
>           ctx->pc_succ_insn = ctx->base.pc_next + 4;
>           if (!decode_insn32(ctx, ctx->opcode)) {
> -            /* fallback to old decoder */
> -            decode_RV32_64G(ctx->env, ctx);
> +            gen_exception_illegal(ctx);
>           }
>       }
>   }
>
diff mbox series

Patch

diff --git a/target/riscv/translate.c b/target/riscv/translate.c
index 0e37beb68e..b0251b3518 100644
--- a/target/riscv/translate.c
+++ b/target/riscv/translate.c
@@ -600,26 +600,6 @@  bool decode_insn16(DisasContext *ctx, uint16_t insn);
 #include "decode_insn16.inc.c"
 #include "insn_trans/trans_rvc.inc.c"
 
-static void decode_RV32_64G(CPURISCVState *env, DisasContext *ctx)
-{
-    uint32_t op;
-
-    /* We do not do misaligned address check here: the address should never be
-     * misaligned at this point. Instructions that set PC must do the check,
-     * since epc must be the address of the instruction that caused us to
-     * perform the misaligned instruction fetch */
-
-    op = MASK_OP_MAJOR(ctx->opcode);
-
-    switch (op) {
-    case OPC_RISC_SYSTEM:
-        break;
-    default:
-        gen_exception_illegal(ctx);
-        break;
-    }
-}
-
 static void decode_opc(DisasContext *ctx)
 {
     /* check for compressed insn */
@@ -636,8 +616,7 @@  static void decode_opc(DisasContext *ctx)
     } else {
         ctx->pc_succ_insn = ctx->base.pc_next + 4;
         if (!decode_insn32(ctx, ctx->opcode)) {
-            /* fallback to old decoder */
-            decode_RV32_64G(ctx->env, ctx);
+            gen_exception_illegal(ctx);
         }
     }
 }