Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 4 --
include/tcg/tcg-op-def2.h.inc | 1 +
tcg/tcg-op.c | 121 +++++++++++-----------------------
3 files changed, 38 insertions(+), 88 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 0a37a8edb60..7c6421f692c 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -153,8 +153,6 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
void tcg_gen_deposit_z_i32(TCGv_i32 ret, TCGv_i32 arg,
unsigned int ofs, unsigned int len);
-void tcg_gen_sextract_i32(TCGv_i32 ret, TCGv_i32 arg,
- unsigned int ofs, unsigned int len);
void tcg_gen_extract2_i32(TCGv_i32 ret, TCGv_i32 al, TCGv_i32 ah,
unsigned int ofs);
void tcg_gen_add2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 al,
@@ -200,8 +198,6 @@ void tcg_gen_st_i32(TCGv_i32 arg1, TCGv_ptr arg2,
tcg_target_long offset);
void tcg_gen_deposit_z_i64(TCGv_i64 ret, TCGv_i64 arg,
unsigned int ofs, unsigned int len);
-void tcg_gen_sextract_i64(TCGv_i64 ret, TCGv_i64 arg,
- unsigned int ofs, unsigned int len);
void tcg_gen_extract2_i64(TCGv_i64 ret, TCGv_i64 al, TCGv_i64 ah,
unsigned int ofs);
void tcg_gen_add2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 al,
diff --git a/include/tcg/tcg-op-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index 24db95e294d..5cbdf39b3e6 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -52,3 +52,4 @@ DEF_RRR(sub)
DEF_RRR(xor)
DEF_RRRUU(deposit)
DEF_RRUU(extract)
+DEF_RRUU(sextract)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index d196c36fc4f..2a31ae17f4d 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -244,20 +244,6 @@ static void DNI tcg_gen_op4i_i64(TCGOpcode opc, TCGv_i64
a1, TCGv_i64 a2,
tcgv_i64_arg(a3), a4);
}
-static TCGOp * DNI tcg_gen_op4ii_i32(TCGOpcode opc, TCGv_i32 a1, TCGv_i32 a2,
- TCGArg a3, TCGArg a4)
-{
- return tcg_gen_op4(opc, TCG_TYPE_I32,
- tcgv_i32_arg(a1), tcgv_i32_arg(a2), a3, a4);
-}
-
-static TCGOp * DNI tcg_gen_op4ii_i64(TCGOpcode opc, TCGv_i64 a1, TCGv_i64 a2,
- TCGArg a3, TCGArg a4)
-{
- return tcg_gen_op4(opc, TCG_TYPE_I64,
- tcgv_i64_arg(a1), tcgv_i64_arg(a2), a3, a4);
-}
-
static void DNI tcg_gen_op5ii_i32(TCGOpcode opc, TCGv_i32 a1, TCGv_i32 a2,
TCGv_i32 a3, TCGArg a4, TCGArg a5)
{
@@ -994,6 +980,43 @@ static void gen_setcondi(TCGType type, TCGCond cond,
TCGTemp *dst,
gen_setcond(type, cond, dst, src1, tcg_constant_internal(type, src2));
}
+static void gen_sextract(TCGType type, TCGTemp *dst, TCGTemp *src,
+ unsigned int ofs, unsigned int len)
+{
+ int width = tcg_type_size(type) * 8;
+
+ tcg_debug_assert(ofs < width);
+ tcg_debug_assert(len > 0);
+ tcg_debug_assert(len <= width);
+ tcg_debug_assert(ofs + len <= width);
+
+ /* Canonicalize certain special cases, even if extract is supported. */
+ if (ofs + len == width) {
+ gen_sari(type, dst, src, width - len);
+ return;
+ }
+
+ if (TCG_TARGET_sextract_valid(type, ofs, len)) {
+ gen_op_ttii(INDEX_op_sextract, type, dst, src, ofs, len);
+ return;
+ }
+
+ /* Assume that sign-extension, if available, is cheaper than a shift. */
+ if (TCG_TARGET_sextract_valid(type, 0, ofs + len)) {
+ gen_op_ttii(INDEX_op_sextract, type, dst, src, 0, ofs + len);
+ gen_sari(type, dst, dst, ofs);
+ return;
+ }
+ if (TCG_TARGET_sextract_valid(type, 0, len)) {
+ gen_shri(type, dst, src, ofs);
+ gen_op_ttii(INDEX_op_sextract, type, dst, dst, 0, len);
+ return;
+ }
+
+ gen_shli(type, dst, src, width - len - ofs);
+ gen_sari(type, dst, dst, width - len);
+}
+
static void gen_shl(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
{
gen_op_ttt(INDEX_op_shl, type, dst, src1, src2);
@@ -1157,41 +1180,6 @@ void tcg_gen_deposit_z_i32(TCGv_i32 ret, TCGv_i32 arg,
}
}
-void tcg_gen_sextract_i32(TCGv_i32 ret, TCGv_i32 arg,
- unsigned int ofs, unsigned int len)
-{
- tcg_debug_assert(ofs < 32);
- tcg_debug_assert(len > 0);
- tcg_debug_assert(len <= 32);
- tcg_debug_assert(ofs + len <= 32);
-
- /* Canonicalize certain special cases, even if extract is supported. */
- if (ofs + len == 32) {
- tcg_gen_sari_i32(ret, arg, 32 - len);
- return;
- }
-
- if (TCG_TARGET_sextract_valid(TCG_TYPE_I32, ofs, len)) {
- tcg_gen_op4ii_i32(INDEX_op_sextract, ret, arg, ofs, len);
- return;
- }
-
- /* Assume that sign-extension, if available, is cheaper than a shift. */
- if (TCG_TARGET_sextract_valid(TCG_TYPE_I32, 0, ofs + len)) {
- tcg_gen_op4ii_i32(INDEX_op_sextract, ret, arg, 0, ofs + len);
- tcg_gen_sari_i32(ret, ret, ofs);
- return;
- }
- if (TCG_TARGET_sextract_valid(TCG_TYPE_I32, 0, len)) {
- tcg_gen_shri_i32(ret, arg, ofs);
- tcg_gen_op4ii_i32(INDEX_op_sextract, ret, ret, 0, len);
- return;
- }
-
- tcg_gen_shli_i32(ret, arg, 32 - len - ofs);
- tcg_gen_sari_i32(ret, ret, 32 - len);
-}
-
/*
* Extract 32-bits from a 64-bit input, ah:al, starting from ofs.
* Unlike tcg_gen_extract_i32 above, len is fixed at 32.
@@ -1861,41 +1849,6 @@ void tcg_gen_deposit_z_i64(TCGv_i64 ret, TCGv_i64 arg,
}
}
-void tcg_gen_sextract_i64(TCGv_i64 ret, TCGv_i64 arg,
- unsigned int ofs, unsigned int len)
-{
- tcg_debug_assert(ofs < 64);
- tcg_debug_assert(len > 0);
- tcg_debug_assert(len <= 64);
- tcg_debug_assert(ofs + len <= 64);
-
- /* Canonicalize certain special cases, even if sextract is supported. */
- if (ofs + len == 64) {
- tcg_gen_sari_i64(ret, arg, 64 - len);
- return;
- }
-
- if (TCG_TARGET_sextract_valid(TCG_TYPE_I64, ofs, len)) {
- tcg_gen_op4ii_i64(INDEX_op_sextract, ret, arg, ofs, len);
- return;
- }
-
- /* Assume that sign-extension, if available, is cheaper than a shift. */
- if (TCG_TARGET_sextract_valid(TCG_TYPE_I64, 0, ofs + len)) {
- tcg_gen_op4ii_i64(INDEX_op_sextract, ret, arg, 0, ofs + len);
- tcg_gen_sari_i64(ret, ret, ofs);
- return;
- }
- if (TCG_TARGET_sextract_valid(TCG_TYPE_I64, 0, len)) {
- tcg_gen_shri_i64(ret, arg, ofs);
- tcg_gen_op4ii_i64(INDEX_op_sextract, ret, ret, 0, len);
- return;
- }
-
- tcg_gen_shli_i64(ret, arg, 64 - len - ofs);
- tcg_gen_sari_i64(ret, ret, 64 - len);
-}
-
/*
* Extract 64 bits from a 128-bit input, ah:al, starting from ofs.
* Unlike tcg_gen_extract_i64 above, len is fixed at 64.
--
2.53.0
