aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHimbeer <himbeer@disroot.org>2024-07-27 16:31:37 +0200
committerHimbeer <himbeer@disroot.org>2024-07-27 16:31:37 +0200
commit5104b1c599a8dd353a0b27a127aada17ee27695a (patch)
treee9b7eb9317acb29b06b8ec272200852c6d9a6f37
parent360fd4e87bfc261966480efa72befa892dc41cb6 (diff)
syscall: Reorder handler functions to match numbering
-rw-r--r--src/lib/syscall.zig36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/syscall.zig b/src/lib/syscall.zig
index a4c803a..7ffadd7 100644
--- a/src/lib/syscall.zig
+++ b/src/lib/syscall.zig
@@ -45,24 +45,6 @@ fn uprint(trap_frame: *const trap.Frame) void {
w.print("User message: {s}\r\n", .{str}) catch unreachable;
}
-// end() void
-fn end(proc: *process.Info) void {
- proc.terminate();
- process.schedule() catch |err| {
- std.debug.panic("schedule error: {}", .{err});
- };
-}
-
-// processId() usize
-fn processId(proc: *const process.Info) usize {
- return proc.id;
-}
-
-// threadId() usize
-fn threadId(proc: *const process.Info) usize {
- return proc.thread_id;
-}
-
// launch(bytes: [*]align(@alignOf(std.elf.Elf64_Ehdr)) const u8, len: usize) !usize
fn launch(trap_frame: *const trap.Frame) !usize {
const alignment = @alignOf(std.elf.Elf64_Ehdr);
@@ -77,6 +59,14 @@ fn launch(trap_frame: *const trap.Frame) !usize {
return new_proc.id;
}
+// end() void
+fn end(proc: *process.Info) void {
+ proc.terminate();
+ process.schedule() catch |err| {
+ std.debug.panic("schedule error: {}", .{err});
+ };
+}
+
pub const TerminateError = error{
PidOutOfRange,
ProcessNotFound,
@@ -101,3 +91,13 @@ fn terminate(proc: *const process.Info, trap_frame: *const trap.Frame) !void {
};
}
}
+
+// processId() usize
+fn processId(proc: *const process.Info) usize {
+ return proc.id;
+}
+
+// threadId() usize
+fn threadId(proc: *const process.Info) usize {
+ return proc.thread_id;
+}