add register validation and asserts

1 files changed, 6 insertions, 3 deletions

diff --git a/arch/x86_64/src/context_switching/main.cpp b/arch/x86_64/src/context_switching/main.cpp
index 3efba45..0f2ec93 100644
--- a/arch/x86_64/src/context_switching/main.cpp
+++ b/arch/x86_64/src/context_switching/main.cpp
@@ -2,6 +2,7 @@
 
 #include "arch/exception_handling/assert.hpp"
 #include "arch/kernel/cpu/call.hpp"
+#include "arch/kernel/cpu/control_register.hpp"
 #include "arch/kernel/cpu/if.hpp"
 #include "arch/kernel/cpu/segment_register.hpp"
 #include "arch/kernel/cpu/tr.hpp"
@@ -82,10 +83,12 @@ namespace teachos::arch::context_switching
   auto user_mode_main() -> void
   {
     auto current_segment = kernel::cpu::read_code_segment_register();
-    arch::exception_handling::assert(USER_CODE_SEGMENT_SELECTOR == current_segment,
-                                     "[Context Switching] Context switch into user mode not successful");
+    exception_handling::assert(USER_CODE_SEGMENT_SELECTOR == current_segment,
+                               "[Context Switching] Context switch into user mode not successful");
+    exception_handling::assert(USER_DATA_SEGMENT_SELECTOR == kernel::cpu::validate_data_segment_registers(),
+                               "[Context Switching] Context switch into user mode not successful");
 
-    video::vga::text::write("User Mode!!!", video::vga::text::common_attributes::green_on_black);
+    video::vga::text::write("Successfully entered user mode!", video::vga::text::common_attributes::green_on_black);
   }
 
   auto switch_to_user_mode() -> void