authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-05-12 23:17:24-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-05-12 23:17:24-07:00
logb109daacddf54dbe4ffcbef9041443f2759511e3
tree7f02883d8a68324da98159fb07623af698e9e078
parentc102e1371088cf34aac28627a8523e66f0525098

stage2: fix test cases to add `pub` on exported _start fn

This way the start code respects them.

7 files changed, 64 insertions(+), 64 deletions(-)

test/stage2/aarch64.zig+2-2
......@@ -11,7 +11,7 @@ pub fn addCases(ctx: *TestContext) !void {
1111 var case = ctx.exe("linux_aarch64 hello world", linux_aarch64);
1212 // Regular old hello world
1313 case.addCompareOutput(
14 \\export fn _start() noreturn {
14 \\pub export fn _start() noreturn {
1515 \\ print();
1616 \\ exit();
1717 \\}
......@@ -51,7 +51,7 @@ pub fn addCases(ctx: *TestContext) !void {
5151 var case = ctx.exe("exit fn taking argument", linux_aarch64);
5252
5353 case.addCompareOutput(
54 \\export fn _start() noreturn {
54 \\pub export fn _start() noreturn {
5555 \\ exit(0);
5656 \\}
5757 \\
test/stage2/arm.zig+14-14
......@@ -11,7 +11,7 @@ pub fn addCases(ctx: *TestContext) !void {
1111 var case = ctx.exe("linux_arm hello world", linux_arm);
1212 // Regular old hello world
1313 case.addCompareOutput(
14 \\export fn _start() noreturn {
14 \\pub export fn _start() noreturn {
1515 \\ print();
1616 \\ exit();
1717 \\}
......@@ -50,7 +50,7 @@ pub fn addCases(ctx: *TestContext) !void {
5050 // be in a specific order because otherwise the write to r0
5151 // would overwrite the len parameter which resides in r0
5252 case.addCompareOutput(
53 \\export fn _start() noreturn {
53 \\pub export fn _start() noreturn {
5454 \\ print(id(14));
5555 \\ exit();
5656 \\}
......@@ -89,7 +89,7 @@ pub fn addCases(ctx: *TestContext) !void {
8989 var case = ctx.exe("non-leaf functions", linux_arm);
9090 // Testing non-leaf functions
9191 case.addCompareOutput(
92 \\export fn _start() noreturn {
92 \\pub export fn _start() noreturn {
9393 \\ foo();
9494 \\ exit();
9595 \\}
......@@ -119,7 +119,7 @@ pub fn addCases(ctx: *TestContext) !void {
119119
120120 // Add two numbers
121121 case.addCompareOutput(
122 \\export fn _start() noreturn {
122 \\pub export fn _start() noreturn {
123123 \\ print(2, 4);
124124 \\ print(1, 7);
125125 \\ exit();
......@@ -152,7 +152,7 @@ pub fn addCases(ctx: *TestContext) !void {
152152
153153 // Subtract two numbers
154154 case.addCompareOutput(
155 \\export fn _start() noreturn {
155 \\pub export fn _start() noreturn {
156156 \\ print(10, 5);
157157 \\ print(4, 3);
158158 \\ exit();
......@@ -185,7 +185,7 @@ pub fn addCases(ctx: *TestContext) !void {
185185
186186 // Bitwise And
187187 case.addCompareOutput(
188 \\export fn _start() noreturn {
188 \\pub export fn _start() noreturn {
189189 \\ print(8, 9);
190190 \\ print(3, 7);
191191 \\ exit();
......@@ -218,7 +218,7 @@ pub fn addCases(ctx: *TestContext) !void {
218218
219219 // Bitwise Or
220220 case.addCompareOutput(
221 \\export fn _start() noreturn {
221 \\pub export fn _start() noreturn {
222222 \\ print(4, 2);
223223 \\ print(3, 7);
224224 \\ exit();
......@@ -251,7 +251,7 @@ pub fn addCases(ctx: *TestContext) !void {
251251
252252 // Bitwise Xor
253253 case.addCompareOutput(
254 \\export fn _start() noreturn {
254 \\pub export fn _start() noreturn {
255255 \\ print(42, 42);
256256 \\ print(3, 5);
257257 \\ exit();
......@@ -287,7 +287,7 @@ pub fn addCases(ctx: *TestContext) !void {
287287 var case = ctx.exe("if statements", linux_arm);
288288 // Simple if statement in assert
289289 case.addCompareOutput(
290 \\export fn _start() noreturn {
290 \\pub export fn _start() noreturn {
291291 \\ var x: u32 = 123;
292292 \\ var y: u32 = 42;
293293 \\ assert(x > y);
......@@ -316,7 +316,7 @@ pub fn addCases(ctx: *TestContext) !void {
316316 var case = ctx.exe("while loops", linux_arm);
317317 // Simple while loop with assert
318318 case.addCompareOutput(
319 \\export fn _start() noreturn {
319 \\pub export fn _start() noreturn {
320320 \\ var x: u32 = 2020;
321321 \\ var i: u32 = 0;
322322 \\ while (x > 0) {
......@@ -349,7 +349,7 @@ pub fn addCases(ctx: *TestContext) !void {
349349 var case = ctx.exe("integer multiplication", linux_arm);
350350 // Simple u32 integer multiplication
351351 case.addCompareOutput(
352 \\export fn _start() noreturn {
352 \\pub export fn _start() noreturn {
353353 \\ assert(mul(1, 1) == 1);
354354 \\ assert(mul(42, 1) == 42);
355355 \\ assert(mul(1, 42) == 42);
......@@ -385,7 +385,7 @@ pub fn addCases(ctx: *TestContext) !void {
385385 // callee preserved register, otherwise it will be overwritten
386386 // by the first parameter to baz.
387387 case.addCompareOutput(
388 \\export fn _start() noreturn {
388 \\pub export fn _start() noreturn {
389389 \\ assert(foo() == 43);
390390 \\ exit();
391391 \\}
......@@ -423,7 +423,7 @@ pub fn addCases(ctx: *TestContext) !void {
423423 {
424424 var case = ctx.exe("recursive fibonacci", linux_arm);
425425 case.addCompareOutput(
426 \\export fn _start() noreturn {
426 \\pub export fn _start() noreturn {
427427 \\ assert(fib(0) == 0);
428428 \\ assert(fib(1) == 1);
429429 \\ assert(fib(2) == 1);
......@@ -462,7 +462,7 @@ pub fn addCases(ctx: *TestContext) !void {
462462 {
463463 var case = ctx.exe("spilling registers", linux_arm);
464464 case.addCompareOutput(
465 \\export fn _start() noreturn {
465 \\pub export fn _start() noreturn {
466466 \\ assert(add(3, 4) == 791);
467467 \\ exit();
468468 \\}
test/stage2/darwin.zig+6-6
......@@ -17,7 +17,7 @@ pub fn addCases(ctx: *TestContext) !void {
1717
1818 // Incorrect return type
1919 case.addError(
20 \\export fn _start() noreturn {
20 \\pub export fn _start() noreturn {
2121 \\}
2222 , &[_][]const u8{":2:1: error: expected noreturn, found void"});
2323
......@@ -26,7 +26,7 @@ pub fn addCases(ctx: *TestContext) !void {
2626 \\extern "c" fn write(usize, usize, usize) usize;
2727 \\extern "c" fn exit(usize) noreturn;
2828 \\
29 \\export fn _start() noreturn {
29 \\pub export fn _start() noreturn {
3030 \\ print();
3131 \\
3232 \\ exit(0);
......@@ -46,7 +46,7 @@ pub fn addCases(ctx: *TestContext) !void {
4646 \\extern "c" fn write(usize, usize, usize) usize;
4747 \\extern "c" fn exit(usize) noreturn;
4848 \\
49 \\export fn _start() noreturn {
49 \\pub export fn _start() noreturn {
5050 \\ print();
5151 \\
5252 \\ exit(0);
......@@ -66,7 +66,7 @@ pub fn addCases(ctx: *TestContext) !void {
6666 \\extern "c" fn write(usize, usize, usize) usize;
6767 \\extern "c" fn exit(usize) noreturn;
6868 \\
69 \\export fn _start() noreturn {
69 \\pub export fn _start() noreturn {
7070 \\ print();
7171 \\ print();
7272 \\
......@@ -92,7 +92,7 @@ pub fn addCases(ctx: *TestContext) !void {
9292 case.addCompareOutput(
9393 \\extern "c" fn exit(usize) noreturn;
9494 \\
95 \\export fn _start() noreturn {
95 \\pub export fn _start() noreturn {
9696 \\ exit(0);
9797 \\}
9898 ,
......@@ -103,7 +103,7 @@ pub fn addCases(ctx: *TestContext) !void {
103103 \\extern "c" fn exit(usize) noreturn;
104104 \\extern "c" fn write(usize, usize, usize) usize;
105105 \\
106 \\export fn _start() noreturn {
106 \\pub export fn _start() noreturn {
107107 \\ _ = write(1, @ptrToInt("Hey!\n"), 5);
108108 \\ exit(0);
109109 \\}
test/stage2/llvm.zig+8-8
......@@ -18,7 +18,7 @@ pub fn addCases(ctx: *TestContext) !void {
1818 \\ return a + b;
1919 \\}
2020 \\
21 \\export fn main() c_int {
21 \\pub export fn main() c_int {
2222 \\ var a: i32 = -5;
2323 \\ const x = add(a, 7);
2424 \\ var y = add(2, 0);
......@@ -34,7 +34,7 @@ pub fn addCases(ctx: *TestContext) !void {
3434 case.addCompareOutput(
3535 \\extern fn puts(s: [*:0]const u8) c_int;
3636 \\
37 \\export fn main() c_int {
37 \\pub export fn main() c_int {
3838 \\ _ = puts("hello world!");
3939 \\ return 0;
4040 \\}
......@@ -53,7 +53,7 @@ pub fn addCases(ctx: *TestContext) !void {
5353 \\ if (!ok) unreachable;
5454 \\}
5555 \\
56 \\export fn main() c_int {
56 \\pub export fn main() c_int {
5757 \\ assert(add(1,2) == 3);
5858 \\ return 0;
5959 \\}
......@@ -77,7 +77,7 @@ pub fn addCases(ctx: *TestContext) !void {
7777 \\ return val + 10;
7878 \\}
7979 \\
80 \\export fn main() c_int {
80 \\pub export fn main() c_int {
8181 \\ assert(foo(false) == 20);
8282 \\ assert(foo(true) == 30);
8383 \\ return 0;
......@@ -104,7 +104,7 @@ pub fn addCases(ctx: *TestContext) !void {
104104 \\ return val;
105105 \\}
106106 \\
107 \\export fn main() c_int {
107 \\pub export fn main() c_int {
108108 \\ assert(foo(false) == 10);
109109 \\ assert(foo(true) == 20);
110110 \\ return 0;
......@@ -120,7 +120,7 @@ pub fn addCases(ctx: *TestContext) !void {
120120 \\ if (!ok) unreachable;
121121 \\}
122122 \\
123 \\export fn main() c_int {
123 \\pub export fn main() c_int {
124124 \\ var sum: u32 = 0;
125125 \\ var i: u32 = 0;
126126 \\ while (i < 5) : (i += 1) {
......@@ -141,7 +141,7 @@ pub fn addCases(ctx: *TestContext) !void {
141141 \\ if (!ok) unreachable;
142142 \\}
143143 \\
144 \\export fn main() c_int {
144 \\pub export fn main() c_int {
145145 \\ var opt_val: ?i32 = 10;
146146 \\ var null_val: ?i32 = null;
147147 \\
......@@ -190,7 +190,7 @@ pub fn addCases(ctx: *TestContext) !void {
190190 \\ if (!ok) unreachable;
191191 \\}
192192 \\
193 \\export fn main() c_int {
193 \\pub export fn main() c_int {
194194 \\ var x: u32 = 0;
195195 \\ for ("hello") |_| {
196196 \\ x += 1;
test/stage2/riscv64.zig+1-1
......@@ -11,7 +11,7 @@ pub fn addCases(ctx: *TestContext) !void {
1111 var case = ctx.exe("riscv64 hello world", linux_riscv64);
1212 // Regular old hello world
1313 case.addCompareOutput(
14 \\export fn _start() noreturn {
14 \\pub export fn _start() noreturn {
1515 \\ print();
1616 \\
1717 \\ exit();
test/stage2/spu-ii.zig+1-1
......@@ -15,7 +15,7 @@ pub fn addCases(ctx: *TestContext) !void {
1515 \\ unreachable;
1616 \\}
1717 \\
18 \\export fn _start() noreturn {
18 \\pub export fn _start() noreturn {
1919 \\ killEmulator();
2020 \\}
2121 , "");
test/stage2/wasm.zig+32-32
......@@ -11,7 +11,7 @@ pub fn addCases(ctx: *TestContext) !void {
1111 var case = ctx.exe("wasm function calls", wasi);
1212
1313 case.addCompareOutput(
14 \\export fn _start() u32 {
14 \\pub export fn _start() u32 {
1515 \\ foo();
1616 \\ bar();
1717 \\ return 42;
......@@ -26,7 +26,7 @@ pub fn addCases(ctx: *TestContext) !void {
2626 );
2727
2828 case.addCompareOutput(
29 \\export fn _start() i64 {
29 \\pub export fn _start() i64 {
3030 \\ bar();
3131 \\ foo();
3232 \\ foo();
......@@ -44,7 +44,7 @@ pub fn addCases(ctx: *TestContext) !void {
4444 );
4545
4646 case.addCompareOutput(
47 \\export fn _start() f32 {
47 \\pub export fn _start() f32 {
4848 \\ bar();
4949 \\ foo();
5050 \\ return 42.0;
......@@ -66,7 +66,7 @@ pub fn addCases(ctx: *TestContext) !void {
6666 );
6767
6868 case.addCompareOutput(
69 \\export fn _start() u32 {
69 \\pub export fn _start() u32 {
7070 \\ foo(10, 20);
7171 \\ return 5;
7272 \\}
......@@ -78,7 +78,7 @@ pub fn addCases(ctx: *TestContext) !void {
7878 var case = ctx.exe("wasm locals", wasi);
7979
8080 case.addCompareOutput(
81 \\export fn _start() u32 {
81 \\pub export fn _start() u32 {
8282 \\ var i: u32 = 5;
8383 \\ var y: f32 = 42.0;
8484 \\ var x: u32 = 10;
......@@ -87,7 +87,7 @@ pub fn addCases(ctx: *TestContext) !void {
8787 , "5\n");
8888
8989 case.addCompareOutput(
90 \\export fn _start() u32 {
90 \\pub export fn _start() u32 {
9191 \\ var i: u32 = 5;
9292 \\ var y: f32 = 42.0;
9393 \\ var x: u32 = 10;
......@@ -106,7 +106,7 @@ pub fn addCases(ctx: *TestContext) !void {
106106 var case = ctx.exe("wasm binary operands", wasi);
107107
108108 case.addCompareOutput(
109 \\export fn _start() u32 {
109 \\pub export fn _start() u32 {
110110 \\ var i: u32 = 5;
111111 \\ i += 20;
112112 \\ return i;
......@@ -114,7 +114,7 @@ pub fn addCases(ctx: *TestContext) !void {
114114 , "25\n");
115115
116116 case.addCompareOutput(
117 \\export fn _start() u32 {
117 \\pub export fn _start() u32 {
118118 \\ var i: u32 = 5;
119119 \\ i += 20;
120120 \\ var result: u32 = foo(i, 10);
......@@ -126,7 +126,7 @@ pub fn addCases(ctx: *TestContext) !void {
126126 , "35\n");
127127
128128 case.addCompareOutput(
129 \\export fn _start() u32 {
129 \\pub export fn _start() u32 {
130130 \\ var i: u32 = 20;
131131 \\ i -= 5;
132132 \\ return i;
......@@ -134,7 +134,7 @@ pub fn addCases(ctx: *TestContext) !void {
134134 , "15\n");
135135
136136 case.addCompareOutput(
137 \\export fn _start() u32 {
137 \\pub export fn _start() u32 {
138138 \\ var i: u32 = 5;
139139 \\ i -= 3;
140140 \\ var result: u32 = foo(i, 10);
......@@ -146,7 +146,7 @@ pub fn addCases(ctx: *TestContext) !void {
146146 , "8\n");
147147
148148 case.addCompareOutput(
149 \\export fn _start() u32 {
149 \\pub export fn _start() u32 {
150150 \\ var i: u32 = 5;
151151 \\ i *= 7;
152152 \\ var result: u32 = foo(i, 10);
......@@ -158,7 +158,7 @@ pub fn addCases(ctx: *TestContext) !void {
158158 , "350\n");
159159
160160 case.addCompareOutput(
161 \\export fn _start() u32 {
161 \\pub export fn _start() u32 {
162162 \\ var i: u32 = 352;
163163 \\ i /= 7; // i = 50
164164 \\ var result: u32 = foo(i, 7);
......@@ -170,7 +170,7 @@ pub fn addCases(ctx: *TestContext) !void {
170170 , "7\n");
171171
172172 case.addCompareOutput(
173 \\export fn _start() u32 {
173 \\pub export fn _start() u32 {
174174 \\ var i: u32 = 5;
175175 \\ i &= 6;
176176 \\ return i;
......@@ -178,7 +178,7 @@ pub fn addCases(ctx: *TestContext) !void {
178178 , "4\n");
179179
180180 case.addCompareOutput(
181 \\export fn _start() u32 {
181 \\pub export fn _start() u32 {
182182 \\ var i: u32 = 5;
183183 \\ i |= 6;
184184 \\ return i;
......@@ -186,7 +186,7 @@ pub fn addCases(ctx: *TestContext) !void {
186186 , "7\n");
187187
188188 case.addCompareOutput(
189 \\export fn _start() u32 {
189 \\pub export fn _start() u32 {
190190 \\ var i: u32 = 5;
191191 \\ i ^= 6;
192192 \\ return i;
......@@ -194,7 +194,7 @@ pub fn addCases(ctx: *TestContext) !void {
194194 , "3\n");
195195
196196 case.addCompareOutput(
197 \\export fn _start() bool {
197 \\pub export fn _start() bool {
198198 \\ var b: bool = false;
199199 \\ b = b or false;
200200 \\ return b;
......@@ -202,7 +202,7 @@ pub fn addCases(ctx: *TestContext) !void {
202202 , "0\n");
203203
204204 case.addCompareOutput(
205 \\export fn _start() bool {
205 \\pub export fn _start() bool {
206206 \\ var b: bool = true;
207207 \\ b = b or false;
208208 \\ return b;
......@@ -210,7 +210,7 @@ pub fn addCases(ctx: *TestContext) !void {
210210 , "1\n");
211211
212212 case.addCompareOutput(
213 \\export fn _start() bool {
213 \\pub export fn _start() bool {
214214 \\ var b: bool = false;
215215 \\ b = b or true;
216216 \\ return b;
......@@ -218,7 +218,7 @@ pub fn addCases(ctx: *TestContext) !void {
218218 , "1\n");
219219
220220 case.addCompareOutput(
221 \\export fn _start() bool {
221 \\pub export fn _start() bool {
222222 \\ var b: bool = true;
223223 \\ b = b or true;
224224 \\ return b;
......@@ -226,7 +226,7 @@ pub fn addCases(ctx: *TestContext) !void {
226226 , "1\n");
227227
228228 case.addCompareOutput(
229 \\export fn _start() bool {
229 \\pub export fn _start() bool {
230230 \\ var b: bool = false;
231231 \\ b = b and false;
232232 \\ return b;
......@@ -234,7 +234,7 @@ pub fn addCases(ctx: *TestContext) !void {
234234 , "0\n");
235235
236236 case.addCompareOutput(
237 \\export fn _start() bool {
237 \\pub export fn _start() bool {
238238 \\ var b: bool = true;
239239 \\ b = b and false;
240240 \\ return b;
......@@ -242,7 +242,7 @@ pub fn addCases(ctx: *TestContext) !void {
242242 , "0\n");
243243
244244 case.addCompareOutput(
245 \\export fn _start() bool {
245 \\pub export fn _start() bool {
246246 \\ var b: bool = false;
247247 \\ b = b and true;
248248 \\ return b;
......@@ -250,7 +250,7 @@ pub fn addCases(ctx: *TestContext) !void {
250250 , "0\n");
251251
252252 case.addCompareOutput(
253 \\export fn _start() bool {
253 \\pub export fn _start() bool {
254254 \\ var b: bool = true;
255255 \\ b = b and true;
256256 \\ return b;
......@@ -262,7 +262,7 @@ pub fn addCases(ctx: *TestContext) !void {
262262 var case = ctx.exe("wasm conditions", wasi);
263263
264264 case.addCompareOutput(
265 \\export fn _start() u32 {
265 \\pub export fn _start() u32 {
266266 \\ var i: u32 = 5;
267267 \\ if (i > @as(u32, 4)) {
268268 \\ i += 10;
......@@ -272,7 +272,7 @@ pub fn addCases(ctx: *TestContext) !void {
272272 , "15\n");
273273
274274 case.addCompareOutput(
275 \\export fn _start() u32 {
275 \\pub export fn _start() u32 {
276276 \\ var i: u32 = 5;
277277 \\ if (i < @as(u32, 4)) {
278278 \\ i += 10;
......@@ -284,7 +284,7 @@ pub fn addCases(ctx: *TestContext) !void {
284284 , "2\n");
285285
286286 case.addCompareOutput(
287 \\export fn _start() u32 {
287 \\pub export fn _start() u32 {
288288 \\ var i: u32 = 5;
289289 \\ if (i < @as(u32, 4)) {
290290 \\ i += 10;
......@@ -296,7 +296,7 @@ pub fn addCases(ctx: *TestContext) !void {
296296 , "20\n");
297297
298298 case.addCompareOutput(
299 \\export fn _start() u32 {
299 \\pub export fn _start() u32 {
300300 \\ var i: u32 = 11;
301301 \\ if (i < @as(u32, 4)) {
302302 \\ i += 10;
......@@ -312,7 +312,7 @@ pub fn addCases(ctx: *TestContext) !void {
312312 , "31\n");
313313
314314 case.addCompareOutput(
315 \\export fn _start() void {
315 \\pub export fn _start() void {
316316 \\ assert(foo(true) != @as(i32, 30));
317317 \\}
318318 \\
......@@ -327,7 +327,7 @@ pub fn addCases(ctx: *TestContext) !void {
327327 , "");
328328
329329 case.addCompareOutput(
330 \\export fn _start() void {
330 \\pub export fn _start() void {
331331 \\ assert(foo(false) == @as(i32, 20));
332332 \\ assert(foo(true) == @as(i32, 30));
333333 \\}
......@@ -351,7 +351,7 @@ pub fn addCases(ctx: *TestContext) !void {
351351 var case = ctx.exe("wasm while loops", wasi);
352352
353353 case.addCompareOutput(
354 \\export fn _start() u32 {
354 \\pub export fn _start() u32 {
355355 \\ var i: u32 = 0;
356356 \\ while(i < @as(u32, 5)){
357357 \\ i += 1;
......@@ -362,7 +362,7 @@ pub fn addCases(ctx: *TestContext) !void {
362362 , "5\n");
363363
364364 case.addCompareOutput(
365 \\export fn _start() u32 {
365 \\pub export fn _start() u32 {
366366 \\ var i: u32 = 0;
367367 \\ while(i < @as(u32, 10)){
368368 \\ var x: u32 = 1;
......@@ -373,7 +373,7 @@ pub fn addCases(ctx: *TestContext) !void {
373373 , "10\n");
374374
375375 case.addCompareOutput(
376 \\export fn _start() u32 {
376 \\pub export fn _start() u32 {
377377 \\ var i: u32 = 0;
378378 \\ while(i < @as(u32, 10)){
379379 \\ var x: u32 = 1;