Merge branch 'boot' into new_intr

Signed-off-by: Zone.N <[email protected]>
MRNIU · Aug 7, 2024 · 68929d2 · 68929d2
2 parents f423d9f + 527f305
commit 68929d2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cmake/functions.cmake b/cmake/functions.cmake
@@ -16,7 +16,7 @@ function(objdump_readelf_nm _target)
             POST_BUILD
             DEPENDS ${_target}
             WORKING_DIRECTORY ${${_target}_BINARY_DIR}
-            COMMAND ${CMAKE_OBJDUMP} -D $<TARGET_FILE:${_target}> > $<TARGET_FILE_DIR:${_target}>/${_target}.asm
+            COMMAND ${CMAKE_OBJDUMP} -D $<TARGET_FILE:${_target}> > $<TARGET_FILE_DIR:${_target}>/${_target}.asm || exit 0
             COMMAND ${CMAKE_READELF} -a $<TARGET_FILE:${_target}> > $<TARGET_FILE_DIR:${_target}>/${_target}.readelf || exit 0
             COMMAND ${CMAKE_NM} -a $<TARGET_FILE:${_target}> > $<TARGET_FILE_DIR:${_target}>/${_target}.sym
             COMMENT "Generating symbol table, assembly, and readelf result for ${_target}"

diff --git a/src/boot/boot.cpp b/src/boot/boot.cpp
@@ -19,7 +19,7 @@
 #include "project_config.h"
 
 // efi 使用的全局变量
-#if defined(__x86_64__)
+#if defined(__x86_64__) || defined(__aarch64__)
 uintptr_t ImageBase = 0;
 #endif
 

diff --git a/src/kernel/arch/aarch64/include/cpu.hpp b/src/kernel/arch/aarch64/include/cpu.hpp
@@ -83,7 +83,7 @@ class ReadOnlyRegBase {
     if constexpr (std::is_same<RegInfo, reginfo::X29Info>::value) {
       __asm__ volatile("mov %0, x29" : "=r"(value) : :);
     } else {
-      Err("No Type\n");
+      log::Err("No Type\n");
       throw;
     }
     return value;
@@ -120,7 +120,7 @@ class WriteOnlyRegBase {
     if constexpr (std::is_same<RegInfo, reginfo::X29Info>::value) {
       __asm__ volatile("mv fp, %0" : : "r"(value) :);
     } else {
-      Err("No Type\n");
+      log::Err("No Type\n");
       throw;
     }
   }