authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2020-03-07 17:36:17+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-04-08 14:11:01-04:00
log7b5fb79b5b9625a1c2b7359c6653653a799ca114
treebfaec9fbe4aa89dab774b907ed8244501693ff60
parentb3aef49eeaa42127ac57ded3b15228db39f806b3
signaturelock-open Commit is signed but in an unrecognized format.

Translate C: Put an alignCast in c style pointer casts to allow opaque types to cast properly in C macros

Translate C: add test case for aligning opaque types in pointer casts

2 files changed, 45 insertions(+), 9 deletions(-)

src-self-hosted/translate_c.zig+26-5
......@@ -5519,12 +5519,12 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
55195519 return error.ParseError;
55205520 }
55215521
5522 //if (@typeInfo(@TypeOf(x)) == .Pointer)
5523 // @ptrCast(dest, x)
5524 //else if (@typeInfo(@TypeOf(x)) == .Int and @typeInfo(dest) == .Pointer)
5522 //( if (@typeInfo(@TypeOf(x)) == .Pointer)
5523 // @ptrCast(dest, @alignCast(@alignOf(dest.Child), x))
5524 //else if (@typeInfo(@TypeOf(x)) == .Integer and @typeInfo(dest) == .Pointer))
55255525 // @intToPtr(dest, x)
55265526 //else
5527 // @as(dest, x)
5527 // @as(dest, x) )
55285528
55295529 const lparen = try appendToken(c, .LParen, "(");
55305530
......@@ -5546,9 +5546,30 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
55465546 if_1.condition = &cmp_1.base;
55475547 _ = try appendToken(c, .RParen, ")");
55485548
5549 const period_tok = try appendToken(c, .Period, ".");
5550 const child_ident = try transCreateNodeIdentifier(c, "Child");
5551 const inner_node_child = try c.a().create(ast.Node.InfixOp);
5552 inner_node_child.* = .{
5553 .op_token = period_tok,
5554 .lhs = inner_node,
5555 .op = .Period,
5556 .rhs = child_ident,
5557 };
5558
5559 const align_of = try transCreateNodeBuiltinFnCall(c, "@alignOf");
5560 try align_of.params.push(&inner_node_child.base);
5561 align_of.rparen_token = try appendToken(c, .RParen, ")");
5562 // hack to get zig fmt to render a comma in builtin calls
5563 _ = try appendToken(c, .Comma, ",");
5564
5565 const align_cast = try transCreateNodeBuiltinFnCall(c, "@alignCast");
5566 try align_cast.params.push(&align_of.base);
5567 try align_cast.params.push(node_to_cast);
5568 align_cast.rparen_token = try appendToken(c, .RParen, ")");
5569
55495570 const ptr_cast = try transCreateNodeBuiltinFnCall(c, "@ptrCast");
55505571 try ptr_cast.params.push(inner_node);
5551 try ptr_cast.params.push(node_to_cast);
5572 try ptr_cast.params.push(&align_cast.base);
55525573 ptr_cast.rparen_token = try appendToken(c, .RParen, ")");
55535574 if_1.body = &ptr_cast.base;
55545575
test/translate_c.zig+19-4
......@@ -1458,7 +1458,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
14581458 cases.add("macro pointer cast",
14591459 \\#define NRF_GPIO ((NRF_GPIO_Type *) NRF_GPIO_BASE)
14601460 , &[_][]const u8{
1461 \\pub const NRF_GPIO = (if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Pointer) @ptrCast([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Int and @typeInfo([*c]NRF_GPIO_Type) == .Pointer) @intToPtr([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else @as([*c]NRF_GPIO_Type, NRF_GPIO_BASE));
1461 \\pub const NRF_GPIO = (if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Pointer) @ptrCast([*c]NRF_GPIO_Type, @alignCast(@alignOf([*c]NRF_GPIO_Type.Child), NRF_GPIO_BASE)) else if (@typeInfo(@TypeOf(NRF_GPIO_BASE)) == .Int and @typeInfo([*c]NRF_GPIO_Type) == .Pointer) @intToPtr([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else @as([*c]NRF_GPIO_Type, NRF_GPIO_BASE));
14621462 });
14631463
14641464 cases.add("basic macro function",
......@@ -2668,11 +2668,11 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
26682668 \\#define FOO(bar) baz((void *)(baz))
26692669 \\#define BAR (void*) a
26702670 , &[_][]const u8{
2671 \\pub inline fn FOO(bar: var) @TypeOf(baz((if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, baz) else if (@typeInfo(@TypeOf(baz)) == .Int and @typeInfo(*c_void) == .Pointer) @intToPtr(*c_void, baz) else @as(*c_void, baz)))) {
2672 \\ return baz((if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, baz) else if (@typeInfo(@TypeOf(baz)) == .Int and @typeInfo(*c_void) == .Pointer) @intToPtr(*c_void, baz) else @as(*c_void, baz)));
2671 \\pub inline fn FOO(bar: var) @TypeOf(baz((if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, @alignCast(@alignOf(*c_void.Child), baz)) else if (@typeInfo(@TypeOf(baz)) == .Int and @typeInfo(*c_void) == .Pointer) @intToPtr(*c_void, baz) else @as(*c_void, baz)))) {
2672 \\ return baz((if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, @alignCast(@alignOf(*c_void.Child), baz)) else if (@typeInfo(@TypeOf(baz)) == .Int and @typeInfo(*c_void) == .Pointer) @intToPtr(*c_void, baz) else @as(*c_void, baz)));
26732673 \\}
26742674 ,
2675 \\pub const BAR = (if (@typeInfo(@TypeOf(a)) == .Pointer) @ptrCast(*c_void, a) else if (@typeInfo(@TypeOf(a)) == .Int and @typeInfo(*c_void) == .Pointer) @intToPtr(*c_void, a) else @as(*c_void, a));
2675 \\pub const BAR = (if (@typeInfo(@TypeOf(a)) == .Pointer) @ptrCast(*c_void, @alignCast(@alignOf(*c_void.Child), a)) else if (@typeInfo(@TypeOf(a)) == .Int and @typeInfo(*c_void) == .Pointer) @intToPtr(*c_void, a) else @as(*c_void, a));
26762676 });
26772677
26782678 cases.add("macro conditional operator",
......@@ -2879,4 +2879,19 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
28792879 , &[_][]const u8{
28802880 \\pub const FOO = 0x61626364;
28812881 });
2882
2883 cases.add("Make sure casts are grouped",
2884 \\typedef struct
2885 \\{
2886 \\ int i;
2887 \\}
2888 \\*_XPrivDisplay;
2889 \\typedef struct _XDisplay Display;
2890 \\#define DefaultScreen(dpy) (((_XPrivDisplay)(dpy))->default_screen)
2891 \\
2892 , &[_][]const u8{
2893 \\pub inline fn DefaultScreen(dpy: var) @TypeOf((if (@typeInfo(@TypeOf(dpy)) == .Pointer) @ptrCast(_XPrivDisplay, @alignCast(@alignOf(_XPrivDisplay.Child), dpy)) else if (@typeInfo(@TypeOf(dpy)) == .Int and @typeInfo(_XPrivDisplay) == .Pointer) @intToPtr(_XPrivDisplay, dpy) else @as(_XPrivDisplay, dpy)).*.default_screen) {
2894 \\ return (if (@typeInfo(@TypeOf(dpy)) == .Pointer) @ptrCast(_XPrivDisplay, @alignCast(@alignOf(_XPrivDisplay.Child), dpy)) else if (@typeInfo(@TypeOf(dpy)) == .Int and @typeInfo(_XPrivDisplay) == .Pointer) @intToPtr(_XPrivDisplay, dpy) else @as(_XPrivDisplay, dpy)).*.default_screen;
2895 \\}
2896 });
28822897}