authorgravatar for 29632054+Parzival-3141@users.noreply.github.comJulian <29632054+Parzival-3141@users.noreply.github.com> 2024-04-28 18:43:00-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-04-28 22:43:00+00:00
log4303400e47a0c15f7719c2e009f74dec5468a638
treed74439c91878ca05b69f6f3989dafa38914aa5d3
parent8a36a1f913c729993d53786486b542c0501dc27d
signaturebadge-check Signed by PGP key B5690EEEBB952194

Sema+llvm: properly implement `Interrupt` callconv

Co-authored-by: Veikka Tuominen <git@vexu.eu>

2 files changed, 25 insertions(+), 0 deletions(-)

src/Sema.zig+21
......@@ -9700,6 +9700,18 @@ fn funcCommon(
97009700 {
97019701 return sema.fail(block, param_src, "non-pointer parameter declared noalias", .{});
97029702 }
9703
9704 if (cc_resolved == .Interrupt) switch (target.cpu.arch) {
9705 .x86, .x86_64 => {
9706 const err_code_size = target.ptrBitWidth();
9707 switch (i) {
9708 0 => if (param_ty.zigTypeTag(mod) != .Pointer) return sema.fail(block, param_src, "parameter must be a pointer type", .{}),
9709 1 => if (param_ty.bitSize(mod) != err_code_size) return sema.fail(block, param_src, "parameter must be a {d}-bit integer", .{err_code_size}),
9710 else => return sema.fail(block, param_src, "Interrupt calling convention supports up to 2 parameters, found {d}", .{i + 1}),
9711 }
9712 },
9713 else => return sema.fail(block, param_src, "parameters are not allowed with Interrupt calling convention", .{}),
9714 };
97039715 }
97049716
97059717 var ret_ty_requires_comptime = false;
......@@ -10048,6 +10060,15 @@ fn finishFunc(
1004810060 });
1004910061 }
1005010062
10063 if (cc_resolved == .Interrupt and return_type.zigTypeTag(mod) != .Void) {
10064 return sema.fail(
10065 block,
10066 cc_src,
10067 "non-void return type '{}' not allowed in function with calling convention 'Interrupt'",
10068 .{return_type.fmt(mod)},
10069 );
10070 }
10071
1005110072 if (cc_resolved == .Inline and is_noinline) {
1005210073 return sema.fail(block, cc_src, "'noinline' function cannot have callconv 'Inline'", .{});
1005310074 }
src/codegen/llvm.zig+4
......@@ -4529,6 +4529,10 @@ pub const Object = struct {
45294529 if (!param_ty.isPtrLikeOptional(mod) and !ptr_info.flags.is_allowzero) {
45304530 try attributes.addParamAttr(llvm_arg_i, .nonnull, &o.builder);
45314531 }
4532 if (fn_info.cc == .Interrupt) {
4533 const child_type = try lowerType(o, Type.fromInterned(ptr_info.child));
4534 try attributes.addParamAttr(llvm_arg_i, .{ .byval = child_type }, &o.builder);
4535 }
45324536 if (ptr_info.flags.is_const) {
45334537 try attributes.addParamAttr(llvm_arg_i, .readonly, &o.builder);
45344538 }