On 11/3/24 09:26, Paolo Bonzini wrote:
These are translated to CBZ and CBNZ instructions, and the code generation part
of tcg_out_brcond checks that c is one of TCG_COND_EQ or TCG_COND_NE.
Fixes: 34aff3c2e06 ("tcg/aarch64: Generate CBNZ for TSTNE of UINT32_MAX",
2024-02-03)
Cc: Philippe Mathieu-Daudé <phi...@linaro.org>
Cc: Richard Henderson <richard.hender...@linaro.org>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
tcg/aarch64/tcg-target.c.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc
index dec8ecc1b65..6ed174bd172 100644
--- a/tcg/aarch64/tcg-target.c.inc
+++ b/tcg/aarch64/tcg-target.c.inc
@@ -1465,6 +1465,7 @@ static void tcg_out_brcond(TCGContext *s, TCGType ext,
TCGCond c, TCGArg a,
case TCG_COND_TSTNE:
/* tst xN,0xffffffff; b.ne L -> cbnz wN,L */
if (b_const && b == UINT32_MAX) {
+ c = (c == TCG_COND_TSTEQ ? TCG_COND_EQ : TCG_COND_NE);
Correct. Richard posted the same fix but using tcg_tst_eqne_cond:
https://lore.kernel.org/qemu-devel/20240309175102.726332-3-richard.hender...@linaro.org/
ext = TCG_TYPE_I32;
need_cmp = false;
break;
