arch: Merged Arch.h and VirtualMemory.h.

skift-org · Apr 12, 2021 · 7eaa96e · 7eaa96e
1 parent 92457f9
commit 7eaa96e
Show file tree

Hide file tree

Showing 20 changed files with 55 additions and 58 deletions.
diff --git a/kernel/archs/VirtualMemory.h → kernel/archs/Arch.h b/kernel/archs/VirtualMemory.h → kernel/archs/Arch.h
@@ -1,11 +1,41 @@
 #pragma once
 
 #include <abi/Memory.h>
-
 #include <libsystem/Result.h>
+#include <skift/Time.h>
 
 #include "kernel/memory/MemoryRange.h"
 
+struct Task;
+
+void arch_disable_interrupts();
+
+void arch_enable_interrupts();
+
+void arch_halt();
+
+void arch_yield();
+
+void arch_save_context(Task *task);
+
+void arch_load_context(Task *task);
+
+void arch_task_go(Task *task);
+
+size_t arch_debug_write(const void *buffer, size_t size);
+
+TimeStamp arch_get_time();
+
+NO_RETURN void arch_reboot();
+
+NO_RETURN void arch_shutdown();
+
+void arch_panic_dump();
+
+void arch_dump_stack_frame(void *stackframe);
+
+void arch_backtrace();
+
 void *arch_kernel_address_space();
 
 void arch_virtual_initialize();
@@ -27,4 +57,3 @@ void *arch_address_space_create();
 void arch_address_space_destroy(void *address_space);
 
 void arch_address_space_switch(void *address_space);
-
diff --git a/kernel/archs/Architectures.h b/kernel/archs/Architectures.h
diff --git a/kernel/archs/x86/x86.h b/kernel/archs/x86/x86.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "archs/Architectures.h"
+#include "archs/Arch.h"
 
 #ifdef __x86_64__
 using CRRegister = uint64_t;

diff --git a/kernel/archs/x86_32/Power.cpp b/kernel/archs/x86_32/Power.cpp
@@ -1,7 +1,6 @@
 #include <libsystem/Logger.h>
 
-#include "archs/Architectures.h"
-#include "archs/VirtualMemory.h"
+#include "archs/Arch.h"
 
 #include "archs/x86/IOPort.h"
 #include "archs/x86/x86.h"

diff --git a/kernel/archs/x86_32/VirtualMemory.cpp b/kernel/archs/x86_32/VirtualMemory.cpp
@@ -3,7 +3,7 @@
 #include <libsystem/Logger.h>
 #include <libutils/ResultOr.h>
 
-#include "archs/VirtualMemory.h"
+#include "archs/Arch.h"
 #include "archs/x86_32/Paging.h"
 
 #include "kernel/interrupts/Interupts.h"

diff --git a/kernel/archs/x86_32/x86_32.cpp b/kernel/archs/x86_32/x86_32.cpp
@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <libsystem/core/Plugs.h>
 
-#include "archs/VirtualMemory.h"
+#include "archs/Arch.h"
 #include "archs/x86/COM.h"
 #include "archs/x86/CPUID.h"
 #include "archs/x86/FPU.h"

diff --git a/kernel/archs/x86_64/VirtualMemory.cpp b/kernel/archs/x86_64/VirtualMemory.cpp
@@ -5,8 +5,7 @@
 #include "kernel/memory/Memory.h"
 #include "kernel/system/System.h"
 
-#include "archs/VirtualMemory.h"
-
+#include "archs/Arch.h"
 #include "archs/x86_64/Paging.h"
 #include "archs/x86_64/x86_64.h"
 

diff --git a/kernel/kernel/graphics/Framebuffer.cpp b/kernel/kernel/graphics/Framebuffer.cpp
@@ -3,7 +3,7 @@
 #include <libmath/MinMax.h>
 #include <libsystem/Logger.h>
 
-#include "archs/VirtualMemory.h"
+#include "archs/Arch.h"
 
 #include "kernel/graphics/Graphics.h"
 #include "kernel/interrupts/Interupts.h"

diff --git a/kernel/kernel/interrupts/Interupts.cpp b/kernel/kernel/interrupts/Interupts.cpp
@@ -1,6 +1,6 @@
 #include <libsystem/Logger.h>
 
-#include "archs/Architectures.h"
+#include "archs/Arch.h"
 
 #include "kernel/interrupts/Dispatcher.h"
 #include "kernel/interrupts/Interupts.h"

diff --git a/kernel/kernel/memory/MMIO.cpp b/kernel/kernel/memory/MMIO.cpp
@@ -1,6 +1,6 @@
 #include <libsystem/Logger.h>
 
-#include "archs/VirtualMemory.h"
+#include "archs/Arch.h"
 
 #include "kernel/interrupts/Interupts.h"
 #include "kernel/memory/MMIO.h"

