From: Mark Wielaard <mark@klomp.org>
Date: Tue, 24 Dec 2024 23:36:53 +0000 (+0100)
Subject: none/tests/riscv64/integer.c: replace zero by a1
X-Git-Tag: VALGRIND_3_25_0~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e54645bb7ad1147e6b14b3f7bcf648efe85c0036;p=thirdparty%2Fvalgrind.git

none/tests/riscv64/integer.c: replace zero by a1

Using zero will produce an gas Error: illegal operands `la zero,0'
https://sourceware.org/bugzilla/show_bug.cgi?id=32496

Simplest seems to be to replace the usage of "zero" in the branch
instruction tests by "a1".  It seems that does test something similar
that isn't tested before.
---

diff --git a/none/tests/riscv64/integer.c b/none/tests/riscv64/integer.c
index d0c8828e9..0b5638b23 100644
--- a/none/tests/riscv64/integer.c
+++ b/none/tests/riscv64/integer.c
@@ -129,10 +129,10 @@ static void test_integer_shared(void)
    TESTINST_0_2_Bxx_COND(4, "beq a0, a1, 1f", 0, 1, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "beq a0, a1, 1f", 1, 0, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "beq a0, a1, 1f", 1, 1, a0, a1);
-   TESTINST_0_2_Bxx_COND(4, "beq a0, zero, 1f", 0, 0, a0, zero);
-   TESTINST_0_2_Bxx_COND(4, "beq a0, zero, 1f", 1, 0, a0, zero);
-   TESTINST_0_2_Bxx_COND(4, "beq zero, a0, 1f", 0, 0, zero, a0);
-   TESTINST_0_2_Bxx_COND(4, "beq zero, a0, 1f", 0, 1, zero, a0);
+   TESTINST_0_2_Bxx_COND(4, "beq a0, a1, 1f", 0, 0, a0, a1);
+   TESTINST_0_2_Bxx_COND(4, "beq a0, a1, 1f", 1, 0, a0, a1);
+   TESTINST_0_2_Bxx_COND(4, "beq a1, a0, 1f", 0, 0, a1, a0);
+   TESTINST_0_2_Bxx_COND(4, "beq a1, a0, 1f", 0, 1, a1, a0);
    TESTINST_0_2_Bxx_COND(4, "beq a0, a1, 1f", 0, -1, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "beq a0, a1, 1f", -1, 0, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "beq a0, a1, 1f", -1, -1, a0, a1);
@@ -142,10 +142,10 @@ static void test_integer_shared(void)
    TESTINST_0_2_Bxx_COND(4, "bne a0, a1, 1f", 0, 1, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bne a0, a1, 1f", 1, 0, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bne a0, a1, 1f", 1, 1, a0, a1);
-   TESTINST_0_2_Bxx_COND(4, "bne a0, zero, 1f", 0, 0, a0, zero);
-   TESTINST_0_2_Bxx_COND(4, "bne a0, zero, 1f", 1, 0, a0, zero);
-   TESTINST_0_2_Bxx_COND(4, "bne zero, a0, 1f", 0, 0, zero, a0);
-   TESTINST_0_2_Bxx_COND(4, "bne zero, a0, 1f", 0, 1, zero, a0);
+   TESTINST_0_2_Bxx_COND(4, "bne a0, a1, 1f", 0, 0, a0, a1);
+   TESTINST_0_2_Bxx_COND(4, "bne a0, a1, 1f", 1, 0, a0, a1);
+   TESTINST_0_2_Bxx_COND(4, "bne a1, a0, 1f", 0, 0, a1, a0);
+   TESTINST_0_2_Bxx_COND(4, "bne a1, a0, 1f", 0, 1, a1, a0);
    TESTINST_0_2_Bxx_COND(4, "bne a0, a1, 1f", 0, -1, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bne a0, a1, 1f", -1, 0, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bne a0, a1, 1f", -1, -1, a0, a1);
@@ -155,10 +155,10 @@ static void test_integer_shared(void)
    TESTINST_0_2_Bxx_COND(4, "blt a0, a1, 1f", 0, 1, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "blt a0, a1, 1f", 1, 0, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "blt a0, a1, 1f", 1, 1, a0, a1);
-   TESTINST_0_2_Bxx_COND(4, "blt a0, zero, 1f", 0, 0, a0, zero);
-   TESTINST_0_2_Bxx_COND(4, "blt a0, zero, 1f", 1, 0, a0, zero);
-   TESTINST_0_2_Bxx_COND(4, "blt zero, a0, 1f", 0, 0, zero, a0);
-   TESTINST_0_2_Bxx_COND(4, "blt zero, a0, 1f", 0, 1, zero, a0);
+   TESTINST_0_2_Bxx_COND(4, "blt a0, a1, 1f", 0, 0, a0, a1);
+   TESTINST_0_2_Bxx_COND(4, "blt a0, a1, 1f", 1, 0, a0, a1);
+   TESTINST_0_2_Bxx_COND(4, "blt a1, a0, 1f", 0, 0, a1, a0);
+   TESTINST_0_2_Bxx_COND(4, "blt a1, a0, 1f", 0, 1, a1, a0);
    TESTINST_0_2_Bxx_COND(4, "blt a0, a1, 1f", 0, -1, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "blt a0, a1, 1f", -1, 0, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "blt a0, a1, 1f", -1, -1, a0, a1);
@@ -168,10 +168,10 @@ static void test_integer_shared(void)
    TESTINST_0_2_Bxx_COND(4, "bge a0, a1, 1f", 0, 1, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bge a0, a1, 1f", 1, 0, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bge a0, a1, 1f", 1, 1, a0, a1);
-   TESTINST_0_2_Bxx_COND(4, "bge a0, zero, 1f", 0, 0, a0, zero);
-   TESTINST_0_2_Bxx_COND(4, "bge a0, zero, 1f", 1, 0, a0, zero);
-   TESTINST_0_2_Bxx_COND(4, "bge zero, a0, 1f", 0, 0, zero, a0);
-   TESTINST_0_2_Bxx_COND(4, "bge zero, a0, 1f", 0, 1, zero, a0);
+   TESTINST_0_2_Bxx_COND(4, "bge a0, a1, 1f", 0, 0, a0, a1);
+   TESTINST_0_2_Bxx_COND(4, "bge a0, a1, 1f", 1, 0, a0, a1);
+   TESTINST_0_2_Bxx_COND(4, "bge a1, a0, 1f", 0, 0, a1, a0);
+   TESTINST_0_2_Bxx_COND(4, "bge a1, a0, 1f", 0, 1, a1, a0);
    TESTINST_0_2_Bxx_COND(4, "bge a0, a1, 1f", 0, -1, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bge a0, a1, 1f", -1, 0, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bge a0, a1, 1f", -1, -1, a0, a1);
@@ -181,10 +181,10 @@ static void test_integer_shared(void)
    TESTINST_0_2_Bxx_COND(4, "bltu a0, a1, 1f", 0, 1, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bltu a0, a1, 1f", 1, 0, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bltu a0, a1, 1f", 1, 1, a0, a1);
-   TESTINST_0_2_Bxx_COND(4, "bltu a0, zero, 1f", 0, 0, a0, zero);
-   TESTINST_0_2_Bxx_COND(4, "bltu a0, zero, 1f", 1, 0, a0, zero);
-   TESTINST_0_2_Bxx_COND(4, "bltu zero, a0, 1f", 0, 0, zero, a0);
-   TESTINST_0_2_Bxx_COND(4, "bltu zero, a0, 1f", 0, 1, zero, a0);
+   TESTINST_0_2_Bxx_COND(4, "bltu a0, a1, 1f", 0, 0, a0, a1);
+   TESTINST_0_2_Bxx_COND(4, "bltu a0, a1, 1f", 1, 0, a0, a1);
+   TESTINST_0_2_Bxx_COND(4, "bltu a1, a0, 1f", 0, 0, a1, a0);
+   TESTINST_0_2_Bxx_COND(4, "bltu a1, a0, 1f", 0, 1, a1, a0);
    TESTINST_0_2_Bxx_COND(4, "bltu a0, a1, 1f", 0, -1, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bltu a0, a1, 1f", -1, 0, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bltu a0, a1, 1f", -1, -1, a0, a1);
@@ -194,10 +194,10 @@ static void test_integer_shared(void)
    TESTINST_0_2_Bxx_COND(4, "bgeu a0, a1, 1f", 0, 1, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bgeu a0, a1, 1f", 1, 0, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bgeu a0, a1, 1f", 1, 1, a0, a1);
-   TESTINST_0_2_Bxx_COND(4, "bgeu a0, zero, 1f", 0, 0, a0, zero);
-   TESTINST_0_2_Bxx_COND(4, "bgeu a0, zero, 1f", 1, 0, a0, zero);
-   TESTINST_0_2_Bxx_COND(4, "bgeu zero, a0, 1f", 0, 0, zero, a0);
-   TESTINST_0_2_Bxx_COND(4, "bgeu zero, a0, 1f", 0, 1, zero, a0);
+   TESTINST_0_2_Bxx_COND(4, "bgeu a0, a1, 1f", 0, 0, a0, a1);
+   TESTINST_0_2_Bxx_COND(4, "bgeu a0, a1, 1f", 1, 0, a0, a1);
+   TESTINST_0_2_Bxx_COND(4, "bgeu a1, a0, 1f", 0, 0, a1, a0);
+   TESTINST_0_2_Bxx_COND(4, "bgeu a1, a0, 1f", 0, 1, a1, a0);
    TESTINST_0_2_Bxx_COND(4, "bgeu a0, a1, 1f", 0, -1, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bgeu a0, a1, 1f", -1, 0, a0, a1);
    TESTINST_0_2_Bxx_COND(4, "bgeu a0, a1, 1f", -1, -1, a0, a1);
diff --git a/none/tests/riscv64/integer.stdout.exp b/none/tests/riscv64/integer.stdout.exp
index 6a3bf8936..1a4d89b7a 100644
--- a/none/tests/riscv64/integer.stdout.exp
+++ b/none/tests/riscv64/integer.stdout.exp
@@ -292,17 +292,17 @@ beq a0, a1, 1f ::
 beq a0, a1, 1f ::
   inputs: a0=1, a1=1
   branch: taken
-beq a0, zero, 1f ::
-  inputs: a0=0, zero=0
+beq a0, a1, 1f ::
+  inputs: a0=0, a1=0
   branch: taken
-beq a0, zero, 1f ::
-  inputs: a0=1, zero=0
+beq a0, a1, 1f ::
+  inputs: a0=1, a1=0
   branch: not taken
-beq zero, a0, 1f ::
-  inputs: zero=0, a0=0
+beq a1, a0, 1f ::
+  inputs: a1=0, a0=0
   branch: taken
-beq zero, a0, 1f ::
-  inputs: zero=0, a0=1
+beq a1, a0, 1f ::
+  inputs: a1=0, a0=1
   branch: not taken
 beq a0, a1, 1f ::
   inputs: a0=0, a1=-1
@@ -325,17 +325,17 @@ bne a0, a1, 1f ::
 bne a0, a1, 1f ::
   inputs: a0=1, a1=1
   branch: not taken
-bne a0, zero, 1f ::
-  inputs: a0=0, zero=0
+bne a0, a1, 1f ::
+  inputs: a0=0, a1=0
   branch: not taken
-bne a0, zero, 1f ::
-  inputs: a0=1, zero=0
+bne a0, a1, 1f ::
+  inputs: a0=1, a1=0
   branch: taken
-bne zero, a0, 1f ::
-  inputs: zero=0, a0=0
+bne a1, a0, 1f ::
+  inputs: a1=0, a0=0
   branch: not taken
-bne zero, a0, 1f ::
-  inputs: zero=0, a0=1
+bne a1, a0, 1f ::
+  inputs: a1=0, a0=1
   branch: taken
 bne a0, a1, 1f ::
   inputs: a0=0, a1=-1
@@ -358,17 +358,17 @@ blt a0, a1, 1f ::
 blt a0, a1, 1f ::
   inputs: a0=1, a1=1
   branch: not taken
-blt a0, zero, 1f ::
-  inputs: a0=0, zero=0
+blt a0, a1, 1f ::
+  inputs: a0=0, a1=0
   branch: not taken
-blt a0, zero, 1f ::
-  inputs: a0=1, zero=0
+blt a0, a1, 1f ::
+  inputs: a0=1, a1=0
   branch: not taken
-blt zero, a0, 1f ::
-  inputs: zero=0, a0=0
+blt a1, a0, 1f ::
+  inputs: a1=0, a0=0
   branch: not taken
-blt zero, a0, 1f ::
-  inputs: zero=0, a0=1
+blt a1, a0, 1f ::
+  inputs: a1=0, a0=1
   branch: taken
 blt a0, a1, 1f ::
   inputs: a0=0, a1=-1
@@ -391,17 +391,17 @@ bge a0, a1, 1f ::
 bge a0, a1, 1f ::
   inputs: a0=1, a1=1
   branch: taken
-bge a0, zero, 1f ::
-  inputs: a0=0, zero=0
+bge a0, a1, 1f ::
+  inputs: a0=0, a1=0
   branch: taken
-bge a0, zero, 1f ::
-  inputs: a0=1, zero=0
+bge a0, a1, 1f ::
+  inputs: a0=1, a1=0
   branch: taken
-bge zero, a0, 1f ::
-  inputs: zero=0, a0=0
+bge a1, a0, 1f ::
+  inputs: a1=0, a0=0
   branch: taken
-bge zero, a0, 1f ::
-  inputs: zero=0, a0=1
+bge a1, a0, 1f ::
+  inputs: a1=0, a0=1
   branch: not taken
 bge a0, a1, 1f ::
   inputs: a0=0, a1=-1
@@ -424,17 +424,17 @@ bltu a0, a1, 1f ::
 bltu a0, a1, 1f ::
   inputs: a0=1, a1=1
   branch: not taken
-bltu a0, zero, 1f ::
-  inputs: a0=0, zero=0
+bltu a0, a1, 1f ::
+  inputs: a0=0, a1=0
   branch: not taken
-bltu a0, zero, 1f ::
-  inputs: a0=1, zero=0
+bltu a0, a1, 1f ::
+  inputs: a0=1, a1=0
   branch: not taken
-bltu zero, a0, 1f ::
-  inputs: zero=0, a0=0
+bltu a1, a0, 1f ::
+  inputs: a1=0, a0=0
   branch: not taken
-bltu zero, a0, 1f ::
-  inputs: zero=0, a0=1
+bltu a1, a0, 1f ::
+  inputs: a1=0, a0=1
   branch: taken
 bltu a0, a1, 1f ::
   inputs: a0=0, a1=-1
@@ -457,17 +457,17 @@ bgeu a0, a1, 1f ::
 bgeu a0, a1, 1f ::
   inputs: a0=1, a1=1
   branch: taken
-bgeu a0, zero, 1f ::
-  inputs: a0=0, zero=0
+bgeu a0, a1, 1f ::
+  inputs: a0=0, a1=0
   branch: taken
-bgeu a0, zero, 1f ::
-  inputs: a0=1, zero=0
+bgeu a0, a1, 1f ::
+  inputs: a0=1, a1=0
   branch: taken
-bgeu zero, a0, 1f ::
-  inputs: zero=0, a0=0
+bgeu a1, a0, 1f ::
+  inputs: a1=0, a0=0
   branch: taken
-bgeu zero, a0, 1f ::
-  inputs: zero=0, a0=1
+bgeu a1, a0, 1f ::
+  inputs: a1=0, a0=1
   branch: not taken
 bgeu a0, a1, 1f ::
   inputs: a0=0, a1=-1