Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Zig 0.14: Page sizes are not compile-time

Browse Source
This commit is contained in:
LN Liberda
2025-03-10 01:52:27 +01:00
parent 804974f3bf
commit ecf75c146a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/terminal/PageList.zig
View File

@ -56,7 +56,7 @@ const std_size = Page.layout(std_capacity).total_size;
/// allocator because we need memory that is zero-initialized and page-aligned. /// allocator because we need memory that is zero-initialized and page-aligned.
const PagePool = std.heap.MemoryPoolAligned( const PagePool = std.heap.MemoryPoolAligned(
[std_size]u8, [std_size]u8,
std.mem.page_size, std.heap.page_size_min,
); );
/// List of pins, known as "tracked" pins. These are pins that are kept /// List of pins, known as "tracked" pins. These are pins that are kept

6
src/terminal/page.zig
View File

@ -83,7 +83,7 @@ pub const Page = struct {
comptime { comptime {
// The alignment of our members. We want to ensure that the page // The alignment of our members. We want to ensure that the page
// alignment is always divisible by this. // alignment is always divisible by this.
assert(std.mem.page_size % @max( assert(std.heap.page_size_min % @max(
@alignOf(Row), @alignOf(Row),
@alignOf(Cell), @alignOf(Cell),
style.Set.base_align, style.Set.base_align,
@ -93,7 +93,7 @@ pub const Page = struct {
/// The backing memory for the page. A page is always made up of a /// The backing memory for the page. A page is always made up of a
/// a single contiguous block of memory that is aligned on a page /// a single contiguous block of memory that is aligned on a page
/// boundary and is a multiple of the system page size. /// boundary and is a multiple of the system page size.
memory: []align(std.mem.page_size) u8, memory: []align(std.heap.page_size_min) u8,
/// The array of rows in the page. The rows are always in row order /// The array of rows in the page. The rows are always in row order
/// (i.e. index 0 is the top row, index 1 is the row below that, etc.) /// (i.e. index 0 is the top row, index 1 is the row below that, etc.)
@ -1755,7 +1755,7 @@ pub const Page = struct {
const hyperlink_map_start = alignForward(usize, hyperlink_set_end, hyperlink.Map.base_align); const hyperlink_map_start = alignForward(usize, hyperlink_set_end, hyperlink.Map.base_align);
const hyperlink_map_end = hyperlink_map_start + hyperlink_map_layout.total_size; const hyperlink_map_end = hyperlink_map_start + hyperlink_map_layout.total_size;
const total_size = alignForward(usize, hyperlink_map_end, std.mem.page_size); const total_size = alignForward(usize, hyperlink_map_end, std.heap.page_size_min);
return .{ return .{
.total_size = total_size, .total_size = total_size,