aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/src
diff options
context:
space:
mode:
authorFabian Imhof <fabian.imhof@ost.ch>2024-10-22 07:40:42 +0000
committerFabian Imhof <fabian.imhof@ost.ch>2024-10-22 07:40:42 +0000
commit8911e405e1d04676f9dd9129c3cfeccd9379b785 (patch)
tree2c78dff925145547871206cb5e0c3b6ea9c6f60f /arch/x86_64/src
parent5a2892f65abe13c32bb07de697826f374c1d2b1d (diff)
parentba054441f93a30e2042a71d632a6a5fb04007d15 (diff)
downloadteachos-8911e405e1d04676f9dd9129c3cfeccd9379b785.tar.xz
teachos-8911e405e1d04676f9dd9129c3cfeccd9379b785.zip
Merge branch 'feat_memory_manager' of ssh://gitlab.ost.ch:45022/teachos/kernel into feat_memory_manager
Diffstat (limited to 'arch/x86_64/src')
-rw-r--r--arch/x86_64/src/exception_handling/abort.cpp4
-rw-r--r--arch/x86_64/src/kernel/main.cpp1
-rw-r--r--arch/x86_64/src/memory/paging/page_table.cpp14
3 files changed, 9 insertions, 10 deletions
diff --git a/arch/x86_64/src/exception_handling/abort.cpp b/arch/x86_64/src/exception_handling/abort.cpp
index e331d34..e12e4cb 100644
--- a/arch/x86_64/src/exception_handling/abort.cpp
+++ b/arch/x86_64/src/exception_handling/abort.cpp
@@ -7,8 +7,8 @@ namespace teachos::arch::exception_handling
/**
* @brief Override for the newlib abort function.
*
- * newlib defines @p ::abort as a weak symbol, thus allowing implementations to override it by simply providing a
- * matching implementation. Since the default implemenatation calls a number of functions the kernel does not
+ * @note newlib defines @p ::abort as a weak symbol, thus allowing implementations to override it by simply providing
+ * a matching implementation. Since the default implemenatation calls a number of functions the kernel does not
* currently implement, @p ::abort gets overridden to simply panic.
*/
extern "C" auto abort() -> void { panic("Terminate was called, possibly due to an unhandled exception"); }
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index 3e25d2d..ad1eb39 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -10,7 +10,6 @@
namespace teachos::arch::kernel
{
-
auto main() -> void
{
video::vga::text::clear();
diff --git a/arch/x86_64/src/memory/paging/page_table.cpp b/arch/x86_64/src/memory/paging/page_table.cpp
index 939f3b1..555d38a 100644
--- a/arch/x86_64/src/memory/paging/page_table.cpp
+++ b/arch/x86_64/src/memory/paging/page_table.cpp
@@ -15,11 +15,12 @@ namespace teachos::arch::memory::paging
auto zero_entries() -> void;
/**
- * @brief Returns the next page table level from the given page table index.
+ * @brief Returns the next page table level from the given page table index. Meaning we use an index into a Level 4
+ * page table to get the according Level 3 page table.
*
- * Meaning we use an index into a Level 4 page table to get the according Level 3 page table. This method should not
- * be called on a Level 1 page table, because there is no furthere page table and mangeling up and returning the
- * physical address would cause hard to debug issues.
+ * @note This method
+ * should not be called on a Level 1 page table, because there is no furthere page table and mangeling up and
+ * returning the physical address would cause hard to debug issues.
*
* @param table_index Index of this page table in the page table one level lower.
*/
@@ -37,9 +38,8 @@ namespace teachos::arch::memory::paging
/**
* @brief Calculates the address of the next page table level for the given table index.
*
- * The next page table address
- * is only valid if the corresponding entry is present and not a huge page. Meaning we use an index into a
- * Level 4 page table to get the according Level 3 page table address.
+ * @note The next page table address is only valid if the corresponding entry is present and not a huge page.
+ * Meaning we use an index into a Level 4 page table to get the according Level 3 page table address.
*
* @param table_index Index of this page table in the page table one level higher.
* @return An optional of the address of the next page table or null.