Re: [PULL 4/8] tests/tcg/s390x: Test BRASL and BRCL with large negative offsets

2022-05-02 Thread Thomas Huth

On 15/03/2022 12.20, Thomas Huth wrote:

From: Ilya Leoshkevich 

Add a small test in order to prevent regressions.

Signed-off-by: Ilya Leoshkevich 
Message-Id: <20220314104232.675863-4-...@linux.ibm.com>
Reviewed-by: Richard Henderson 
Reviewed-by: David Hildenbrand 
Signed-off-by: Thomas Huth 
---
  tests/tcg/s390x/Makefile.target|  1 +
  tests/tcg/s390x/branch-relative-long.c | 68 ++
  2 files changed, 69 insertions(+)
  create mode 100644 tests/tcg/s390x/branch-relative-long.c

diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.target
index 7aa502a557..f0d474a245 100644
--- a/tests/tcg/s390x/Makefile.target
+++ b/tests/tcg/s390x/Makefile.target
@@ -15,6 +15,7 @@ TESTS+=mvc
  TESTS+=shift
  TESTS+=trap
  TESTS+=signals-s390x
+TESTS+=branch-relative-long
  
  ifneq ($(HAVE_GDB_BIN),)

  GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py
diff --git a/tests/tcg/s390x/branch-relative-long.c 
b/tests/tcg/s390x/branch-relative-long.c
new file mode 100644
index 00..94219afcad
--- /dev/null
+++ b/tests/tcg/s390x/branch-relative-long.c
@@ -0,0 +1,68 @@
+#include 
+#include 
+#include 
+#include 
+
+#define DEFINE_ASM(_name, _code) \
+extern const char _name[]; \
+extern const char _name ## _end[]; \
+asm(".globl " #_name "\n" \
+#_name ":\n" \
+"" _code "\n" \
+".globl " #_name "_end\n" \
+#_name "_end:\n");
+
+DEFINE_ASM(br_r14, "br %r14");
+DEFINE_ASM(brasl_r0, "brasl %r0,.-0x1");
+DEFINE_ASM(brcl_0xf, "brcl 0xf,.-0x1");


 Hi Ilya,

I just noticed that this does not compile with Clang
(version 13.0.1):

:8:15: error: offset out of range
brasl %r0,.-0x1
  ^
:13:14: error: offset out of range
brcl 0xf,.-0x1
 ^
2 errors generated.

Any ideas how to fix this? Could we decrease the offset a little bit? Or 
maybe detect Clang and run with -no-integrated-as in that case?


 Thomas




[PULL 4/8] tests/tcg/s390x: Test BRASL and BRCL with large negative offsets

2022-03-15 Thread Thomas Huth
From: Ilya Leoshkevich 

Add a small test in order to prevent regressions.

Signed-off-by: Ilya Leoshkevich 
Message-Id: <20220314104232.675863-4-...@linux.ibm.com>
Reviewed-by: Richard Henderson 
Reviewed-by: David Hildenbrand 
Signed-off-by: Thomas Huth 
---
 tests/tcg/s390x/Makefile.target|  1 +
 tests/tcg/s390x/branch-relative-long.c | 68 ++
 2 files changed, 69 insertions(+)
 create mode 100644 tests/tcg/s390x/branch-relative-long.c

diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.target
index 7aa502a557..f0d474a245 100644
--- a/tests/tcg/s390x/Makefile.target
+++ b/tests/tcg/s390x/Makefile.target
@@ -15,6 +15,7 @@ TESTS+=mvc
 TESTS+=shift
 TESTS+=trap
 TESTS+=signals-s390x
+TESTS+=branch-relative-long
 
 ifneq ($(HAVE_GDB_BIN),)
 GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py
diff --git a/tests/tcg/s390x/branch-relative-long.c 
b/tests/tcg/s390x/branch-relative-long.c
new file mode 100644
index 00..94219afcad
--- /dev/null
+++ b/tests/tcg/s390x/branch-relative-long.c
@@ -0,0 +1,68 @@
+#include 
+#include 
+#include 
+#include 
+
+#define DEFINE_ASM(_name, _code) \
+extern const char _name[]; \
+extern const char _name ## _end[]; \
+asm(".globl " #_name "\n" \
+#_name ":\n" \
+"" _code "\n" \
+".globl " #_name "_end\n" \
+#_name "_end:\n");
+
+DEFINE_ASM(br_r14, "br %r14");
+DEFINE_ASM(brasl_r0, "brasl %r0,.-0x1");
+DEFINE_ASM(brcl_0xf, "brcl 0xf,.-0x1");
+
+struct test {
+const char *code;
+const char *code_end;
+};
+
+static const struct test tests[] = {
+{
+.code = brasl_r0,
+.code_end = brasl_r0_end,
+},
+{
+.code = brcl_0xf,
+.code_end = brcl_0xf_end,
+},
+};
+
+int main(void)
+{
+unsigned char *buf;
+size_t length = 0;
+size_t i;
+
+for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
+size_t test_length = 0x1 + (tests[i].code_end - tests[i].code);
+
+if (test_length > length) {
+length = test_length;
+}
+}
+
+buf = mmap(NULL, length, PROT_READ | PROT_WRITE | PROT_EXEC,
+   MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
+if (buf == MAP_FAILED) {
+perror("SKIP: mmap() failed");
+return 0;
+}
+
+memcpy(buf, br_r14, br_r14_end - br_r14);
+for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
+void (*code)(void) = (void *)(buf + 0x1);
+
+memcpy(code, tests[i].code, tests[i].code_end - tests[i].code);
+code();
+memset(code, 0, tests[i].code_end - tests[i].code);
+}
+
+munmap(buf, length);
+
+return 0;
+}
-- 
2.27.0