target-ppc: fix rlwimi, rlwinm, rlwnm for Clang-9
cover target-ppc: fix rlwimi, rlwinm, rlwnm for Clang-9
Until Clang v8, -Wtype-limits was kept for GCC compatibility but had no effect. With Clang v9, the flag is now implemented ( see
https://tinyurl.com/clang8-manual vs https://tinyurl.com/clang9-manual )
Starting with Clang v9, compiling with -Wtype-limits (default for QEMU) triggers the following errors on the ppc-softmmu and ppc-linux-user targets:
/root/qemu/target/ppc/translate.c:1894:18: error: result of comparison 'target_ulong' (aka 'unsigned int') <= 4294967295 is always true [-Werror,-Wtautological-type-limit-compare]
if (mask <= 0xffffffffu) {
~~~~ ^ ~~~~~~~~~~~
/root/qemu/target/ppc/translate.c:1941:18: error: result of comparison
'target_ulong' (aka 'unsigned int') <= 4294967295 is always true
[-Werror,-Wtautological-type-limit-compare]
if (mask <= 0xffffffffu) {
~~~~ ^ ~~~~~~~~~~~
/root/qemu/target/ppc/translate.c:1983:14: error: result of comparison
'target_ulong' (aka 'unsigned int') <= 4294967295 is always true
[-Werror,-Wtautological-type-limit-compare]
if (mask <= 0xffffffffu) {
~~~~ ^ ~~~~~~~~~~~The same error can be triggered with this small repro:
int main() {
unsigned int x = 1;
if ( x <= 0xffffffffu) return 1;
return 0;
}$ gcc test.c -Wtype-limits
[nothing]
$ clang-9 test.c -Wtype-limits
test.c:3:12: warning: result of comparison 'unsigned int' <= 4294967295
is always true [-Wtautological-type-limit-compare]
if ( x <= 0xffffffffu)
~ ^ ~~~~~~~~~~~
1 warning generated.
$ clang-9 test.c -Wtype-limits -Wno-tautological-type-limit-compare
[nothing]We could get away with the compilation error by adding the flag "-Wno-tautological-type-limit-compare", but I think we should avoid that to make sure the checks are applied to the rest of the code and warn us for logical errors in the future.
Looking at the code, the comparison is only needed for PPC64, since the else branch in PPC32 only has a "g_assert_not_reached();" This patch restructures the code so that PPC32 always runs the "true" branch.
I tried to keep the changes to a minimum, to make sure to not affect the semantics of the instructions. However, considering the target architecture, my testing has been limited. check-acceptance seems to be able to properly start a few linux kernels succesfully, and make check didn't complain on both ppc-softmmu and ppc64-softmmu.
Daniele Buono (1):
target-ppc: fix rlwimi, rlwinm, rlwnm for Clang-9
target/ppc/translate.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/1 target-ppc: fix rlwimi, rlwinm, rlwnm for Clang-9
Starting with Clang v9, -Wtype-limits is implemented and triggers a few "result of comparison is always true" errors when compiling PPC32 targets.
The comparisons seem to be necessary only on PPC64, since the else branch in PPC32 only has a "g_assert_not_reached();" in all cases.
This patch restructures the code so that PPC32 does not execute the check, while PPC64 works like before
--- target/ppc/translate.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)
target/ppc/translate.c +19 -15
@@ -1882,6 +1882,7 @@ static void gen_rlwimi(DisasContext *ctx)tcg_gen_deposit_tl (t_ra, t_ra, t_rs, sh, me - mb +1 ); }else {target_ulong mask; +TCGv_i32 t0;TCGv t1;#if defined(TARGET_PPC64 )
@@ -1891,20 +1892,20 @@ static void gen_rlwimi(DisasContext *ctx) mask =MASK (mb, me); t1 =tcg_temp_new (); +#if defined(TARGET_PPC64 )if (mask <=0xffffffffu ) { -TCGv_i32 t0 =tcg_temp_new_i32 (); +#endif + t0 =tcg_temp_new_i32 ();tcg_gen_trunc_tl_i32 (t0, t_rs);tcg_gen_rotli_i32 (t0, t0, sh);tcg_gen_extu_i32_tl (t1, t0);tcg_temp_free_i32 (t0); - }else {#if defined(TARGET_PPC64 ) + } else {tcg_gen_deposit_i64 (t1, t_rs, t_rs,32 ,32 );tcg_gen_rotli_i64 (t1, t1, sh); -#else -g_assert_not_reached (); -#endif } +#endif tcg_gen_andi_tl (t1, t1, mask);tcg_gen_andi_tl (t_ra, t_ra, ~mask);
@@ -1938,7 +1939,9 @@ static void gen_rlwinm(DisasContext *ctx) me +=32 ;#endif mask =MASK (mb, me); +#if defined(TARGET_PPC64 )if (mask <=0xffffffffu ) { +#endif if (sh ==0 ) {tcg_gen_andi_tl (t_ra, t_rs, mask); }else {
@@ -1949,15 +1952,13 @@ static void gen_rlwinm(DisasContext *ctx)tcg_gen_extu_i32_tl (t_ra, t0);tcg_temp_free_i32 (t0); } - }else {#if defined(TARGET_PPC64 ) + } else {tcg_gen_deposit_i64 (t_ra, t_rs, t_rs,32 ,32 );tcg_gen_rotli_i64 (t_ra, t_ra, sh);tcg_gen_andi_i64 (t_ra, t_ra, mask); -#else -g_assert_not_reached (); -#endif } +#endif }if (unlikely (Rc (ctx->opcode) !=0 )) {gen_set_Rc0 (ctx, t_ra);
@@ -1972,6 +1973,9 @@ static void gen_rlwnm(DisasContext *ctx)TCGv t_rb = cpu_gpr[rB (ctx->opcode)];uint32_t mb =MB (ctx->opcode);uint32_t me =ME (ctx->opcode); +TCGv_i32 t0; +TCGv_i32 t1; +target_ulong mask;#if defined(TARGET_PPC64 )
@@ -1980,9 +1984,11 @@ static void gen_rlwnm(DisasContext *ctx)#endif mask =MASK (mb, me); +#if defined(TARGET_PPC64 )if (mask <=0xffffffffu ) { -TCGv_i32 t0 =tcg_temp_new_i32 (); -TCGv_i32 t1 =tcg_temp_new_i32 (); +#endif + t0 =tcg_temp_new_i32 (); + t1 =tcg_temp_new_i32 ();tcg_gen_trunc_tl_i32 (t0, t_rb);tcg_gen_trunc_tl_i32 (t1, t_rs);tcg_gen_andi_i32 (t0, t0,0x1f );
@@ -1990,17 +1996,15 @@ static void gen_rlwnm(DisasContext *ctx)tcg_gen_extu_i32_tl (t_ra, t1);tcg_temp_free_i32 (t0);tcg_temp_free_i32 (t1); - }else {#if defined(TARGET_PPC64 ) + } else {TCGv_i64 t0 =tcg_temp_new_i64 ();tcg_gen_andi_i64 (t0, t_rb,0x1f );tcg_gen_deposit_i64 (t_ra, t_rs, t_rs,32 ,32 );tcg_gen_rotl_i64 (t_ra, t_ra, t0);tcg_temp_free_i64 (t0); -#else -g_assert_not_reached (); -#endif } +#endif tcg_gen_andi_tl (t_ra, t_ra, mask);
Signature · 1 line
2.26.2
Quoted 11 lines · Daniele Buono
Starting with Clang v9, -Wtype-limits is implemented and triggers a few "result of comparison is always true" errors when compiling PPC32 targets.
The comparisons seem to be necessary only on PPC64, since the else branch in PPC32 only has a "
g_assert_not_reached();" in all cases.This patch restructures the code so that PPC32 does not execute the check, while PPC64 works like before
Signed-off-by Daniele Buono <[email protected]>
Urgh. #ifdefs intertangled with if statements gets pretty ugly. But, then, it's already pretty ugly, so, applied.
Quoted 114 lines
--- target/ppc/translate.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)target/ppc/translate.c +19
-15@@ -1882,6 +1882,7 @@ static void gen_rlwimi(DisasContext *ctx)tcg_gen_deposit_tl (t_ra, t_ra, t_rs, sh, me - mb +1 ); }else {target_ulong mask; +TCGv_i32 t0;TCGv t1;#if defined(TARGET_PPC64 )@@ -1891,20 +1892,20 @@ static void gen_rlwimi(DisasContext *ctx) mask =MASK (mb, me); t1 =tcg_temp_new (); +#if defined(TARGET_PPC64 )if (mask <=0xffffffffu ) { -TCGv_i32 t0 =tcg_temp_new_i32 (); +#endif + t0 =tcg_temp_new_i32 ();tcg_gen_trunc_tl_i32 (t0, t_rs);tcg_gen_rotli_i32 (t0, t0, sh);tcg_gen_extu_i32_tl (t1, t0);tcg_temp_free_i32 (t0); - }else {#if defined(TARGET_PPC64 ) + } else {tcg_gen_deposit_i64 (t1, t_rs, t_rs,32 ,32 );tcg_gen_rotli_i64 (t1, t1, sh); -#else -g_assert_not_reached (); -#endif } +#endif tcg_gen_andi_tl (t1, t1, mask);tcg_gen_andi_tl (t_ra, t_ra, ~mask);@@ -1938,7 +1939,9 @@ static void gen_rlwinm(DisasContext *ctx) me +=32 ;#endif mask =MASK (mb, me); +#if defined(TARGET_PPC64 )if (mask <=0xffffffffu ) { +#endif if (sh ==0 ) {tcg_gen_andi_tl (t_ra, t_rs, mask); }else {@@ -1949,15 +1952,13 @@ static void gen_rlwinm(DisasContext *ctx)tcg_gen_extu_i32_tl (t_ra, t0);tcg_temp_free_i32 (t0); } - }else {#if defined(TARGET_PPC64 ) + } else {tcg_gen_deposit_i64 (t_ra, t_rs, t_rs,32 ,32 );tcg_gen_rotli_i64 (t_ra, t_ra, sh);tcg_gen_andi_i64 (t_ra, t_ra, mask); -#else -g_assert_not_reached (); -#endif } +#endif }if (unlikely (Rc (ctx->opcode) !=0 )) {gen_set_Rc0 (ctx, t_ra);@@ -1972,6 +1973,9 @@ static void gen_rlwnm(DisasContext *ctx)TCGv t_rb = cpu_gpr[rB (ctx->opcode)];uint32_t mb =MB (ctx->opcode);uint32_t me =ME (ctx->opcode); +TCGv_i32 t0; +TCGv_i32 t1; +target_ulong mask;#if defined(TARGET_PPC64 )@@ -1980,9 +1984,11 @@ static void gen_rlwnm(DisasContext *ctx)#endif mask =MASK (mb, me); +#if defined(TARGET_PPC64 )if (mask <=0xffffffffu ) { -TCGv_i32 t0 =tcg_temp_new_i32 (); -TCGv_i32 t1 =tcg_temp_new_i32 (); +#endif + t0 =tcg_temp_new_i32 (); + t1 =tcg_temp_new_i32 ();tcg_gen_trunc_tl_i32 (t0, t_rb);tcg_gen_trunc_tl_i32 (t1, t_rs);tcg_gen_andi_i32 (t0, t0,0x1f );@@ -1990,17 +1996,15 @@ static void gen_rlwnm(DisasContext *ctx)tcg_gen_extu_i32_tl (t_ra, t1);tcg_temp_free_i32 (t0);tcg_temp_free_i32 (t1); - }else {#if defined(TARGET_PPC64 ) + } else {TCGv_i64 t0 =tcg_temp_new_i64 ();tcg_gen_andi_i64 (t0, t_rb,0x1f );tcg_gen_deposit_i64 (t_ra, t_rs, t_rs,32 ,32 );tcg_gen_rotl_i64 (t_ra, t_ra, t0);tcg_temp_free_i64 (t0); -#else -g_assert_not_reached (); -#endif } +#endif tcg_gen_andi_tl (t_ra, t_ra, mask);
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Quoted 8 lines · David Gibson
Quoted 7 lines · Daniele Buono
Starting with Clang v9, -Wtype-limits is implemented and triggers a few "result of comparison is always true" errors when compiling PPC32 targets.
The comparisons seem to be necessary only on PPC64, since the else branch in PPC32 only has a "
g_assert_not_reached();" in all cases.
Quoted 8 lines
Quoted 4 lines
This patch restructures the code so that PPC32 does not execute the check, while PPC64 works like before
Signed-off-by Daniele Buono <[email protected]>Urgh. #ifdefs intertangled with if statements gets pretty ugly. But, then, it's already pretty ugly, so, applied.
Agreed, it's very ugly. After I sent the patch I thought of an alternative that looks like this:
bool mask_in_32b = true;
#if defined(TARGET_PPC64)
if (mask > 0xffffffffu)
mask_in_32b = false;
#endif
if (mask_in_32b) {
/* Original if-else untouched using mask_in_32b instead of mask*/
It does have an additional if, but with a bit of luck the compiler may optimize it out (at least for the 32bit case). If you think the final outcome may be better, let me know and I'll send a patch v2 like that.
Quoted 115 lines
Quoted 114 lines
--- target/ppc/translate.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)target/ppc/translate.c +19
-15@@ -1882,6 +1882,7 @@ static void gen_rlwimi(DisasContext *ctx)tcg_gen_deposit_tl (t_ra, t_ra, t_rs, sh, me - mb +1 ); }else {target_ulong mask; +TCGv_i32 t0;TCGv t1;#if defined(TARGET_PPC64 )@@ -1891,20 +1892,20 @@ static void gen_rlwimi(DisasContext *ctx) mask =MASK (mb, me); t1 =tcg_temp_new (); +#if defined(TARGET_PPC64 )if (mask <=0xffffffffu ) { -TCGv_i32 t0 =tcg_temp_new_i32 (); +#endif + t0 =tcg_temp_new_i32 ();tcg_gen_trunc_tl_i32 (t0, t_rs);tcg_gen_rotli_i32 (t0, t0, sh);tcg_gen_extu_i32_tl (t1, t0);tcg_temp_free_i32 (t0); - }else {#if defined(TARGET_PPC64 ) + } else {tcg_gen_deposit_i64 (t1, t_rs, t_rs,32 ,32 );tcg_gen_rotli_i64 (t1, t1, sh); -#else -g_assert_not_reached (); -#endif } +#endif tcg_gen_andi_tl (t1, t1, mask);tcg_gen_andi_tl (t_ra, t_ra, ~mask);@@ -1938,7 +1939,9 @@ static void gen_rlwinm(DisasContext *ctx) me +=32 ;#endif mask =MASK (mb, me); +#if defined(TARGET_PPC64 )if (mask <=0xffffffffu ) { +#endif if (sh ==0 ) {tcg_gen_andi_tl (t_ra, t_rs, mask); }else {@@ -1949,15 +1952,13 @@ static void gen_rlwinm(DisasContext *ctx)tcg_gen_extu_i32_tl (t_ra, t0);tcg_temp_free_i32 (t0); } - }else {#if defined(TARGET_PPC64 ) + } else {tcg_gen_deposit_i64 (t_ra, t_rs, t_rs,32 ,32 );tcg_gen_rotli_i64 (t_ra, t_ra, sh);tcg_gen_andi_i64 (t_ra, t_ra, mask); -#else -g_assert_not_reached (); -#endif } +#endif }if (unlikely (Rc (ctx->opcode) !=0 )) {gen_set_Rc0 (ctx, t_ra);@@ -1972,6 +1973,9 @@ static void gen_rlwnm(DisasContext *ctx)TCGv t_rb = cpu_gpr[rB (ctx->opcode)];uint32_t mb =MB (ctx->opcode);uint32_t me =ME (ctx->opcode); +TCGv_i32 t0; +TCGv_i32 t1; +target_ulong mask;#if defined(TARGET_PPC64 )@@ -1980,9 +1984,11 @@ static void gen_rlwnm(DisasContext *ctx)#endif mask =MASK (mb, me); +#if defined(TARGET_PPC64 )if (mask <=0xffffffffu ) { -TCGv_i32 t0 =tcg_temp_new_i32 (); -TCGv_i32 t1 =tcg_temp_new_i32 (); +#endif + t0 =tcg_temp_new_i32 (); + t1 =tcg_temp_new_i32 ();tcg_gen_trunc_tl_i32 (t0, t_rb);tcg_gen_trunc_tl_i32 (t1, t_rs);tcg_gen_andi_i32 (t0, t0,0x1f );@@ -1990,17 +1996,15 @@ static void gen_rlwnm(DisasContext *ctx)tcg_gen_extu_i32_tl (t_ra, t1);tcg_temp_free_i32 (t0);tcg_temp_free_i32 (t1); - }else {#if defined(TARGET_PPC64 ) + } else {TCGv_i64 t0 =tcg_temp_new_i64 ();tcg_gen_andi_i64 (t0, t_rb,0x1f );tcg_gen_deposit_i64 (t_ra, t_rs, t_rs,32 ,32 );tcg_gen_rotl_i64 (t_ra, t_ra, t0);tcg_temp_free_i64 (t0); -#else -g_assert_not_reached (); -#endif } +#endif tcg_gen_andi_tl (t_ra, t_ra, mask);
Quoted 27 lines · Daniele Buono
Quoted 8 lines · David Gibson
Quoted 7 lines · Daniele Buono
Starting with Clang v9, -Wtype-limits is implemented and triggers a few "result of comparison is always true" errors when compiling PPC32 targets.
The comparisons seem to be necessary only on PPC64, since the else branch in PPC32 only has a "
g_assert_not_reached();" in all cases.Quoted 8 lines
Quoted 4 lines
This patch restructures the code so that PPC32 does not execute the check, while PPC64 works like before
Signed-off-by Daniele Buono <[email protected]>Urgh. #ifdefs intertangled with if statements gets pretty ugly. But, then, it's already pretty ugly, so, applied.
Agreed, it's very ugly. After I sent the patch I thought of an alternative that looks like this:
bool
mask_in_32b= true;#if
defined(TARGET_PPC64)
if (mask >0xffffffffu)
mask_in_32b= false;
#endif
Quoted 7 lines
if (
mask_in_32b) {
/* Original if-else untouched usingmask_in_32binstead of mask*/It does have an additional if, but with a bit of luck the compiler may optimize it out (at least for the 32bit case).
If you think the final outcome may be better, let me know and I'll send a patch v2 like that.
Yeah, that would be a bit nicer. Please send the v2.
Quoted 110 lines
Quoted 109 lines
Quoted 108 lines
--- target/ppc/translate.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)target/ppc/translate.c +19
-15@@ -1882,6 +1882,7 @@ static void gen_rlwimi(DisasContext *ctx)tcg_gen_deposit_tl (t_ra, t_ra, t_rs, sh, me - mb +1 ); }else {target_ulong mask; +TCGv_i32 t0;TCGv t1;#if defined(TARGET_PPC64 )@@ -1891,20 +1892,20 @@ static void gen_rlwimi(DisasContext *ctx) mask =MASK (mb, me); t1 =tcg_temp_new (); +#if defined(TARGET_PPC64 )if (mask <=0xffffffffu ) { -TCGv_i32 t0 =tcg_temp_new_i32 (); +#endif + t0 =tcg_temp_new_i32 ();tcg_gen_trunc_tl_i32 (t0, t_rs);tcg_gen_rotli_i32 (t0, t0, sh);tcg_gen_extu_i32_tl (t1, t0);tcg_temp_free_i32 (t0); - }else {#if defined(TARGET_PPC64 ) + } else {tcg_gen_deposit_i64 (t1, t_rs, t_rs,32 ,32 );tcg_gen_rotli_i64 (t1, t1, sh); -#else -g_assert_not_reached (); -#endif } +#endif tcg_gen_andi_tl (t1, t1, mask);tcg_gen_andi_tl (t_ra, t_ra, ~mask);@@ -1938,7 +1939,9 @@ static void gen_rlwinm(DisasContext *ctx) me +=32 ;#endif mask =MASK (mb, me); +#if defined(TARGET_PPC64 )if (mask <=0xffffffffu ) { +#endif if (sh ==0 ) {tcg_gen_andi_tl (t_ra, t_rs, mask); }else {@@ -1949,15 +1952,13 @@ static void gen_rlwinm(DisasContext *ctx)tcg_gen_extu_i32_tl (t_ra, t0);tcg_temp_free_i32 (t0); } - }else {#if defined(TARGET_PPC64 ) + } else {tcg_gen_deposit_i64 (t_ra, t_rs, t_rs,32 ,32 );tcg_gen_rotli_i64 (t_ra, t_ra, sh);tcg_gen_andi_i64 (t_ra, t_ra, mask); -#else -g_assert_not_reached (); -#endif } +#endif }if (unlikely (Rc (ctx->opcode) !=0 )) {gen_set_Rc0 (ctx, t_ra);@@ -1972,6 +1973,9 @@ static void gen_rlwnm(DisasContext *ctx)TCGv t_rb = cpu_gpr[rB (ctx->opcode)];uint32_t mb =MB (ctx->opcode);uint32_t me =ME (ctx->opcode); +TCGv_i32 t0; +TCGv_i32 t1; +target_ulong mask;#if defined(TARGET_PPC64 )@@ -1980,9 +1984,11 @@ static void gen_rlwnm(DisasContext *ctx)#endif mask =MASK (mb, me); +#if defined(TARGET_PPC64 )if (mask <=0xffffffffu ) { -TCGv_i32 t0 =tcg_temp_new_i32 (); -TCGv_i32 t1 =tcg_temp_new_i32 (); +#endif + t0 =tcg_temp_new_i32 (); + t1 =tcg_temp_new_i32 ();tcg_gen_trunc_tl_i32 (t0, t_rb);tcg_gen_trunc_tl_i32 (t1, t_rs);tcg_gen_andi_i32 (t0, t0,0x1f );@@ -1990,17 +1996,15 @@ static void gen_rlwnm(DisasContext *ctx)tcg_gen_extu_i32_tl (t_ra, t1);tcg_temp_free_i32 (t0);tcg_temp_free_i32 (t1); - }else {#if defined(TARGET_PPC64 ) + } else {TCGv_i64 t0 =tcg_temp_new_i64 ();tcg_gen_andi_i64 (t0, t_rb,0x1f );tcg_gen_deposit_i64 (t_ra, t_rs, t_rs,32 ,32 );tcg_gen_rotl_i64 (t_ra, t_ra, t0);tcg_temp_free_i64 (t0); -#else -g_assert_not_reached (); -#endif } +#endif tcg_gen_andi_tl (t_ra, t_ra, mask);
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson