summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/CMakeLists.txt4
-rw-r--r--src/core/hle/config_mem.cpp31
-rw-r--r--src/core/hle/config_mem.h56
-rw-r--r--src/core/hle/kernel/kernel.cpp5
-rw-r--r--src/core/hle/kernel/memory.cpp10
-rw-r--r--src/core/hle/kernel/wait_object.cpp2
-rw-r--r--src/core/hle/service/vi/vi.cpp33
-rw-r--r--src/core/hle/shared_page.cpp86
-rw-r--r--src/core/hle/shared_page.h69
-rw-r--r--src/core/loader/linker.cpp8
-rw-r--r--src/core/loader/linker.h3
-rw-r--r--src/core/loader/loader.cpp2
-rw-r--r--src/core/loader/nro.cpp37
-rw-r--r--src/core/loader/nro.h10
14 files changed, 60 insertions, 296 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index fd75854b0..6b6efbc00 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -40,8 +40,6 @@ add_library(core STATIC
frontend/input.h
gdbstub/gdbstub.cpp
gdbstub/gdbstub.h
- hle/config_mem.cpp
- hle/config_mem.h
hle/ipc.h
hle/ipc_helpers.h
hle/kernel/address_arbiter.cpp
@@ -251,8 +249,6 @@ add_library(core STATIC
hle/service/vi/vi_s.h
hle/service/vi/vi_u.cpp
hle/service/vi/vi_u.h
- hle/shared_page.cpp
- hle/shared_page.h
hw/hw.cpp
hw/hw.h
hw/lcd.cpp
diff --git a/src/core/hle/config_mem.cpp b/src/core/hle/config_mem.cpp
deleted file mode 100644
index 038af7909..000000000
--- a/src/core/hle/config_mem.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include <cstring>
-#include "core/hle/config_mem.h"
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace ConfigMem {
-
-ConfigMemDef config_mem;
-
-void Init() {
- std::memset(&config_mem, 0, sizeof(config_mem));
-
- // Values extracted from firmware 11.2.0-35E
- config_mem.kernel_version_min = 0x34;
- config_mem.kernel_version_maj = 0x2;
- config_mem.ns_tid = 0x0004013000008002;
- config_mem.sys_core_ver = 0x2;
- config_mem.unit_info = 0x1; // Bit 0 set for Retail
- config_mem.prev_firm = 0x1;
- config_mem.ctr_sdk_ver = 0x0000F297;
- config_mem.firm_version_min = 0x34;
- config_mem.firm_version_maj = 0x2;
- config_mem.firm_sys_core_ver = 0x2;
- config_mem.firm_ctr_sdk_ver = 0x0000F297;
-}
-
-} // namespace ConfigMem
diff --git a/src/core/hle/config_mem.h b/src/core/hle/config_mem.h
deleted file mode 100644
index 1840d1760..000000000
--- a/src/core/hle/config_mem.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-// Configuration memory stores various hardware/kernel configuration settings. This memory page is
-// read-only for ARM11 processes. I'm guessing this would normally be written to by the firmware/
-// bootrom. Because we're not emulating this, and essentially just "stubbing" the functionality, I'm
-// putting this as a subset of HLE for now.
-
-#include "common/common_funcs.h"
-#include "common/common_types.h"
-#include "common/swap.h"
-#include "core/memory.h"
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace ConfigMem {
-
-struct ConfigMemDef {
- u8 kernel_unk; // 0
- u8 kernel_version_rev; // 1
- u8 kernel_version_min; // 2
- u8 kernel_version_maj; // 3
- u32_le update_flag; // 4
- u64_le ns_tid; // 8
- u32_le sys_core_ver; // 10
- u8 unit_info; // 14
- u8 boot_firm; // 15
- u8 prev_firm; // 16
- INSERT_PADDING_BYTES(0x1); // 17
- u32_le ctr_sdk_ver; // 18
- INSERT_PADDING_BYTES(0x30 - 0x1C); // 1C
- u32_le app_mem_type; // 30
- INSERT_PADDING_BYTES(0x40 - 0x34); // 34
- u32_le app_mem_alloc; // 40
- u32_le sys_mem_alloc; // 44
- u32_le base_mem_alloc; // 48
- INSERT_PADDING_BYTES(0x60 - 0x4C); // 4C
- u8 firm_unk; // 60
- u8 firm_version_rev; // 61
- u8 firm_version_min; // 62
- u8 firm_version_maj; // 63
- u32_le firm_sys_core_ver; // 64
- u32_le firm_ctr_sdk_ver; // 68
- INSERT_PADDING_BYTES(0x1000 - 0x6C); // 6C
-};
-static_assert(sizeof(ConfigMemDef) == Memory::CONFIG_MEMORY_SIZE,
- "Config Memory structure size is wrong");
-
-extern ConfigMemDef config_mem;
-
-void Init();
-
-} // namespace ConfigMem
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index b325b879b..1beb98566 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -2,7 +2,6 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/config_mem.h"
#include "core/hle/kernel/handle_table.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/memory.h"
@@ -11,7 +10,6 @@
#include "core/hle/kernel/resource_limit.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/kernel/timer.h"
-#include "core/hle/shared_page.h"
namespace Kernel {
@@ -19,9 +17,6 @@ unsigned int Object::next_object_id;
/// Initialize the kernel
void Init(u32 system_mode) {
- ConfigMem::Init();
- SharedPage::Init();
-
Kernel::MemoryInit(system_mode);
Kernel::ResourceLimitsInit();
diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp
index d2600cdd7..94eac677c 100644
--- a/src/core/hle/kernel/memory.cpp
+++ b/src/core/hle/kernel/memory.cpp
@@ -11,11 +11,9 @@
#include "common/assert.h"
#include "common/common_types.h"
#include "common/logging/log.h"
-#include "core/hle/config_mem.h"
#include "core/hle/kernel/memory.h"
#include "core/hle/kernel/vm_manager.h"
#include "core/hle/result.h"
-#include "core/hle/shared_page.h"
#include "core/memory.h"
#include "core/memory_setup.h"
@@ -63,14 +61,6 @@ void MemoryInit(u32 mem_type) {
// We must've allocated the entire FCRAM by the end
ASSERT(base == Memory::FCRAM_SIZE);
-
- using ConfigMem::config_mem;
- config_mem.app_mem_type = mem_type;
- // app_mem_malloc does not always match the configured size for memory_region[0]: in case the
- // n3DS type override is in effect it reports the size the game expects, not the real one.
- config_mem.app_mem_alloc = memory_region_sizes[mem_type][0];
- config_mem.sys_mem_alloc = static_cast<u32_le>(memory_regions[1].size);
- config_mem.base_mem_alloc = static_cast<u32_le>(memory_regions[2].size);
}
void MemoryShutdown() {
diff --git a/src/core/hle/kernel/wait_object.cpp b/src/core/hle/kernel/wait_object.cpp
index eb3c92e66..23af346d0 100644
--- a/src/core/hle/kernel/wait_object.cpp
+++ b/src/core/hle/kernel/wait_object.cpp
@@ -5,7 +5,6 @@
#include <algorithm>
#include "common/assert.h"
#include "common/logging/log.h"
-#include "core/hle/config_mem.h"
#include "core/hle/kernel/errors.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/memory.h"
@@ -13,7 +12,6 @@
#include "core/hle/kernel/resource_limit.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/kernel/timer.h"
-#include "core/hle/shared_page.h"
namespace Kernel {
diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp
index 3a69b85f9..993f1e65a 100644
--- a/src/core/hle/service/vi/vi.cpp
+++ b/src/core/hle/service/vi/vi.cpp
@@ -5,6 +5,8 @@
#include <algorithm>
#include <array>
#include <memory>
+#include <type_traits>
+#include <utility>
#include <boost/optional.hpp>
#include "common/alignment.h"
#include "common/math_util.h"
@@ -43,7 +45,9 @@ public:
template <typename T>
T Read() {
+ static_assert(std::is_trivially_copyable_v<T>, "T must be trivially copyable.");
ASSERT(read_index + sizeof(T) <= buffer.size());
+
T val;
std::memcpy(&val, buffer.data() + read_index, sizeof(T));
read_index += sizeof(T);
@@ -53,7 +57,9 @@ public:
template <typename T>
T ReadUnaligned() {
+ static_assert(std::is_trivially_copyable_v<T>, "T must be trivially copyable.");
ASSERT(read_index + sizeof(T) <= buffer.size());
+
T val;
std::memcpy(&val, buffer.data() + read_index, sizeof(T));
read_index += sizeof(T);
@@ -87,8 +93,12 @@ public:
template <typename T>
void Write(const T& val) {
- if (buffer.size() < write_index + sizeof(T))
+ static_assert(std::is_trivially_copyable_v<T>, "T must be trivially copyable.");
+
+ if (buffer.size() < write_index + sizeof(T)) {
buffer.resize(buffer.size() + sizeof(T) + DefaultBufferSize);
+ }
+
std::memcpy(buffer.data() + write_index, &val, sizeof(T));
write_index += sizeof(T);
write_index = Common::AlignUp(write_index, 4);
@@ -96,7 +106,9 @@ public:
template <typename T>
void WriteObject(const T& val) {
- u32_le size = static_cast<u32>(sizeof(val));
+ static_assert(std::is_trivially_copyable_v<T>, "T must be trivially copyable.");
+
+ const u32_le size = static_cast<u32>(sizeof(val));
Write(size);
// TODO(Subv): Support file descriptors.
Write<u32_le>(0); // Fd count.
@@ -176,7 +188,7 @@ private:
class IGBPConnectRequestParcel : public Parcel {
public:
- explicit IGBPConnectRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
+ explicit IGBPConnectRequestParcel(std::vector<u8> buffer) : Parcel(std::move(buffer)) {
Deserialize();
}
~IGBPConnectRequestParcel() override = default;
@@ -223,8 +235,8 @@ private:
class IGBPSetPreallocatedBufferRequestParcel : public Parcel {
public:
- explicit IGBPSetPreallocatedBufferRequestParcel(const std::vector<u8>& buffer)
- : Parcel(buffer) {
+ explicit IGBPSetPreallocatedBufferRequestParcel(std::vector<u8> buffer)
+ : Parcel(std::move(buffer)) {
Deserialize();
}
~IGBPSetPreallocatedBufferRequestParcel() override = default;
@@ -256,7 +268,7 @@ protected:
class IGBPDequeueBufferRequestParcel : public Parcel {
public:
- explicit IGBPDequeueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
+ explicit IGBPDequeueBufferRequestParcel(std::vector<u8> buffer) : Parcel(std::move(buffer)) {
Deserialize();
}
~IGBPDequeueBufferRequestParcel() override = default;
@@ -307,7 +319,7 @@ protected:
class IGBPRequestBufferRequestParcel : public Parcel {
public:
- explicit IGBPRequestBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
+ explicit IGBPRequestBufferRequestParcel(std::vector<u8> buffer) : Parcel(std::move(buffer)) {
Deserialize();
}
~IGBPRequestBufferRequestParcel() override = default;
@@ -322,8 +334,7 @@ public:
class IGBPRequestBufferResponseParcel : public Parcel {
public:
- explicit IGBPRequestBufferResponseParcel(NVFlinger::IGBPBuffer buffer)
- : Parcel(), buffer(buffer) {}
+ explicit IGBPRequestBufferResponseParcel(NVFlinger::IGBPBuffer buffer) : buffer(buffer) {}
~IGBPRequestBufferResponseParcel() override = default;
protected:
@@ -340,7 +351,7 @@ protected:
class IGBPQueueBufferRequestParcel : public Parcel {
public:
- explicit IGBPQueueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
+ explicit IGBPQueueBufferRequestParcel(std::vector<u8> buffer) : Parcel(std::move(buffer)) {
Deserialize();
}
~IGBPQueueBufferRequestParcel() override = default;
@@ -409,7 +420,7 @@ private:
class IGBPQueryRequestParcel : public Parcel {
public:
- explicit IGBPQueryRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
+ explicit IGBPQueryRequestParcel(std::vector<u8> buffer) : Parcel(std::move(buffer)) {
Deserialize();
}
~IGBPQueryRequestParcel() override = default;
diff --git a/src/core/hle/shared_page.cpp b/src/core/hle/shared_page.cpp
deleted file mode 100644
index 9ed8ab249..000000000
--- a/src/core/hle/shared_page.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include <chrono>
-#include <cstring>
-#include <ctime>
-#include "core/core_timing.h"
-#include "core/hle/shared_page.h"
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace SharedPage {
-
-SharedPageDef shared_page;
-
-static CoreTiming::EventType* update_time_event;
-
-/// Gets system time in 3DS format. The epoch is Jan 1900, and the unit is millisecond.
-static u64 GetSystemTime() {
- auto now = std::chrono::system_clock::now();
-
- // 3DS system does't allow user to set a time before Jan 1 2000,
- // so we use it as an auxiliary epoch to calculate the console time.
- std::tm epoch_tm;
- epoch_tm.tm_sec = 0;
- epoch_tm.tm_min = 0;
- epoch_tm.tm_hour = 0;
- epoch_tm.tm_mday = 1;
- epoch_tm.tm_mon = 0;
- epoch_tm.tm_year = 100;
- epoch_tm.tm_isdst = 0;
- auto epoch = std::chrono::system_clock::from_time_t(std::mktime(&epoch_tm));
-
- // 3DS console time uses Jan 1 1900 as internal epoch,
- // so we use the milliseconds between 1900 and 2000 as base console time
- u64 console_time = 3155673600000ULL;
-
- // Only when system time is after 2000, we set it as 3DS system time
- if (now > epoch) {
- console_time += std::chrono::duration_cast<std::chrono::milliseconds>(now - epoch).count();
- }
-
- // If the system time is in daylight saving, we give an additional hour to console time
- std::time_t now_time_t = std::chrono::system_clock::to_time_t(now);
- std::tm* now_tm = std::localtime(&now_time_t);
- if (now_tm && now_tm->tm_isdst > 0)
- console_time += 60 * 60 * 1000;
-
- return console_time;
-}
-
-static void UpdateTimeCallback(u64 userdata, int cycles_late) {
- DateTime& date_time =
- shared_page.date_time_counter % 2 ? shared_page.date_time_0 : shared_page.date_time_1;
-
- date_time.date_time = GetSystemTime();
- date_time.update_tick = CoreTiming::GetTicks();
- date_time.tick_to_second_coefficient = CoreTiming::BASE_CLOCK_RATE;
- date_time.tick_offset = 0;
-
- ++shared_page.date_time_counter;
-
- // system time is updated hourly
- CoreTiming::ScheduleEvent(CoreTiming::msToCycles(60 * 60 * 1000) - cycles_late,
- update_time_event);
-}
-
-void Init() {
- std::memset(&shared_page, 0, sizeof(shared_page));
-
- shared_page.running_hw = 0x1; // product
-
- // Some games wait until this value becomes 0x1, before asking running_hw
- shared_page.unknown_value = 0x1;
-
- // Set to a completely full battery
- shared_page.battery_state.is_adapter_connected.Assign(1);
- shared_page.battery_state.is_charging.Assign(1);
-
- update_time_event =
- CoreTiming::RegisterEvent("SharedPage::UpdateTimeCallback", UpdateTimeCallback);
- CoreTiming::ScheduleEvent(0, update_time_event);
-}
-
-} // namespace SharedPage
diff --git a/src/core/hle/shared_page.h b/src/core/hle/shared_page.h
deleted file mode 100644
index a58259888..000000000
--- a/src/core/hle/shared_page.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-/**
- * The shared page stores various runtime configuration settings. This memory page is
- * read-only for user processes (there is a bit in the header that grants the process
- * write access, according to 3dbrew; this is not emulated)
- */
-
-#include "common/bit_field.h"
-#include "common/common_funcs.h"
-#include "common/common_types.h"
-#include "common/swap.h"
-#include "core/memory.h"
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace SharedPage {
-
-// See http://3dbrew.org/wiki/Configuration_Memory#Shared_Memory_Page_For_ARM11_Processes
-
-struct DateTime {
- u64_le date_time; // 0
- u64_le update_tick; // 8
- u64_le tick_to_second_coefficient; // 10
- u64_le tick_offset; // 18
-};
-static_assert(sizeof(DateTime) == 0x20, "Datetime size is wrong");
-
-union BatteryState {
- u8 raw;
- BitField<0, 1, u8> is_adapter_connected;
- BitField<1, 1, u8> is_charging;
- BitField<2, 3, u8> charge_level;
-};
-
-struct SharedPageDef {
- // Most of these names are taken from the 3dbrew page linked above.
- u32_le date_time_counter; // 0
- u8 running_hw; // 4
- /// "Microcontroller hardware info"
- u8 mcu_hw_info; // 5
- INSERT_PADDING_BYTES(0x20 - 0x6); // 6
- DateTime date_time_0; // 20
- DateTime date_time_1; // 40
- u8 wifi_macaddr[6]; // 60
- u8 wifi_link_level; // 66
- u8 wifi_unknown2; // 67
- INSERT_PADDING_BYTES(0x80 - 0x68); // 68
- float_le sliderstate_3d; // 80
- u8 ledstate_3d; // 84
- BatteryState battery_state; // 85
- u8 unknown_value; // 86
- INSERT_PADDING_BYTES(0xA0 - 0x87); // 87
- u64_le menu_title_id; // A0
- u64_le active_menu_title_id; // A8
- INSERT_PADDING_BYTES(0x1000 - 0xB0); // B0
-};
-static_assert(sizeof(SharedPageDef) == Memory::SHARED_PAGE_SIZE,
- "Shared page structure size is wrong");
-
-extern SharedPageDef shared_page;
-
-void Init();
-
-} // namespace SharedPage
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/loader.cpp b/src/core/loader/loader.cpp
index 4cbd9e285..cbc4177c6 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -42,7 +42,7 @@ FileType IdentifyFile(FileSys::VirtualFile file) {
}
FileType IdentifyFile(const std::string& file_name) {
- return IdentifyFile(FileSys::VirtualFile(std::make_shared<FileSys::RealVfsFile>(file_name)));
+ return IdentifyFile(std::make_shared<FileSys::RealVfsFile>(file_name));
}
FileType GuessFromFilename(const std::string& name) {
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-11-10 17:12:47 +0100