Commit d18b6785bb
Changed files (6)
src
test
stage2
src/codegen/c.zig
@@ -21,6 +21,34 @@ fn map(allocator: *std.mem.Allocator, name: []const u8) ![]const u8 {
return allocator.dupe(u8, name);
}
+const Mutability = enum { Const, Mut };
+
+fn renderTypeAndName(
+ ctx: *Context,
+ writer: Writer,
+ ty: Type,
+ name: []const u8,
+ mutability: Mutability,
+) error{ OutOfMemory, AnalysisFail }!void {
+ var suffix = std.ArrayList(u8).init(&ctx.arena.allocator);
+
+ var render_ty = ty;
+ while (render_ty.zigTypeTag() == .Array) {
+ const sentinel_bit = @boolToInt(render_ty.sentinel() != null);
+ const c_len = render_ty.arrayLen() + sentinel_bit;
+ try suffix.writer().print("[{d}]", .{c_len});
+ render_ty = render_ty.elemType();
+ }
+
+ try renderType(ctx, writer, render_ty);
+
+ const const_prefix = switch (mutability) {
+ .Const => "const ",
+ .Mut => "",
+ };
+ try writer.print(" {s}{s}{s}", .{ const_prefix, name, suffix.items });
+}
+
fn renderType(
ctx: *Context,
writer: Writer,
@@ -74,14 +102,14 @@ fn renderType(
if (t.isSlice()) {
return ctx.fail(ctx.decl.src(), "TODO: C backend: implement slices", .{});
} else {
+ try renderType(ctx, writer, t.elemType());
+ try writer.writeAll(" *");
if (t.isConstPtr()) {
try writer.writeAll("const ");
}
if (t.isVolatilePtr()) {
try writer.writeAll("volatile ");
}
- try renderType(ctx, writer, t.elemType());
- try writer.writeAll(" *");
}
},
.Array => {
@@ -176,12 +204,27 @@ fn renderFunctionSignature(
decl: *Decl,
) !void {
const tv = decl.typed_value.most_recent.typed_value;
+ // Determine whether the function is globally visible.
+ const is_global = blk: {
+ switch (tv.val.tag()) {
+ .extern_fn => break :blk true,
+ .function => {
+ const func = tv.val.cast(Value.Payload.Function).?.func;
+ break :blk ctx.module.decl_exports.contains(func.owner_decl);
+ },
+ else => unreachable,
+ }
+ };
+ if (!is_global) {
+ try writer.writeAll("static ");
+ }
try renderType(ctx, writer, tv.ty.fnReturnType());
// Use the child allocator directly, as we know the name can be freed before
// the rest of the arena.
- const name = try map(ctx.arena.child_allocator, mem.spanZ(decl.name));
+ const decl_name = mem.span(decl.name);
+ const name = try map(ctx.arena.child_allocator, decl_name);
defer ctx.arena.child_allocator.free(name);
- try writer.print(" {}(", .{name});
+ try writer.print(" {s}(", .{name});
var param_len = tv.ty.fnParamLen();
if (param_len == 0)
try writer.writeAll("void")
@@ -205,7 +248,7 @@ fn indent(file: *C) !void {
try file.main.writer().writeByteNTimes(' ', indent_amt);
}
-pub fn generate(file: *C, decl: *Decl) !void {
+pub fn generate(file: *C, module: *Module, decl: *Decl) !void {
const tv = decl.typed_value.most_recent.typed_value;
var arena = std.heap.ArenaAllocator.init(file.base.allocator);
@@ -218,6 +261,7 @@ pub fn generate(file: *C, decl: *Decl) !void {
.inst_map = &inst_map,
.target = file.base.options.target,
.header = &file.header,
+ .module = module,
};
defer {
file.error_msg = ctx.error_msg;
@@ -236,17 +280,26 @@ pub fn generate(file: *C, decl: *Decl) !void {
try writer.writeAll("\n");
for (instructions) |inst| {
if (switch (inst.tag) {
+ .add => try genBinOp(&ctx, file, inst.castTag(.add).?, "+"),
+ .alloc => try genAlloc(&ctx, file, inst.castTag(.alloc).?),
+ .arg => try genArg(&ctx),
.assembly => try genAsm(&ctx, file, inst.castTag(.assembly).?),
+ .block => try genBlock(&ctx, file, inst.castTag(.block).?),
+ .breakpoint => try genBreakpoint(file, inst.castTag(.breakpoint).?),
.call => try genCall(&ctx, file, inst.castTag(.call).?),
- .add => try genBinOp(&ctx, file, inst.cast(Inst.BinOp).?, "+"),
- .sub => try genBinOp(&ctx, file, inst.cast(Inst.BinOp).?, "-"),
+ .cmp_eq => try genBinOp(&ctx, file, inst.castTag(.cmp_eq).?, "=="),
+ .cmp_gt => try genBinOp(&ctx, file, inst.castTag(.cmp_gt).?, ">"),
+ .cmp_gte => try genBinOp(&ctx, file, inst.castTag(.cmp_gte).?, ">="),
+ .cmp_lt => try genBinOp(&ctx, file, inst.castTag(.cmp_lt).?, "<"),
+ .cmp_lte => try genBinOp(&ctx, file, inst.castTag(.cmp_lte).?, "<="),
+ .cmp_neq => try genBinOp(&ctx, file, inst.castTag(.cmp_neq).?, "!="),
+ .dbg_stmt => try genDbgStmt(&ctx, inst.castTag(.dbg_stmt).?),
+ .intcast => try genIntCast(&ctx, file, inst.castTag(.intcast).?),
.ret => try genRet(&ctx, file, inst.castTag(.ret).?),
.retvoid => try genRetVoid(file),
- .arg => try genArg(&ctx),
- .dbg_stmt => try genDbgStmt(&ctx, inst.castTag(.dbg_stmt).?),
- .breakpoint => try genBreakpoint(file, inst.castTag(.breakpoint).?),
+ .store => try genStore(&ctx, file, inst.castTag(.store).?),
+ .sub => try genBinOp(&ctx, file, inst.castTag(.sub).?, "-"),
.unreach => try genUnreach(file, inst.castTag(.unreach).?),
- .intcast => try genIntCast(&ctx, file, inst.castTag(.intcast).?),
else => |e| return ctx.fail(decl.src(), "TODO: C backend: implement codegen for {}", .{e}),
}) |name| {
try ctx.inst_map.putNoClobber(inst, name);
@@ -264,19 +317,7 @@ pub fn generate(file: *C, decl: *Decl) !void {
// TODO ask the Decl if it is const
// https://github.com/ziglang/zig/issues/7582
- var suffix = std.ArrayList(u8).init(file.base.allocator);
- defer suffix.deinit();
-
- var render_ty = tv.ty;
- while (render_ty.zigTypeTag() == .Array) {
- const sentinel_bit = @boolToInt(render_ty.sentinel() != null);
- const c_len = render_ty.arrayLen() + sentinel_bit;
- try suffix.writer().print("[{d}]", .{c_len});
- render_ty = render_ty.elemType();
- }
-
- try renderType(&ctx, writer, render_ty);
- try writer.print(" {s}{s}", .{ decl.name, suffix.items });
+ try renderTypeAndName(&ctx, writer, tv.ty, mem.span(decl.name), .Mut);
try writer.writeAll(" = ");
try renderValue(&ctx, writer, tv.ty, tv.val);
@@ -304,6 +345,7 @@ pub fn generateHeader(
.inst_map = &inst_map,
.target = comp.getTarget(),
.header = header,
+ .module = module,
};
const writer = header.buf.writer();
renderFunctionSignature(&ctx, writer, decl) catch |err| {
@@ -327,17 +369,15 @@ const Context = struct {
error_msg: *Compilation.ErrorMsg = undefined,
target: std.Target,
header: *C.Header,
+ module: *Module,
fn resolveInst(self: *Context, inst: *Inst) ![]u8 {
- if (inst.cast(Inst.Constant)) |const_inst| {
+ if (inst.value()) |val| {
var out = std.ArrayList(u8).init(&self.arena.allocator);
- try renderValue(self, out.writer(), inst.ty, const_inst.val);
+ try renderValue(self, out.writer(), inst.ty, val);
return out.toOwnedSlice();
}
- if (self.inst_map.get(inst)) |val| {
- return val;
- }
- unreachable;
+ return self.inst_map.get(inst).?; // Instruction does not dominate all uses!
}
fn name(self: *Context) ![]u8 {
@@ -356,6 +396,27 @@ const Context = struct {
}
};
+fn genAlloc(ctx: *Context, file: *C, alloc: *Inst.NoOp) !?[]u8 {
+ const writer = file.main.writer();
+
+ // First line: the variable used as data storage.
+ try indent(file);
+ const local_name = try ctx.name();
+ const elem_type = alloc.base.ty.elemType();
+ const mutability: Mutability = if (alloc.base.ty.isConstPtr()) .Const else .Mut;
+ try renderTypeAndName(ctx, writer, elem_type, local_name, mutability);
+ try writer.writeAll(";\n");
+
+ // Second line: a pointer to it so that we can refer to it as the allocation.
+ // One line for the variable, one line for the pointer to the variable, which we return.
+ try indent(file);
+ const ptr_local_name = try ctx.name();
+ try renderTypeAndName(ctx, writer, alloc.base.ty, ptr_local_name, .Const);
+ try writer.print(" = &{s};\n", .{local_name});
+
+ return ptr_local_name;
+}
+
fn genArg(ctx: *Context) !?[]u8 {
const name = try std.fmt.allocPrint(&ctx.arena.allocator, "arg{}", .{ctx.argdex});
ctx.argdex += 1;
@@ -371,20 +432,10 @@ fn genRetVoid(file: *C) !?[]u8 {
fn genRet(ctx: *Context, file: *C, inst: *Inst.UnOp) !?[]u8 {
try indent(file);
const writer = file.main.writer();
- try writer.writeAll("return ");
- try genValue(ctx, writer, inst.operand);
- try writer.writeAll(";\n");
+ try writer.print("return {s};\n", .{try ctx.resolveInst(inst.operand)});
return null;
}
-fn genValue(ctx: *Context, writer: Writer, inst: *Inst) !void {
- if (inst.value()) |val| {
- try renderValue(ctx, writer, inst.ty, val);
- return;
- }
- return ctx.fail(ctx.decl.src(), "TODO: C backend: genValue for non-constant value", .{});
-}
-
fn genIntCast(ctx: *Context, file: *C, inst: *Inst.UnOp) !?[]u8 {
if (inst.base.isUnused())
return null;
@@ -393,25 +444,34 @@ fn genIntCast(ctx: *Context, file: *C, inst: *Inst.UnOp) !?[]u8 {
const writer = file.main.writer();
const name = try ctx.name();
const from = try ctx.resolveInst(inst.operand);
- try writer.writeAll("const ");
- try renderType(ctx, writer, inst.base.ty);
- try writer.print(" {} = (", .{name});
+
+ try renderTypeAndName(ctx, writer, inst.base.ty, name, .Const);
+ try writer.writeAll(" = (");
try renderType(ctx, writer, inst.base.ty);
- try writer.print("){};\n", .{from});
+ try writer.print("){s};\n", .{from});
return name;
}
-fn genBinOp(ctx: *Context, file: *C, inst: *Inst.BinOp, comptime operator: []const u8) !?[]u8 {
+fn genStore(ctx: *Context, file: *C, inst: *Inst.BinOp) !?[]u8 {
+ // *a = b;
+ try indent(file);
+ const writer = file.main.writer();
+ const dest_ptr_name = try ctx.resolveInst(inst.lhs);
+ const src_val_name = try ctx.resolveInst(inst.rhs);
+ try writer.print("*{s} = {s};\n", .{ dest_ptr_name, src_val_name });
+ return null;
+}
+
+fn genBinOp(ctx: *Context, file: *C, inst: *Inst.BinOp, operator: []const u8) !?[]u8 {
if (inst.base.isUnused())
return null;
try indent(file);
- const lhs = ctx.resolveInst(inst.lhs);
- const rhs = ctx.resolveInst(inst.rhs);
+ const lhs = try ctx.resolveInst(inst.lhs);
+ const rhs = try ctx.resolveInst(inst.rhs);
const writer = file.main.writer();
const name = try ctx.name();
- try writer.writeAll("const ");
- try renderType(ctx, writer, inst.base.ty);
- try writer.print(" {} = {} " ++ operator ++ " {};\n", .{ name, lhs, rhs });
+ try renderTypeAndName(ctx, writer, inst.base.ty, name, .Const);
+ try writer.print(" = {s} {s} {s};\n", .{ lhs, operator, rhs });
return name;
}
@@ -428,13 +488,22 @@ fn genCall(ctx: *Context, file: *C, inst: *Inst.Call) !?[]u8 {
unreachable;
const fn_ty = fn_decl.typed_value.most_recent.typed_value.ty;
- const ret_ty = fn_ty.fnReturnType().tag();
- if (fn_ty.fnReturnType().hasCodeGenBits() and inst.base.isUnused()) {
- try writer.print("(void)", .{});
+ const ret_ty = fn_ty.fnReturnType();
+ const unused_result = inst.base.isUnused();
+ var result_name: ?[]u8 = null;
+ if (unused_result) {
+ if (ret_ty.hasCodeGenBits()) {
+ try writer.print("(void)", .{});
+ }
+ } else {
+ const local_name = try ctx.name();
+ try renderTypeAndName(ctx, writer, ret_ty, local_name, .Const);
+ try writer.writeAll(" = ");
+ result_name = local_name;
}
const fn_name = mem.spanZ(fn_decl.name);
if (file.called.get(fn_name) == null) {
- try file.called.put(fn_name, void{});
+ try file.called.put(fn_name, {});
try renderFunctionSignature(ctx, header, fn_decl);
try header.writeAll(";\n");
}
@@ -453,10 +522,10 @@ fn genCall(ctx: *Context, file: *C, inst: *Inst.Call) !?[]u8 {
}
}
try writer.writeAll(");\n");
+ return result_name;
} else {
return ctx.fail(ctx.decl.src(), "TODO: C backend: implement function pointers", .{});
}
- return null;
}
fn genDbgStmt(ctx: *Context, inst: *Inst.NoOp) !?[]u8 {
@@ -464,6 +533,10 @@ fn genDbgStmt(ctx: *Context, inst: *Inst.NoOp) !?[]u8 {
return null;
}
+fn genBlock(ctx: *Context, file: *C, inst: *Inst.Block) !?[]u8 {
+ return ctx.fail(ctx.decl.src(), "TODO: C backend: implement blocks", .{});
+}
+
fn genBreakpoint(file: *C, inst: *Inst.NoOp) !?[]u8 {
try indent(file);
try file.main.writer().writeAll("zig_breakpoint();\n");
src/link/C.zig
@@ -90,7 +90,7 @@ pub fn deinit(self: *C) void {
}
pub fn updateDecl(self: *C, module: *Module, decl: *Module.Decl) !void {
- codegen.generate(self, decl) catch |err| {
+ codegen.generate(self, module, decl) catch |err| {
if (err == error.AnalysisFail) {
try module.failed_decls.put(module.gpa, decl, self.error_msg);
}
src/Module.zig
@@ -37,6 +37,7 @@ root_scope: *Scope,
/// It's rare for a decl to be exported, so we save memory by having a sparse map of
/// Decl pointers to details about them being exported.
/// The Export memory is owned by the `export_owners` table; the slice itself is owned by this table.
+/// The slice is guaranteed to not be empty.
decl_exports: std.AutoArrayHashMapUnmanaged(*Decl, []*Export) = .{},
/// We track which export is associated with the given symbol name for quick
/// detection of symbol collisions.
src/test.zig
@@ -863,6 +863,7 @@ pub const TestContext = struct {
},
}
std.testing.expectEqualStrings(expected_stdout, exec_result.stdout);
+ std.testing.expectEqualStrings("", exec_result.stderr);
},
}
}
src/zir_sema.zig
@@ -352,7 +352,11 @@ fn analyzeInstCoerceToPtrElem(mod: *Module, scope: *Scope, inst: *zir.Inst.Coerc
}
fn analyzeInstRetPtr(mod: *Module, scope: *Scope, inst: *zir.Inst.NoOp) InnerError!*Inst {
- return mod.fail(scope, inst.base.src, "TODO implement analyzeInstRetPtr", .{});
+ const b = try mod.requireFunctionBlock(scope, inst.base.src);
+ const fn_ty = b.func.?.owner_decl.typed_value.most_recent.typed_value.ty;
+ const ret_type = fn_ty.fnReturnType();
+ const ptr_type = try mod.simplePtrType(scope, inst.base.src, ret_type, true, .One);
+ return mod.addNoOp(b, inst.base.src, ptr_type, .alloc);
}
fn analyzeInstRef(mod: *Module, scope: *Scope, inst: *zir.Inst.UnOp) InnerError!*Inst {
test/stage2/cbe.zig
@@ -33,6 +33,24 @@ pub fn addCases(ctx: *TestContext) !void {
//, "yo" ++ std.cstr.line_sep);
}
+ {
+ var case = ctx.exeFromCompiledC("alloc and retptr", .{});
+
+ case.addCompareOutput(
+ \\fn add(a: i32, b: i32) i32 {
+ \\ return a + b;
+ \\}
+ \\
+ \\fn addIndirect(a: i32, b: i32) i32 {
+ \\ return add(a, b);
+ \\}
+ \\
+ \\export fn main() c_int {
+ \\ return addIndirect(1, 2) - 3;
+ \\}
+ , "");
+ }
+
ctx.c("empty start function", linux_x64,
\\export fn _start() noreturn {
\\ unreachable;
@@ -59,13 +77,13 @@ pub fn addCases(ctx: *TestContext) !void {
\\ main();
\\}
,
- \\zig_noreturn void main(void);
+ \\static zig_noreturn void main(void);
\\
\\zig_noreturn void _start(void) {
\\ main();
\\}
\\
- \\zig_noreturn void main(void) {
+ \\static zig_noreturn void main(void) {
\\ zig_breakpoint();
\\ zig_unreachable();
\\}
@@ -87,7 +105,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\ exitGood();
\\}
,
- \\zig_noreturn void exitGood(void);
+ \\static zig_noreturn void exitGood(void);
\\
\\static uint8_t exitGood__anon_0[6] = "{rax}";
\\static uint8_t exitGood__anon_1[6] = "{rdi}";
@@ -97,7 +115,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\ exitGood();
\\}
\\
- \\zig_noreturn void exitGood(void) {
+ \\static zig_noreturn void exitGood(void) {
\\ register uintptr_t rax_constant __asm__("rax") = 231;
\\ register uintptr_t rdi_constant __asm__("rdi") = 0;
\\ __asm volatile ("syscall" :: ""(rax_constant), ""(rdi_constant));
@@ -121,7 +139,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
\\
,
- \\zig_noreturn void exit(uintptr_t arg0);
+ \\static zig_noreturn void exit(uintptr_t arg0);
\\
\\static uint8_t exit__anon_0[6] = "{rax}";
\\static uint8_t exit__anon_1[6] = "{rdi}";
@@ -131,7 +149,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\ exit(0);
\\}
\\
- \\zig_noreturn void exit(uintptr_t arg0) {
+ \\static zig_noreturn void exit(uintptr_t arg0) {
\\ register uintptr_t rax_constant __asm__("rax") = 231;
\\ register uintptr_t rdi_constant __asm__("rdi") = arg0;
\\ __asm volatile ("syscall" :: ""(rax_constant), ""(rdi_constant));
@@ -155,7 +173,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
\\
,
- \\zig_noreturn void exit(uint8_t arg0);
+ \\static zig_noreturn void exit(uint8_t arg0);
\\
\\static uint8_t exit__anon_0[6] = "{rax}";
\\static uint8_t exit__anon_1[6] = "{rdi}";
@@ -165,8 +183,8 @@ pub fn addCases(ctx: *TestContext) !void {
\\ exit(0);
\\}
\\
- \\zig_noreturn void exit(uint8_t arg0) {
- \\ const uintptr_t __temp_0 = (uintptr_t)arg0;
+ \\static zig_noreturn void exit(uint8_t arg0) {
+ \\ uintptr_t const __temp_0 = (uintptr_t)arg0;
\\ register uintptr_t rax_constant __asm__("rax") = 231;
\\ register uintptr_t rdi_constant __asm__("rdi") = __temp_0;
\\ __asm volatile ("syscall" :: ""(rax_constant), ""(rdi_constant));
@@ -194,8 +212,8 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
\\
,
- \\zig_noreturn void exitMath(uint8_t arg0);
- \\zig_noreturn void exit(uint8_t arg0);
+ \\static zig_noreturn void exitMath(uint8_t arg0);
+ \\static zig_noreturn void exit(uint8_t arg0);
\\
\\static uint8_t exit__anon_0[6] = "{rax}";
\\static uint8_t exit__anon_1[6] = "{rdi}";
@@ -205,14 +223,14 @@ pub fn addCases(ctx: *TestContext) !void {
\\ exitMath(1);
\\}
\\
- \\zig_noreturn void exitMath(uint8_t arg0) {
- \\ const uint8_t __temp_0 = 0 + arg0;
- \\ const uint8_t __temp_1 = __temp_0 - arg0;
+ \\static zig_noreturn void exitMath(uint8_t arg0) {
+ \\ uint8_t const __temp_0 = 0 + arg0;
+ \\ uint8_t const __temp_1 = __temp_0 - arg0;
\\ exit(__temp_1);
\\}
\\
- \\zig_noreturn void exit(uint8_t arg0) {
- \\ const uintptr_t __temp_0 = (uintptr_t)arg0;
+ \\static zig_noreturn void exit(uint8_t arg0) {
+ \\ uintptr_t const __temp_0 = (uintptr_t)arg0;
\\ register uintptr_t rax_constant __asm__("rax") = 231;
\\ register uintptr_t rdi_constant __asm__("rdi") = __temp_0;
\\ __asm volatile ("syscall" :: ""(rax_constant), ""(rdi_constant));
@@ -240,8 +258,8 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
\\
,
- \\zig_noreturn void exitMath(uint8_t arg0);
- \\zig_noreturn void exit(uint8_t arg0);
+ \\static zig_noreturn void exitMath(uint8_t arg0);
+ \\static zig_noreturn void exit(uint8_t arg0);
\\
\\static uint8_t exit__anon_0[6] = "{rax}";
\\static uint8_t exit__anon_1[6] = "{rdi}";
@@ -251,14 +269,14 @@ pub fn addCases(ctx: *TestContext) !void {
\\ exitMath(1);
\\}
\\
- \\zig_noreturn void exitMath(uint8_t arg0) {
- \\ const uint8_t __temp_0 = arg0 + 0;
- \\ const uint8_t __temp_1 = __temp_0 - arg0;
+ \\static zig_noreturn void exitMath(uint8_t arg0) {
+ \\ uint8_t const __temp_0 = arg0 + 0;
+ \\ uint8_t const __temp_1 = __temp_0 - arg0;
\\ exit(__temp_1);
\\}
\\
- \\zig_noreturn void exit(uint8_t arg0) {
- \\ const uintptr_t __temp_0 = (uintptr_t)arg0;
+ \\static zig_noreturn void exit(uint8_t arg0) {
+ \\ uintptr_t const __temp_0 = (uintptr_t)arg0;
\\ register uintptr_t rax_constant __asm__("rax") = 231;
\\ register uintptr_t rdi_constant __asm__("rdi") = __temp_0;
\\ __asm volatile ("syscall" :: ""(rax_constant), ""(rdi_constant));