mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 09:55:55 +00:00
tcg: Fix integral argument type to tcg_gen_rot[rl]i_i{32,64}
For the benefit of compatibility of function pointer types,
we have standardized on int32_t and int64_t as the integral
argument to tcg expanders.
We converted most of them in 474b2e8f0f
, but missed the rotates.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
ac09ae627e
commit
07dada0336
|
@ -297,9 +297,9 @@ void tcg_gen_ctzi_i32(TCGv_i32 ret, TCGv_i32 arg1, uint32_t arg2);
|
||||||
void tcg_gen_clrsb_i32(TCGv_i32 ret, TCGv_i32 arg);
|
void tcg_gen_clrsb_i32(TCGv_i32 ret, TCGv_i32 arg);
|
||||||
void tcg_gen_ctpop_i32(TCGv_i32 a1, TCGv_i32 a2);
|
void tcg_gen_ctpop_i32(TCGv_i32 a1, TCGv_i32 a2);
|
||||||
void tcg_gen_rotl_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
|
void tcg_gen_rotl_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
|
||||||
void tcg_gen_rotli_i32(TCGv_i32 ret, TCGv_i32 arg1, unsigned arg2);
|
void tcg_gen_rotli_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2);
|
||||||
void tcg_gen_rotr_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
|
void tcg_gen_rotr_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
|
||||||
void tcg_gen_rotri_i32(TCGv_i32 ret, TCGv_i32 arg1, unsigned 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,
|
void tcg_gen_deposit_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2,
|
||||||
unsigned int ofs, unsigned int len);
|
unsigned int ofs, unsigned int len);
|
||||||
void tcg_gen_deposit_z_i32(TCGv_i32 ret, TCGv_i32 arg,
|
void tcg_gen_deposit_z_i32(TCGv_i32 ret, TCGv_i32 arg,
|
||||||
|
@ -493,9 +493,9 @@ void tcg_gen_ctzi_i64(TCGv_i64 ret, TCGv_i64 arg1, uint64_t arg2);
|
||||||
void tcg_gen_clrsb_i64(TCGv_i64 ret, TCGv_i64 arg);
|
void tcg_gen_clrsb_i64(TCGv_i64 ret, TCGv_i64 arg);
|
||||||
void tcg_gen_ctpop_i64(TCGv_i64 a1, TCGv_i64 a2);
|
void tcg_gen_ctpop_i64(TCGv_i64 a1, TCGv_i64 a2);
|
||||||
void tcg_gen_rotl_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
|
void tcg_gen_rotl_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
|
||||||
void tcg_gen_rotli_i64(TCGv_i64 ret, TCGv_i64 arg1, unsigned arg2);
|
void tcg_gen_rotli_i64(TCGv_i64 ret, TCGv_i64 arg1, int64_t arg2);
|
||||||
void tcg_gen_rotr_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
|
void tcg_gen_rotr_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
|
||||||
void tcg_gen_rotri_i64(TCGv_i64 ret, TCGv_i64 arg1, unsigned 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,
|
void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2,
|
||||||
unsigned int ofs, unsigned int len);
|
unsigned int ofs, unsigned int len);
|
||||||
void tcg_gen_deposit_z_i64(TCGv_i64 ret, TCGv_i64 arg,
|
void tcg_gen_deposit_z_i64(TCGv_i64 ret, TCGv_i64 arg,
|
||||||
|
|
16
tcg/tcg-op.c
16
tcg/tcg-op.c
|
@ -540,9 +540,9 @@ void tcg_gen_rotl_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void tcg_gen_rotli_i32(TCGv_i32 ret, TCGv_i32 arg1, unsigned arg2)
|
void tcg_gen_rotli_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2)
|
||||||
{
|
{
|
||||||
tcg_debug_assert(arg2 < 32);
|
tcg_debug_assert(arg2 >= 0 && arg2 < 32);
|
||||||
/* some cases can be optimized here */
|
/* some cases can be optimized here */
|
||||||
if (arg2 == 0) {
|
if (arg2 == 0) {
|
||||||
tcg_gen_mov_i32(ret, arg1);
|
tcg_gen_mov_i32(ret, arg1);
|
||||||
|
@ -580,9 +580,9 @@ void tcg_gen_rotr_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void tcg_gen_rotri_i32(TCGv_i32 ret, TCGv_i32 arg1, unsigned arg2)
|
void tcg_gen_rotri_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2)
|
||||||
{
|
{
|
||||||
tcg_debug_assert(arg2 < 32);
|
tcg_debug_assert(arg2 >= 0 && arg2 < 32);
|
||||||
/* some cases can be optimized here */
|
/* some cases can be optimized here */
|
||||||
if (arg2 == 0) {
|
if (arg2 == 0) {
|
||||||
tcg_gen_mov_i32(ret, arg1);
|
tcg_gen_mov_i32(ret, arg1);
|
||||||
|
@ -1962,9 +1962,9 @@ void tcg_gen_rotl_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void tcg_gen_rotli_i64(TCGv_i64 ret, TCGv_i64 arg1, unsigned arg2)
|
void tcg_gen_rotli_i64(TCGv_i64 ret, TCGv_i64 arg1, int64_t arg2)
|
||||||
{
|
{
|
||||||
tcg_debug_assert(arg2 < 64);
|
tcg_debug_assert(arg2 >= 0 && arg2 < 64);
|
||||||
/* some cases can be optimized here */
|
/* some cases can be optimized here */
|
||||||
if (arg2 == 0) {
|
if (arg2 == 0) {
|
||||||
tcg_gen_mov_i64(ret, arg1);
|
tcg_gen_mov_i64(ret, arg1);
|
||||||
|
@ -2001,9 +2001,9 @@ void tcg_gen_rotr_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void tcg_gen_rotri_i64(TCGv_i64 ret, TCGv_i64 arg1, unsigned arg2)
|
void tcg_gen_rotri_i64(TCGv_i64 ret, TCGv_i64 arg1, int64_t arg2)
|
||||||
{
|
{
|
||||||
tcg_debug_assert(arg2 < 64);
|
tcg_debug_assert(arg2 >= 0 && arg2 < 64);
|
||||||
/* some cases can be optimized here */
|
/* some cases can be optimized here */
|
||||||
if (arg2 == 0) {
|
if (arg2 == 0) {
|
||||||
tcg_gen_mov_i64(ret, arg1);
|
tcg_gen_mov_i64(ret, arg1);
|
||||||
|
|
Loading…
Reference in a new issue