1 files changed, 30 insertions, 27 deletions

diff --git a/tests/programs/bytes.zc b/tests/programs/bytes.zc
index b4e1079..1332c26 100644
--- a/tests/programs/bytes.zc
+++ b/tests/programs/bytes.zc
@@ -1,44 +1,47 @@
-fn sp() { put_c(32); return 0; }
+namespace;
+include rt;
+
+fn sp() { rt.put_c(32); return 0; }
 fn litw(v) { return v + v + 1; }
-fn f() { put_c('A'); return 0; }
+fn f() { rt.put_c('A'); return 0; }
 fn sumbytes(n) {
 	let buf[64], i = 0, s = 0, b;
 	while (i < 64) { buf[i] = i * 0x0101010101010101; i++; }
-	b = addr_b(buf);
+	b = rt.addr_b(buf);
 	i = 0;
-	while (i < n) { s = s + ld8(b + (i & 511)); i++; }
+	while (i < n) { s = s + rt.ld8(b + (i & 511)); i++; }
 	return s;
 }
 fn main() {
 	let buf[3], b;
 	buf[0] = 0; buf[1] = 0; buf[2] = 0;
-	b = addr_b(buf);
-	st8(b, 0x11);
-	st8(b + 1, 0x22);
-	st8(b + 7, 0x7f);
-	st16(b + 7, 0xabcd);
-	st32(b + 10, 0x01020304);
-	put_n(ld8(b)); sp();
-	put_n(ld8(b + 1)); sp();
-	put_n(ld16(b + 7)); sp();
-	put_n(ld32(b + 10)); sp();
-	put_n(addr_w(b) == buf); sp();
-	put_n(ld8(b + 7)); sp();
-	put_n(ld8(b + 8)); sp();
-	put_n(buf[0]); sp();
-	put_n(buf[1]); sp();
-	st8(0 - 1, 99);
-	put_n(ld8(0 - 1)); sp();
-	put_n(ld16(addr_b(MW) - 1)); sp();
-	put_n(sumbytes(1000));
-	put_c(10);
+	b = rt.addr_b(buf);
+	rt.st8(b, 0x11);
+	rt.st8(b + 1, 0x22);
+	rt.st8(b + 7, 0x7f);
+	rt.st16(b + 7, 0xabcd);
+	rt.st32(b + 10, 0x01020304);
+	rt.put_n(rt.ld8(b)); sp();
+	rt.put_n(rt.ld8(b + 1)); sp();
+	rt.put_n(rt.ld16(b + 7)); sp();
+	rt.put_n(rt.ld32(b + 10)); sp();
+	rt.put_n(rt.addr_w(b) == buf); sp();
+	rt.put_n(rt.ld8(b + 7)); sp();
+	rt.put_n(rt.ld8(b + 8)); sp();
+	rt.put_n(buf[0]); sp();
+	rt.put_n(buf[1]); sp();
+	rt.st8(0 - 1, 99);
+	rt.put_n(rt.ld8(0 - 1)); sp();
+	rt.put_n(rt.ld16(rt.addr_b(rt.MW) - 1)); sp();
+	rt.put_n(sumbytes(1000));
+	rt.put_c(10);
 	let p = f;
 	f();
 	while (*p != litw('A')) p++;
-	st8(addr_b(p), litw('B') & 255);
+	rt.st8(rt.addr_b(p), litw('B') & 255);
 	f();
-	st8(addr_b(p), litw('C') & 255);
+	rt.st8(rt.addr_b(p), litw('C') & 255);
 	f();
-	put_c(10);
+	rt.put_c(10);
 	return 0;
 }