From c4dc3ee92a962dbb939789d5d5f7fd43a8dcdb6c Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Mon, 13 Jun 2022 14:20:29 -0700
Subject: Fix tests for x86_64 -> x86_64-sysv target rename

---
 test/builtin-va-copy+x86_64-sysv.c   | 11 +++++++
 test/builtin-va-copy+x86_64-sysv.qbe | 60 ++++++++++++++++++++++++++++++++++++
 test/builtin-va-copy+x86_64.c        | 11 -------
 test/builtin-va-copy+x86_64.qbe      | 60 ------------------------------------
 test/char-sign+x86_64-sysv.c         |  4 +++
 test/char-sign+x86_64-sysv.qbe       | 10 ++++++
 test/char-sign+x86_64.c              |  4 ---
 test/char-sign+x86_64.qbe            | 10 ------
 test/varargs+aarch64.c               |  2 +-
 test/varargs+riscv64.c               |  2 +-
 test/varargs+x86_64-sysv.c           | 26 ++++++++++++++++
 test/varargs+x86_64-sysv.qbe         | 49 +++++++++++++++++++++++++++++
 test/varargs+x86_64.c                | 26 ----------------
 test/varargs+x86_64.qbe              | 49 -----------------------------
 test/wchar-sign+x86_64-sysv.c        |  4 +++
 test/wchar-sign+x86_64-sysv.qbe      |  9 ++++++
 test/wchar-sign+x86_64.c             |  4 ---
 test/wchar-sign+x86_64.qbe           |  9 ------
 18 files changed, 175 insertions(+), 175 deletions(-)
 create mode 100644 test/builtin-va-copy+x86_64-sysv.c
 create mode 100644 test/builtin-va-copy+x86_64-sysv.qbe
 delete mode 100644 test/builtin-va-copy+x86_64.c
 delete mode 100644 test/builtin-va-copy+x86_64.qbe
 create mode 100644 test/char-sign+x86_64-sysv.c
 create mode 100644 test/char-sign+x86_64-sysv.qbe
 delete mode 100644 test/char-sign+x86_64.c
 delete mode 100644 test/char-sign+x86_64.qbe
 create mode 100644 test/varargs+x86_64-sysv.c
 create mode 100644 test/varargs+x86_64-sysv.qbe
 delete mode 100644 test/varargs+x86_64.c
 delete mode 100644 test/varargs+x86_64.qbe
 create mode 100644 test/wchar-sign+x86_64-sysv.c
 create mode 100644 test/wchar-sign+x86_64-sysv.qbe
 delete mode 100644 test/wchar-sign+x86_64.c
 delete mode 100644 test/wchar-sign+x86_64.qbe

(limited to 'test')

