update Aro dependency and enable passing tests

Author: Vexu

build.zig.zon

@@ -9,8 +9,8 @@
 
     .dependencies = .{
         .aro = .{
-            .url = "git+https://github.com/Vexu/arocc#3daec2b3950ab8aee5b3a8ae3e9cc11fb437e803",
-            .hash = "aro-0.0.0-JSD1QkIZJgDmOZ70WVhJvlnU4fV1zEjP6Hm8eF-y6Dtd",
+            .url = "git+https://github.com/Vexu/arocc#6211f260b924c33b566367fe505021a2887489f3",
+            .hash = "aro-0.0.0-JSD1QgZiJgAHbAL6WgwZx2fEUPB2WbHdYkAQ50URgkCG",
         },
 
         // .example_compile_c = .{

src/Translator.zig

@@ -173,6 +173,10 @@ pub fn translate(
 
     try translator.prepopulateGlobalNameTable();
     try translator.transTopLevelDecls();
+
+    // Insert empty line before macros.
+    try translator.global_scope.nodes.append(gpa, try ZigTag.warning.create(arena, "\n"));
+
     try translator.transMacros();
 
     for (translator.alias_list.items) |alias| {
@@ -592,9 +596,16 @@ fn transFnDecl(t: *Translator, scope: *Scope, fn_decl_node: Node.Index) Error!vo
         .is_export = !is_export_or_inline and has_body and !is_always_inline,
         .is_pub = is_pub,
         .cc = if (raw_qt.getAttribute(t.comp, .calling_convention)) |some| switch (some.cc) {
-            .C => .c,
+            .c => .c,
             .stdcall => .x86_stdcall,
             .thiscall => .x86_thiscall,
+            .fastcall => .x86_fastcall,
+            .regcall => .x86_regcall,
+            .riscv_vector => .riscv_vector,
+            .aarch64_sve_pcs => .aarch64_sve_pcs,
+            .aarch64_vector_pcs => .aarch64_vfabi,
+            .arm_aapcs => .arm_aapcs,
+            .arm_aapcs_vfp => .arm_aapcs_vfp,
             .vectorcall => switch (t.comp.target.cpu.arch) {
                 .x86 => .x86_vectorcall,
                 .aarch64, .aarch64_be => .aarch64_vfabi,

src/ast.zig

@@ -611,10 +611,13 @@ pub const Payload = struct {
             x86_fastcall,
             x86_thiscall,
             x86_vectorcall,
+            x86_regcall,
             aarch64_vfabi,
+            aarch64_sve_pcs,
             arm_aapcs,
             arm_aapcs_vfp,
             m68k_rtd,
+            riscv_vector,
         };
     };
 
@@ -2867,10 +2870,13 @@ fn renderFunc(c: *Context, node: Node) !NodeIndex {
             .x86_fastcall,
             .x86_thiscall,
             .x86_vectorcall,
+            .x86_regcall,
             .aarch64_vfabi,
+            .aarch64_sve_pcs,
             .arm_aapcs,
             .arm_aapcs_vfp,
             .m68k_rtd,
+            .riscv_vector,
             => cc_node: {
                 // .{ .foo = .{} }
                 _ = try c.addToken(.period, ".");

src/main.zig

@@ -22,7 +22,15 @@ pub fn main() u8 {
         return 1;
     };
 
-    var comp = aro.Compilation.initDefault(gpa, std.fs.cwd()) catch |err| switch (err) {
+    const stderr = std.io.getStdErr();
+    var diagnostics: aro.Diagnostics = .{
+        .output = .{ .to_file = .{
+            .file = stderr,
+            .config = std.io.tty.detectConfig(stderr),
+        } },
+    };
+
+    var comp = aro.Compilation.initDefault(gpa, &diagnostics, std.fs.cwd()) catch |err| switch (err) {
         error.OutOfMemory => {
             std.debug.print("ran out of memory initializing C compilation\n", .{});
             if (fast_exit) process.exit(1);
@@ -38,7 +46,7 @@ pub fn main() u8 {
     };
     defer gpa.free(exe_name);
 
-    var driver: aro.Driver = .{ .comp = &comp, .aro_name = exe_name };
+    var driver: aro.Driver = .{ .comp = &comp, .diagnostics = &diagnostics, .aro_name = exe_name };
     defer driver.deinit();
 
     var toolchain: aro.Toolchain = .{ .driver = &driver, .arena = arena, .filesystem = .{ .real = comp.cwd } };
@@ -51,7 +59,6 @@ pub fn main() u8 {
             return 1;
         },
         error.FatalError => {
-            _ = renderErrors(&driver);
             if (fast_exit) process.exit(1);
             return 1;
         },
@@ -102,9 +109,9 @@ fn translate(d: *aro.Driver, tc: *aro.Toolchain, args: []const []const u8) !void
     var c_tree = try pp.parse();
     defer c_tree.deinit();
 
-    if (renderErrors(d) != 0) {
+    if (d.diagnostics.errors != 0) {
         if (fast_exit) process.exit(1);
-        return;
+        return error.FatalError;
     }
 
     const rendered_zig = try Translator.translate(gpa, d.comp, &pp, &c_tree);
@@ -129,39 +136,6 @@ fn translate(d: *aro.Driver, tc: *aro.Toolchain, args: []const []const u8) !void
     if (fast_exit) process.exit(0);
 }
 
-/// Renders errors and fatal errors + associated notes (e.g. "expanded from here"); does not render warnings or associated notes
-fn renderErrors(d: *aro.Driver) u32 {
-    var writer = aro.Diagnostics.defaultMsgWriter(d.detectConfig(std.io.getStdErr()));
-    defer writer.deinit();
-
-    var errors: u32 = 0;
-    var saw_error = false;
-    for (d.comp.diagnostics.list.items) |msg| {
-        switch (msg.kind) {
-            .@"error", .@"fatal error" => {
-                errors += 1;
-                saw_error = true;
-                aro.Diagnostics.renderMessage(d.comp, &writer, msg);
-            },
-            .warning => saw_error = false,
-            .note => {
-                if (saw_error) {
-                    aro.Diagnostics.renderMessage(d.comp, &writer, msg);
-                }
-            },
-            .off => {},
-            .default => unreachable,
-        }
-    }
-    const e_s = if (errors == 1) "" else "s";
-    if (errors != 0) {
-        writer.print("{d} error{s} generated.\n", .{ errors, e_s });
-    }
-
-    d.comp.diagnostics.list.items.len = 0;
-    return errors;
-}
-
 comptime {
     if (@import("builtin").is_test) {
         _ = Translator;

test/cases/translate/Calling_convention_aarch64.c

@@ -1,7 +1,6 @@
 void __attribute__((aarch64_vector_pcs)) foo1(float *a);
 
 // translate
-// expect=fail
 // target=aarch64-linux-none
 //
 // pub extern fn foo1(a: [*c]f32) callconv(.{ .aarch64_vfabi = .{} }) void;

test/cases/translate/Calling_convention_arm.c

@@ -2,7 +2,6 @@ void __attribute__((pcs("aapcs"))) foo1(float *a);
 void __attribute__((pcs("aapcs-vfp"))) foo2(float *a);
 
 // translate
-// expect=fail
 // target=arm-linux-none
 //
 // pub extern fn foo1(a: [*c]f32) callconv(.{ .arm_aapcs = .{} }) void;

test/cases/translate/Calling_convention_x86.c

@@ -5,7 +5,6 @@ void __attribute__((cdecl)) foo4(float *a);
 void __attribute__((thiscall)) foo5(float *a);
 
 // translate
-// expect=fail
 // target=x86-linux-none
 //
 // pub extern fn foo1(a: [*c]f32) callconv(.{ .x86_fastcall = .{} }) void;

test/cases/translate/macros_with_field_targets.c

@@ -12,13 +12,12 @@ extern union OpenGLProcs glProcs;
 #define glClearPFN PFNGLCLEARPROC
 
 // translate
-// expect=fail
 //
 // pub const GLbitfield = c_uint;
-// pub const PFNGLCLEARPROC = ?*const fn (GLbitfield) callconv(.c) void;
+// pub const PFNGLCLEARPROC = ?*const fn (mask: GLbitfield) callconv(.c) void;
 // pub const OpenGLProc = ?*const fn () callconv(.c) void;
 // const struct_unnamed_1 = extern struct {
-//     Clear: PFNGLCLEARPROC = @import("std").mem.zeroes(PFNGLCLEARPROC),
+//     Clear: PFNGLCLEARPROC = null,
 // };
 // pub const union_OpenGLProcs = extern union {
 //     ptr: [1]OpenGLProc,
@@ -28,8 +27,8 @@ extern union OpenGLProcs glProcs;
 //
 // pub const glClearPFN = PFNGLCLEARPROC;
 //
-// pub inline fn glClearUnion(arg_2: GLbitfield) void {
-//     return glProcs.gl.Clear.?(arg_2);
+// pub inline fn glClearUnion(mask: GLbitfield) void {
+//     return glProcs.gl.Clear.?(mask);
 // }
 //
 // pub const OpenGLProcs = union_OpenGLProcs;

test/cases/translate/shift_right_assign_with_a_fixed_size_type.c

@@ -1,4 +1,7 @@
-#include <stdint.h>
+// TODO https://github.com/Vexu/arocc/issues/848
+// #include <stdint.h>
+typedef __UINT32_TYPE__ uint32_t;
+
 int log2(uint32_t a) {
     int i = 0;
     while (a > 0) {
@@ -8,15 +11,14 @@ int log2(uint32_t a) {
 }
 
 // translate
-// expect=fail
 //
 // pub export fn log2(arg_a: u32) c_int {
 //     var a = arg_a;
 //     _ = &a;
 //     var i: c_int = 0;
 //     _ = &i;
-//     while (a > @as(u32, @bitCast(@as(c_int, 0)))) {
-//         a >>= @intCast(@as(c_int, 1));
+//     while (a > @as(u32, 0)) {
+//         a >>= @intCast(1);
 //     }
 //     return i;
 // }