prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RomFS loads and games execute

Browse Source
This commit is contained in:
Zach Hilman
2018-06-16 17:50:46 -04:00
parent 07e0b00d23
commit 48e7c479bc
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/loader/nca.cpp
View File

@@ -15,6 +15,7 @@
#include "core/file_sys/romfs_factory.h" #include "core/file_sys/romfs_factory.h"
#include "core/hle/kernel/process.h" #include "core/hle/kernel/process.h"
#include "core/hle/kernel/resource_limit.h" #include "core/hle/kernel/resource_limit.h"
#include "core/hle/service/filesystem/filesystem.h"
#include "core/loader/nro.h" #include "core/loader/nro.h"
#include "core/memory.h" #include "core/memory.h"
#include "nca.h" #include "nca.h"
@@ -250,9 +251,9 @@ ResultStatus AppLoader_NCA::Load(Kernel::SharedPtr<Kernel::Process>& process) {
return ResultStatus::Error; return ResultStatus::Error;
} }
Nca nca{std::move(file), filepath}; nca = std::make_unique<Nca>(std::move(file), filepath);
ResultStatus result = metadata.Load(nca.GetExeFsFile("main.npdm")); ResultStatus result = metadata.Load(nca->GetExeFsFile("main.npdm"));
if (result != ResultStatus::Success) { if (result != ResultStatus::Success) {
return result; return result;
} }
@@ -267,7 +268,7 @@ ResultStatus AppLoader_NCA::Load(Kernel::SharedPtr<Kernel::Process>& process) {
for (const auto& module : {"rtld", "main", "subsdk0", "subsdk1", "subsdk2", "subsdk3", for (const auto& module : {"rtld", "main", "subsdk0", "subsdk1", "subsdk2", "subsdk3",
"subsdk4", "subsdk5", "subsdk6", "subsdk7", "sdk"}) { "subsdk4", "subsdk5", "subsdk6", "subsdk7", "sdk"}) {
const VAddr load_addr = next_load_addr; const VAddr load_addr = next_load_addr;
next_load_addr = AppLoader_NSO::LoadModule(module, nca.GetExeFsFile(module), load_addr); next_load_addr = AppLoader_NSO::LoadModule(module, nca->GetExeFsFile(module), load_addr);
if (next_load_addr) { if (next_load_addr) {
NGLOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", module, load_addr); NGLOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", module, load_addr);
} else { } else {
@@ -283,10 +284,30 @@ ResultStatus AppLoader_NCA::Load(Kernel::SharedPtr<Kernel::Process>& process) {
process->Run(Memory::PROCESS_IMAGE_VADDR, metadata.GetMainThreadPriority(), process->Run(Memory::PROCESS_IMAGE_VADDR, metadata.GetMainThreadPriority(),
metadata.GetMainThreadStackSize()); metadata.GetMainThreadStackSize());
// Load the RomFS if (nca->GetRomFsSize() > 0)
Service::FileSystem::RegisterFileSystem(std::make_unique<FileSys::RomFS_Factory>(*this),
Service::FileSystem::Type::RomFS);
is_loaded = true; is_loaded = true;
return ResultStatus::Success; return ResultStatus::Success;
} }
ResultStatus AppLoader_NCA::ReadRomFS(std::shared_ptr<FileUtil::IOFile>& romfs_file, u64& offset,
u64& size) {
if (nca->GetRomFsSize() == 0) {
NGLOG_DEBUG(Loader, "No RomFS available");
return ResultStatus::ErrorNotUsed;
}
romfs_file = std::make_shared<FileUtil::IOFile>(filepath, "rb");
offset = nca->GetRomFsOffset();
size = nca->GetRomFsSize();
NGLOG_DEBUG(Loader, "RomFS offset: 0x{:016X}", offset);
NGLOG_DEBUG(Loader, "RomFS size: 0x{:016X}", size);
return ResultStatus::Success;
}
} // namespace Loader } // namespace Loader

9
src/core/loader/nca.h
View File

@@ -34,8 +34,8 @@ private:
std::vector<FileSys::PartitionFilesystem> pfs; std::vector<FileSys::PartitionFilesystem> pfs;
std::vector<u64> pfs_offset; std::vector<u64> pfs_offset;
u64 romfs_offset; u64 romfs_offset = 0;
u64 romfs_size; u64 romfs_size = 0;
FileUtil::IOFile file; FileUtil::IOFile file;
std::string path; std::string path;
@@ -60,9 +60,14 @@ public:
ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override; ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
ResultStatus ReadRomFS(std::shared_ptr<FileUtil::IOFile>& romfs_file, u64& offset,
u64& size) override;
private: private:
std::string filepath; std::string filepath;
FileSys::ProgramMetadata metadata; FileSys::ProgramMetadata metadata;
std::unique_ptr<Nca> nca;
}; };
} // namespace Loader } // namespace Loader