authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-12-28 20:27:58-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-12-28 20:32:13-07:00
log813d3308ccd13bdc96a40b583ffd8722651b7b83
tree287b4417d847bcfc27d068ef75e45c6a2fce1991
parentbbe66572e1c1e2abff0a433c36291f3429482e8f

stage2: update C backend test cases for new output

2 files changed, 31 insertions(+), 34 deletions(-)

src/codegen/c.zig+15-5
......@@ -198,6 +198,13 @@ fn renderFunctionSignature(
198198 try writer.writeByte(')');
199199}
200200
201fn indent(file: *C) !void {
202 const indent_size = 4;
203 const indent_level = 1;
204 const indent_amt = indent_size * indent_level;
205 try file.main.writer().writeByteNTimes(' ', indent_amt);
206}
207
201208pub fn generate(file: *C, decl: *Decl) !void {
202209 const tv = decl.typed_value.most_recent.typed_value;
203210
......@@ -228,11 +235,6 @@ pub fn generate(file: *C, decl: *Decl) !void {
228235 if (instructions.len > 0) {
229236 try writer.writeAll("\n");
230237 for (instructions) |inst| {
231 if (inst.tag != .dbg_stmt) {
232 const indent_size = 4;
233 const indent_level = 1;
234 try writer.writeByteNTimes(' ', indent_size * indent_level);
235 }
236238 if (switch (inst.tag) {
237239 .assembly => try genAsm(&ctx, file, inst.castTag(.assembly).?),
238240 .call => try genCall(&ctx, file, inst.castTag(.call).?),
......@@ -361,11 +363,13 @@ fn genArg(ctx: *Context) !?[]u8 {
361363}
362364
363365fn genRetVoid(file: *C) !?[]u8 {
366 try indent(file);
364367 try file.main.writer().print("return;\n", .{});
365368 return null;
366369}
367370
368371fn genRet(ctx: *Context, file: *C, inst: *Inst.UnOp) !?[]u8 {
372 try indent(file);
369373 const writer = file.main.writer();
370374 try writer.writeAll("return ");
371375 try genValue(ctx, writer, inst.operand);
......@@ -384,6 +388,7 @@ fn genValue(ctx: *Context, writer: Writer, inst: *Inst) !void {
384388fn genIntCast(ctx: *Context, file: *C, inst: *Inst.UnOp) !?[]u8 {
385389 if (inst.base.isUnused())
386390 return null;
391 try indent(file);
387392 const op = inst.operand;
388393 const writer = file.main.writer();
389394 const name = try ctx.name();
......@@ -399,6 +404,7 @@ fn genIntCast(ctx: *Context, file: *C, inst: *Inst.UnOp) !?[]u8 {
399404fn genBinOp(ctx: *Context, file: *C, inst: *Inst.BinOp, comptime operator: []const u8) !?[]u8 {
400405 if (inst.base.isUnused())
401406 return null;
407 try indent(file);
402408 const lhs = ctx.resolveInst(inst.lhs);
403409 const rhs = ctx.resolveInst(inst.rhs);
404410 const writer = file.main.writer();
......@@ -410,6 +416,7 @@ fn genBinOp(ctx: *Context, file: *C, inst: *Inst.BinOp, comptime operator: []con
410416}
411417
412418fn genCall(ctx: *Context, file: *C, inst: *Inst.Call) !?[]u8 {
419 try indent(file);
413420 const writer = file.main.writer();
414421 const header = file.header.buf.writer();
415422 if (inst.func.castTag(.constant)) |func_inst| {
......@@ -458,16 +465,19 @@ fn genDbgStmt(ctx: *Context, inst: *Inst.NoOp) !?[]u8 {
458465}
459466
460467fn genBreakpoint(file: *C, inst: *Inst.NoOp) !?[]u8 {
468 try indent(file);
461469 try file.main.writer().writeAll("zig_breakpoint();\n");
462470 return null;
463471}
464472
465473fn genUnreach(file: *C, inst: *Inst.NoOp) !?[]u8 {
474 try indent(file);
466475 try file.main.writer().writeAll("zig_unreachable();\n");
467476 return null;
468477}
469478
470479fn genAsm(ctx: *Context, file: *C, as: *Inst.Assembly) !?[]u8 {
480 try indent(file);
471481 const writer = file.main.writer();
472482 for (as.inputs) |i, index| {
473483 if (i[0] == '{' and i[i.len - 1] == '}') {
test/stage2/cbe.zig+16-29
......@@ -23,6 +23,7 @@ pub fn addCases(ctx: *TestContext) !void {
2323
2424 // Now change the message only
2525 // TODO fix C backend not supporting updates
26 // https://github.com/ziglang/zig/issues/7589
2627 //case.addCompareOutput(
2728 // \\extern fn puts(s: [*:0]const u8) c_int;
2829 // \\export fn main() c_int {
......@@ -88,9 +89,9 @@ pub fn addCases(ctx: *TestContext) !void {
8889 ,
8990 \\zig_noreturn void exitGood(void);
9091 \\
91 \\const char *const exitGood__anon_0 = "{rax}";
92 \\const char *const exitGood__anon_1 = "{rdi}";
93 \\const char *const exitGood__anon_2 = "syscall";
92 \\static uint8_t exitGood__anon_0[6] = "{rax}";
93 \\static uint8_t exitGood__anon_1[6] = "{rdi}";
94 \\static uint8_t exitGood__anon_2[8] = "syscall";
9495 \\
9596 \\zig_noreturn void _start(void) {
9697 \\ exitGood();
......@@ -122,9 +123,9 @@ pub fn addCases(ctx: *TestContext) !void {
122123 ,
123124 \\zig_noreturn void exit(uintptr_t arg0);
124125 \\
125 \\const char *const exit__anon_0 = "{rax}";
126 \\const char *const exit__anon_1 = "{rdi}";
127 \\const char *const exit__anon_2 = "syscall";
126 \\static uint8_t exit__anon_0[6] = "{rax}";
127 \\static uint8_t exit__anon_1[6] = "{rdi}";
128 \\static uint8_t exit__anon_2[8] = "syscall";
128129 \\
129130 \\zig_noreturn void _start(void) {
130131 \\ exit(0);
......@@ -154,13 +155,11 @@ pub fn addCases(ctx: *TestContext) !void {
154155 \\}
155156 \\
156157 ,
157 \\#include <stdint.h>
158 \\
159158 \\zig_noreturn void exit(uint8_t arg0);
160159 \\
161 \\const char *const exit__anon_0 = "{rax}";
162 \\const char *const exit__anon_1 = "{rdi}";
163 \\const char *const exit__anon_2 = "syscall";
160 \\static uint8_t exit__anon_0[6] = "{rax}";
161 \\static uint8_t exit__anon_1[6] = "{rdi}";
162 \\static uint8_t exit__anon_2[8] = "syscall";
164163 \\
165164 \\zig_noreturn void _start(void) {
166165 \\ exit(0);
......@@ -195,14 +194,12 @@ pub fn addCases(ctx: *TestContext) !void {
195194 \\}
196195 \\
197196 ,
198 \\#include <stdint.h>
199 \\
200197 \\zig_noreturn void exitMath(uint8_t arg0);
201198 \\zig_noreturn void exit(uint8_t arg0);
202199 \\
203 \\const char *const exit__anon_0 = "{rax}";
204 \\const char *const exit__anon_1 = "{rdi}";
205 \\const char *const exit__anon_2 = "syscall";
200 \\static uint8_t exit__anon_0[6] = "{rax}";
201 \\static uint8_t exit__anon_1[6] = "{rdi}";
202 \\static uint8_t exit__anon_2[8] = "syscall";
206203 \\
207204 \\zig_noreturn void _start(void) {
208205 \\ exitMath(1);
......@@ -243,14 +240,12 @@ pub fn addCases(ctx: *TestContext) !void {
243240 \\}
244241 \\
245242 ,
246 \\#include <stdint.h>
247 \\
248243 \\zig_noreturn void exitMath(uint8_t arg0);
249244 \\zig_noreturn void exit(uint8_t arg0);
250245 \\
251 \\const char *const exit__anon_0 = "{rax}";
252 \\const char *const exit__anon_1 = "{rdi}";
253 \\const char *const exit__anon_2 = "syscall";
246 \\static uint8_t exit__anon_0[6] = "{rax}";
247 \\static uint8_t exit__anon_1[6] = "{rdi}";
248 \\static uint8_t exit__anon_2[8] = "syscall";
254249 \\
255250 \\zig_noreturn void _start(void) {
256251 \\ exitMath(1);
......@@ -275,24 +270,18 @@ pub fn addCases(ctx: *TestContext) !void {
275270 ctx.h("header with single param function", linux_x64,
276271 \\export fn start(a: u8) void{}
277272 ,
278 \\#include <stdint.h>
279 \\
280273 \\void start(uint8_t arg0);
281274 \\
282275 );
283276 ctx.h("header with multiple param function", linux_x64,
284277 \\export fn start(a: u8, b: u8, c: u8) void{}
285278 ,
286 \\#include <stdint.h>
287 \\
288279 \\void start(uint8_t arg0, uint8_t arg1, uint8_t arg2);
289280 \\
290281 );
291282 ctx.h("header with u32 param function", linux_x64,
292283 \\export fn start(a: u32) void{}
293284 ,
294 \\#include <stdint.h>
295 \\
296285 \\void start(uint32_t arg0);
297286 \\
298287 );
......@@ -329,8 +318,6 @@ pub fn addCases(ctx: *TestContext) !void {
329318 ctx.h("header with multiple includes", linux_x64,
330319 \\export fn start(a: u32, b: usize) void{}
331320 ,
332 \\#include <stdint.h>
333 \\
334321 \\void start(uint32_t arg0, uintptr_t arg1);
335322 \\
336323 );