SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tcg/s390x: Fold the ext{8,16,32}[us] cases into {s}extract

Browse Source 
Accept byte and word extensions with the extract opcodes.
This is preparatory to removing the specialized extracts.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-12-25 22:26:42 -08:00
parent fa65f13555
commit 42103c4ce7
2 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tcg/s390x/tcg-target-has.h
View File

@ -48,7 +48,7 @@ extern uint64_t s390_facilities[3];
#define TCG_TARGET_HAS_ctpop_i32 1 #define TCG_TARGET_HAS_ctpop_i32 1
#define TCG_TARGET_HAS_deposit_i32 1 #define TCG_TARGET_HAS_deposit_i32 1
#define TCG_TARGET_HAS_extract_i32 1 #define TCG_TARGET_HAS_extract_i32 1
#define TCG_TARGET_HAS_sextract_i32 0 #define TCG_TARGET_HAS_sextract_i32 1
#define TCG_TARGET_HAS_extract2_i32 0 #define TCG_TARGET_HAS_extract2_i32 0
#define TCG_TARGET_HAS_negsetcond_i32 1 #define TCG_TARGET_HAS_negsetcond_i32 1
#define TCG_TARGET_HAS_add2_i32 1 #define TCG_TARGET_HAS_add2_i32 1
@ -82,7 +82,7 @@ extern uint64_t s390_facilities[3];
#define TCG_TARGET_HAS_ctpop_i64 1 #define TCG_TARGET_HAS_ctpop_i64 1
#define TCG_TARGET_HAS_deposit_i64 1 #define TCG_TARGET_HAS_deposit_i64 1
#define TCG_TARGET_HAS_extract_i64 1 #define TCG_TARGET_HAS_extract_i64 1
#define TCG_TARGET_HAS_sextract_i64 0 #define TCG_TARGET_HAS_sextract_i64 1
#define TCG_TARGET_HAS_extract2_i64 0 #define TCG_TARGET_HAS_extract2_i64 0
#define TCG_TARGET_HAS_negsetcond_i64 1 #define TCG_TARGET_HAS_negsetcond_i64 1
#define TCG_TARGET_HAS_add2_i64 1 #define TCG_TARGET_HAS_add2_i64 1
@ -121,4 +121,22 @@ extern uint64_t s390_facilities[3];
#define TCG_TARGET_HAS_cmpsel_vec 1 #define TCG_TARGET_HAS_cmpsel_vec 1
#define TCG_TARGET_HAS_tst_vec 0 #define TCG_TARGET_HAS_tst_vec 0
#define TCG_TARGET_extract_valid(type, ofs, len) 1
static inline bool
tcg_target_sextract_valid(TCGType type, unsigned ofs, unsigned len)
{
if (ofs == 0) {
switch (len) {
case 8:
case 16:
return true;
case 32:
return type == TCG_TYPE_I64;
}
}
return false;
}
#define TCG_TARGET_sextract_valid tcg_target_sextract_valid
#endif #endif

37
tcg/s390x/tcg-target.c.inc
View File

@ -1572,9 +1572,41 @@ static void tgen_deposit(TCGContext *s, TCGReg dest, TCGReg src,
static void tgen_extract(TCGContext *s, TCGReg dest, TCGReg src, static void tgen_extract(TCGContext *s, TCGReg dest, TCGReg src,
int ofs, int len) int ofs, int len)
{ {
if (ofs == 0) {
switch (len) {
case 8:
tcg_out_ext8u(s, dest, src);
return;
case 16:
tcg_out_ext16u(s, dest, src);
return;
case 32:
tcg_out_ext32u(s, dest, src);
return;
}
}
tcg_out_risbg(s, dest, src, 64 - len, 63, 64 - ofs, 1); tcg_out_risbg(s, dest, src, 64 - len, 63, 64 - ofs, 1);
} }
static void tgen_sextract(TCGContext *s, TCGReg dest, TCGReg src,
int ofs, int len)
{
if (ofs == 0) {
switch (len) {
case 8:
tcg_out_ext8s(s, TCG_TYPE_REG, dest, src);
return;
case 16:
tcg_out_ext16s(s, TCG_TYPE_REG, dest, src);
return;
case 32:
tcg_out_ext32s(s, dest, src);
return;
}
}
g_assert_not_reached();
}
static void tgen_gotoi(TCGContext *s, int cc, const tcg_insn_unit *dest) static void tgen_gotoi(TCGContext *s, int cc, const tcg_insn_unit *dest)
{ {
ptrdiff_t off = tcg_pcrel_diff(s, dest) >> 1; ptrdiff_t off = tcg_pcrel_diff(s, dest) >> 1;
@ -2726,6 +2758,9 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
OP_32_64(extract): OP_32_64(extract):
tgen_extract(s, args[0], args[1], args[2], args[3]); tgen_extract(s, args[0], args[1], args[2], args[3]);
break; break;
OP_32_64(sextract):
tgen_sextract(s, args[0], args[1], args[2], args[3]);
break;
case INDEX_op_clz_i64: case INDEX_op_clz_i64:
tgen_clz(s, args[0], args[1], args[2], const_args[2]); tgen_clz(s, args[0], args[1], args[2], const_args[2]);
@ -3325,6 +3360,8 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags)
case INDEX_op_extu_i32_i64: case INDEX_op_extu_i32_i64:
case INDEX_op_extract_i32: case INDEX_op_extract_i32:
case INDEX_op_extract_i64: case INDEX_op_extract_i64:
case INDEX_op_sextract_i32:
case INDEX_op_sextract_i64:
case INDEX_op_ctpop_i32: case INDEX_op_ctpop_i32:
case INDEX_op_ctpop_i64: case INDEX_op_ctpop_i64:
return C_O1_I1(r, r); return C_O1_I1(r, r);