authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-10 12:56:17-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-03-10 12:56:17-04:00
log9c4dc7b1bb79b2e1cf5a88d99b9e187640426769
tree5f964c24ade38e7c16ccef3b655d7919ef609d5e
parent3e93dce0a12e8b09f2de30276364d9ee18c6ada0
parentcb4c488cbd1e02b88ca8e7466a0945691f06d4fd
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #4703 from Vexu/translate-c

Translate-c improvements

5 files changed, 67 insertions(+), 12 deletions(-)

src-self-hosted/clang.zig+1
......@@ -765,6 +765,7 @@ pub extern fn ZigClangTagDecl_isThisDeclarationADefinition(self: *const ZigClang
765765pub extern fn ZigClangEnumType_getDecl(record_ty: ?*const struct_ZigClangEnumType) *const struct_ZigClangEnumDecl;
766766pub extern fn ZigClangRecordDecl_getCanonicalDecl(record_decl: ?*const struct_ZigClangRecordDecl) ?*const struct_ZigClangTagDecl;
767767pub extern fn ZigClangFieldDecl_getCanonicalDecl(field_decl: ?*const struct_ZigClangFieldDecl) ?*const struct_ZigClangFieldDecl;
768pub extern fn ZigClangFieldDecl_getAlignedAttribute(field_decl: ?*const struct_ZigClangFieldDecl, *const ZigClangASTContext) c_uint;
768769pub extern fn ZigClangEnumDecl_getCanonicalDecl(self: ?*const struct_ZigClangEnumDecl) ?*const struct_ZigClangTagDecl;
769770pub extern fn ZigClangTypedefNameDecl_getCanonicalDecl(self: ?*const struct_ZigClangTypedefNameDecl) ?*const struct_ZigClangTypedefNameDecl;
770771pub extern fn ZigClangFunctionDecl_getCanonicalDecl(self: ?*const struct_ZigClangFunctionDecl) ?*const struct_ZigClangFunctionDecl;
src-self-hosted/translate_c.zig+40-7
......@@ -560,7 +560,7 @@ fn visitVarDecl(c: *Context, var_decl: *const ZigClangVarDecl) Error!void {
560560
561561 // TODO https://github.com/ziglang/zig/issues/3756
562562 // TODO https://github.com/ziglang/zig/issues/1802
563 const checked_name = if (isZigPrimitiveType(var_name)) try std.fmt.allocPrint(c.a(), "_{}", .{var_name}) else var_name;
563 const checked_name = if (isZigPrimitiveType(var_name)) try std.fmt.allocPrint(c.a(), "{}_{}", .{var_name, c.getMangle()}) else var_name;
564564 const var_decl_loc = ZigClangVarDecl_getLocation(var_decl);
565565
566566 const qual_type = ZigClangVarDecl_getTypeSourceInfo_getType(var_decl);
......@@ -632,7 +632,7 @@ fn visitVarDecl(c: *Context, var_decl: *const ZigClangVarDecl) Error!void {
632632 const align_expr = blk: {
633633 const alignment = ZigClangVarDecl_getAlignedAttribute(var_decl, rp.c.clang_context);
634634 if (alignment != 0) {
635 _ = try appendToken(rp.c, .Keyword_linksection, "align");
635 _ = try appendToken(rp.c, .Keyword_align, "align");
636636 _ = try appendToken(rp.c, .LParen, "(");
637637 // Clang reports the alignment in bits
638638 const expr = try transCreateNodeInt(rp.c, alignment / 8);
......@@ -677,7 +677,7 @@ fn transTypeDef(c: *Context, typedef_decl: *const ZigClangTypedefNameDecl, top_l
677677
678678 // TODO https://github.com/ziglang/zig/issues/3756
679679 // TODO https://github.com/ziglang/zig/issues/1802
680 const checked_name = if (isZigPrimitiveType(typedef_name)) try std.fmt.allocPrint(c.a(), "_{}", .{typedef_name}) else typedef_name;
680 const checked_name = if (isZigPrimitiveType(typedef_name)) try std.fmt.allocPrint(c.a(), "{}_{}", .{typedef_name, c.getMangle()}) else typedef_name;
681681
682682 if (mem.eql(u8, checked_name, "uint8_t"))
683683 return transTypeDefAsBuiltin(c, typedef_decl, "u8")
......@@ -827,6 +827,20 @@ fn transRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) Error!?*
827827 else => |e| return e,
828828 };
829829
830 const align_expr = blk: {
831 const alignment = ZigClangFieldDecl_getAlignedAttribute(field_decl, rp.c.clang_context);
832 if (alignment != 0) {
833 _ = try appendToken(rp.c, .Keyword_align, "align");
834 _ = try appendToken(rp.c, .LParen, "(");
835 // Clang reports the alignment in bits
836 const expr = try transCreateNodeInt(rp.c, alignment / 8);
837 _ = try appendToken(rp.c, .RParen, ")");
838
839 break :blk expr;
840 }
841 break :blk null;
842 };
843
830844 const field_node = try c.a().create(ast.Node.ContainerField);
831845 field_node.* = .{
832846 .doc_comments = null,
......@@ -834,7 +848,7 @@ fn transRecordDecl(c: *Context, record_decl: *const ZigClangRecordDecl) Error!?*
834848 .name_token = field_name,
835849 .type_expr = field_type,
836850 .value_expr = null,
837 .align_expr = null,
851 .align_expr = align_expr,
838852 };
839853
840854 if (is_anon) {
......@@ -4607,7 +4621,7 @@ fn finishTransFnProto(
46074621 if (fn_decl) |decl| {
46084622 const alignment = ZigClangFunctionDecl_getAlignedAttribute(decl, rp.c.clang_context);
46094623 if (alignment != 0) {
4610 _ = try appendToken(rp.c, .Keyword_linksection, "align");
4624 _ = try appendToken(rp.c, .Keyword_align, "align");
46114625 _ = try appendToken(rp.c, .LParen, "(");
46124626 // Clang reports the alignment in bits
46134627 const expr = try transCreateNodeInt(rp.c, alignment / 8);
......@@ -4857,7 +4871,7 @@ fn transPreprocessorEntities(c: *Context, unit: *ZigClangASTUnit) Error!void {
48574871 const name = try c.str(raw_name);
48584872 // TODO https://github.com/ziglang/zig/issues/3756
48594873 // TODO https://github.com/ziglang/zig/issues/1802
4860 const mangled_name = if (isZigPrimitiveType(name)) try std.fmt.allocPrint(c.a(), "_{}", .{name}) else name;
4874 const mangled_name = if (isZigPrimitiveType(name)) try std.fmt.allocPrint(c.a(), "{}_{}", .{name, c.getMangle()}) else name;
48614875 if (scope.containsNow(mangled_name)) {
48624876 continue;
48634877 }
......@@ -5437,7 +5451,7 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
54375451
54385452 //if (@typeInfo(@TypeOf(x)) == .Pointer)
54395453 // @ptrCast(dest, x)
5440 //else if (@typeInfo(@TypeOf(x)) == .Integer)
5454 //else if (@typeInfo(@TypeOf(x)) == .Int and @typeInfo(dest) == .Pointer)
54415455 // @intToPtr(dest, x)
54425456 //else
54435457 // @as(dest, x)
......@@ -5487,6 +5501,25 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
54875501 .rhs = try transCreateNodeEnumLiteral(c, "Int"),
54885502 };
54895503 if_2.condition = &cmp_2.base;
5504 const cmp_4 = try c.a().create(ast.Node.InfixOp);
5505 cmp_4.* = .{
5506 .op_token = try appendToken(c, .Keyword_and, "and"),
5507 .lhs = &cmp_2.base,
5508 .op = .BoolAnd,
5509 .rhs = undefined,
5510 };
5511 const type_id_3 = try transCreateNodeBuiltinFnCall(c, "@typeInfo");
5512 try type_id_3.params.push(inner_node);
5513 type_id_3.rparen_token = try appendToken(c, .LParen, ")");
5514 const cmp_3 = try c.a().create(ast.Node.InfixOp);
5515 cmp_3.* = .{
5516 .op_token = try appendToken(c, .EqualEqual, "=="),
5517 .lhs = &type_id_3.base,
5518 .op = .EqualEqual,
5519 .rhs = try transCreateNodeEnumLiteral(c, "Pointer"),
5520 };
5521 cmp_4.rhs = &cmp_3.base;
5522 if_2.condition = &cmp_4.base;
54905523 else_1.body = &if_2.base;
54915524 _ = try appendToken(c, .RParen, ")");
54925525
src/zig_clang.cpp+10
......@@ -1615,6 +1615,16 @@ unsigned ZigClangVarDecl_getAlignedAttribute(const struct ZigClangVarDecl *self,
16151615 return 0;
16161616}
16171617
1618unsigned ZigClangFieldDecl_getAlignedAttribute(const struct ZigClangFieldDecl *self, const ZigClangASTContext* ctx) {
1619 auto casted_self = reinterpret_cast<const clang::FieldDecl *>(self);
1620 auto casted_ctx = const_cast<clang::ASTContext *>(reinterpret_cast<const clang::ASTContext *>(ctx));
1621 if (const clang::AlignedAttr *AA = casted_self->getAttr<clang::AlignedAttr>()) {
1622 return AA->getAlignment(*casted_ctx);
1623 }
1624 // Zero means no explicit alignment factor was specified
1625 return 0;
1626}
1627
16181628unsigned ZigClangFunctionDecl_getAlignedAttribute(const struct ZigClangFunctionDecl *self, const ZigClangASTContext* ctx) {
16191629 auto casted_self = reinterpret_cast<const clang::FunctionDecl *>(self);
16201630 auto casted_ctx = const_cast<clang::ASTContext *>(reinterpret_cast<const clang::ASTContext *>(ctx));
src/zig_clang.h+1
......@@ -865,6 +865,7 @@ ZIG_EXTERN_C const struct ZigClangVarDecl *ZigClangVarDecl_getCanonicalDecl(cons
865865ZIG_EXTERN_C const char* ZigClangVarDecl_getSectionAttribute(const struct ZigClangVarDecl *self, size_t *len);
866866ZIG_EXTERN_C unsigned ZigClangVarDecl_getAlignedAttribute(const struct ZigClangVarDecl *self, const ZigClangASTContext* ctx);
867867ZIG_EXTERN_C unsigned ZigClangFunctionDecl_getAlignedAttribute(const struct ZigClangFunctionDecl *self, const ZigClangASTContext* ctx);
868ZIG_EXTERN_C unsigned ZigClangFieldDecl_getAlignedAttribute(const struct ZigClangFieldDecl *self, const ZigClangASTContext* ctx);
868869
869870ZIG_EXTERN_C struct ZigClangQualType ZigClangParmVarDecl_getOriginalType(const struct ZigClangParmVarDecl *self);
870871
test/translate_c.zig+15-5
......@@ -3,6 +3,16 @@ const std = @import("std");
33const CrossTarget = std.zig.CrossTarget;
44
55pub fn addCases(cases: *tests.TranslateCContext) void {
6 cases.add("struct with aligned fields",
7 \\struct foo {
8 \\ __attribute__((aligned(1))) short bar;
9 \\};
10 , &[_][]const u8{
11 \\pub const struct_foo = extern struct {
12 \\ bar: c_short align(1),
13 \\};
14 });
15
616 cases.add("structs with VLAs are rejected",
717 \\struct foo { int x; int y[]; };
818 \\struct bar { int x; int y[0]; };
......@@ -1429,7 +1439,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
14291439 cases.add("macro pointer cast",
14301440 \\#define NRF_GPIO ((NRF_GPIO_Type *) NRF_GPIO_BASE)
14311441 , &[_][]const u8{
1432 \\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) @intToPtr([*c]NRF_GPIO_Type, NRF_GPIO_BASE) else @as([*c]NRF_GPIO_Type, NRF_GPIO_BASE));
1442 \\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));
14331443 });
14341444
14351445 cases.add("basic macro function",
......@@ -1601,7 +1611,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
16011611 cases.add("shadowing primitive types",
16021612 \\unsigned anyerror = 2;
16031613 , &[_][]const u8{
1604 \\pub export var _anyerror: c_uint = @bitCast(c_uint, @as(c_int, 2));
1614 \\pub export var anyerror_1: c_uint = @bitCast(c_uint, @as(c_int, 2));
16051615 });
16061616
16071617 cases.add("floats",
......@@ -2613,11 +2623,11 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
26132623 \\#define FOO(bar) baz((void *)(baz))
26142624 \\#define BAR (void*) a
26152625 , &[_][]const u8{
2616 \\pub inline fn FOO(bar: var) @TypeOf(baz((if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, baz) else if (@typeInfo(@TypeOf(baz)) == .Int) @intToPtr(*c_void, baz) else @as(*c_void, baz)))) {
2617 \\ return baz((if (@typeInfo(@TypeOf(baz)) == .Pointer) @ptrCast(*c_void, baz) else if (@typeInfo(@TypeOf(baz)) == .Int) @intToPtr(*c_void, baz) else @as(*c_void, baz)));
2626 \\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)))) {
2627 \\ 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)));
26182628 \\}
26192629 ,
2620 \\pub const BAR = (if (@typeInfo(@TypeOf(a)) == .Pointer) @ptrCast(*c_void, a) else if (@typeInfo(@TypeOf(a)) == .Int) @intToPtr(*c_void, a) else @as(*c_void, a));
2630 \\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));
26212631 });
26222632
26232633 cases.add("macro conditional operator",