Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 2 --
include/tcg/tcg-op-def2.h.inc | 1 +
tcg/tcg-op.c | 49 ++++++++++++++---------------------
3 files changed, 20 insertions(+), 32 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 7a0b87e13cc..265582c5a27 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -143,7 +143,6 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
/* 32 bit ops */
void tcg_gen_rotli_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2);
-void tcg_gen_rotri_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2);
void tcg_gen_deposit_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2,
unsigned int ofs, unsigned int len);
void tcg_gen_deposit_z_i32(TCGv_i32 ret, TCGv_i32 arg,
@@ -196,7 +195,6 @@ void tcg_gen_st_i32(TCGv_i32 arg1, TCGv_ptr arg2,
tcg_target_long offset);
/* 64 bit ops */
void tcg_gen_rotli_i64(TCGv_i64 ret, TCGv_i64 arg1, int64_t arg2);
-void tcg_gen_rotri_i64(TCGv_i64 ret, TCGv_i64 arg1, int64_t arg2);
void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2,
unsigned int ofs, unsigned int len);
void tcg_gen_deposit_z_i64(TCGv_i64 ret, TCGv_i64 arg,
diff --git a/include/tcg/tcg-op-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index f77598c5531..76263510228 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -21,6 +21,7 @@ DEF_RRI(clzi)
DEF_RRI(ctzi)
DEF_RRI(muli)
DEF_RRI(ori)
+DEF_RRI(rotri)
DEF_RRI(sari)
DEF_RRI(shli)
DEF_RRI(shri)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index abf6b64c3e5..f7531d321ca 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -848,6 +848,25 @@ static void gen_rotr(TCGType type, TCGTemp *dst, TCGTemp
*src1, TCGTemp *src2)
}
}
+static void gen_rotri(TCGType type, TCGTemp *dst, TCGTemp *src1, int64_t src2)
+{
+ int width = tcg_type_size(type) * 8;
+
+ tcg_debug_assert(src2 >= 0 && src2 < width);
+ if (src2 == 0) {
+ gen_mov(type, dst, src1);
+ } else if (tcg_op_supported(INDEX_op_rotr, type, 0)) {
+ gen_op_ttt(INDEX_op_rotr, type, dst, src1,
+ tcg_constant_internal(type, src2));
+ } else if (tcg_op_supported(INDEX_op_rotl, type, 0)) {
+ gen_op_ttt(INDEX_op_rotl, type, dst, src1,
+ tcg_constant_internal(type, width - src2));
+ } else {
+ /* Do not recurse with the rotri simplification. */
+ gen_op_ttti(INDEX_op_extract2, type, dst, src1, src1, src2);
+ }
+}
+
static void gen_sar(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
{
gen_op_ttt(INDEX_op_sar, type, dst, src1, src2);
@@ -1026,21 +1045,6 @@ void tcg_gen_rotli_i32(TCGv_i32 ret, TCGv_i32 arg1,
int32_t arg2)
}
}
-void tcg_gen_rotri_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2)
-{
- tcg_debug_assert(arg2 >= 0 && arg2 < 32);
- if (arg2 == 0) {
- tcg_gen_mov_i32(ret, arg1);
- } else if (tcg_op_supported(INDEX_op_rotr, TCG_TYPE_I32, 0)) {
- tcg_gen_op3_i32(INDEX_op_rotr, ret, arg1, tcg_constant_i32(arg2));
- } else if (tcg_op_supported(INDEX_op_rotl, TCG_TYPE_I32, 0)) {
- tcg_gen_op3_i32(INDEX_op_rotl, ret, arg1, tcg_constant_i32(32 - arg2));
- } else {
- /* Do not recurse with the rotri simplification. */
- tcg_gen_op4i_i32(INDEX_op_extract2, ret, arg1, arg1, arg2);
- }
-}
-
void tcg_gen_deposit_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2,
unsigned int ofs, unsigned int len)
{
@@ -1815,21 +1819,6 @@ void tcg_gen_rotli_i64(TCGv_i64 ret, TCGv_i64 arg1,
int64_t arg2)
}
}
-void tcg_gen_rotri_i64(TCGv_i64 ret, TCGv_i64 arg1, int64_t arg2)
-{
- tcg_debug_assert(arg2 >= 0 && arg2 < 64);
- if (arg2 == 0) {
- tcg_gen_mov_i64(ret, arg1);
- } else if (tcg_op_supported(INDEX_op_rotr, TCG_TYPE_I64, 0)) {
- tcg_gen_op3_i64(INDEX_op_rotr, ret, arg1, tcg_constant_i64(arg2));
- } else if (tcg_op_supported(INDEX_op_rotl, TCG_TYPE_I64, 0)) {
- tcg_gen_op3_i64(INDEX_op_rotl, ret, arg1, tcg_constant_i64(64 - arg2));
- } else {
- /* Do not recurse with the rotri simplification. */
- tcg_gen_op4i_i64(INDEX_op_extract2, ret, arg1, arg1, arg2);
- }
-}
-
void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2,
unsigned int ofs, unsigned int len)
{
--
2.53.0
