From ab3187e9d02a9e4c3395c28858ac179d1fc5787b Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Wed, 14 Apr 2021 14:57:01 -0700
Subject: expr: Include NUL-terminator in string expression data

This will facilitate the support of wide-string literals.

Based on patch from Nihal Jere.
---
 test/hello.qbe                       |  2 +-
 test/initializer-replace-local.qbe   | 10 +++++-----
 test/initializer-replace-static.qbe  |  2 +-
 test/initializer-string-braces.qbe   |  2 +-
 test/initializer-string.qbe          |  2 +-
 test/initializer-unsigned-string.qbe |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'test')

diff --git a/test/hello.qbe b/test/hello.qbe
index 3e695ab..1826315 100644
--- a/test/hello.qbe
+++ b/test/hello.qbe
@@ -1,4 +1,4 @@
-data $.Lstring.2 = align 1 { b "hello", z 1, }
+data $.Lstring.2 = align 1 { b "hello\000", }
 export
 function w $main() {
 @start.1
diff --git a/test/initializer-replace-local.qbe b/test/initializer-replace-local.qbe
index 72ad90a..316edb0 100644
--- a/test/initializer-replace-local.qbe
+++ b/test/initializer-replace-local.qbe
@@ -13,10 +13,10 @@ function $f() {
 	storeb 108, %.5
 	%.6 =l add %.1, 4
 	storeb 111, %.6
-	%.7 =l add %.1, 1
-	%.8 =w copy 97
-	storeb %.8, %.7
-	%.9 =l add %.1, 5
-	storeb 0, %.9
+	%.7 =l add %.1, 5
+	storeb 0, %.7
+	%.8 =l add %.1, 1
+	%.9 =w copy 97
+	storeb %.9, %.8
 	ret
 }
diff --git a/test/initializer-replace-static.qbe b/test/initializer-replace-static.qbe
index 18b774e..8d8f2cd 100644
--- a/test/initializer-replace-static.qbe
+++ b/test/initializer-replace-static.qbe
@@ -1 +1 @@
-export data $x = align 1 { b "hallo", z 1, }
+export data $x = align 1 { b "hallo\000", }
diff --git a/test/initializer-string-braces.qbe b/test/initializer-string-braces.qbe
index 46be123..5d44117 100644
--- a/test/initializer-string-braces.qbe
+++ b/test/initializer-string-braces.qbe
@@ -1 +1 @@
-export data $s = align 1 { b "abc", z 1, }
+export data $s = align 1 { b "abc\000", }
diff --git a/test/initializer-string.qbe b/test/initializer-string.qbe
index ba992da..ee83e50 100644
--- a/test/initializer-string.qbe
+++ b/test/initializer-string.qbe
@@ -1,4 +1,4 @@
-export data $x = align 1 { b "hello", z 1, }
+export data $x = align 1 { b "hello\000", }
 export
 function $f() {
 @start.1
diff --git a/test/initializer-unsigned-string.qbe b/test/initializer-unsigned-string.qbe
index 46be123..5d44117 100644
--- a/test/initializer-unsigned-string.qbe
+++ b/test/initializer-unsigned-string.qbe
@@ -1 +1 @@
-export data $s = align 1 { b "abc", z 1, }
+export data $s = align 1 { b "abc\000", }
-- 
cgit v1.2.3