Separate image base address per architecture

2024-07-10 22:42:48 +02:00 · 2024-07-10 22:42:48 +02:00 · 94076b7471
commit 94076b7471
parent ebc2607446
4 changed files with 3 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -44,7 +44,7 @@ set(CMAKE_TOOLCHAIN_FILE "sdk/cmake/toolchain.cmake")
 project(EXECTOS)

 # Load all the CMake SDK
-include(sdk/cmake/baseaddress.cmake)
+include(sdk/cmake/baseaddress/${ARCH}.cmake)
 include(sdk/cmake/emulation.cmake)
 include(sdk/cmake/functions.cmake)
 include(sdk/cmake/version.cmake)
--- a/sdk/cmake/baseaddress/amd64.cmake
+++ b/sdk/cmake/baseaddress/amd64.cmake
@ -0,0 +1,2 @@
+# Set base addresses for all modules
+set(BASEADDRESS_XTOSKRNL 0x0000000140000000)
--- a/sdk/cmake/baseaddress/i686.cmake
+++ b/sdk/cmake/baseaddress/i686.cmake
@ -1,3 +1,2 @@
 # Set base addresses for all modules
-set(BASEADDRESS_XTLDR    0x00010000)
 set(BASEADDRESS_XTOSKRNL 0x00400000)
--- a/xtldr/CMakeLists.txt
+++ b/xtldr/CMakeLists.txt
@ -49,6 +49,5 @@ set_install_target(xtldr efi/boot)

 # Set loader entrypoint and subsystem
 set_entrypoint(xtldr "BlStartXtLoader")
-set_imagebase(xtldr ${BASEADDRESS_XTLDR})
 set_linker_map(xtldr TRUE)
 set_subsystem(xtldr efi_application)