translate-c: a little closer to self-hosted implementation

Author: andrewrk

CMakeLists.txt

@@ -512,6 +512,7 @@ set(ZIG_STD_FILES
     "heap.zig"
     "io.zig"
     "io/seekable_stream.zig"
+    "io/c_out_stream.zig"
     "json.zig"
     "lazy_init.zig"
     "linked_list.zig"

src-self-hosted/clang.zig

@@ -1,8 +1,7 @@
 // This is Zig code that is used by both stage1 and stage2.
 // The prototypes in src/userland.h must match these definitions.
-comptime {
-    _ = @import("translate_c.zig");
-}
+
+const std = @import("std");
 
 pub const info_zen =
     \\
@@ -29,3 +28,93 @@ export fn stage2_zen(ptr: *[*]const u8, len: *usize) void {
 export fn stage2_panic(ptr: [*]const u8, len: usize) void {
     @panic(ptr[0..len]);
 }
+
+const TranslateMode = extern enum {
+    import,
+    translate,
+};
+
+const Error = extern enum {
+    None,
+    OutOfMemory,
+    InvalidFormat,
+    SemanticAnalyzeFail,
+    AccessDenied,
+    Interrupted,
+    SystemResources,
+    FileNotFound,
+    FileSystem,
+    FileTooBig,
+    DivByZero,
+    Overflow,
+    PathAlreadyExists,
+    Unexpected,
+    ExactDivRemainder,
+    NegativeDenominator,
+    ShiftedOutOneBits,
+    CCompileErrors,
+    EndOfFile,
+    IsDir,
+    NotDir,
+    UnsupportedOperatingSystem,
+    SharingViolation,
+    PipeBusy,
+    PrimitiveTypeNotFound,
+    CacheUnavailable,
+    PathTooLong,
+    CCompilerCannotFindFile,
+    ReadingDepFile,
+    InvalidDepFile,
+    MissingArchitecture,
+    MissingOperatingSystem,
+    UnknownArchitecture,
+    UnknownOperatingSystem,
+    UnknownABI,
+    InvalidFilename,
+    DiskQuota,
+    DiskSpace,
+    UnexpectedWriteFailure,
+    UnexpectedSeekFailure,
+    UnexpectedFileTruncationFailure,
+    Unimplemented,
+    OperationAborted,
+    BrokenPipe,
+    NoSpaceLeft,
+};
+
+const FILE = std.c.FILE;
+const ast = std.zig.ast;
+
+/// Args should have a null terminating last arg.
+export fn stage2_translate_c(
+    out_ast: **ast.Tree,
+    args_begin: [*]?[*]const u8,
+    args_end: [*]?[*]const u8,
+    mode: TranslateMode,
+) Error {
+    const translate_c = @import("translate_c.zig");
+    out_ast.* = translate_c.translate(args_begin, args_end, switch (mode) {
+        .import => translate_c.Mode.import,
+        .translate => translate_c.Mode.translate,
+    }) catch |err| switch (err) {
+        error.Unimplemented => return Error.Unimplemented,
+    };
+    return Error.None;
+}
+
+export fn stage2_render_ast(tree: *ast.Tree, output_file: *FILE) Error {
+    const c_out_stream = &std.io.COutStream.init(output_file).stream;
+    _ = std.zig.render(std.heap.c_allocator, c_out_stream, tree) catch |e| switch (e) {
+        error.SystemResources => return Error.SystemResources,
+        error.OperationAborted => return Error.OperationAborted,
+        error.BrokenPipe => return Error.BrokenPipe,
+        error.DiskQuota => return Error.DiskQuota,
+        error.FileTooBig => return Error.FileTooBig,
+        error.NoSpaceLeft => return Error.NoSpaceLeft,
+        error.AccessDenied => return Error.AccessDenied,
+        error.OutOfMemory => return Error.OutOfMemory,
+        error.Unexpected => return Error.Unexpected,
+        error.InputOutput => return Error.FileSystem,
+    };
+    return Error.None;
+}

src-self-hosted/stage1.zig

@@ -2,7 +2,14 @@
 // and stage2. Currently it's not used by anything, as it's not feature complete.
 
 const std = @import("std");
+const ast = std.zig.ast;
+use @import("clang.zig");
 
-export fn stage2_translate_c() void {
-    std.debug.panic("unimplemented");
+pub const Mode = enum {
+    import,
+    translate,
+};
+
+pub fn translate(args_begin: [*]?[*]const u8, args_end: [*]?[*]const u8, mode: Mode) !*ast.Tree {
+    return error.Unimplemented;
 }

src-self-hosted/translate_c.zig

@@ -3725,7 +3725,7 @@ static void analyze_fn_body(CodeGen *g, ZigFn *fn_table_entry) {
     }
     if (g->verbose_ir) {
         fprintf(stderr, "\n");
-        ast_render(g, stderr, fn_table_entry->body_node, 4);
+        ast_render(stderr, fn_table_entry->body_node, 4);
         fprintf(stderr, "\n{ // (IR)\n");
         ir_print(g, stderr, &fn_table_entry->ir_executable, 4);
         fprintf(stderr, "}\n");

src/analyze.cpp

@@ -247,4 +247,6 @@ Error create_c_object_cache(CodeGen *g, CacheHash **out_cache_hash, bool verbose
 LLVMTypeRef get_llvm_type(CodeGen *g, ZigType *type);
 ZigLLVMDIType *get_llvm_di_type(CodeGen *g, ZigType *type);
 
+void add_cc_args(CodeGen *g, ZigList<const char *> &args, const char *out_dep_path, bool translate_c);
+
 #endif

src/analyze.hpp

@@ -296,7 +296,6 @@ void ast_print(FILE *f, AstNode *node, int indent) {
 
 
 struct AstRender {
-    CodeGen *codegen;
     int indent;
     int indent_size;
     FILE *f;
@@ -1170,9 +1169,8 @@ static void render_node_extra(AstRender *ar, AstNode *node, bool grouped) {
 }
 
 
-void ast_render(CodeGen *codegen, FILE *f, AstNode *node, int indent_size) {
+void ast_render(FILE *f, AstNode *node, int indent_size) {
     AstRender ar = {0};
-    ar.codegen = codegen;
     ar.f = f;
     ar.indent_size = indent_size;
     ar.indent = 0;

src/ast_render.cpp

@@ -15,6 +15,6 @@
 
 void ast_print(FILE *f, AstNode *node, int indent);
 
-void ast_render(CodeGen *codegen, FILE *f, AstNode *node, int indent_size);
+void ast_render(FILE *f, AstNode *node, int indent_size);
 
 #endif