Remove unneeded mocking files
This commit is contained in:
parent
285b8d9579
commit
b8ebc5f341
19 changed files with 52 additions and 235 deletions
|
@ -1,11 +1,11 @@
|
|||
const std = @import("std");
|
||||
const Allocator = std.mem.Allocator;
|
||||
const mem = @import("mem_mock.zig");
|
||||
const mem = @import("../../../src/kernel/mem.zig");
|
||||
const MemProfile = mem.MemProfile;
|
||||
const pci = @import("pci_mock.zig");
|
||||
const gdt = @import("gdt_mock.zig");
|
||||
const idt = @import("idt_mock.zig");
|
||||
const vmm = @import("vmm_mock.zig");
|
||||
const vmm = @import("../../../src/kernel/vmm.zig");
|
||||
const paging = @import("paging_mock.zig");
|
||||
const Serial = @import("../../../src/kernel/serial.zig").Serial;
|
||||
const TTY = @import("../../../src/kernel/tty.zig").TTY;
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
const std = @import("std");
|
||||
const mock_framework = @import("mock_framework.zig");
|
||||
pub const initTest = mock_framework.initTest;
|
||||
pub const freeTest = mock_framework.freeTest;
|
||||
pub const addTestParams = mock_framework.addTestParams;
|
||||
pub const addConsumeFunction = mock_framework.addConsumeFunction;
|
||||
pub const addRepeatFunction = mock_framework.addRepeatFunction;
|
||||
|
||||
pub fn log(comptime level: std.log.Level, comptime format: []const u8, args: anytype) void {
|
||||
// Just print to std print
|
||||
std.debug.print(format, args);
|
||||
}
|
|
@ -1,52 +0,0 @@
|
|||
const std = @import("std");
|
||||
const multiboot = @import("../../../src/kernel/multiboot.zig");
|
||||
|
||||
pub const Module = struct {
|
||||
region: Range,
|
||||
name: []const u8,
|
||||
};
|
||||
|
||||
pub const Map = struct {
|
||||
virtual: Range,
|
||||
physical: ?Range,
|
||||
};
|
||||
|
||||
pub const Range = struct {
|
||||
start: usize,
|
||||
end: usize,
|
||||
};
|
||||
|
||||
pub const MemProfile = struct {
|
||||
vaddr_end: [*]u8,
|
||||
vaddr_start: [*]u8,
|
||||
physaddr_end: [*]u8,
|
||||
physaddr_start: [*]u8,
|
||||
mem_kb: u32,
|
||||
modules: []Module,
|
||||
virtual_reserved: []Map,
|
||||
physical_reserved: []Range,
|
||||
fixed_allocator: std.heap.FixedBufferAllocator,
|
||||
};
|
||||
|
||||
pub var fixed_buffer_allocator: std.heap.FixedBufferAllocator = undefined;
|
||||
|
||||
const FIXED_ALLOC_SIZE = 1024 * 1024;
|
||||
const ADDR_OFFSET: usize = 100;
|
||||
|
||||
pub fn virtToPhys(virt: anytype) @TypeOf(virt) {
|
||||
const T = @TypeOf(virt);
|
||||
return switch (@typeInfo(T)) {
|
||||
.Pointer => @intToPtr(T, @ptrToInt(virt) - ADDR_OFFSET),
|
||||
.Int => virt - ADDR_OFFSET,
|
||||
else => @compileError("Only pointers and integers are supported"),
|
||||
};
|
||||
}
|
||||
|
||||
pub fn physToVirt(phys: anytype) @TypeOf(phys) {
|
||||
const T = @TypeOf(phys);
|
||||
return switch (@typeInfo(T)) {
|
||||
.Pointer => @intToPtr(T, @ptrToInt(phys) + ADDR_OFFSET),
|
||||
.Int => phys + ADDR_OFFSET,
|
||||
else => @compileError("Only pointers and integers are supported"),
|
||||
};
|
||||
}
|
|
@ -1,13 +0,0 @@
|
|||
const builtin = @import("builtin");
|
||||
const std = @import("std");
|
||||
const MemProfile = @import("mem_mock.zig").MemProfile;
|
||||
|
||||
pub fn panic(trace: ?*builtin.StackTrace, comptime format: []const u8, args: anytype) noreturn {
|
||||
@setCold(true);
|
||||
std.debug.panic(format, args);
|
||||
}
|
||||
|
||||
pub fn init(mem_profile: *const MemProfile, allocator: *std.mem.Allocator) !void {
|
||||
// This is never run so just return an arbitrary error to satisfy the compiler
|
||||
return error.NotNeeded;
|
||||
}
|
|
@ -1,32 +0,0 @@
|
|||
const std = @import("std");
|
||||
const vmm = @import("vmm_mock.zig");
|
||||
const arch = @import("arch_mock.zig");
|
||||
const Allocator = std.mem.Allocator;
|
||||
|
||||
const mock_framework = @import("mock_framework.zig");
|
||||
pub const initTest = mock_framework.initTest;
|
||||
pub const freeTest = mock_framework.freeTest;
|
||||
pub const addTestParams = mock_framework.addTestParams;
|
||||
pub const addConsumeFunction = mock_framework.addConsumeFunction;
|
||||
pub const addRepeatFunction = mock_framework.addRepeatFunction;
|
||||
|
||||
pub const EntryPoint = usize;
|
||||
|
||||
pub const Task = struct {
|
||||
const Self = @This();
|
||||
|
||||
pid: u32,
|
||||
kernel_stack: []u32,
|
||||
user_stack: []u32,
|
||||
stack_pointer: usize,
|
||||
kernel: bool,
|
||||
vmm: vmm.VirtualMemoryManager(arch.VmmPayload),
|
||||
|
||||
pub fn create(entry_point: EntryPoint, kernel: bool, task_vmm: *vmm.VirtualMemoryManager(arch.VmmPayload), allocator: *Allocator) Allocator.Error!*Task {
|
||||
return mock_framework.performAction("Task.create", Allocator.Error!*Task, .{ entry_point, allocator, kernel, task_vmm });
|
||||
}
|
||||
|
||||
pub fn destroy(self: *Self, allocator: *Allocator) void {
|
||||
return mock_framework.performAction("Task.destroy", void, .{ self, allocator });
|
||||
}
|
||||
};
|
|
@ -1,56 +0,0 @@
|
|||
const mem = @import("mem_mock.zig");
|
||||
const bitmap = @import("../../../src/kernel/bitmap.zig");
|
||||
const vmm = @import("../../../src/kernel/vmm.zig");
|
||||
const arch = @import("arch_mock.zig");
|
||||
const std = @import("std");
|
||||
const Allocator = std.mem.Allocator;
|
||||
|
||||
pub const VmmError = error{
|
||||
/// A memory region expected to be allocated wasn't
|
||||
NotAllocated,
|
||||
};
|
||||
|
||||
pub const Attributes = vmm.Attributes;
|
||||
|
||||
pub const BLOCK_SIZE: u32 = 1024;
|
||||
|
||||
pub const Mapper = vmm.Mapper;
|
||||
|
||||
pub const MapperError = error{
|
||||
InvalidVirtualAddress,
|
||||
InvalidPhysicalAddress,
|
||||
AddressMismatch,
|
||||
MisalignedVirtualAddress,
|
||||
MisalignedPhysicalAddress,
|
||||
NotMapped,
|
||||
};
|
||||
|
||||
pub var kernel_vmm: VirtualMemoryManager(arch.VmmPayload) = undefined;
|
||||
|
||||
pub fn VirtualMemoryManager(comptime Payload: type) type {
|
||||
return struct {
|
||||
const Self = @This();
|
||||
|
||||
pub fn init(start: usize, end: usize, allocator: *std.mem.Allocator, mapper: Mapper(Payload), payload: Payload) std.mem.Allocator.Error!Self {
|
||||
return Self{};
|
||||
}
|
||||
|
||||
pub fn virtToPhys(self: *const Self, virt: usize) VmmError!usize {
|
||||
return 0;
|
||||
}
|
||||
|
||||
pub fn alloc(self: *Self, num: u32, attrs: Attributes) std.mem.Allocator.Error!?usize {
|
||||
return std.mem.Allocator.Error.OutOfMemory;
|
||||
}
|
||||
|
||||
pub fn free(self: *Self, vaddr: usize) (bitmap.Bitmap(u32).BitmapError || VmmError)!void {
|
||||
return VmmError.NotAllocated;
|
||||
}
|
||||
|
||||
pub fn copyData(self: *Self, other: *Self, data: []const u8, dest: usize, from_self: bool) (bitmap.Bitmap(usize).BitmapError || VmmError || Allocator.Error)!void {}
|
||||
};
|
||||
}
|
||||
|
||||
pub fn init(mem_profile: *const mem.MemProfile, allocator: *Allocator) Allocator.Error!*VirtualMemoryManager(arch.VmmPayload) {
|
||||
return std.mem.Allocator.Error.OutOfMemory;
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue