refactor: arch

Signed-off-by: Zone.N <[email protected]>

README.md

@@ -27,6 +27,14 @@
 
 本分支是 SImpleKernel 的首个分支。在本分支中，完成了构建系统的基础搭建、基本的文档部署与自动化测试，当然还有最重要的，有基于 uefi 的 x86_64 内核与由 opensbi 启动的 riscv64 内核，可以在 qemu 上运行，并实现了简单的屏幕输出。
 
+调用顺序
+
+ - x86_64/aarch64
+  uefi->main.cpp:main->arch.cpp:arch_init
+
+- riscv64
+  opensbi->boot.S:_start->main.cpp:main->arch.cpp:arch_init
+
 - 构建系统 
 
   参考 [MRNIU/cmake-kernel](https://github.com/MRNIU/cmake-kernel) 的构建系统，详细解释见 [doc/build_system.md](./doc/build_system.md)

cmake/add_header.cmake

@@ -27,9 +27,7 @@ endfunction ()
 
 function (add_header_arch _target)
     target_include_directories(${_target} PRIVATE
-        ${CMAKE_SOURCE_DIR}/src/kernel/arch/include)
-    target_include_directories(${_target} PRIVATE
-        ${CMAKE_SOURCE_DIR}/src/kernel/arch/${TARGET_ARCH}/include)
+        ${CMAKE_SOURCE_DIR}/src/kernel/arch)
 endfunction ()
 
 function (add_header_kernel _target)

src/kernel/arch/CMakeLists.txt

@@ -18,7 +18,7 @@ add_library(${PROJECT_NAME} OBJECT
     $<$<STREQUAL:${TARGET_ARCH},riscv64>:
     ${PROJECT_SOURCE_DIR}/${TARGET_ARCH}/boot.S
     >
-    ${PROJECT_SOURCE_DIR}/${TARGET_ARCH}/arch.cpp
+    ${PROJECT_SOURCE_DIR}/${TARGET_ARCH}/arch_main.cpp
 )
 
 # 添加头文件

src/kernel/arch/aarch64/arch.cpp → src/kernel/arch/aarch64/arch_main.cpp

@@ -1,7 +1,7 @@
 
 /**
- * @file arch.cpp
- * @brief arch cpp
+ * @file arch_main.cpp
+ * @brief arch_main cpp
  * @author Zone.N ([email protected])
  * @version 1.0
  * @date 2023-07-15
@@ -16,7 +16,7 @@
 
 #include "arch.h"
 
-int32_t arch(uint32_t _argc, uint8_t **_argv) {
+int32_t arch_init(uint32_t _argc, uint8_t **_argv) {
   (void)_argc;
   (void)_argv;
 

src/kernel/arch/include/arch.h → src/kernel/arch/arch.h

@@ -14,11 +14,11 @@
  * </table>
  */
 
-#ifndef CMAKE_ARCH_H
-#define CMAKE_ARCH_H
+#ifndef SIMPLEKERNEL_SRC_KERNEL_ARCH_ARCH_H
+#define SIMPLEKERNEL_SRC_KERNEL_ARCH_ARCH_H
 
 #include "cstdint"
 
-int32_t arch(uint32_t _argc, uint8_t **_argv);
+int32_t arch_init(uint32_t _argc, uint8_t **_argv);
 
-#endif /* CMAKE_ARCH_H */
+#endif /* SIMPLEKERNEL_SRC_KERNEL_ARCH_ARCH_H */

src/kernel/arch/riscv64/arch.cpp → src/kernel/arch/riscv64/arch_main.cpp

@@ -1,7 +1,7 @@
 
 /**
- * @file arch.cpp
- * @brief arch cpp
+ * @file arch_main.cpp
+ * @brief arch_main cpp
  * @author Zone.N ([email protected])
  * @version 1.0
  * @date 2023-07-15
@@ -14,12 +14,7 @@
  * </table>
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "cstdint"
-
 #include "sbi/sbi_ecall_interface.h"
 
 struct sbiret_t {
@@ -70,6 +65,14 @@ int arch(int, char **) {
   return 0;
 }
 
-#ifdef __cplusplus
+int32_t arch_init(uint32_t _argc, uint8_t **_argv) {
+  (void)_argc;
+  (void)_argv;
+
+  // 进入死循环
+  while (1) {
+    ;
+  }
+
+  return 0;
 }
-#endif

src/kernel/arch/arch.cpp → src/kernel/arch/x86_64/arch_main.cpp

@@ -1,7 +1,7 @@
 
 /**
- * @file arch.cpp
- * @brief arch cpp
+ * @file arch_main.cpp
+ * @brief arch_main cpp
  * @author Zone.N ([email protected])
  * @version 1.0
  * @date 2023-07-15
@@ -16,7 +16,7 @@
 
 #include "arch.h"
 
-int32_t arch(uint32_t _argc, uint8_t **_argv) {
+int32_t arch_init(uint32_t _argc, uint8_t **_argv) {
   (void)_argc;
   (void)_argv;
 

src/kernel/main.cpp

@@ -14,12 +14,15 @@
  * </table>
  */
 
+#include "arch.h"
 #include "kernel.h"
 
 int main(int _argc, char **_argv) {
   (void)_argc;
   (void)_argv;
 
+  auto arch_init_ret = arch_init(_argc, (uint8_t **)_argv);
+
   // 进入死循环
   while (1) {
     ;