OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/mips: Convert CTCMSA opcode to decodetree

Browse Source 
Convert the CTCMSA (Copy To Control MSA register) opcode
to decodetree. Since it overlaps with the SLDI opcode,
use a decodetree overlap group.

Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211028210843.2120802-30-f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2021-10-19 18:29:14 +02:00
parent 6f74237691
commit 643ec9022e
2 changed files with 16 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/mips/tcg/msa.decode
View File

@ -167,7 +167,10 @@ BNZ 010001 111 .. ..... ................ @bz
HSUB_S 011110 110.. ..... ..... ..... 010101 @3r HSUB_S 011110 110.. ..... ..... ..... 010101 @3r
HSUB_U 011110 111.. ..... ..... ..... 010101 @3r HSUB_U 011110 111.. ..... ..... ..... 010101 @3r
SLDI 011110 0000 ...... ..... ..... 011001 @elm_df {
CTCMSA 011110 0000111110 ..... ..... 011001 @elm
SLDI 011110 0000 ...... ..... ..... 011001 @elm_df
}
{ {
CFCMSA 011110 0001111110 ..... ..... 011001 @elm CFCMSA 011110 0001111110 ..... ..... 011001 @elm
SPLATI 011110 0001 ...... ..... ..... 011001 @elm_df SPLATI 011110 0001 ...... ..... ..... 011001 @elm_df

69
target/mips/tcg/msa_translate.c
View File

@ -35,18 +35,6 @@ static inline int plus_2(DisasContext *s, int x)
/* Include the auto-generated decoder. */ /* Include the auto-generated decoder. */
#include "decode-msa.c.inc" #include "decode-msa.c.inc"
#define OPC_MSA (0x1E << 26)
#define MASK_MSA_MINOR(op) (MASK_OP_MAJOR(op) | (op & 0x3F))
enum {
OPC_MSA_ELM = 0x19 | OPC_MSA,
};
enum {
/* ELM instructions df(bits 21..16) = _b, _h, _w, _d */
OPC_CTCMSA = (0x0 << 22) | (0x3E << 16) | OPC_MSA_ELM,
};
static const char msaregnames[][6] = { static const char msaregnames[][6] = {
"w0.d0", "w0.d1", "w1.d0", "w1.d1", "w0.d0", "w0.d1", "w1.d0", "w1.d1",
"w2.d0", "w2.d1", "w3.d0", "w3.d1", "w2.d0", "w2.d1", "w3.d0", "w3.d1",
@ -544,27 +532,22 @@ static bool trans_MOVE_V(DisasContext *ctx, arg_msa_elm *a)
return true; return true;
} }
static void gen_msa_elm_3e(DisasContext *ctx) static bool trans_CTCMSA(DisasContext *ctx, arg_msa_elm *a)
{ {
#define MASK_MSA_ELM_DF3E(op) (MASK_MSA_MINOR(op) | (op & (0x3FF << 16))) TCGv telm;
uint8_t source = (ctx->opcode >> 11) & 0x1f;
uint8_t dest = (ctx->opcode >> 6) & 0x1f;
TCGv telm = tcg_temp_new();
TCGv_i32 tdt = tcg_const_i32(dest);
switch (MASK_MSA_ELM_DF3E(ctx->opcode)) { if (!check_msa_enabled(ctx)) {
case OPC_CTCMSA: return true;
gen_load_gpr(telm, source);
gen_helper_msa_ctcmsa(cpu_env, telm, tdt);
break;
default:
MIPS_INVAL("MSA instruction");
gen_reserved_instruction(ctx);
break;
} }
telm = tcg_temp_new();
gen_load_gpr(telm, a->ws);
gen_helper_msa_ctcmsa(cpu_env, telm, tcg_constant_i32(a->wd));
tcg_temp_free(telm); tcg_temp_free(telm);
tcg_temp_free_i32(tdt);
return true;
} }
static bool trans_CFCMSA(DisasContext *ctx, arg_msa_elm *a) static bool trans_CFCMSA(DisasContext *ctx, arg_msa_elm *a)
@ -669,20 +652,6 @@ static bool trans_INSERT(DisasContext *ctx, arg_msa_elm_df *a)
return trans_msa_elm_fn(ctx, a, gen_msa_insert); return trans_msa_elm_fn(ctx, a, gen_msa_insert);
} }
static void gen_msa_elm(DisasContext *ctx)
{
uint8_t dfn = (ctx->opcode >> 16) & 0x3f;
if (dfn == 0x3E) {
/* CTCMSA */
gen_msa_elm_3e(ctx);
return;
} else {
gen_reserved_instruction(ctx);
return;
}
}
TRANS(FCAF, trans_msa_3rf, gen_helper_msa_fcaf_df); TRANS(FCAF, trans_msa_3rf, gen_helper_msa_fcaf_df);
TRANS(FCUN, trans_msa_3rf, gen_helper_msa_fcun_df); TRANS(FCUN, trans_msa_3rf, gen_helper_msa_fcun_df);
TRANS(FCEQ, trans_msa_3rf, gen_helper_msa_fceq_df); TRANS(FCEQ, trans_msa_3rf, gen_helper_msa_fceq_df);
@ -796,21 +765,7 @@ TRANS(FFINT_U, trans_msa_2rf, gen_helper_msa_ffint_u_df);
static bool trans_MSA(DisasContext *ctx, arg_MSA *a) static bool trans_MSA(DisasContext *ctx, arg_MSA *a)
{ {
uint32_t opcode = ctx->opcode; gen_reserved_instruction(ctx);
if (!check_msa_enabled(ctx)) {
return true;
}
switch (MASK_MSA_MINOR(opcode)) {
case OPC_MSA_ELM:
gen_msa_elm(ctx);
break;
default:
MIPS_INVAL("MSA instruction");
gen_reserved_instruction(ctx);
break;
}
return true; return true;
} }