Merge branch 'boot' into new_intr

Signed-off-by: Zone.N <[email protected]>
MRNIU · Aug 30, 2024 · c264454 · c264454
2 parents 545f2ce + c61cc09
commit c264454
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/src/kernel/arch/aarch64/include/cpu/cpu.hpp b/src/kernel/arch/aarch64/include/cpu/cpu.hpp
@@ -23,8 +23,8 @@
 #include <typeinfo>
 
 #include "kernel_log.hpp"
+#include "regs.hpp"
 #include "sk_cstdio"
 #include "sk_iostream"
-#include "sr.hpp"
 
 #endif  // SIMPLEKERNEL_SRC_KERNEL_ARCH_AARCH64_INCLUDE_CPU_CPU_HPP_
diff --git a/src/kernel/arch/aarch64/include/cpu/sr.hpp → src/kernel/arch/aarch64/include/cpu/regs.hpp b/src/kernel/arch/aarch64/include/cpu/sr.hpp → src/kernel/arch/aarch64/include/cpu/regs.hpp
@@ -1,7 +1,7 @@
 
 /**
- * @file sr.hpp
- * @brief aarch64 sr 相关定义
+ * @file regs.hpp
+ * @brief aarch64 寄存器相关定义
  * @author Zone.N ([email protected])
  * @version 1.0
  * @date 2024-03-05
@@ -14,8 +14,8 @@
  * </table>
  */
 
-#ifndef SIMPLEKERNEL_SRC_KERNEL_ARCH_AARCH64_INCLUDE_CPU_SR_HPP_
-#define SIMPLEKERNEL_SRC_KERNEL_ARCH_AARCH64_INCLUDE_CPU_SR_HPP_
+#ifndef SIMPLEKERNEL_SRC_KERNEL_ARCH_AARCH64_INCLUDE_CPU_REGS_HPP_
+#define SIMPLEKERNEL_SRC_KERNEL_ARCH_AARCH64_INCLUDE_CPU_REGS_HPP_
 
 #include <cstdint>
 #include <cstdlib>
@@ -166,4 +166,4 @@ struct AllXreg {
 
 };  // namespace cpu
 
-#endif  // SIMPLEKERNEL_SRC_KERNEL_ARCH_AARCH64_INCLUDE_CPU_SR_HPP_
+#endif  // SIMPLEKERNEL_SRC_KERNEL_ARCH_AARCH64_INCLUDE_CPU_REGS_HPP_
diff --git a/src/kernel/arch/riscv64/include/cpu/cpu.hpp b/src/kernel/arch/riscv64/include/cpu/cpu.hpp
@@ -22,8 +22,8 @@
 #include <type_traits>
 #include <typeinfo>
 
-#include "csr.hpp"
 #include "kernel_log.hpp"
+#include "regs.hpp"
 #include "sk_cstdio"
 #include "sk_iostream"
 

diff --git a/src/kernel/arch/riscv64/include/cpu/csr.hpp → src/kernel/arch/riscv64/include/cpu/regs.hpp b/src/kernel/arch/riscv64/include/cpu/csr.hpp → src/kernel/arch/riscv64/include/cpu/regs.hpp
@@ -1,7 +1,7 @@
 
 /**
- * @file csr.hpp
- * @brief riscv64 csr 相关定义
+ * @file regs.hpp
+ * @brief riscv64 寄存器相关定义
  * @author Zone.N ([email protected])
  * @version 1.0
  * @date 2024-03-05
@@ -14,8 +14,8 @@
  * </table>
  */
 
-#ifndef SIMPLEKERNEL_SRC_KERNEL_ARCH_RISCV64_INCLUDE_CPU_CSR_HPP_
-#define SIMPLEKERNEL_SRC_KERNEL_ARCH_RISCV64_INCLUDE_CPU_CSR_HPP_
+#ifndef SIMPLEKERNEL_SRC_KERNEL_ARCH_RISCV64_INCLUDE_CPU_REGS_HPP_
+#define SIMPLEKERNEL_SRC_KERNEL_ARCH_RISCV64_INCLUDE_CPU_REGS_HPP_
 
 #include <cstdint>
 #include <cstdlib>
@@ -1611,4 +1611,4 @@ class AllCsr {
 
 };  // namespace cpu
 
-#endif  // SIMPLEKERNEL_SRC_KERNEL_ARCH_RISCV64_INCLUDE_CPU_CSR_HPP_
+#endif  // SIMPLEKERNEL_SRC_KERNEL_ARCH_RISCV64_INCLUDE_CPU_REGS_HPP_
diff --git a/src/kernel/arch/x86_64/include/cpu/cpu.hpp b/src/kernel/arch/x86_64/include/cpu/cpu.hpp
@@ -22,8 +22,8 @@
 #include <type_traits>
 #include <typeinfo>
 
-#include "cr.hpp"
 #include "kernel_log.hpp"
+#include "regs.hpp"
 #include "sk_cstdio"
 #include "sk_iostream"
 

diff --git a/src/kernel/arch/x86_64/include/cpu/cr.hpp → src/kernel/arch/x86_64/include/cpu/regs.hpp b/src/kernel/arch/x86_64/include/cpu/cr.hpp → src/kernel/arch/x86_64/include/cpu/regs.hpp
@@ -1,7 +1,7 @@
 
 /**
- * @file cr.hpp
- * @brief x86_64 cr 相关定义
+ * @file regs.hpp
+ * @brief x86_64 寄存器相关定义
  * @author Zone.N ([email protected])
  * @version 1.0
  * @date 2024-03-05
@@ -14,8 +14,8 @@
  * </table>
  */
 
-#ifndef SIMPLEKERNEL_SRC_KERNEL_ARCH_X86_64_INCLUDE_CPU_CR_HPP_
-#define SIMPLEKERNEL_SRC_KERNEL_ARCH_X86_64_INCLUDE_CPU_CR_HPP_
+#ifndef SIMPLEKERNEL_SRC_KERNEL_ARCH_X86_64_INCLUDE_CPU_REGS_HPP_
+#define SIMPLEKERNEL_SRC_KERNEL_ARCH_X86_64_INCLUDE_CPU_REGS_HPP_
 
 #include <cstdint>
 #include <cstdlib>
@@ -1773,4 +1773,4 @@ struct AllCr {
 
 };  // namespace cpu
 
-#endif  // SIMPLEKERNEL_SRC_KERNEL_ARCH_X86_64_INCLUDE_CPU_CR_HPP_
+#endif  // SIMPLEKERNEL_SRC_KERNEL_ARCH_X86_64_INCLUDE_CPU_REGS_HPP_