aboutsummaryrefslogtreecommitdiff
path: root/src/type.zig
diff options
context:
space:
mode:
authorMotiejus Jakštys <motiejus@uber.com>2023-06-09 16:02:18 -0700
committerAndrew Kelley <andrew@ziglang.org>2023-06-17 12:49:13 -0700
commitd41111d7ef531f6f55a19c56205d6d2f1134c224 (patch)
tree14d7b7764a64fa2d4d274c0726a1a587484c4999 /src/type.zig
parent5baa05664e6dac0f473c8411f6e9d8e0f62555a9 (diff)
downloadzig-d41111d7ef531f6f55a19c56205d6d2f1134c224.tar.gz
zig-d41111d7ef531f6f55a19c56205d6d2f1134c224.zip
mem: rename align*Generic to mem.align*
Anecdote 1: The generic version is way more popular than the non-generic one in Zig codebase: git grep -w alignForward | wc -l 56 git grep -w alignForwardGeneric | wc -l 149 git grep -w alignBackward | wc -l 6 git grep -w alignBackwardGeneric | wc -l 15 Anecdote 2: In my project (turbonss) that does much arithmetic and alignment I exclusively use the Generic functions. Anecdote 3: we used only the Generic versions in the Macho Man's linker workshop.
Diffstat (limited to 'src/type.zig')
-rw-r--r--src/type.zig22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/type.zig b/src/type.zig
index bb82a50682..1c3435dafd 100644
--- a/src/type.zig
+++ b/src/type.zig
@@ -1339,7 +1339,7 @@ pub const Type = struct {
.storage = .{ .lazy_size = ty.toIntern() },
} })).toValue() },
};
- const result = std.mem.alignForwardGeneric(u32, total_bytes, alignment);
+ const result = std.mem.alignForward(u32, total_bytes, alignment);
return AbiSizeAdvanced{ .scalar = result };
},
@@ -1380,14 +1380,14 @@ pub const Type = struct {
var size: u64 = 0;
if (code_align > payload_align) {
size += code_size;
- size = std.mem.alignForwardGeneric(u64, size, payload_align);
+ size = std.mem.alignForward(u64, size, payload_align);
size += payload_size;
- size = std.mem.alignForwardGeneric(u64, size, code_align);
+ size = std.mem.alignForward(u64, size, code_align);
} else {
size += payload_size;
- size = std.mem.alignForwardGeneric(u64, size, code_align);
+ size = std.mem.alignForward(u64, size, code_align);
size += code_size;
- size = std.mem.alignForwardGeneric(u64, size, payload_align);
+ size = std.mem.alignForward(u64, size, payload_align);
}
return AbiSizeAdvanced{ .scalar = size };
},
@@ -1595,7 +1595,7 @@ pub const Type = struct {
fn intAbiSize(bits: u16, target: Target) u64 {
const alignment = intAbiAlignment(bits, target);
- return std.mem.alignForwardGeneric(u64, @intCast(u16, (@as(u17, bits) + 7) / 8), alignment);
+ return std.mem.alignForward(u64, @intCast(u16, (@as(u17, bits) + 7) / 8), alignment);
}
fn intAbiAlignment(bits: u16, target: Target) u32 {
@@ -3194,7 +3194,7 @@ pub const Type = struct {
const field_align = field.alignment(mod, it.struct_obj.layout);
it.big_align = @max(it.big_align, field_align);
- const field_offset = std.mem.alignForwardGeneric(u64, it.offset, field_align);
+ const field_offset = std.mem.alignForward(u64, it.offset, field_align);
it.offset = field_offset + field.ty.abiSize(mod);
return FieldOffset{ .field = i, .offset = field_offset };
}
@@ -3223,7 +3223,7 @@ pub const Type = struct {
return field_offset.offset;
}
- return std.mem.alignForwardGeneric(u64, it.offset, @max(it.big_align, 1));
+ return std.mem.alignForward(u64, it.offset, @max(it.big_align, 1));
},
.anon_struct_type => |tuple| {
@@ -3239,11 +3239,11 @@ pub const Type = struct {
const field_align = field_ty.toType().abiAlignment(mod);
big_align = @max(big_align, field_align);
- offset = std.mem.alignForwardGeneric(u64, offset, field_align);
+ offset = std.mem.alignForward(u64, offset, field_align);
if (i == index) return offset;
offset += field_ty.toType().abiSize(mod);
}
- offset = std.mem.alignForwardGeneric(u64, offset, @max(big_align, 1));
+ offset = std.mem.alignForward(u64, offset, @max(big_align, 1));
return offset;
},
@@ -3254,7 +3254,7 @@ pub const Type = struct {
const layout = union_obj.getLayout(mod, true);
if (layout.tag_align >= layout.payload_align) {
// {Tag, Payload}
- return std.mem.alignForwardGeneric(u64, layout.tag_size, layout.payload_align);
+ return std.mem.alignForward(u64, layout.tag_size, layout.payload_align);
} else {
// {Payload, Tag}
return 0;