diff --git a/test/builtin-va-copy+x86_64-sysv.c b/test/builtin-va-copy+x86_64-sysv.c
new file mode 100644
index 0000000..48577ed
--- /dev/null
+++ b/test/builtin-va-copy+x86_64-sysv.c
@@ -0,0 +1,11 @@
+void f1(void) {
+	static __builtin_va_list a, b;
+	__builtin_va_copy(a, b);
+}
+void f2(__builtin_va_list b) {
+	static __builtin_va_list a;
+	__builtin_va_copy(a, b);
+}
+void f3(__builtin_va_list a, __builtin_va_list b) {
+	__builtin_va_copy(a, b);
+}
diff --git a/test/builtin-va-copy+x86_64-sysv.qbe b/test/builtin-va-copy+x86_64-sysv.qbe
new file mode 100644
index 0000000..de2fa5a
--- /dev/null
+++ b/test/builtin-va-copy+x86_64-sysv.qbe
@@ -0,0 +1,60 @@
+data $.La.2 = align 8 { z 24 }
+data $.Lb.3 = align 8 { z 24 }
+export
+function $f1() {
+@start.1
+@body.2
+	%.1 =l loadl $.Lb.3
+	storel %.1, $.La.2
+	%.2 =l add $.Lb.3, 8
+	%.3 =l add $.La.2, 8
+	%.4 =l loadl %.2
+	storel %.4, %.3
+	%.5 =l add %.2, 8
+	%.6 =l add %.3, 8
+	%.7 =l loadl %.5
+	storel %.7, %.6
+	ret
+}
+data $.La.5 = align 8 { z 24 }
+export
+function $f2(l %.1) {
+@start.3
+	%.2 =l alloc8 8
+	storel %.1, %.2
+@body.4
+	%.3 =l loadl %.2
+	%.4 =l loadl %.3
+	storel %.4, $.La.5
+	%.5 =l add %.3, 8
+	%.6 =l add $.La.5, 8
+	%.7 =l loadl %.5
+	storel %.7, %.6
+	%.8 =l add %.5, 8
+	%.9 =l add %.6, 8
+	%.10 =l loadl %.8
+	storel %.10, %.9
+	ret
+}
+export
+function $f3(l %.1, l %.3) {
+@start.5
+	%.2 =l alloc8 8
+	storel %.1, %.2
+	%.4 =l alloc8 8
+	storel %.3, %.4
+@body.6
+	%.5 =l loadl %.4
+	%.6 =l loadl %.2
+	%.7 =l loadl %.5
+	storel %.7, %.6
+	%.8 =l add %.5, 8
+	%.9 =l add %.6, 8
+	%.10 =l loadl %.8
+	storel %.10, %.9
+	%.11 =l add %.8, 8
+	%.12 =l add %.9, 8
+	%.13 =l loadl %.11
+	storel %.13, %.12
+	ret
+}
diff --git a/test/builtin-va-copy+x86_64.c b/test/builtin-va-copy+x86_64.c
deleted file mode 100644
index 48577ed..0000000
--- a/test/builtin-va-copy+x86_64.c
+++ /dev/null
@@ -1,11 +0,0 @@
-void f1(void) {
-	static __builtin_va_list a, b;
-	__builtin_va_copy(a, b);
-}
-void f2(__builtin_va_list b) {
-	static __builtin_va_list a;
-	__builtin_va_copy(a, b);
-}
-void f3(__builtin_va_list a, __builtin_va_list b) {
-	__builtin_va_copy(a, b);
-}
diff --git a/test/builtin-va-copy+x86_64.qbe b/test/builtin-va-copy+x86_64.qbe
deleted file mode 100644
index de2fa5a..0000000
--- a/test/builtin-va-copy+x86_64.qbe
+++ /dev/null
@@ -1,60 +0,0 @@
-data $.La.2 = align 8 { z 24 }
-data $.Lb.3 = align 8 { z 24 }
-export
-function $f1() {
-@start.1
-@body.2
-	%.1 =l loadl $.Lb.3
-	storel %.1, $.La.2
-	%.2 =l add $.Lb.3, 8
-	%.3 =l add $.La.2, 8
-	%.4 =l loadl %.2
-	storel %.4, %.3
-	%.5 =l add %.2, 8
-	%.6 =l add %.3, 8
-	%.7 =l loadl %.5
-	storel %.7, %.6
-	ret
-}
-data $.La.5 = align 8 { z 24 }
-export
-function $f2(l %.1) {
-@start.3
-	%.2 =l alloc8 8
-	storel %.1, %.2
-@body.4
-	%.3 =l loadl %.2
-	%.4 =l loadl %.3
-	storel %.4, $.La.5
-	%.5 =l add %.3, 8
-	%.6 =l add $.La.5, 8
-	%.7 =l loadl %.5
-	storel %.7, %.6
-	%.8 =l add %.5, 8
-	%.9 =l add %.6, 8
-	%.10 =l loadl %.8
-	storel %.10, %.9
-	ret
-}
-export
-function $f3(l %.1, l %.3) {
-@start.5
-	%.2 =l alloc8 8
-	storel %.1, %.2
-	%.4 =l alloc8 8
-	storel %.3, %.4
-@body.6
-	%.5 =l loadl %.4
-	%.6 =l loadl %.2
-	%.7 =l loadl %.5
-	storel %.7, %.6
-	%.8 =l add %.5, 8
-	%.9 =l add %.6, 8
-	%.10 =l loadl %.8
-	storel %.10, %.9
-	%.11 =l add %.8, 8
-	%.12 =l add %.9, 8
-	%.13 =l loadl %.11
-	storel %.13, %.12
-	ret
-}
diff --git a/test/char-sign+x86_64-sysv.c b/test/char-sign+x86_64-sysv.c
new file mode 100644
index 0000000..1dae89b
--- /dev/null
+++ b/test/char-sign+x86_64-sysv.c
@@ -0,0 +1,4 @@
+int x = (char)-1 > 0;
+int main(void) {
+	return (char)-1 > 0;
+}
diff --git a/test/char-sign+x86_64-sysv.qbe b/test/char-sign+x86_64-sysv.qbe
new file mode 100644
index 0000000..ddf6f3f
--- /dev/null
+++ b/test/char-sign+x86_64-sysv.qbe
@@ -0,0 +1,10 @@
+export data $x = align 4 { w 0, }
+export
+function w $main() {
+@start.1
+@body.2
+	%.1 =w neg 1
+	%.2 =w extsb %.1
+	%.3 =w csgtw %.2, 0
+	ret %.3
+}
diff --git a/test/char-sign+x86_64.c b/test/char-sign+x86_64.c
deleted file mode 100644
index 1dae89b..0000000
--- a/test/char-sign+x86_64.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int x = (char)-1 > 0;
-int main(void) {
-	return (char)-1 > 0;
-}
diff --git a/test/char-sign+x86_64.qbe b/test/char-sign+x86_64.qbe
deleted file mode 100644
index ddf6f3f..0000000
--- a/test/char-sign+x86_64.qbe
+++ /dev/null
@@ -1,10 +0,0 @@
-export data $x = align 4 { w 0, }
-export
-function w $main() {
-@start.1
-@body.2
-	%.1 =w neg 1
-	%.2 =w extsb %.1
-	%.3 =w csgtw %.2, 0
-	ret %.3
-}
diff --git a/test/varargs+aarch64.c b/test/varargs+aarch64.c
index c9c990c..c3aae1f 120000
--- a/test/varargs+aarch64.c
+++ b/test/varargs+aarch64.c
@@ -1 +1 @@
-varargs+x86_64.c
\ No newline at end of file
+varargs+x86_64-sysv.c
\ No newline at end of file
diff --git a/test/varargs+riscv64.c b/test/varargs+riscv64.c
index c9c990c..c3aae1f 120000
--- a/test/varargs+riscv64.c
+++ b/test/varargs+riscv64.c
@@ -1 +1 @@
-varargs+x86_64.c
\ No newline at end of file
+varargs+x86_64-sysv.c
\ No newline at end of file
diff --git a/test/varargs+x86_64-sysv.c b/test/varargs+x86_64-sysv.c
new file mode 100644
index 0000000..71bf1d3
--- /dev/null
+++ b/test/varargs+x86_64-sysv.c
@@ -0,0 +1,26 @@
+int f1(int n, __builtin_va_list ap) {
+	return __builtin_va_arg(ap, int);
+}
+
+int f2(int n, ...) {
+	int r;
+	__builtin_va_list ap;
+
+	__builtin_va_start(ap, n);
+	r = f1(n, ap);
+	__builtin_va_end(ap);
+	return r;
+}
+
+void f3(int n, ...) {
+	__builtin_va_list ap;
+
+	__builtin_va_start(ap, n);
+	while (n) {
+		__builtin_va_arg(ap, int);
+		__builtin_va_arg(ap, float);
+		__builtin_va_arg(ap, char *);
+		--n;
+	}
+	__builtin_va_end(ap);
+}
diff --git a/test/varargs+x86_64-sysv.qbe b/test/varargs+x86_64-sysv.qbe
new file mode 100644
index 0000000..46904b6
--- /dev/null
+++ b/test/varargs+x86_64-sysv.qbe
@@ -0,0 +1,49 @@
+export
+function w $f1(w %.1, l %.3) {
+@start.1
+	%.2 =l alloc4 4
+	storew %.1, %.2
+	%.4 =l alloc8 8
+	storel %.3, %.4
+@body.2
+	%.5 =l loadl %.4
+	%.6 =w vaarg %.5
+	ret %.6
+}
+export
+function w $f2(w %.1, ...) {
+@start.3
+	%.2 =l alloc4 4
+	storew %.1, %.2
+	%.3 =l alloc4 4
+	%.4 =l alloc8 24
+@body.4
+	vastart %.4
+	%.5 =w loadw %.2
+	%.6 =w call $f1(w %.5, l %.4)
+	storew %.6, %.3
+	%.7 =w loadw %.3
+	ret %.7
+}
+export
+function $f3(w %.1, ...) {
+@start.5
+	%.2 =l alloc4 4
+	storew %.1, %.2
+	%.3 =l alloc8 24
+@body.6
+	vastart %.3
+@while_cond.7
+	%.4 =w loadw %.2
+	jnz %.4, @while_body.8, @while_join.9
+@while_body.8
+	%.5 =w vaarg %.3
+	%.6 =s vaarg %.3
+	%.7 =l vaarg %.3
+	%.8 =w loadw %.2
+	%.9 =w sub %.8, 1
+	storew %.9, %.2
+	jmp @while_cond.7
+@while_join.9
+	ret
+}
diff --git a/test/varargs+x86_64.c b/test/varargs+x86_64.c
deleted file mode 100644
index 71bf1d3..0000000
--- a/test/varargs+x86_64.c
+++ /dev/null
@@ -1,26 +0,0 @@
-int f1(int n, __builtin_va_list ap) {
-	return __builtin_va_arg(ap, int);
-}
-
-int f2(int n, ...) {
-	int r;
-	__builtin_va_list ap;
-
-	__builtin_va_start(ap, n);
-	r = f1(n, ap);
-	__builtin_va_end(ap);
-	return r;
-}
-
-void f3(int n, ...) {
-	__builtin_va_list ap;
-
-	__builtin_va_start(ap, n);
-	while (n) {
-		__builtin_va_arg(ap, int);
-		__builtin_va_arg(ap, float);
-		__builtin_va_arg(ap, char *);
-		--n;
-	}
-	__builtin_va_end(ap);
-}
diff --git a/test/varargs+x86_64.qbe b/test/varargs+x86_64.qbe
deleted file mode 100644
index 46904b6..0000000
--- a/test/varargs+x86_64.qbe
+++ /dev/null
@@ -1,49 +0,0 @@
-export
-function w $f1(w %.1, l %.3) {
-@start.1
-	%.2 =l alloc4 4
-	storew %.1, %.2
-	%.4 =l alloc8 8
-	storel %.3, %.4
-@body.2
-	%.5 =l loadl %.4
-	%.6 =w vaarg %.5
-	ret %.6
-}
-export
-function w $f2(w %.1, ...) {
-@start.3
-	%.2 =l alloc4 4
-	storew %.1, %.2
-	%.3 =l alloc4 4
-	%.4 =l alloc8 24
-@body.4
-	vastart %.4
-	%.5 =w loadw %.2
-	%.6 =w call $f1(w %.5, l %.4)
-	storew %.6, %.3
-	%.7 =w loadw %.3
-	ret %.7
-}
-export
-function $f3(w %.1, ...) {
-@start.5
-	%.2 =l alloc4 4
-	storew %.1, %.2
-	%.3 =l alloc8 24
-@body.6
-	vastart %.3
-@while_cond.7
-	%.4 =w loadw %.2
-	jnz %.4, @while_body.8, @while_join.9
-@while_body.8
-	%.5 =w vaarg %.3
-	%.6 =s vaarg %.3
-	%.7 =l vaarg %.3
-	%.8 =w loadw %.2
-	%.9 =w sub %.8, 1
-	storew %.9, %.2
-	jmp @while_cond.7
-@while_join.9
-	ret
-}
diff --git a/test/wchar-sign+x86_64-sysv.c b/test/wchar-sign+x86_64-sysv.c
new file mode 100644
index 0000000..2edb6e4
--- /dev/null
+++ b/test/wchar-sign+x86_64-sysv.c
@@ -0,0 +1,4 @@
+int x = -L'\001' > 0;
+int main(void) {
+	return -L'\001' > 0;
+}
diff --git a/test/wchar-sign+x86_64-sysv.qbe b/test/wchar-sign+x86_64-sysv.qbe
new file mode 100644
index 0000000..888a5c9
--- /dev/null
+++ b/test/wchar-sign+x86_64-sysv.qbe
@@ -0,0 +1,9 @@
+export data $x = align 4 { w 0, }
+export
+function w $main() {
+@start.1
+@body.2
+	%.1 =w neg 1
+	%.2 =w csgtw %.1, 0
+	ret %.2
+}
diff --git a/test/wchar-sign+x86_64.c b/test/wchar-sign+x86_64.c
deleted file mode 100644
index 2edb6e4..0000000
--- a/test/wchar-sign+x86_64.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int x = -L'\001' > 0;
-int main(void) {
-	return -L'\001' > 0;
-}
diff --git a/test/wchar-sign+x86_64.qbe b/test/wchar-sign+x86_64.qbe
deleted file mode 100644
index 888a5c9..0000000
--- a/test/wchar-sign+x86_64.qbe
+++ /dev/null
@@ -1,9 +0,0 @@
-export data $x = align 4 { w 0, }
-export
-function w $main() {
-@start.1
-@body.2
-	%.1 =w neg 1
-	%.2 =w csgtw %.1, 0
-	ret %.2
-}
-- 
cgit v1.2.3