tricore: added some missing cpu instructions

Signed-off-by: David Brenken <david.brenken@efs-auto.de>
Signed-off-by: Florian Artmeier <florian.artmeier@efs-auto.de>
Signed-off-by: Georg Hofstetter <georg.hofstetter@efs-auto.de>
Message-Id: <20180301155619.8640-2-david.brenken@efs-auto.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
This commit is contained in:
David Brenken 2018-03-01 16:56:16 +01:00 committed by Bastian Koppelmann
parent 427cbc7e41
commit defda2d420
2 changed files with 30 additions and 0 deletions

View File

@ -3389,10 +3389,18 @@ static void gen_compute_branch(DisasContext *ctx, uint32_t opc, int r1,
gen_branch_cond(ctx, TCG_COND_EQ, cpu_gpr_d[r1], cpu_gpr_d[15], gen_branch_cond(ctx, TCG_COND_EQ, cpu_gpr_d[r1], cpu_gpr_d[15],
offset); offset);
break; break;
case OPC1_16_SBR_JEQ2:
gen_branch_cond(ctx, TCG_COND_EQ, cpu_gpr_d[r1], cpu_gpr_d[15],
offset + 16);
break;
case OPC1_16_SBR_JNE: case OPC1_16_SBR_JNE:
gen_branch_cond(ctx, TCG_COND_NE, cpu_gpr_d[r1], cpu_gpr_d[15], gen_branch_cond(ctx, TCG_COND_NE, cpu_gpr_d[r1], cpu_gpr_d[15],
offset); offset);
break; break;
case OPC1_16_SBR_JNE2:
gen_branch_cond(ctx, TCG_COND_NE, cpu_gpr_d[r1], cpu_gpr_d[15],
offset + 16);
break;
case OPC1_16_SBR_JNZ: case OPC1_16_SBR_JNZ:
gen_branch_condi(ctx, TCG_COND_NE, cpu_gpr_d[r1], 0, offset); gen_branch_condi(ctx, TCG_COND_NE, cpu_gpr_d[r1], 0, offset);
break; break;
@ -4121,6 +4129,16 @@ static void decode_16Bit_opc(CPUTriCoreState *env, DisasContext *ctx)
gen_compute_branch(ctx, op1, 0, 0, const16, address); gen_compute_branch(ctx, op1, 0, 0, const16, address);
break; break;
/* SBR-format */ /* SBR-format */
case OPC1_16_SBR_JEQ2:
case OPC1_16_SBR_JNE2:
if (tricore_feature(env, TRICORE_FEATURE_16)) {
r1 = MASK_OP_SBR_S2(ctx->opcode);
address = MASK_OP_SBR_DISP4(ctx->opcode);
gen_compute_branch(ctx, op1, r1, 0, 0, address);
} else {
generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC);
}
break;
case OPC1_16_SBR_JEQ: case OPC1_16_SBR_JEQ:
case OPC1_16_SBR_JGEZ: case OPC1_16_SBR_JGEZ:
case OPC1_16_SBR_JGTZ: case OPC1_16_SBR_JGTZ:
@ -6256,6 +6274,15 @@ static void decode_rr_accumulator(CPUTriCoreState *env, DisasContext *ctx)
generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC); generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC);
} }
break; break;
case OPC2_32_RR_MOVS_64:
if (tricore_feature(env, TRICORE_FEATURE_16)) {
CHECK_REG_PAIR(r3);
tcg_gen_mov_tl(cpu_gpr_d[r3], cpu_gpr_d[r2]);
tcg_gen_sari_tl(cpu_gpr_d[r3 + 1], cpu_gpr_d[r2], 31);
} else {
generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC);
}
break;
case OPC2_32_RR_NE: case OPC2_32_RR_NE:
tcg_gen_setcond_tl(TCG_COND_NE, cpu_gpr_d[r3], cpu_gpr_d[r1], tcg_gen_setcond_tl(TCG_COND_NE, cpu_gpr_d[r3], cpu_gpr_d[r1],
cpu_gpr_d[r2]); cpu_gpr_d[r2]);

View File

@ -313,6 +313,7 @@ enum {
OPC1_16_SBC_JEQ = 0x1e, OPC1_16_SBC_JEQ = 0x1e,
OPC1_16_SBC_JEQ2 = 0x9e, OPC1_16_SBC_JEQ2 = 0x9e,
OPC1_16_SBR_JEQ = 0x3e, OPC1_16_SBR_JEQ = 0x3e,
OPC1_16_SBR_JEQ2 = 0xbe,
OPC1_16_SBR_JGEZ = 0xce, OPC1_16_SBR_JGEZ = 0xce,
OPC1_16_SBR_JGTZ = 0x4e, OPC1_16_SBR_JGTZ = 0x4e,
OPC1_16_SR_JI = 0xdc, OPC1_16_SR_JI = 0xdc,
@ -321,6 +322,7 @@ enum {
OPC1_16_SBC_JNE = 0x5e, OPC1_16_SBC_JNE = 0x5e,
OPC1_16_SBC_JNE2 = 0xde, OPC1_16_SBC_JNE2 = 0xde,
OPC1_16_SBR_JNE = 0x7e, OPC1_16_SBR_JNE = 0x7e,
OPC1_16_SBR_JNE2 = 0xfe,
OPC1_16_SB_JNZ = 0xee, OPC1_16_SB_JNZ = 0xee,
OPC1_16_SBR_JNZ = 0xf6, OPC1_16_SBR_JNZ = 0xf6,
OPC1_16_SBR_JNZ_A = 0x7c, OPC1_16_SBR_JNZ_A = 0x7c,
@ -1064,6 +1066,7 @@ enum {
OPC2_32_RR_MIN_H = 0x78, OPC2_32_RR_MIN_H = 0x78,
OPC2_32_RR_MIN_HU = 0x79, OPC2_32_RR_MIN_HU = 0x79,
OPC2_32_RR_MOV = 0x1f, OPC2_32_RR_MOV = 0x1f,
OPC2_32_RR_MOVS_64 = 0x80,
OPC2_32_RR_MOV_64 = 0x81, OPC2_32_RR_MOV_64 = 0x81,
OPC2_32_RR_NE = 0x11, OPC2_32_RR_NE = 0x11,
OPC2_32_RR_OR_EQ = 0x27, OPC2_32_RR_OR_EQ = 0x27,