lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix tcg_out_dupi_vec interface conflicts

Browse Source
This commit is contained in:
WangLiangpu
2023-11-01 21:36:35 +08:00
parent b957324d3d
commit 2d9587f26b
2 changed files with 60 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
qemu/tcg/loongarch64/tcg-target.inc.c
View File

@@ -1897,38 +1897,38 @@ static bool tcg_out_dupm_vec(TCGContext *s, TCGType type, unsigned vece,
return true; return true;
} }
static void tcg_out_dupi_vec(TCGContext *s, TCGType type, unsigned vece, // static void tcg_out_dupi_vec(TCGContext *s, TCGType type, unsigned vece,
TCGReg rd, int64_t v64) // TCGReg rd, int64_t v64)
{ // {
/* Try vldi if imm can fit */ // /* Try vldi if imm can fit */
int64_t value = sextract64(v64, 0, 8 << vece); // int64_t value = sextract64(v64, 0, 8 << vece);
if (-0x200 <= value && value <= 0x1FF) { // if (-0x200 <= value && value <= 0x1FF) {
uint32_t imm = (vece << 10) | ((uint32_t)v64 & 0x3FF); // uint32_t imm = (vece << 10) | ((uint32_t)v64 & 0x3FF);
tcg_out_opc_vldi(s, rd, imm); // tcg_out_opc_vldi(s, rd, imm);
return; // return;
} // }
/* TODO: vldi patterns when imm 12 is set */ // /* TODO: vldi patterns when imm 12 is set */
/* Fallback to vreplgr2vr */ // /* Fallback to vreplgr2vr */
tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_TMP0, value); // tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_TMP0, value);
switch (vece) { // switch (vece) {
case MO_8: // case MO_8:
tcg_out_opc_vreplgr2vr_b(s, rd, TCG_REG_TMP0); // tcg_out_opc_vreplgr2vr_b(s, rd, TCG_REG_TMP0);
break; // break;
case MO_16: // case MO_16:
tcg_out_opc_vreplgr2vr_h(s, rd, TCG_REG_TMP0); // tcg_out_opc_vreplgr2vr_h(s, rd, TCG_REG_TMP0);
break; // break;
case MO_32: // case MO_32:
tcg_out_opc_vreplgr2vr_w(s, rd, TCG_REG_TMP0); // tcg_out_opc_vreplgr2vr_w(s, rd, TCG_REG_TMP0);
break; // break;
case MO_64: // case MO_64:
tcg_out_opc_vreplgr2vr_d(s, rd, TCG_REG_TMP0); // tcg_out_opc_vreplgr2vr_d(s, rd, TCG_REG_TMP0);
break; // break;
default: // default:
g_assert_not_reached(); // g_assert_not_reached();
} // }
} // }
static void tcg_out_addsub_vec(TCGContext *s, unsigned vece, const TCGArg a0, static void tcg_out_addsub_vec(TCGContext *s, unsigned vece, const TCGArg a0,
const TCGArg a1, const TCGArg a2, const TCGArg a1, const TCGArg a2,
@@ -2128,7 +2128,35 @@ static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc,
* dupi_vec temp, a2 * dupi_vec temp, a2
* cmp_vec a0, a1, temp, cond * cmp_vec a0, a1, temp, cond
*/ */
tcg_out_dupi_vec(s, type, vece, temp_vec, a2); // tcg_out_dupi_vec(s, type, vece, temp_vec, a2);
/* Try vldi if imm can fit */
if (-0x200 <= value && value <= 0x1FF) {
uint32_t imm = (vece << 10) | ((uint32_t)a2 & 0x3FF);
tcg_out_opc_vldi(s, temp_vec, imm);
goto enddupi;
}
/* TODO: vldi patterns when imm 12 is set */
/* Fallback to vreplgr2vr */
tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_TMP0, value);
switch (vece) {
case MO_8:
tcg_out_opc_vreplgr2vr_b(s, temp_vec, TCG_REG_TMP0);
break;
case MO_16:
tcg_out_opc_vreplgr2vr_h(s, temp_vec, TCG_REG_TMP0);
break;
case MO_32:
tcg_out_opc_vreplgr2vr_w(s, temp_vec, TCG_REG_TMP0);
break;
case MO_64:
tcg_out_opc_vreplgr2vr_d(s, temp_vec, TCG_REG_TMP0);
break;
default:
g_assert_not_reached();
}
enddupi:
a2 = temp_vec; a2 = temp_vec;
} }

2
qemu/tcg/tcg.c
View File

@@ -114,7 +114,7 @@ static bool tcg_out_dup_vec(TCGContext *s, TCGType type, unsigned vece,
TCGReg dst, TCGReg src); TCGReg dst, TCGReg src);
static bool tcg_out_dupm_vec(TCGContext *s, TCGType type, unsigned vece, static bool tcg_out_dupm_vec(TCGContext *s, TCGType type, unsigned vece,
TCGReg dst, TCGReg base, intptr_t offset); TCGReg dst, TCGReg base, intptr_t offset);
static void tcg_out_dupi_vec(TCGContext *s, TCGType type, unsigned vece, static void tcg_out_dupi_vec(TCGContext *s, TCGType type,
TCGReg dst, tcg_target_long arg); TCGReg dst, tcg_target_long arg);
static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc, unsigned vecl, static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc, unsigned vecl,
unsigned vece, const TCGArg *args, unsigned vece, const TCGArg *args,