Loader: Updated read methods to be const
- Required "file" handle to be made local and explicitly opened/closed as needed
This commit is contained in:
parent
1ccdb6a769
commit
2c62d92551
|
@ -11,7 +11,7 @@
|
|||
|
||||
namespace FileSys {
|
||||
|
||||
Archive_RomFS::Archive_RomFS(Loader::AppLoader& app_loader) {
|
||||
Archive_RomFS::Archive_RomFS(const Loader::AppLoader& app_loader) {
|
||||
// Load the RomFS from the app
|
||||
if (Loader::ResultStatus::Success != app_loader.ReadRomFS(raw_data)) {
|
||||
WARN_LOG(FILESYS, "Unable to read RomFS!");
|
||||
|
|
|
@ -19,7 +19,7 @@ namespace FileSys {
|
|||
/// File system interface to the RomFS archive
|
||||
class Archive_RomFS : public Archive {
|
||||
public:
|
||||
Archive_RomFS(Loader::AppLoader& app_loader);
|
||||
Archive_RomFS(const Loader::AppLoader& app_loader);
|
||||
~Archive_RomFS();
|
||||
|
||||
/**
|
||||
|
|
|
@ -51,7 +51,7 @@ public:
|
|||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
virtual ResultStatus ReadCode(std::vector<u8>& buffer) {
|
||||
virtual ResultStatus ReadCode(std::vector<u8>& buffer) const {
|
||||
return ResultStatus::ErrorNotImplemented;
|
||||
}
|
||||
|
||||
|
@ -60,7 +60,7 @@ public:
|
|||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
virtual ResultStatus ReadIcon(std::vector<u8>& buffer) {
|
||||
virtual ResultStatus ReadIcon(std::vector<u8>& buffer) const {
|
||||
return ResultStatus::ErrorNotImplemented;
|
||||
}
|
||||
|
||||
|
@ -69,7 +69,7 @@ public:
|
|||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
virtual ResultStatus ReadBanner(std::vector<u8>& buffer) {
|
||||
virtual ResultStatus ReadBanner(std::vector<u8>& buffer) const {
|
||||
return ResultStatus::ErrorNotImplemented;
|
||||
}
|
||||
|
||||
|
@ -78,7 +78,7 @@ public:
|
|||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
virtual ResultStatus ReadLogo(std::vector<u8>& buffer) {
|
||||
virtual ResultStatus ReadLogo(std::vector<u8>& buffer) const {
|
||||
return ResultStatus::ErrorNotImplemented;
|
||||
}
|
||||
|
||||
|
@ -87,7 +87,7 @@ public:
|
|||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
virtual ResultStatus ReadRomFS(std::vector<u8>& buffer) {
|
||||
virtual ResultStatus ReadRomFS(std::vector<u8>& buffer) const {
|
||||
return ResultStatus::ErrorNotImplemented;
|
||||
}
|
||||
};
|
||||
|
|
|
@ -113,15 +113,13 @@ AppLoader_NCCH::AppLoader_NCCH(const std::string& filename) {
|
|||
|
||||
/// AppLoader_NCCH destructor
|
||||
AppLoader_NCCH::~AppLoader_NCCH() {
|
||||
if (file.IsOpen())
|
||||
file.Close();
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads .code section into memory for booting
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
ResultStatus AppLoader_NCCH::LoadExec() {
|
||||
ResultStatus AppLoader_NCCH::LoadExec() const {
|
||||
if (!is_loaded)
|
||||
return ResultStatus::ErrorNotLoaded;
|
||||
|
||||
|
@ -140,8 +138,10 @@ ResultStatus AppLoader_NCCH::LoadExec() {
|
|||
* @param buffer Vector to read data into
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
ResultStatus AppLoader_NCCH::LoadSectionExeFS(const char* name, std::vector<u8>& buffer) {
|
||||
ResultStatus AppLoader_NCCH::LoadSectionExeFS(const char* name, std::vector<u8>& buffer) const {
|
||||
// Iterate through the ExeFs archive until we find the .code file...
|
||||
File::IOFile file(filename, "rb");
|
||||
if (file.IsOpen()) {
|
||||
for (int i = 0; i < kMaxSections; i++) {
|
||||
// Load the specified section...
|
||||
if (strcmp((const char*)exefs_header.section[i].name, name) == 0) {
|
||||
|
@ -169,13 +169,18 @@ ResultStatus AppLoader_NCCH::LoadSectionExeFS(const char* name, std::vector<u8>&
|
|||
return ResultStatus::ErrorInvalidFormat;
|
||||
}
|
||||
// Section is uncompressed...
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
buffer.resize(exefs_header.section[i].size);
|
||||
file.ReadBytes(&buffer[0], exefs_header.section[i].size);
|
||||
}
|
||||
return ResultStatus::Success;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
ERROR_LOG(LOADER, "Unable to read file %s!", filename.c_str());
|
||||
return ResultStatus::Error;
|
||||
}
|
||||
return ResultStatus::ErrorNotUsed;
|
||||
}
|
||||
|
||||
|
@ -191,8 +196,7 @@ ResultStatus AppLoader_NCCH::Load() {
|
|||
if (is_loaded)
|
||||
return ResultStatus::ErrorAlreadyLoaded;
|
||||
|
||||
file = File::IOFile(filename, "rb");
|
||||
|
||||
File::IOFile file(filename, "rb");
|
||||
if (file.IsOpen()) {
|
||||
file.ReadBytes(&ncch_header, sizeof(NCCH_Header));
|
||||
|
||||
|
@ -235,6 +239,8 @@ ResultStatus AppLoader_NCCH::Load() {
|
|||
LoadExec(); // Load the executable into memory for booting
|
||||
|
||||
return ResultStatus::Success;
|
||||
} else {
|
||||
ERROR_LOG(LOADER, "Unable to read file %s!", filename.c_str());
|
||||
}
|
||||
return ResultStatus::Error;
|
||||
}
|
||||
|
@ -244,7 +250,7 @@ ResultStatus AppLoader_NCCH::Load() {
|
|||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
ResultStatus AppLoader_NCCH::ReadCode(std::vector<u8>& buffer) {
|
||||
ResultStatus AppLoader_NCCH::ReadCode(std::vector<u8>& buffer) const {
|
||||
return LoadSectionExeFS(".code", buffer);
|
||||
}
|
||||
|
||||
|
@ -253,7 +259,7 @@ ResultStatus AppLoader_NCCH::ReadCode(std::vector<u8>& buffer) {
|
|||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
ResultStatus AppLoader_NCCH::ReadIcon(std::vector<u8>& buffer) {
|
||||
ResultStatus AppLoader_NCCH::ReadIcon(std::vector<u8>& buffer) const {
|
||||
return LoadSectionExeFS("icon", buffer);
|
||||
}
|
||||
|
||||
|
@ -262,7 +268,7 @@ ResultStatus AppLoader_NCCH::ReadIcon(std::vector<u8>& buffer) {
|
|||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
ResultStatus AppLoader_NCCH::ReadBanner(std::vector<u8>& buffer) {
|
||||
ResultStatus AppLoader_NCCH::ReadBanner(std::vector<u8>& buffer) const {
|
||||
return LoadSectionExeFS("banner", buffer);
|
||||
}
|
||||
|
||||
|
@ -271,7 +277,7 @@ ResultStatus AppLoader_NCCH::ReadBanner(std::vector<u8>& buffer) {
|
|||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
ResultStatus AppLoader_NCCH::ReadLogo(std::vector<u8>& buffer) {
|
||||
ResultStatus AppLoader_NCCH::ReadLogo(std::vector<u8>& buffer) const {
|
||||
return LoadSectionExeFS("logo", buffer);
|
||||
}
|
||||
|
||||
|
@ -280,7 +286,9 @@ ResultStatus AppLoader_NCCH::ReadLogo(std::vector<u8>& buffer) {
|
|||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
ResultStatus AppLoader_NCCH::ReadRomFS(std::vector<u8>& buffer) {
|
||||
ResultStatus AppLoader_NCCH::ReadRomFS(std::vector<u8>& buffer) const {
|
||||
File::IOFile file(filename, "rb");
|
||||
if (file.IsOpen()) {
|
||||
// Check if the NCCH has a RomFS...
|
||||
if (ncch_header.romfs_offset != 0 && ncch_header.romfs_size != 0) {
|
||||
u32 romfs_offset = ncch_offset + (ncch_header.romfs_offset * kBlockSize) + 0x1000;
|
||||
|
@ -298,6 +306,10 @@ ResultStatus AppLoader_NCCH::ReadRomFS(std::vector<u8>& buffer) {
|
|||
}
|
||||
NOTICE_LOG(LOADER, "RomFS unused");
|
||||
return ResultStatus::ErrorNotUsed;
|
||||
} else {
|
||||
ERROR_LOG(LOADER, "Unable to read file %s!", filename.c_str());
|
||||
}
|
||||
return ResultStatus::Error;
|
||||
}
|
||||
|
||||
} // namespace Loader
|
||||
|
|
|
@ -161,35 +161,35 @@ public:
|
|||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
ResultStatus ReadCode(std::vector<u8>& buffer);
|
||||
ResultStatus ReadCode(std::vector<u8>& buffer) const;
|
||||
|
||||
/**
|
||||
* Get the icon (typically icon section) of the application
|
||||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
ResultStatus ReadIcon(std::vector<u8>& buffer);
|
||||
ResultStatus ReadIcon(std::vector<u8>& buffer) const;
|
||||
|
||||
/**
|
||||
* Get the banner (typically banner section) of the application
|
||||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
ResultStatus ReadBanner(std::vector<u8>& buffer);
|
||||
ResultStatus ReadBanner(std::vector<u8>& buffer) const;
|
||||
|
||||
/**
|
||||
* Get the logo (typically logo section) of the application
|
||||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
ResultStatus ReadLogo(std::vector<u8>& buffer);
|
||||
ResultStatus ReadLogo(std::vector<u8>& buffer) const;
|
||||
|
||||
/**
|
||||
* Get the RomFS of the application
|
||||
* @param buffer Reference to buffer to store data
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
ResultStatus ReadRomFS(std::vector<u8>& buffer);
|
||||
ResultStatus ReadRomFS(std::vector<u8>& buffer) const;
|
||||
|
||||
private:
|
||||
|
||||
|
@ -199,15 +199,14 @@ private:
|
|||
* @param buffer Vector to read data into
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
ResultStatus LoadSectionExeFS(const char* name, std::vector<u8>& buffer);
|
||||
ResultStatus LoadSectionExeFS(const char* name, std::vector<u8>& buffer) const;
|
||||
|
||||
/**
|
||||
* Loads .code section into memory for booting
|
||||
* @return ResultStatus result of function
|
||||
*/
|
||||
ResultStatus LoadExec();
|
||||
ResultStatus LoadExec() const;
|
||||
|
||||
File::IOFile file;
|
||||
std::string filename;
|
||||
|
||||
bool is_loaded;
|
||||
|
|
Reference in New Issue