diff --git a/cmake/functions.cmake b/cmake/functions.cmake index d2dc97eb..c44ed31d 100644 --- 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}.asm + COMMAND ${CMAKE_OBJDUMP} -D $ > $/${_target}.asm || exit 0 COMMAND ${CMAKE_READELF} -a $ > $/${_target}.readelf || exit 0 COMMAND ${CMAKE_NM} -a $ > $/${_target}.sym COMMENT "Generating symbol table, assembly, and readelf result for ${_target}" diff --git a/src/boot/boot.cpp b/src/boot/boot.cpp index ffea71e6..60a96480 100644 --- 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 index 1983913a..c48d5ce3 100644 --- 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::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::value) { __asm__ volatile("mv fp, %0" : : "r"(value) :); } else { - Err("No Type\n"); + log::Err("No Type\n"); throw; } }