Commit 36da8d02b56e06c92279b4df21fbfaa0273e6c7b | zig

6 files changed, 62 insertions(+), 0 deletions(-)

src/clang.zig+5

...	...	@@ -905,6 +905,11 @@ pub const TypedefNameDecl = opaque {
905	905	extern fn ZigClangTypedefNameDecl_getLocation(*const TypedefNameDecl) SourceLocation;
906	906	};
907	907
	908	pub const FileScopeAsmDecl = opaque {
	909	pub const getAsmString = ZigClangFileScopeAsmDecl_getAsmString;
	910	extern fn ZigClangFileScopeAsmDecl_getAsmString(const FileScopeAsmDecl) const StringLiteral;
	911	};
	912
908	913	pub const TypedefType = opaque {
909	914	pub const getDecl = ZigClangTypedefType_getDecl;
910	915	extern fn ZigClangTypedefType_getDecl(const TypedefType) const TypedefNameDecl;

src/translate_c.zig+18

...	...	@@ -480,6 +480,9 @@ fn declVisitor(c: Context, decl: const clang.Decl) Error!void {
480	480	.Empty => {
481	481	// Do nothing
482	482	},
	483	.FileScopeAsm => {
	484	try transFileScopeAsm(c, &c.global_scope.base, @ptrCast(*const clang.FileScopeAsmDecl, decl));
	485	},
483	486	else => {
484	487	const decl_name = try c.str(decl.getDeclKindName());
485	488	try warn(c, &c.global_scope.base, decl.getLocation(), "ignoring {s} declaration", .{decl_name});
...	...	@@ -487,6 +490,21 @@ fn declVisitor(c: Context, decl: const clang.Decl) Error!void {
487	490	}
488	491	}
489	492
	493	fn transFileScopeAsm(c: Context, scope: Scope, file_scope_asm: *const clang.FileScopeAsmDecl) Error!void {
	494	const asm_string = file_scope_asm.getAsmString();
	495	var len: usize = undefined;
	496	const bytes_ptr = asm_string.getString_bytes_begin_size(&len);
	497
	498	const str = try std.fmt.allocPrint(c.arena, "\"{}\"", .{std.zig.fmtEscapes(bytes_ptr[0..len])});
	499	const str_node = try Tag.string_literal.create(c.arena, str);
	500
	501	const asm_node = try Tag.asm_simple.create(c.arena, str_node);
	502	const block = try Tag.block_single.create(c.arena, asm_node);
	503	const comptime_node = try Tag.@"comptime".create(c.arena, block);
	504
	505	try scope.appendNode(comptime_node);
	506	}
	507
490	508	fn visitFnDecl(c: Context, fn_decl: const clang.FunctionDecl) Error!void {
491	509	const fn_name = try c.str(@ptrCast(*const clang.NamedDecl, fn_decl).getName_bytes_begin());
492	510	if (c.global_scope.sym_table.contains(fn_name))

src/translate_c/ast.zig+17

...	...	@@ -161,6 +161,8 @@ pub const Node = extern union {
161	161	/// @shuffle(type, a, b, mask)
162	162	shuffle,
163	163
	164	asm_simple,
	165
164	166	negate,
165	167	negate_wrap,
166	168	bit_not,
...	...	@@ -245,6 +247,7 @@ pub const Node = extern union {
245	247	.std_mem_zeroes,
246	248	.@"return",
247	249	.@"comptime",
	250	.asm_simple,
248	251	.discard,
249	252	.std_math_Log2Int,
250	253	.negate,
...	...	@@ -1017,6 +1020,19 @@ fn renderNode(c: *Context, node: Node) Allocator.Error!NodeIndex {
1017	1020	},
1018	1021	});
1019	1022	},
	1023	.asm_simple => {
	1024	const payload = node.castTag(.asm_simple).?.data;
	1025	const asm_token = try c.addToken(.keyword_asm, "asm");
	1026	_ = try c.addToken(.l_paren, "(");
	1027	return c.addNode(.{
	1028	.tag = .asm_simple,
	1029	.main_token = asm_token,
	1030	.data = .{
	1031	.lhs = try renderNode(c, payload),
	1032	.rhs = try c.addToken(.r_paren, ")"),
	1033	},
	1034	});
	1035	},
1020	1036	.type => {
1021	1037	const payload = node.castTag(.type).?.data;
1022	1038	return c.addNode(.{
...	...	@@ -2257,6 +2273,7 @@ fn renderNodeGrouped(c: *Context, node: Node) !NodeIndex {
2257	2273	.@"continue",
2258	2274	.@"return",
2259	2275	.@"comptime",
	2276	.asm_simple,
2260	2277	.usingnamespace_builtins,
2261	2278	.while_true,
2262	2279	.if_not_break,

src/zig_clang.cpp+5

...	...	@@ -1820,6 +1820,11 @@ const ZigClangEnumDecl ZigClangEnumDecl_getDefinition(const ZigClangEnumDecl z
1820	1820	return reinterpret_cast<const ZigClangEnumDecl *>(definition);
1821	1821	}
1822	1822
	1823	const ZigClangStringLiteral ZigClangFileScopeAsmDecl_getAsmString(const ZigClangFileScopeAsmDecl self) {
	1824	const clang::StringLiteral result = reinterpret_cast<const clang::FileScopeAsmDecl>(self)->getAsmString();
	1825	return reinterpret_cast<const ZigClangStringLiteral *>(result);
	1826	}
	1827
1823	1828	bool ZigClangRecordDecl_isUnion(const ZigClangRecordDecl *record_decl) {
1824	1829	return reinterpret_cast<const clang::RecordDecl*>(record_decl)->isUnion();
1825	1830	}

src/zig_clang.h+3

...	...	@@ -124,6 +124,7 @@ struct ZigClangEnumType;
124	124	struct ZigClangExpr;
125	125	struct ZigClangFieldDecl;
126	126	struct ZigClangFileID;
	127	struct ZigClangFileScopeAsmDecl;
127	128	struct ZigClangFloatingLiteral;
128	129	struct ZigClangForStmt;
129	130	struct ZigClangFullSourceLoc;
...	...	@@ -1000,6 +1001,8 @@ ZIG_EXTERN_C unsigned ZigClangVarDecl_getAlignedAttribute(const struct ZigClangV
1000	1001	ZIG_EXTERN_C unsigned ZigClangFunctionDecl_getAlignedAttribute(const struct ZigClangFunctionDecl self, const ZigClangASTContext ctx);
1001	1002	ZIG_EXTERN_C unsigned ZigClangFieldDecl_getAlignedAttribute(const struct ZigClangFieldDecl self, const ZigClangASTContext ctx);
1002	1003
	1004	ZIG_EXTERN_C const struct ZigClangStringLiteral ZigClangFileScopeAsmDecl_getAsmString(const struct ZigClangFileScopeAsmDecl self);
	1005
1003	1006	ZIG_EXTERN_C struct ZigClangQualType ZigClangParmVarDecl_getOriginalType(const struct ZigClangParmVarDecl *self);
1004	1007
1005	1008	ZIG_EXTERN_C bool ZigClangRecordDecl_getPackedAttribute(const struct ZigClangRecordDecl *);

test/translate_c.zig+14

...	...	@@ -3499,4 +3499,18 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
3499	3499	\\ '\u{1f4af}',
3500	3500	\\};
3501	3501	});
	3502
	3503	cases.add("global assembly",
	3504	\\__asm__(".globl func\n\t"
	3505	\\ ".type func, @function\n\t"
	3506	\\ "func:\n\t"
	3507	\\ ".cfi_startproc\n\t"
	3508	\\ "movl $42, %eax\n\t"
	3509	\\ "ret\n\t"
	3510	\\ ".cfi_endproc");
	3511	, &[_][]const u8{
	3512	\\comptime {
	3513	\\ asm (".globl func\n\t.type func, @function\n\tfunc:\n\t.cfi_startproc\n\tmovl $42, %eax\n\tret\n\t.cfi_endproc");
	3514	\\}
	3515	});
3502	3516	}