diff options
| author | Philippe Mathieu-Daudé | 2021-02-24 18:51:00 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé | 2021-03-13 23:42:53 +0100 |
| commit | 2234528618e49d27b85fab4389f393de0fe8ca98 (patch) | |
| tree | 52cfc341ab199ba4ed737aae487bdc67b55417c1 /target/mips | |
| parent | target/mips: Use OPC_MUL instead of OPC__MXU_MUL (diff) | |
| download | qemu-2234528618e49d27b85fab4389f393de0fe8ca98.tar.gz qemu-2234528618e49d27b85fab4389f393de0fe8ca98.tar.xz qemu-2234528618e49d27b85fab4389f393de0fe8ca98.zip | |
target/mips: Move MUL opcode check from decode_mxu() to decode_legacy()
Move the check for MUL opcode from decode_opc_mxu() callee
to decode_opc_legacy() caller, so we can simplify the ifdef'ry
and elide the call in few commits.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210226093111.3865906-9-f4bug@amsat.org>
Diffstat (limited to 'target/mips')
| -rw-r--r-- | target/mips/translate.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/target/mips/translate.c b/target/mips/translate.c index ad09321de8..17cf608d0b 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -25783,19 +25783,6 @@ static void decode_opc_mxu(DisasContext *ctx, uint32_t insn) { uint32_t opcode = extract32(insn, 0, 6); - if (MASK_SPECIAL2(insn) == OPC_MUL) { - uint32_t rs, rt, rd, op1; - - rs = extract32(insn, 21, 5); - rt = extract32(insn, 16, 5); - rd = extract32(insn, 11, 5); - op1 = MASK_SPECIAL2(insn); - - gen_arith(ctx, op1, rd, rs, rt); - - return; - } - if (opcode == OPC_MXU_S32M2I) { gen_mxu_s32m2i(ctx); return; @@ -26994,7 +26981,11 @@ static bool decode_opc_legacy(CPUMIPSState *env, DisasContext *ctx) #endif #if !defined(TARGET_MIPS64) if (ctx->insn_flags & ASE_MXU) { - decode_opc_mxu(ctx, ctx->opcode); + if (MASK_SPECIAL2(ctx->opcode) == OPC_MUL) { + gen_arith(ctx, OPC_MUL, rd, rs, rt); + } else { + decode_opc_mxu(ctx, ctx->opcode); + } break; } #endif |