Commit 0013042cbd539cf7eb463483633e9f7aa2fa8067 | zig

Closes #13830

3 files changed, 37 insertions(+), 4 deletions(-)

src/arch/x86_64/abi.zig+21-2

...	...	@@ -5,7 +5,19 @@ const assert = std.debug.assert;
5	5	const Register = @import("bits.zig").Register;
6	6	const RegisterManagerFn = @import("../../register_manager.zig").RegisterManager;
7	7
8		pub const Class = enum { integer, sse, sseup, x87, x87up, complex_x87, memory, none, win_i128 };
	8	pub const Class = enum {
	9	integer,
	10	sse,
	11	sseup,
	12	x87,
	13	x87up,
	14	complex_x87,
	15	memory,
	16	none,
	17	win_i128,
	18	float,
	19	float_combine,
	20	};
9	21
10	22	pub fn classifyWindows(ty: Type, target: Target) Class {
11	23	// https://docs.microsoft.com/en-gb/cpp/build/x64-calling-convention?view=vs-2017
...	...	@@ -121,7 +133,11 @@ pub fn classifySystemV(ty: Type, target: Target, ctx: Context) [8]Class {
121	133	}
122	134	return result;
123	135	},
124		32, 64 => {
	136	32 => {
	137	result[0] = .float;
	138	return result;
	139	},
	140	64 => {
125	141	result[0] = .sse;
126	142	return result;
127	143	},
...	...	@@ -252,6 +268,9 @@ pub fn classifySystemV(ty: Type, target: Target, ctx: Context) [8]Class {
252	268	combine: {
253	269	// "If both classes are equal, this is the resulting class."
254	270	if (result[result_i] == field_class[0]) {
	271	if (result[result_i] == .float) {
	272	result[result_i] = .float_combine;
	273	}
255	274	break :combine;
256	275	}
257	276

src/codegen/llvm.zig+16

...	...	@@ -10478,6 +10478,14 @@ fn lowerFnRetTy(dg: DeclGen, fn_info: Type.Payload.Function.Data) !llvm.Type {
10478	10478	llvm_types_buffer[llvm_types_index] = dg.context.doubleType();
10479	10479	llvm_types_index += 1;
10480	10480	},
	10481	.float => {
	10482	llvm_types_buffer[llvm_types_index] = dg.context.floatType();
	10483	llvm_types_index += 1;
	10484	},
	10485	.float_combine => {
	10486	llvm_types_buffer[llvm_types_index] = dg.context.floatType().vectorType(2);
	10487	llvm_types_index += 1;
	10488	},
10481	10489	.x87 => {
10482	10490	if (llvm_types_index != 0 or classes[2] != .none) {
10483	10491	return dg.context.voidType();
...	...	@@ -10694,6 +10702,14 @@ const ParamTypeIterator = struct {
10694	10702	llvm_types_buffer[llvm_types_index] = dg.context.doubleType();
10695	10703	llvm_types_index += 1;
10696	10704	},
	10705	.float => {
	10706	llvm_types_buffer[llvm_types_index] = dg.context.floatType();
	10707	llvm_types_index += 1;
	10708	},
	10709	.float_combine => {
	10710	llvm_types_buffer[llvm_types_index] = dg.context.floatType().vectorType(2);
	10711	llvm_types_index += 1;
	10712	},
10697	10713	.x87 => {
10698	10714	it.zig_index += 1;
10699	10715	it.llvm_index += 1;

test/c_abi/main.zig-2

...	...	@@ -937,7 +937,6 @@ test "CFF: Zig returns to C" {
937	937	try expectOk(c_assert_ret_CFF());
938	938	}
939	939	test "CFF: C passes to Zig" {
940		if (builtin.cpu.arch == .x86_64 and builtin.mode != .Debug) return error.SkipZigTest;
941	940	if (builtin.target.cpu.arch == .x86) return error.SkipZigTest;
942	941	if (comptime builtin.cpu.arch.isRISCV() and builtin.mode != .Debug) return error.SkipZigTest;
943	942	if (builtin.cpu.arch == .aarch64 and builtin.mode != .Debug) return error.SkipZigTest;
...	...	@@ -948,7 +947,6 @@ test "CFF: C passes to Zig" {
948	947	try expectOk(c_send_CFF());
949	948	}
950	949	test "CFF: C returns to Zig" {
951		if (builtin.cpu.arch == .x86_64 and builtin.mode != .Debug) return error.SkipZigTest;
952	950	if (builtin.cpu.arch == .x86 and builtin.mode != .Debug) return error.SkipZigTest;
953	951	if (builtin.cpu.arch == .aarch64 and builtin.mode != .Debug) return error.SkipZigTest;
954	952	if (comptime builtin.cpu.arch.isRISCV() and builtin.mode != .Debug) return error.SkipZigTest;