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

Merge pull request #175 from SamTebbs33/bugfix/vmm-start-address

Browse source 
Set the kernel VMM start address to the virtual address offset
This commit is contained in:
Sam Tebbs 2020-06-24 21:09:26 +01:00 committed by GitHub
commit e9fd88c96d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/kernel/vmm.zig
View file

@ -108,6 +108,10 @@ pub const VmmError = error{
InvalidPhysAddresses, InvalidPhysAddresses,
}; };
/// The boot-time offset that the virtual addresses are from the physical addresses
/// This is the start of the memory owned by the kernel and so is where the kernel VMM starts
extern var KERNEL_ADDR_OFFSET: *u32;
/// ///
/// Construct a virtual memory manager to keep track of allocated and free virtual memory regions within a certain space /// Construct a virtual memory manager to keep track of allocated and free virtual memory regions within a certain space
/// ///
@ -186,7 +190,7 @@ pub fn VirtualMemoryManager(comptime Payload: type) type {
/// Bitmap(u32).Error.OutOfBounds - The address given is outside of the memory managed /// Bitmap(u32).Error.OutOfBounds - The address given is outside of the memory managed
/// ///
pub fn isSet(self: *const Self, virt: usize) bitmap.Bitmap(u32).BitmapError!bool { pub fn isSet(self: *const Self, virt: usize) bitmap.Bitmap(u32).BitmapError!bool {
return try self.bmp.isSet(virt / BLOCK_SIZE); return try self.bmp.isSet((virt - self.start) / BLOCK_SIZE);
} }
/// ///
@ -237,7 +241,7 @@ pub fn VirtualMemoryManager(comptime Payload: type) type {
virt = virtual.start; virt = virtual.start;
while (virt < virtual.end) : (virt += BLOCK_SIZE) { while (virt < virtual.end) : (virt += BLOCK_SIZE) {
try self.bmp.setEntry(virt / BLOCK_SIZE); try self.bmp.setEntry((virt - self.start) / BLOCK_SIZE);
} }
if (physical) |p| { if (physical) |p| {
@ -348,7 +352,7 @@ pub fn init(mem_profile: *const mem.MemProfile, allocator: *std.mem.Allocator) s
log.logInfo("Init vmm\n", .{}); log.logInfo("Init vmm\n", .{});
defer log.logInfo("Done vmm\n", .{}); defer log.logInfo("Done vmm\n", .{});
var vmm = try VirtualMemoryManager(arch.VmmPayload).init(BLOCK_SIZE, 0xFFFFFFFF, allocator, arch.VMM_MAPPER, arch.KERNEL_VMM_PAYLOAD); var vmm = try VirtualMemoryManager(arch.VmmPayload).init(@ptrToInt(&KERNEL_ADDR_OFFSET), 0xFFFFFFFF, allocator, arch.VMM_MAPPER, arch.KERNEL_VMM_PAYLOAD);
// Map in kernel // Map in kernel
// Calculate start and end of mapping // Calculate start and end of mapping