summaryrefslogtreecommitdiffstats
path: root/src/core/loader
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/loader')
-rw-r--r--src/core/loader/linker.cpp8
-rw-r--r--src/core/loader/linker.h3
-rw-r--r--src/core/loader/nro.cpp37
-rw-r--r--src/core/loader/nro.h10
4 files changed, 37 insertions, 21 deletions
diff --git a/src/core/loader/linker.cpp b/src/core/loader/linker.cpp
index 769516b6f..57ca8c3ee 100644
--- a/src/core/loader/linker.cpp
+++ b/src/core/loader/linker.cpp
@@ -49,8 +49,7 @@ struct Elf64_Sym {
static_assert(sizeof(Elf64_Sym) == 0x18, "Elf64_Sym has incorrect size.");
void Linker::WriteRelocations(std::vector<u8>& program_image, const std::vector<Symbol>& symbols,
- u64 relocation_offset, u64 size, bool is_jump_relocation,
- VAddr load_base) {
+ u64 relocation_offset, u64 size, VAddr load_base) {
for (u64 i = 0; i < size; i += sizeof(Elf64_Rela)) {
Elf64_Rela rela;
std::memcpy(&rela, &program_image[relocation_offset + i], sizeof(Elf64_Rela));
@@ -124,12 +123,11 @@ void Linker::Relocate(std::vector<u8>& program_image, u32 dynamic_section_offset
}
if (dynamic.find(DT_RELA) != dynamic.end()) {
- WriteRelocations(program_image, symbols, dynamic[DT_RELA], dynamic[DT_RELASZ], false,
- load_base);
+ WriteRelocations(program_image, symbols, dynamic[DT_RELA], dynamic[DT_RELASZ], load_base);
}
if (dynamic.find(DT_JMPREL) != dynamic.end()) {
- WriteRelocations(program_image, symbols, dynamic[DT_JMPREL], dynamic[DT_PLTRELSZ], true,
+ WriteRelocations(program_image, symbols, dynamic[DT_JMPREL], dynamic[DT_PLTRELSZ],
load_base);
}
}
diff --git a/src/core/loader/linker.h b/src/core/loader/linker.h
index c09d382c1..107625837 100644
--- a/src/core/loader/linker.h
+++ b/src/core/loader/linker.h
@@ -24,8 +24,7 @@ protected:
};
void WriteRelocations(std::vector<u8>& program_image, const std::vector<Symbol>& symbols,
- u64 relocation_offset, u64 size, bool is_jump_relocation,
- VAddr load_base);
+ u64 relocation_offset, u64 size, VAddr load_base);
void Relocate(std::vector<u8>& program_image, u32 dynamic_section_offset, VAddr load_base);
void ResolveImports();
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp
index 44158655c..7d3ec2a76 100644
--- a/src/core/loader/nro.cpp
+++ b/src/core/loader/nro.cpp
@@ -6,6 +6,7 @@
#include <vector>
#include "common/common_funcs.h"
+#include "common/common_types.h"
#include "common/file_util.h"
#include "common/logging/log.h"
#include "common/swap.h"
@@ -68,22 +69,27 @@ static_assert(sizeof(AssetHeader) == 0x38, "AssetHeader has incorrect size.");
AppLoader_NRO::AppLoader_NRO(FileSys::VirtualFile file) : AppLoader(file) {
NroHeader nro_header{};
- if (file->ReadObject(&nro_header) != sizeof(NroHeader))
+ if (file->ReadObject(&nro_header) != sizeof(NroHeader)) {
return;
+ }
if (file->GetSize() >= nro_header.file_size + sizeof(AssetHeader)) {
- u64 offset = nro_header.file_size;
+ const u64 offset = nro_header.file_size;
AssetHeader asset_header{};
- if (file->ReadObject(&asset_header, offset) != sizeof(AssetHeader))
+ if (file->ReadObject(&asset_header, offset) != sizeof(AssetHeader)) {
return;
+ }
- if (asset_header.format_version != 0)
+ if (asset_header.format_version != 0) {
LOG_WARNING(Loader,
"NRO Asset Header has format {}, currently supported format is 0. If "
"strange glitches occur with metadata, check NRO assets.",
asset_header.format_version);
- if (asset_header.magic != Common::MakeMagic('A', 'S', 'E', 'T'))
+ }
+
+ if (asset_header.magic != Common::MakeMagic('A', 'S', 'E', 'T')) {
return;
+ }
if (asset_header.nacp.size > 0) {
nacp = std::make_unique<FileSys::NACP>(std::make_shared<FileSys::OffsetVfsFile>(
@@ -101,6 +107,8 @@ AppLoader_NRO::AppLoader_NRO(FileSys::VirtualFile file) : AppLoader(file) {
}
}
+AppLoader_NRO::~AppLoader_NRO() = default;
+
FileType AppLoader_NRO::IdentifyType(const FileSys::VirtualFile& file) {
// Read NSO header
NroHeader nro_header{};
@@ -130,8 +138,9 @@ bool AppLoader_NRO::LoadNro(FileSys::VirtualFile file, VAddr load_base) {
// Build program image
Kernel::SharedPtr<Kernel::CodeSet> codeset = Kernel::CodeSet::Create("");
std::vector<u8> program_image = file->ReadBytes(PageAlignSize(nro_header.file_size));
- if (program_image.size() != PageAlignSize(nro_header.file_size))
+ if (program_image.size() != PageAlignSize(nro_header.file_size)) {
return {};
+ }
for (std::size_t i = 0; i < nro_header.segments.size(); ++i) {
codeset->segments[i].addr = nro_header.segments[i].offset;
@@ -187,29 +196,37 @@ ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) {
}
ResultStatus AppLoader_NRO::ReadIcon(std::vector<u8>& buffer) {
- if (icon_data.empty())
+ if (icon_data.empty()) {
return ResultStatus::ErrorNotUsed;
+ }
+
buffer = icon_data;
return ResultStatus::Success;
}
ResultStatus AppLoader_NRO::ReadProgramId(u64& out_program_id) {
- if (nacp == nullptr)
+ if (nacp == nullptr) {
return ResultStatus::ErrorNotUsed;
+ }
+
out_program_id = nacp->GetTitleId();
return ResultStatus::Success;
}
ResultStatus AppLoader_NRO::ReadRomFS(FileSys::VirtualFile& dir) {
- if (romfs == nullptr)
+ if (romfs == nullptr) {
return ResultStatus::ErrorNotUsed;
+ }
+
dir = romfs;
return ResultStatus::Success;
}
ResultStatus AppLoader_NRO::ReadTitle(std::string& title) {
- if (nacp == nullptr)
+ if (nacp == nullptr) {
return ResultStatus::ErrorNotUsed;
+ }
+
title = nacp->GetApplicationName();
return ResultStatus::Success;
}
diff --git a/src/core/loader/nro.h b/src/core/loader/nro.h
index 5f3fc40d2..04a0f497e 100644
--- a/src/core/loader/nro.h
+++ b/src/core/loader/nro.h
@@ -6,19 +6,21 @@
#include <string>
#include "common/common_types.h"
-#include "core/file_sys/control_metadata.h"
#include "core/hle/kernel/kernel.h"
#include "core/loader/linker.h"
#include "core/loader/loader.h"
-namespace Loader {
+namespace FileSys {
+class NACP;
+}
-struct AssetHeader;
+namespace Loader {
/// Loads an NRO file
class AppLoader_NRO final : public AppLoader, Linker {
public:
- AppLoader_NRO(FileSys::VirtualFile file);
+ explicit AppLoader_NRO(FileSys::VirtualFile file);
+ ~AppLoader_NRO() override;
/**
* Returns the type of the file
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 17:26:58 +0200