summaryrefslogtreecommitdiffhomepage
path: root/dev/kernel/src
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal@nekernel.org>2025-08-04 14:20:59 +0100
committerAmlal El Mahrouss <amlal@nekernel.org>2025-08-04 14:20:59 +0100
commit5c8b167320df4cd3cd91d36705ff9bad4d0e73c4 (patch)
tree2c63140b453076703677ccd55894acf46936e30d /dev/kernel/src
parent406d6c77c5dec5a71bd188db96607802e24f13d6 (diff)
feat: use `kPefMagicFat` instead of `kPefMagic` to check for a FAT binary.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat (limited to 'dev/kernel/src')
-rw-r--r--dev/kernel/src/PEFCodeMgr.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/dev/kernel/src/PEFCodeMgr.cc b/dev/kernel/src/PEFCodeMgr.cc
index af7ea03f..22ef7ba3 100644
--- a/dev/kernel/src/PEFCodeMgr.cc
+++ b/dev/kernel/src/PEFCodeMgr.cc
@@ -77,10 +77,11 @@ PEFLoader::PEFLoader(const Char* path) : fCachedBlob(nullptr), fFatBinary(false)
container->Magic[3] == kPefMagic[3] && container->Magic[4] == kPefMagic[4] &&
container->Abi == kPefAbi) {
return;
- } else if (container->Magic[4] == kPefMagic[0] && container->Magic[3] == kPefMagic[1] &&
- container->Magic[2] == kPefMagic[2] && container->Magic[1] == kPefMagic[3] &&
- container->Magic[0] == kPefMagic[4] && container->Abi == kPefAbi) {
- /// This is a fat binary.
+ } else if (container->Cpu == Detail::ldr_get_platform() && container->Magic[0] == kPefMagicFat[0] &&
+ container->Magic[1] == kPefMagicFat[1] && container->Magic[2] == kPefMagicFat[2] &&
+ container->Magic[3] == kPefMagicFat[3] && container->Magic[4] == kPefMagicFat[4] &&
+ container->Abi == kPefAbi) {
+ /// This is a fat binary, treat it as such.
this->fFatBinary = true;
return;
}
@@ -89,7 +90,7 @@ PEFLoader::PEFLoader(const Char* path) : fCachedBlob(nullptr), fFatBinary(false)
if (fCachedBlob) mm_free_ptr(fCachedBlob);
- kout << "PEFLoader: Warning: Executable format error!\r";
+ kout << "PEFLoader: warning: Executable format error!\r";
fCachedBlob = nullptr;
}