diff --git a/kernel/kernel/memory/Memory.cpp b/kernel/kernel/memory/Memory.cpp
@@ -4,7 +4,7 @@
 #include <libsystem/io/Stream.h>
 #include <string.h>
 
-#include "archs/VirtualMemory.h"
+#include "archs/Arch.h"
 
 #include "kernel/graphics/Graphics.h"
 #include "kernel/interrupts/Interupts.h"

diff --git a/kernel/kernel/modules/Ramdisk.cpp b/kernel/kernel/modules/Ramdisk.cpp
@@ -3,7 +3,7 @@
 #include <libsystem/Logger.h>
 #include <libsystem/Result.h>
 
-#include "archs/VirtualMemory.h"
+#include "archs/Arch.h"
 
 #include "kernel/memory/Memory.h"
 #include "kernel/modules/Modules.h"

diff --git a/kernel/kernel/plugs.cpp b/kernel/kernel/plugs.cpp
@@ -8,8 +8,7 @@
 #include <libsystem/io/Stream_internal.h>
 #include <libsystem/system/System.h>
 
-#include "archs/Architectures.h"
-#include "archs/VirtualMemory.h"
+#include "archs/Arch.h"
 
 #include "kernel/graphics/EarlyConsole.h"
 #include "kernel/interrupts/Interupts.h"

diff --git a/kernel/kernel/scheduling/Scheduler.cpp b/kernel/kernel/scheduling/Scheduler.cpp
@@ -1,6 +1,5 @@
 
-#include "archs/Architectures.h"
-#include "archs/VirtualMemory.h"
+#include "archs/Arch.h"
 
 #include "kernel/interrupts/Interupts.h"
 #include "kernel/scheduling/Scheduler.h"

diff --git a/kernel/kernel/system/Panic.cpp b/kernel/kernel/system/Panic.cpp
@@ -1,4 +1,4 @@
-#include "archs/Architectures.h"
+#include "archs/Arch.h"
 
 #include "kernel/graphics/EarlyConsole.h"
 #include "kernel/graphics/Font.h"
@@ -89,7 +89,7 @@ void system_panic_internal(Utils::SourceLocation location, void *stackframe, con
         stream_format(out_stream, " PANIC\n\t// %s\n\n\t\e[0;31m", YO_DAWG);
     }
 
-        font_set_fg(0xffDC2626);
+    font_set_fg(0xffDC2626);
     stream_vprintf(out_stream, message, va);
     font_set_fg(0xff404040);
     stream_format(out_stream, "\e[0m\n\tthrow by %s %s() ln%d", location.file(), location.function(), location.line());

diff --git a/kernel/kernel/system/System.cpp b/kernel/kernel/system/System.cpp
@@ -1,7 +1,7 @@
 #include <libsystem/BuildInfo.h>
 #include <libsystem/Logger.h>
 
-#include "archs/Architectures.h"
+#include "archs/Arch.h"
 #include "kernel/scheduling/Scheduler.h"
 #include "kernel/system/System.h"
 

diff --git a/kernel/kernel/tasking/Syscalls.cpp b/kernel/kernel/tasking/Syscalls.cpp
@@ -5,7 +5,7 @@
 #include <libsystem/Logger.h>
 #include <libsystem/Result.h>
 
-#include "archs/Architectures.h"
+#include "archs/Arch.h"
 
 #include "kernel/interrupts/Interupts.h"
 #include "kernel/scheduling/Scheduler.h"

diff --git a/kernel/kernel/tasking/Task-Memory.cpp b/kernel/kernel/tasking/Task-Memory.cpp
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include "archs/VirtualMemory.h"
+#include "archs/Arch.h"
 
 #include "kernel/interrupts/Interupts.h"
 #include "kernel/tasking/Task-Memory.h"

diff --git a/kernel/kernel/tasking/Task.cpp b/kernel/kernel/tasking/Task.cpp
@@ -1,8 +1,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include "archs/Architectures.h"
-#include "archs/VirtualMemory.h"
+#include "archs/Arch.h"
 
 #include "kernel/interrupts/Interupts.h"
 #include "kernel/scheduling/Scheduler.h"

diff --git a/userspace/libraries/libio/Format.h b/userspace/libraries/libio/Format.h
@@ -126,6 +126,12 @@ ResultOr<size_t> format(IO::Writer &, const Formating &, double);
 
 ResultOr<size_t> format(IO::Writer &, const Formating &, const char *);
 
+template <typename T>
+ResultOr<size_t> format(IO::Writer &writer, const Formating &format, const T *ptr)
+{
+    return IO::format(writer, format, reinterpret_cast<uintptr_t>(ptr));
+}
+
 ResultOr<size_t> format(IO::Writer &, const Formating &, const String);
 
 ResultOr<size_t> format(IO::Writer &, const Formating &, const Path);