From 090ba239c5c71c765706019fa2733ed2b28ece8f Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Sat, 7 Oct 2023 11:17:54 +0200
Subject: kernel: move x86_64 entry point source

---
 source/kernel/CMakeLists.txt            | 6 +++++-
 source/kernel/arch/x86_64/src/entry.cpp | 9 +++++++++
 source/kernel/src/entry.cpp             | 9 ---------
 3 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 source/kernel/arch/x86_64/src/entry.cpp
 delete mode 100644 source/kernel/src/entry.cpp

(limited to 'source')

diff --git a/source/kernel/CMakeLists.txt b/source/kernel/CMakeLists.txt
index c8e0c4a..48c9e4a 100644
--- a/source/kernel/CMakeLists.txt
+++ b/source/kernel/CMakeLists.txt
@@ -2,7 +2,7 @@ set(TEACHOS_KERNEL_LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/arch/${CMAKE_SYSTE
 mark_as_advanced(TEACHOS_KERNEL_LINKER_SCRIPT)
 
 add_executable("kernel"
-  "src/entry.cpp"
+  "arch/${CMAKE_SYSTEM_PROCESSOR}/src/entry.cpp"
 )
 
 target_compile_features("kernel" PRIVATE
@@ -16,6 +16,10 @@ target_compile_options("kernel" PRIVATE
   "$<$<CXX_COMPILER_ID:GNU>:-pedantic-errors>"
 )
 
+target_include_directories("kernel" PRIVATE
+  "arch/${CMAKE_SYSTEM_PROCESSOR}/include"
+)
+
 target_link_options("kernel" PRIVATE
   "-T${TEACHOS_KERNEL_LINKER_SCRIPT}"
 )
diff --git a/source/kernel/arch/x86_64/src/entry.cpp b/source/kernel/arch/x86_64/src/entry.cpp
new file mode 100644
index 0000000..0daf227
--- /dev/null
+++ b/source/kernel/arch/x86_64/src/entry.cpp
@@ -0,0 +1,9 @@
+namespace teachos
+{
+  extern "C" auto kernel_main() -> void
+  {
+    while(true) {
+      asm volatile ("nop"); 
+    }
+  }
+}
diff --git a/source/kernel/src/entry.cpp b/source/kernel/src/entry.cpp
deleted file mode 100644
index 0daf227..0000000
--- a/source/kernel/src/entry.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace teachos
-{
-  extern "C" auto kernel_main() -> void
-  {
-    while(true) {
-      asm volatile ("nop"); 
-    }
-  }
-}
-- 
cgit v1.2.3