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>
This commit is contained in:
Philippe Mathieu-Daudé 2021-02-24 18:51:00 +01:00
parent de5af7c5e6
commit 2234528618
1 changed files with 5 additions and 14 deletions

View File

@ -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