Skip to content

Commit

Permalink
Merge branch 'boot' into new_intr
Browse files Browse the repository at this point in the history
Signed-off-by: Zone.N <[email protected]>
  • Loading branch information
MRNIU committed Aug 7, 2024
2 parents f423d9f + 527f305 commit 68929d2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmake/functions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion src/boot/boot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "project_config.h"

// efi 使用的全局变量
#if defined(__x86_64__)
#if defined(__x86_64__) || defined(__aarch64__)
uintptr_t ImageBase = 0;
#endif

Expand Down
4 changes: 2 additions & 2 deletions src/kernel/arch/aarch64/include/cpu.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
Expand Down

0 comments on commit 68929d2

Please sign in to comment.