diff options
author | Himbeer <himbeer@disroot.org> | 2024-07-30 10:59:48 +0200 |
---|---|---|
committer | Himbeer <himbeer@disroot.org> | 2024-07-30 10:59:48 +0200 |
commit | cbd3d7939b6472b2dc5cd8739b906b269e3081b8 (patch) | |
tree | 6b3c1d2dd2a89cd2faeb0f1229abb13bae85ba4b /src/lib/process.zig | |
parent | 24e7ca15fbe4fbbe3b5e5903482add3915877172 (diff) |
Remove errors that are no longer needed
Diffstat (limited to 'src/lib/process.zig')
-rw-r--r-- | src/lib/process.zig | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/lib/process.zig b/src/lib/process.zig index 23c2f1c..c8e6d5e 100644 --- a/src/lib/process.zig +++ b/src/lib/process.zig @@ -18,15 +18,10 @@ var next_pid: u16 = 1; const num_stack_pages = 2; -pub const ScheduleError = error{ +pub const Error = error{ EmptySchedule, NoInit, -}; - -pub const Error = error{ TooManyThreads, - TooManyResourceDescriptors, - BadRdHandle, }; pub const ExeError = error{ @@ -35,8 +30,7 @@ pub const ExeError = error{ BadArch, BadBitLen, NotStaticExe, - SizeMismatch, - MemOverrun, + LengthOutOfBounds, BranchPerms, WritableCode, }; @@ -157,7 +151,7 @@ pub fn schedule() !noreturn { switchTo(proc); } - return ScheduleError.EmptySchedule; + return Error.EmptySchedule; } pub fn switchTo(proc: *Info) noreturn { @@ -247,7 +241,9 @@ pub fn create(allocator: Allocator, elf_buf: []align(@alignOf(elf.Elf64_Ehdr)) c while (try it.next()) |phdr| { if (phdr.p_type != elf.PT_LOAD) continue; if (phdr.p_filesz == 0 or phdr.p_memsz == 0) continue; - if (phdr.p_filesz > elf_buf.len or phdr.p_memsz > pages.len) return ExeError.MemOverrun; + if (phdr.p_filesz > elf_buf.len or phdr.p_memsz > pages.len) { + return ExeError.LengthOutOfBounds; + } const sz = @min(phdr.p_filesz, phdr.p_memsz); @memcpy(pages[phdr.p_offset .. phdr.p_offset + sz], elf_buf[phdr.p_offset .. phdr.p_offset + sz]); @@ -319,7 +315,7 @@ pub fn runInit(allocator: Allocator, reader: anytype) !noreturn { if (std.mem.eql(u8, file.name, "./init")) { break file; } - } else return ScheduleError.NoInit; + } else return Error.NoInit; const alignment = @alignOf(elf.Elf64_Ehdr); |