mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/mips: Move MUL, S32M2I, S32I2M handling out of main MXU switch

Browse Source 
Move MUL, S32M2I, S32I2M handling out of switch. These are all
instructions that do not depend on MXU_EN flag of MXU_CR.

Reviewed-by: Stefan Markovic <smarkovic@wavecomp.com>
Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
This commit is contained in:
Aleksandar Markovic 2018-10-23 17:50:49 +02:00
parent 96992d1aa1
commit 87860df551
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
target/mips/translate.c
View File

@ -24999,6 +24999,29 @@ static void decode_opc_mxu(CPUMIPSState *env, DisasContext *ctx)
*/
uint32_t opcode = extract32(ctx->opcode, 0, 6);
if (opcode == OPC__MXU_MUL) {
uint32_t rs, rt, rd, op1;
rs = extract32(ctx->opcode, 21, 5);
rt = extract32(ctx->opcode, 16, 5);
rd = extract32(ctx->opcode, 11, 5);
op1 = MASK_SPECIAL2(ctx->opcode);
gen_arith(ctx, op1, rd, rs, rt);
return;
}
if (opcode == OPC_MXU_S32M2I) {
gen_mxu_s32m2i(ctx);
return;
}
if (opcode == OPC_MXU_S32I2M) {
gen_mxu_s32i2m(ctx);
return;
}
switch (opcode) {
case OPC_MXU_S32MADD:
/* TODO: Implement emulation of S32MADD instruction. */
@ -25010,18 +25033,6 @@ static void decode_opc_mxu(CPUMIPSState *env, DisasContext *ctx)
MIPS_INVAL("OPC_MXU_S32MADDU");
generate_exception_end(ctx, EXCP_RI);
break;
case OPC__MXU_MUL: /* 0x2 - unused in MXU specs */
{
uint32_t rs, rt, rd, op1;
rs = extract32(ctx->opcode, 21, 5);
rt = extract32(ctx->opcode, 16, 5);
rd = extract32(ctx->opcode, 11, 5);
op1 = MASK_SPECIAL2(ctx->opcode);
gen_arith(ctx, op1, rd, rs, rt);
}
break;
case OPC_MXU__POOL00:
decode_opc_mxu__pool00(env, ctx);
break;
@ -25173,12 +25184,6 @@ static void decode_opc_mxu(CPUMIPSState *env, DisasContext *ctx)
MIPS_INVAL("OPC_MXU_S16SDI");
generate_exception_end(ctx, EXCP_RI);
break;
case OPC_MXU_S32M2I:
gen_mxu_s32m2i(ctx);
break;
case OPC_MXU_S32I2M:
gen_mxu_s32i2m(ctx);
break;
case OPC_MXU_D32SLL:
/* TODO: Implement emulation of D32SLL instruction. */
MIPS_INVAL("OPC_MXU_D32SLL");