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

Add start to alloc result

Browse source
This commit is contained in:
Sam Tebbs 2020-04-22 23:56:05 +01:00
parent 8523bcf9f9
commit cf11b17542
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/kernel/vmm.zig
View file

@ -270,21 +270,18 @@ pub fn VirtualMemoryManager(comptime Payload: type) type {
try block_list.ensureCapacity(num); try block_list.ensureCapacity(num);
var i: u32 = 0; var i: u32 = 0;
var first_addr: ?usize = null; const vaddr_start = self.start + entry * BLOCK_SIZE;
const vaddr_start = entry * BLOCK_SIZE;
var vaddr = vaddr_start; var vaddr = vaddr_start;
// Map the blocks to physical memory // Map the blocks to physical memory
while (i < num) : (i += 1) { while (i < num) : (i += 1) {
const addr = pmm.alloc() orelse unreachable; const addr = pmm.alloc() orelse unreachable;
if (i == 0)
first_addr = addr;
try block_list.append(addr); try block_list.append(addr);
// The map function failing isn't the caller's responsibility so panic as it shouldn't happen // The map function failing isn't the caller's responsibility so panic as it shouldn't happen
self.mapper.mapFn(vaddr, vaddr + BLOCK_SIZE, addr, addr + BLOCK_SIZE, attrs, self.allocator, self.payload) catch |e| panic(@errorReturnTrace(), "Failed to map virtual memory: {}\n", .{e}); self.mapper.mapFn(vaddr, vaddr + BLOCK_SIZE, addr, addr + BLOCK_SIZE, attrs, self.allocator, self.payload) catch |e| panic(@errorReturnTrace(), "Failed to map virtual memory: {}\n", .{e});
vaddr += BLOCK_SIZE; vaddr += BLOCK_SIZE;
} }
_ = try self.allocations.put(vaddr_start, Allocation{ .physical = block_list }); _ = try self.allocations.put(vaddr_start, Allocation{ .physical = block_list });
return first_addr; return vaddr_start;
} }
} }
return null; return null;
@ -408,7 +405,7 @@ test "alloc and free" {
should_be_set = false; should_be_set = false;
} else { } else {
// Else it should have succedded and allocated the correct address // Else it should have succedded and allocated the correct address
std.testing.expectEqual(@as(?usize, entry * BLOCK_SIZE), result); std.testing.expectEqual(@as(?usize, vmm.start + entry * BLOCK_SIZE), result);
try virtual_allocations.append(result orelse unreachable); try virtual_allocations.append(result orelse unreachable);
} }
@ -439,7 +436,7 @@ test "alloc and free" {
// All later entries should not be set // All later entries should not be set
var later_entry = entry; var later_entry = entry;
while (later_entry < num_entries) : (later_entry += 1) { while (later_entry < num_entries) : (later_entry += 1) {
std.testing.expect(!(try vmm.isSet(later_entry * BLOCK_SIZE))); std.testing.expect(!(try vmm.isSet(vmm.start + later_entry * BLOCK_SIZE)));
std.testing.expect(!(try pmm.isSet(later_entry * BLOCK_SIZE))); std.testing.expect(!(try pmm.isSet(later_entry * BLOCK_SIZE)));
} }
} }