authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2022-10-24 11:32:31-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2022-10-25 05:11:29-04:00
loge470cf361fb190863341c8859eccf9edda6d122c
tree1c21c32a54b06a7fcfcb339771d7f183ba004d5b
parentab468d57e3af5d158dfbe0229cc451ce62dd80dc

cbe: update test cases

4 files changed, 14 insertions(+), 12 deletions(-)

lib/include/zig.h+1
......@@ -3,6 +3,7 @@
33#define __STDC_WANT_IEC_60559_TYPES_EXT__
44#include <float.h>
55#include <limits.h>
6#include <stddef.h>
67#include <stdint.h>
78
89#if defined(__has_builtin)
lib/std/start.zig+1-1
......@@ -506,7 +506,7 @@ fn main(c_argc: c_int, c_argv: [*c][*c]u8, c_envp: [*c][*c]u8) callconv(.C) c_in
506506}
507507
508508fn mainWithoutEnv(c_argc: c_int, c_argv: [*c][*c]u8) callconv(.C) c_int {
509 std.os.argv = c_argv[0..@intCast(usize, c_argc)];
509 std.os.argv = @ptrCast([*][*:0]u8, c_argv)[0..@intCast(usize, c_argc)];
510510 return @call(.{ .modifier = .always_inline }, callMain, .{});
511511}
512512
src/test.zig+1
......@@ -791,6 +791,7 @@ pub const TestContext = struct {
791791 .updates = std.ArrayList(Update).init(ctx.cases.allocator),
792792 .output_mode = .Exe,
793793 .files = std.ArrayList(File).init(ctx.arena),
794 .link_libc = true,
794795 }) catch @panic("out of memory");
795796 return &ctx.cases.items[ctx.cases.items.len - 1];
796797 }
test/stage2/cbe.zig+11-11
......@@ -951,7 +951,7 @@ pub fn addCases(ctx: *TestContext) !void {
951951 ctx.h("simple header", linux_x64,
952952 \\export fn start() void{}
953953 ,
954 \\ZIG_EXTERN_C void start(void);
954 \\zig_extern_c zig_void start(zig_void);
955955 \\
956956 );
957957 ctx.h("header with single param function", linux_x64,
......@@ -959,7 +959,7 @@ pub fn addCases(ctx: *TestContext) !void {
959959 \\ _ = a;
960960 \\}
961961 ,
962 \\ZIG_EXTERN_C void start(uint8_t a0);
962 \\zig_extern_c zig_void start(zig_u8 const a0);
963963 \\
964964 );
965965 ctx.h("header with multiple param function", linux_x64,
......@@ -967,25 +967,25 @@ pub fn addCases(ctx: *TestContext) !void {
967967 \\ _ = a; _ = b; _ = c;
968968 \\}
969969 ,
970 \\ZIG_EXTERN_C void start(uint8_t a0, uint8_t a1, uint8_t a2);
970 \\zig_extern_c zig_void start(zig_u8 const a0, zig_u8 const a1, zig_u8 const a2);
971971 \\
972972 );
973973 ctx.h("header with u32 param function", linux_x64,
974974 \\export fn start(a: u32) void{ _ = a; }
975975 ,
976 \\ZIG_EXTERN_C void start(uint32_t a0);
976 \\zig_extern_c zig_void start(zig_u32 const a0);
977977 \\
978978 );
979979 ctx.h("header with usize param function", linux_x64,
980980 \\export fn start(a: usize) void{ _ = a; }
981981 ,
982 \\ZIG_EXTERN_C void start(uintptr_t a0);
982 \\zig_extern_c zig_void start(zig_usize const a0);
983983 \\
984984 );
985985 ctx.h("header with bool param function", linux_x64,
986986 \\export fn start(a: bool) void{_ = a;}
987987 ,
988 \\ZIG_EXTERN_C void start(bool a0);
988 \\zig_extern_c zig_void start(zig_bool const a0);
989989 \\
990990 );
991991 ctx.h("header with noreturn function", linux_x64,
......@@ -993,7 +993,7 @@ pub fn addCases(ctx: *TestContext) !void {
993993 \\ unreachable;
994994 \\}
995995 ,
996 \\ZIG_EXTERN_C zig_noreturn void start(void);
996 \\zig_extern_c zig_noreturn start(zig_void);
997997 \\
998998 );
999999 ctx.h("header with multiple functions", linux_x64,
......@@ -1001,15 +1001,15 @@ pub fn addCases(ctx: *TestContext) !void {
10011001 \\export fn b() void{}
10021002 \\export fn c() void{}
10031003 ,
1004 \\ZIG_EXTERN_C void a(void);
1005 \\ZIG_EXTERN_C void b(void);
1006 \\ZIG_EXTERN_C void c(void);
1004 \\zig_extern_c zig_void a(zig_void);
1005 \\zig_extern_c zig_void b(zig_void);
1006 \\zig_extern_c zig_void c(zig_void);
10071007 \\
10081008 );
10091009 ctx.h("header with multiple includes", linux_x64,
10101010 \\export fn start(a: u32, b: usize) void{ _ = a; _ = b; }
10111011 ,
1012 \\ZIG_EXTERN_C void start(uint32_t a0, uintptr_t a1);
1012 \\zig_extern_c zig_void start(zig_u32 const a0, zig_usize const a1);
10131013 \\
10141014 );
10151015}