aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/src
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86_64/src')
-rw-r--r--arch/x86_64/src/boot/boot.s2
-rw-r--r--arch/x86_64/src/context_switching/descriptor_table/global_descriptor_table.cpp57
-rw-r--r--arch/x86_64/src/kernel/cpu/control_register.cpp (renamed from arch/x86_64/src/memory/cpu/control_register.cpp)2
-rw-r--r--arch/x86_64/src/kernel/cpu/msr.cpp (renamed from arch/x86_64/src/memory/cpu/msr.cpp)2
-rw-r--r--arch/x86_64/src/kernel/cpu/ss.cpp33
-rw-r--r--arch/x86_64/src/kernel/cpu/tlb.cpp (renamed from arch/x86_64/src/memory/cpu/tlb.cpp)4
-rw-r--r--arch/x86_64/src/kernel/main.cpp44
-rw-r--r--arch/x86_64/src/memory/main.cpp4
8 files changed, 101 insertions, 47 deletions
diff --git a/arch/x86_64/src/boot/boot.s b/arch/x86_64/src/boot/boot.s
index dbea42a..39bfe33 100644
--- a/arch/x86_64/src/boot/boot.s
+++ b/arch/x86_64/src/boot/boot.s
@@ -199,7 +199,7 @@ _start:
cli /* Clears the interrupt flag during the GDT setup */
lgdt (global_descriptor_table_pointer)
- jmp $global_descriptor_table_code,$_transition_to_long_mode
+ jmp $global_descriptor_table_code, $_transition_to_long_mode
/* The interrupt flag is set in cpp after setting up the GDT */
call halt
diff --git a/arch/x86_64/src/context_switching/descriptor_table/global_descriptor_table.cpp b/arch/x86_64/src/context_switching/descriptor_table/global_descriptor_table.cpp
new file mode 100644
index 0000000..1cba13c
--- /dev/null
+++ b/arch/x86_64/src/context_switching/descriptor_table/global_descriptor_table.cpp
@@ -0,0 +1,57 @@
+#include "global_descriptor_table.hpp"
+
+#include "arch/stl/vector.hpp"
+
+#include "segment_descriptor.hpp"
+
+namespace teachos::arch::context_switching::descriptor_table
+{
+ auto create_global_descriptor_table() -> global_descriptor_table
+ {
+ segment_descriptor null_segment{0};
+
+ // Kernel space code segment
+ access_byte kernel_code_access_byte{access_byte::PRESENT | access_byte::ACCESS_LEVEL_KERNEL |
+ access_byte::CODE_OR_DATA_SEGMENT,
+ type_field::CODE_SEGMENT | type_field::READABLE};
+ gdt_flags kernel_code_gdt_flags{gdt_flags::GRANULARITY | gdt_flags::LENGTH};
+ segment_descriptor kernel_code_segment{kernel_code_access_byte, kernel_code_gdt_flags, 0, 0xFFFFF};
+
+ // Kernel space data segment
+ access_byte kernel_data_access_byte{access_byte::PRESENT | access_byte::ACCESS_LEVEL_KERNEL |
+ access_byte::CODE_OR_DATA_SEGMENT,
+ type_field::WRITABLE};
+ gdt_flags kernel_data_gdt_flags{gdt_flags::GRANULARITY | gdt_flags::UPPER_BOUND};
+ segment_descriptor kernel_data_segment{kernel_data_access_byte, kernel_data_gdt_flags, 0, 0xFFFFF};
+
+ // User space code segment
+ access_byte user_code_access_byte{access_byte::PRESENT | access_byte::ACCESS_LEVEL_USER |
+ access_byte::CODE_OR_DATA_SEGMENT,
+ type_field::CODE_SEGMENT | type_field::READABLE};
+ gdt_flags user_code_gdt_flags{gdt_flags::GRANULARITY | gdt_flags::LENGTH};
+ segment_descriptor user_code_segment{user_code_access_byte, user_code_gdt_flags, 0, 0xFFFFF};
+
+ // User space data segment
+ access_byte user_data_access_byte{access_byte::PRESENT | access_byte::ACCESS_LEVEL_USER |
+ access_byte::CODE_OR_DATA_SEGMENT,
+ type_field::WRITABLE};
+ gdt_flags user_data_gdt_flags{gdt_flags::GRANULARITY | gdt_flags::UPPER_BOUND};
+ segment_descriptor user_data_segment{user_data_access_byte, user_data_gdt_flags, 0, 0xFFFFF};
+
+ stl::vector<segment_descriptor> global_descriptor_table{null_segment, kernel_code_segment, kernel_data_segment,
+ user_code_segment, user_data_segment};
+ return global_descriptor_table;
+ }
+
+ auto load_global_descriptor_table(global_descriptor_table_pointer gdt_pointer) -> void
+ {
+ //
+ }
+
+ auto initialize_global_descriptor_table() -> global_descriptor_table
+ {
+ global_descriptor_table gdt{create_global_descriptor_table()};
+ global_descriptor_table_pointer gdt_pointer{gdt.size() - 1, &gdt};
+ load_global_descriptor_table(gdt_pointer);
+ }
+} // namespace teachos::arch::context_switching::descriptor_table \ No newline at end of file
diff --git a/arch/x86_64/src/memory/cpu/control_register.cpp b/arch/x86_64/src/kernel/cpu/control_register.cpp
index 7ee88b5..3051bae 100644
--- a/arch/x86_64/src/memory/cpu/control_register.cpp
+++ b/arch/x86_64/src/kernel/cpu/control_register.cpp
@@ -1,4 +1,4 @@
-#include "arch/memory/cpu/control_register.hpp"
+#include "arch/kernel/cpu/control_register.hpp"
#include "arch/exception_handling/panic.hpp"
diff --git a/arch/x86_64/src/memory/cpu/msr.cpp b/arch/x86_64/src/kernel/cpu/msr.cpp
index b83f902..082bca9 100644
--- a/arch/x86_64/src/memory/cpu/msr.cpp
+++ b/arch/x86_64/src/kernel/cpu/msr.cpp
@@ -1,4 +1,4 @@
-#include "arch/memory/cpu/msr.hpp"
+#include "arch/kernel/cpu/msr.hpp"
namespace teachos::arch::memory::cpu
{
diff --git a/arch/x86_64/src/kernel/cpu/ss.cpp b/arch/x86_64/src/kernel/cpu/ss.cpp
new file mode 100644
index 0000000..b7e52e1
--- /dev/null
+++ b/arch/x86_64/src/kernel/cpu/ss.cpp
@@ -0,0 +1,33 @@
+#include "arch/kernel/cpu/ss.hpp"
+
+namespace teachos::arch::memory::cpu
+{
+ segment_selector::segment_selector(uint16_t index, std::bitset<1U> table_indicator,
+ std::bitset<2U> requested_privilege_level)
+ : index(index)
+ , table_indicator(table_indicator)
+ , requested_privilege_level(requested_privilege_level)
+ {
+ // Nothing to do
+ }
+
+ auto segment_selector::to_uint16() const -> uint16_t
+ {
+ return static_cast<uint16_t>((index << 3) | (table_indicator.to_ulong() << 2) |
+ requested_privilege_level.to_ulong());
+ }
+
+ auto read_ss() -> uint16_t
+ {
+ uint16_t ss;
+ __asm__("mov %%ss, %0" : "=r"(ss));
+ return ss;
+ }
+
+ auto write_ss(segment_selector selector) -> void
+ {
+ uint16_t ss = selector.to_uint16();
+ __asm__("mov %0, %%ss" ::"r"(ss));
+ }
+
+} // namespace teachos::arch::memory::cpu \ No newline at end of file
diff --git a/arch/x86_64/src/memory/cpu/tlb.cpp b/arch/x86_64/src/kernel/cpu/tlb.cpp
index 591d9fc..e753c2c 100644
--- a/arch/x86_64/src/memory/cpu/tlb.cpp
+++ b/arch/x86_64/src/kernel/cpu/tlb.cpp
@@ -1,6 +1,6 @@
-#include "arch/memory/cpu/tlb.hpp"
+#include "arch/kernel/cpu/tlb.hpp"
-#include "arch/memory/cpu/control_register.hpp"
+#include "arch/kernel/cpu/control_register.hpp"
namespace teachos::arch::memory::cpu
{
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index d3938ed..4db9599 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -1,6 +1,6 @@
#include "arch/kernel/main.hpp"
-#include "arch/context_switching/descriptor_table/segment_descriptor.hpp"
+#include "arch/context_switching/descriptor_table/global_descriptor_table.hpp"
#include "arch/memory/heap/bump_allocator.hpp"
#include "arch/memory/heap/global_heap_allocator.hpp"
#include "arch/memory/main.hpp"
@@ -60,50 +60,14 @@ namespace teachos::arch::kernel
heap_test();
- using context_switching::descriptor_table::access_byte;
- using context_switching::descriptor_table::gdt_flags;
- using context_switching::descriptor_table::segment_descriptor;
- using context_switching::descriptor_table::segment_descriptor_type;
- using context_switching::descriptor_table::type_field;
-
- segment_descriptor null_segment{0};
-
- // Kernel space code segment
- access_byte kernel_code_access_byte{access_byte::PRESENT | access_byte::ACCESS_LEVEL_KERNEL |
- access_byte::CODE_OR_DATA_SEGMENT,
- type_field::CODE_SEGMENT | type_field::READABLE};
- gdt_flags kernel_code_gdt_flags{gdt_flags::GRANULARITY | gdt_flags::LENGTH};
- segment_descriptor kernel_code_segment{kernel_code_access_byte, kernel_code_gdt_flags, 0, 0xFFFFF};
-
- // Kernel space data segment
- access_byte kernel_data_access_byte{access_byte::PRESENT | access_byte::ACCESS_LEVEL_KERNEL |
- access_byte::CODE_OR_DATA_SEGMENT,
- type_field::WRITABLE};
- gdt_flags kernel_data_gdt_flags{gdt_flags::GRANULARITY | gdt_flags::UPPER_BOUND};
- segment_descriptor kernel_data_segment{kernel_data_access_byte, kernel_data_gdt_flags, 0, 0xFFFFF};
-
- // User space code segment
- access_byte user_code_access_byte{access_byte::PRESENT | access_byte::ACCESS_LEVEL_USER |
- access_byte::CODE_OR_DATA_SEGMENT,
- type_field::CODE_SEGMENT | type_field::READABLE};
- gdt_flags user_code_gdt_flags{gdt_flags::GRANULARITY | gdt_flags::LENGTH};
- segment_descriptor user_code_segment{user_code_access_byte, user_code_gdt_flags, 0, 0xFFFFF};
-
- // User space data segment
- access_byte user_data_access_byte{access_byte::PRESENT | access_byte::ACCESS_LEVEL_USER |
- access_byte::CODE_OR_DATA_SEGMENT,
- type_field::WRITABLE};
- gdt_flags user_data_gdt_flags{gdt_flags::GRANULARITY | gdt_flags::UPPER_BOUND};
- segment_descriptor user_data_segment{user_data_access_byte, user_data_gdt_flags, 0, 0xFFFFF};
-
- stl::vector<segment_descriptor> global_descriptor_table{null_segment, kernel_code_segment, kernel_data_segment,
- user_code_segment, user_data_segment};
+ context_switching::descriptor_table::global_descriptor_table global_descriptor_table{
+ context_switching::descriptor_table::initialize_global_descriptor_table()};
decltype(auto) x = global_descriptor_table.at(1);
if (global_descriptor_table.size() == 0)
{
}
- if (x.get_segment_type() == segment_descriptor_type::CODE_SEGMENT)
+ if (x.get_segment_type() == context_switching::descriptor_table::segment_descriptor_type::CODE_SEGMENT)
{
}
video::vga::text::write("GDT FILLED", video::vga::text::common_attributes::green_on_black);
diff --git a/arch/x86_64/src/memory/main.cpp b/arch/x86_64/src/memory/main.cpp
index a6f91d9..abc7431 100644
--- a/arch/x86_64/src/memory/main.cpp
+++ b/arch/x86_64/src/memory/main.cpp
@@ -1,9 +1,9 @@
#include "arch/memory/main.hpp"
#include "arch/exception_handling/assert.hpp"
+#include "arch/kernel/cpu/control_register.hpp"
+#include "arch/kernel/cpu/msr.hpp"
#include "arch/memory/allocator/area_frame_allocator.hpp"
-#include "arch/memory/cpu/control_register.hpp"
-#include "arch/memory/cpu/msr.hpp"
#include "arch/memory/heap/heap_allocator.hpp"
#include "arch/memory/paging/active_page_table.hpp"
#include "arch/memory/paging/kernel_mapper.hpp"
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-19 19:32:38 +0000