summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-12-03 04:13:50 +0100
committerLioncash <mathew1800@gmail.com>2018-12-03 04:18:52 +0100
commitb110d2176c68d8efe572766e9b7edd80e3dd4298 (patch)
tree7bd18c66f920000e940a7bb32ad63e4ce7401cd6
parentMerge pull request #1827 from ReinUsesLisp/clip-and-shader (diff)
downloadyuzu-b110d2176c68d8efe572766e9b7edd80e3dd4298.tar
yuzu-b110d2176c68d8efe572766e9b7edd80e3dd4298.tar.gz
yuzu-b110d2176c68d8efe572766e9b7edd80e3dd4298.tar.bz2
yuzu-b110d2176c68d8efe572766e9b7edd80e3dd4298.tar.lz
yuzu-b110d2176c68d8efe572766e9b7edd80e3dd4298.tar.xz
yuzu-b110d2176c68d8efe572766e9b7edd80e3dd4298.tar.zst
yuzu-b110d2176c68d8efe572766e9b7edd80e3dd4298.zip
-rw-r--r--src/core/loader/nro.cpp14
-rw-r--r--src/core/loader/nro.h9
2 files changed, 13 insertions, 10 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp
index fbbd6b0de..16d5883ee 100644
--- a/src/core/loader/nro.cpp
+++ b/src/core/loader/nro.cpp
@@ -10,7 +10,6 @@
#include "common/file_util.h"
#include "common/logging/log.h"
#include "common/swap.h"
-#include "core/core.h"
#include "core/file_sys/control_metadata.h"
#include "core/file_sys/romfs_factory.h"
#include "core/file_sys/vfs_offset.h"
@@ -129,9 +128,8 @@ static constexpr u32 PageAlignSize(u32 size) {
return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK;
}
-/*static*/ bool AppLoader_NRO::LoadNro(const std::vector<u8>& data, const std::string& name,
- VAddr load_base) {
-
+/*static*/ bool AppLoader_NRO::LoadNro(Kernel::Process& process, const std::vector<u8>& data,
+ const std::string& name, VAddr load_base) {
if (data.size() < sizeof(NroHeader)) {
return {};
}
@@ -189,7 +187,7 @@ static constexpr u32 PageAlignSize(u32 size) {
// Load codeset for current process
codeset.memory = std::make_shared<std::vector<u8>>(std::move(program_image));
- Core::CurrentProcess()->LoadModule(std::move(codeset), load_base);
+ process.LoadModule(std::move(codeset), load_base);
// Register module with GDBStub
GDBStub::RegisterModule(name, load_base, load_base);
@@ -197,8 +195,8 @@ static constexpr u32 PageAlignSize(u32 size) {
return true;
}
-bool AppLoader_NRO::LoadNro(const FileSys::VfsFile& file, VAddr load_base) {
- return AppLoader_NRO::LoadNro(file.ReadAllBytes(), file.GetName(), load_base);
+bool AppLoader_NRO::LoadNro(Kernel::Process& process, const FileSys::VfsFile& file, VAddr load_base) {
+ return LoadNro(process, file.ReadAllBytes(), file.GetName(), load_base);
}
ResultStatus AppLoader_NRO::Load(Kernel::Process& process) {
@@ -209,7 +207,7 @@ ResultStatus AppLoader_NRO::Load(Kernel::Process& process) {
// Load NRO
const VAddr base_address = process.VMManager().GetCodeRegionBaseAddress();
- if (!LoadNro(*file, base_address)) {
+ if (!LoadNro(process, *file, base_address)) {
return ResultStatus::ErrorLoadingNRO;
}
diff --git a/src/core/loader/nro.h b/src/core/loader/nro.h
index 3e6959302..6a63d1a7a 100644
--- a/src/core/loader/nro.h
+++ b/src/core/loader/nro.h
@@ -14,6 +14,10 @@ namespace FileSys {
class NACP;
}
+namespace Kernel {
+class Process;
+}
+
namespace Loader {
/// Loads an NRO file
@@ -41,10 +45,11 @@ public:
ResultStatus ReadTitle(std::string& title) override;
bool IsRomFSUpdatable() const override;
- static bool LoadNro(const std::vector<u8>& data, const std::string& name, VAddr load_base);
+ static bool LoadNro(Kernel::Process& process, const std::vector<u8>& data,
+ const std::string& name, VAddr load_base);
private:
- bool LoadNro(const FileSys::VfsFile& file, VAddr load_base);
+ bool LoadNro(Kernel::Process& process, const FileSys::VfsFile& file, VAddr load_base);
std::vector<u8> icon_data;
std::unique_ptr<FileSys::NACP> nacp;