Imbus/pluto
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the size alignment

Browse source 
The size alignment need to use alignAllocLen and not alignForward as the size align may not be a power of 2.
This commit is contained in:
DrDeano 2020-07-22 10:35:47 +01:00
parent 7e0c1fd589
commit f189fa8976
No known key found for this signature in database
GPG key ID: 96188600582B9ED7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/kernel/heap.zig
View file

@ -201,7 +201,7 @@ const FreeListAllocator = struct {
if (new_size == old_mem.len) return new_size; if (new_size == old_mem.len) return new_size;
const end = @ptrToInt(old_mem.ptr) + old_mem.len; const end = @ptrToInt(old_mem.ptr) + old_mem.len;
const real_size = if (size_alignment > 1) std.mem.alignForward(new_size, size_alignment) else new_size; const real_size = if (size_alignment > 1) std.mem.alignAllocLen(old_mem.len, new_size, size_alignment) else new_size;
// Try to find the buffer's neighbour (if it's free) and the previous free node // Try to find the buffer's neighbour (if it's free) and the previous free node
// We'll be stealing some of the free neighbour's space when expanding or joining up with it when shrinking // We'll be stealing some of the free neighbour's space when expanding or joining up with it when shrinking
@ -312,7 +312,7 @@ const FreeListAllocator = struct {
// Get the real size being allocated, which is the aligned size or the size of a header (whichever is largest) // Get the real size being allocated, which is the aligned size or the size of a header (whichever is largest)
// The size must be at least the size of a header so that it can be freed properly // The size must be at least the size of a header so that it can be freed properly
const real_size = std.math.max(if (size_alignment > 1) std.mem.alignForward(size, size_alignment) else size, @sizeOf(Header)); const real_size = std.math.max(if (size_alignment > 1) std.mem.alignAllocLen(size, size, size_alignment) else size, @sizeOf(Header));
var free_header = self.first_free; var free_header = self.first_free;
var prev: ?*Header = null; var prev: ?*Header = null;
@ -387,7 +387,7 @@ const FreeListAllocator = struct {
} }
self.registerFreeHeader(prev, header.next_free); self.registerFreeHeader(prev, header.next_free);
return @intToPtr([*]u8, @ptrToInt(header))[0..std.mem.alignForward(size, if (size_alignment > 1) size_alignment else 1)]; return @intToPtr([*]u8, @ptrToInt(header))[0..std.mem.alignAllocLen(size, size, if (size_alignment > 1) size_alignment else 1)];
} }
return Allocator.Error.OutOfMemory; return Allocator.Error.OutOfMemory;