aboutsummaryrefslogtreecommitdiff
path: root/docs/arch/x86_64/memory
diff options
context:
space:
mode:
authorMatteo Gmür <matteo.gmuer1@ost.ch>2025-06-06 17:15:32 +0200
committerMatteo Gmür <matteo.gmuer1@ost.ch>2025-06-06 17:15:32 +0200
commitc4ced070ab057e4be6552b2f10ec1bf35509e245 (patch)
tree91602a7732d216bff3fbaf2d6158e965460019e5 /docs/arch/x86_64/memory
parent3fb836101a2032e93f7b82c924ce208d7377a5ea (diff)
parent1031a69ca5e23f2087148ad57e57506735872617 (diff)
downloadteachos-c4ced070ab057e4be6552b2f10ec1bf35509e245.tar.xz
teachos-c4ced070ab057e4be6552b2f10ec1bf35509e245.zip
Merge branch 'feat_inital_context_switching' into 'develop_ba'
Implement Context Switching See merge request teachos/kernel!6
Diffstat (limited to 'docs/arch/x86_64/memory')
-rw-r--r--docs/arch/x86_64/memory/cpu/control_register.rst5
-rw-r--r--docs/arch/x86_64/memory/cpu/msr.rst5
-rw-r--r--docs/arch/x86_64/memory/cpu/tlb.rst5
-rw-r--r--docs/arch/x86_64/memory/heap/bump_allocator.rst2
-rw-r--r--docs/arch/x86_64/memory/heap/concept.rst5
-rw-r--r--docs/arch/x86_64/memory/heap/global_heap_allocator.rst5
-rw-r--r--docs/arch/x86_64/memory/heap/heap_allocator.rst5
-rw-r--r--docs/arch/x86_64/memory/heap/linked_list_allocator.rst2
-rw-r--r--docs/arch/x86_64/memory/heap/user_heap_allocator.rst5
9 files changed, 17 insertions, 22 deletions
diff --git a/docs/arch/x86_64/memory/cpu/control_register.rst b/docs/arch/x86_64/memory/cpu/control_register.rst
deleted file mode 100644
index f087112..0000000
--- a/docs/arch/x86_64/memory/cpu/control_register.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-CPU Control Registers
-=======================
-
-.. doxygenfile:: arch/x86_64/include/arch/memory/cpu/control_register.hpp
-
diff --git a/docs/arch/x86_64/memory/cpu/msr.rst b/docs/arch/x86_64/memory/cpu/msr.rst
deleted file mode 100644
index c67d51c..0000000
--- a/docs/arch/x86_64/memory/cpu/msr.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-CPU Model-Specific Register
-=======================
-
-.. doxygenfile:: arch/x86_64/include/arch/memory/cpu/msr.hpp
-
diff --git a/docs/arch/x86_64/memory/cpu/tlb.rst b/docs/arch/x86_64/memory/cpu/tlb.rst
deleted file mode 100644
index 0d482dc..0000000
--- a/docs/arch/x86_64/memory/cpu/tlb.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-CPU Translation Lookaside Buffer
-=======================
-
-.. doxygenfile:: arch/x86_64/include/arch/memory/cpu/tlb.hpp
-
diff --git a/docs/arch/x86_64/memory/heap/bump_allocator.rst b/docs/arch/x86_64/memory/heap/bump_allocator.rst
index 185f00b..b20916e 100644
--- a/docs/arch/x86_64/memory/heap/bump_allocator.rst
+++ b/docs/arch/x86_64/memory/heap/bump_allocator.rst
@@ -1,4 +1,4 @@
-Heap Bump Allocator
+Kernel Heap Bump Allocator
=======================
.. doxygenfile:: arch/x86_64/include/arch/memory/heap/bump_allocator.hpp
diff --git a/docs/arch/x86_64/memory/heap/concept.rst b/docs/arch/x86_64/memory/heap/concept.rst
deleted file mode 100644
index c0c3123..0000000
--- a/docs/arch/x86_64/memory/heap/concept.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Heap Allocator Concept
-=======================
-
-.. doxygenfile:: arch/x86_64/include/arch/memory/heap/concept.hpp
-
diff --git a/docs/arch/x86_64/memory/heap/global_heap_allocator.rst b/docs/arch/x86_64/memory/heap/global_heap_allocator.rst
new file mode 100644
index 0000000..60ec0b5
--- /dev/null
+++ b/docs/arch/x86_64/memory/heap/global_heap_allocator.rst
@@ -0,0 +1,5 @@
+Global Heap Allocator
+=======================
+
+.. doxygenfile:: arch/x86_64/include/arch/memory/heap/global_heap_allocator.hpp
+
diff --git a/docs/arch/x86_64/memory/heap/heap_allocator.rst b/docs/arch/x86_64/memory/heap/heap_allocator.rst
new file mode 100644
index 0000000..b410e41
--- /dev/null
+++ b/docs/arch/x86_64/memory/heap/heap_allocator.rst
@@ -0,0 +1,5 @@
+Kernel Heap Allocator
+=======================
+
+.. doxygenfile:: arch/x86_64/include/arch/memory/heap/heap_allocator.hpp
+
diff --git a/docs/arch/x86_64/memory/heap/linked_list_allocator.rst b/docs/arch/x86_64/memory/heap/linked_list_allocator.rst
index 26b25ab..d156852 100644
--- a/docs/arch/x86_64/memory/heap/linked_list_allocator.rst
+++ b/docs/arch/x86_64/memory/heap/linked_list_allocator.rst
@@ -1,4 +1,4 @@
-Heap Linked List Allocator
+Kernel Heap Linked List Allocator
=======================
.. doxygenfile:: arch/x86_64/include/arch/memory/heap/linked_list_allocator.hpp
diff --git a/docs/arch/x86_64/memory/heap/user_heap_allocator.rst b/docs/arch/x86_64/memory/heap/user_heap_allocator.rst
new file mode 100644
index 0000000..d0febb6
--- /dev/null
+++ b/docs/arch/x86_64/memory/heap/user_heap_allocator.rst
@@ -0,0 +1,5 @@
+User Heap Linked List Allocator
+=======================
+
+.. doxygenfile:: arch/x86_64/include/arch/memory/heap/user_heap_allocator.hpp
+