diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2025-01-17 01:20:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-17 01:20:11 -0500 |
| commit | 4bace0f6212a3007247c42b0effcc40c6cfe61a8 (patch) | |
| tree | a5c1fee87a9266319d8ceffa7717ca5c70b61f7b /src/codegen | |
| parent | 257054a1467b2612725bd66852d84496024cf66c (diff) | |
| parent | 8c8dfb35f398407319764f0f8998de34c5247ed6 (diff) | |
| download | zig-4bace0f6212a3007247c42b0effcc40c6cfe61a8.tar.gz zig-4bace0f6212a3007247c42b0effcc40c6cfe61a8.zip | |
Merge pull request #22386 from jacobly0/x86_64-rewrite
x86_64: begin rewriting instruction selection
Diffstat (limited to 'src/codegen')
| -rw-r--r-- | src/codegen/c/Type.zig | 10 | ||||
| -rw-r--r-- | src/codegen/llvm.zig | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/codegen/c/Type.zig b/src/codegen/c/Type.zig index 2c2db8b506..20ba8fe6c0 100644 --- a/src/codegen/c/Type.zig +++ b/src/codegen/c/Type.zig @@ -1312,10 +1312,10 @@ pub const Pool = struct { }, else => { const target = &mod.resolved_target.result; - const abi_align = Type.intAbiAlignment(int_info.bits, target.*, false); + const abi_align = Type.intAbiAlignment(int_info.bits, target.*); const abi_align_bytes = abi_align.toByteUnits().?; const array_ctype = try pool.getArray(allocator, .{ - .len = @divExact(Type.intAbiSize(int_info.bits, target.*, false), abi_align_bytes), + .len = @divExact(Type.intAbiSize(int_info.bits, target.*), abi_align_bytes), .elem_ctype = try pool.fromIntInfo(allocator, .{ .signedness = .unsigned, .bits = @intCast(abi_align_bytes * 8), @@ -1429,7 +1429,7 @@ pub const Pool = struct { .name = .{ .index = .len }, .ctype = CType.usize, .alignas = AlignAs.fromAbiAlignment( - Type.intAbiAlignment(target.ptrBitWidth(), target.*, false), + Type.intAbiAlignment(target.ptrBitWidth(), target.*), ), }, }; @@ -1524,7 +1524,7 @@ pub const Pool = struct { .name = .{ .index = .len }, .ctype = CType.usize, .alignas = AlignAs.fromAbiAlignment( - Type.intAbiAlignment(target.ptrBitWidth(), target.*, false), + Type.intAbiAlignment(target.ptrBitWidth(), target.*), ), }, }; @@ -1644,7 +1644,7 @@ pub const Pool = struct { .name = .{ .index = .@"error" }, .ctype = error_set_ctype, .alignas = AlignAs.fromAbiAlignment( - Type.intAbiAlignment(error_set_bits, target.*, false), + Type.intAbiAlignment(error_set_bits, target.*), ), }, .{ diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index 99403db78c..eedbe5a660 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -581,7 +581,7 @@ const DataLayoutBuilder = struct { switch (kind) { .integer => { if (self.target.ptrBitWidth() <= 16 and size >= 128) return; - abi = @min(abi, Type.maxIntAlignment(self.target, true) * 8); + abi = @min(abi, Type.maxIntAlignment(self.target) * 8); switch (self.target.cpu.arch) { .aarch64, .aarch64_be, |
