From d8da707bb90c233d5e815a508bea3473e6e50afa Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 27 Jun 2014 15:33:23 -0400 Subject: Loader: Refactored interface such that data is no longer stored by loader. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NCCH: Removed extra qualification ‘Loader::AppLoader_NCCH::’. --- src/core/loader/loader.h | 54 +++++++++++++-------------------- src/core/loader/ncch.cpp | 77 +++++++++++++++++++++--------------------------- src/core/loader/ncch.h | 38 +++++++++++------------- 3 files changed, 73 insertions(+), 96 deletions(-) (limited to 'src/core/loader') diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index 95f16fcb1..7891c1ed7 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h @@ -48,60 +48,48 @@ public: /** * Get the code (typically .code section) of the application - * @param error ResultStatus result of function - * @return Reference to code buffer + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ - virtual const std::vector& ReadCode(ResultStatus& error) const { - error = ResultStatus::ErrorNotImplemented; - return code; + virtual ResultStatus ReadCode(std::vector& buffer) { + return ResultStatus::ErrorNotImplemented; } /** * Get the icon (typically icon section) of the application - * @param error ResultStatus result of function - * @return Reference to icon buffer + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ - virtual const std::vector& ReadIcon(ResultStatus& error) const { - error = ResultStatus::ErrorNotImplemented; - return icon; + virtual ResultStatus ReadIcon(std::vector& buffer) { + return ResultStatus::ErrorNotImplemented; } /** * Get the banner (typically banner section) of the application - * @param error ResultStatus result of function - * @return Reference to banner buffer + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ - virtual const std::vector& ReadBanner(ResultStatus& error) const { - error = ResultStatus::ErrorNotImplemented; - return banner; + virtual ResultStatus ReadBanner(std::vector& buffer) { + return ResultStatus::ErrorNotImplemented; } /** * Get the logo (typically logo section) of the application - * @param error ResultStatus result of function - * @return Reference to logo buffer + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ - virtual const std::vector& ReadLogo(ResultStatus& error) const { - error = ResultStatus::ErrorNotImplemented; - return logo; + virtual ResultStatus ReadLogo(std::vector& buffer) { + return ResultStatus::ErrorNotImplemented; } /** - * Get the RomFs archive of the application - * @param error ResultStatus result of function - * @return Reference to RomFs archive buffer + * Get the RomFS of the application + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ - virtual const std::vector& ReadRomFS(ResultStatus& error) const { - error = ResultStatus::ErrorNotImplemented; - return romfs; + virtual ResultStatus ReadRomFS(std::vector& buffer) { + return ResultStatus::ErrorNotImplemented; } - -protected: - std::vector code; ///< ExeFS .code section - std::vector icon; ///< ExeFS .icon section - std::vector banner; ///< ExeFS .banner section - std::vector logo; ///< ExeFS .logo section - std::vector romfs; ///< RomFs archive }; /** diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index 60505bdfa..0e3f768ce 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp @@ -125,25 +125,22 @@ ResultStatus AppLoader_NCCH::LoadExec() { if (!is_loaded) return ResultStatus::ErrorNotLoaded; - ResultStatus res; - code = ReadCode(res); - - if (ResultStatus::Success == res) { + std::vector code; + if (ResultStatus::Success == ReadCode(code)) { Memory::WriteBlock(entry_point, &code[0], code.size()); Kernel::LoadExec(entry_point); + return ResultStatus::Success; } - return res; + return ResultStatus::Error; } /** * Reads an application ExeFS section of an NCCH file into AppLoader (e.g. .code, .logo, etc.) * @param name Name of section to read out of NCCH file * @param buffer Vector to read data into - * @param error ResultStatus result of function - * @return Reference to buffer of data that was read + * @return ResultStatus result of function */ -const std::vector& AppLoader_NCCH::LoadSectionExeFS(const char* name, std::vector& buffer, - ResultStatus& error) { +ResultStatus AppLoader_NCCH::LoadSectionExeFS(const char* name, std::vector& buffer) { // Iterate through the ExeFs archive until we find the .code file... for (int i = 0; i < kMaxSections; i++) { // Load the specified section... @@ -169,20 +166,17 @@ const std::vector& AppLoader_NCCH::LoadSectionExeFS(const char* name, std::v buffer.resize(decompressed_size); if (!LZSS_Decompress(&temp_buffer[0], exefs_header.section[i].size, &buffer[0], decompressed_size)) { - error = ResultStatus::ErrorInvalidFormat; - return buffer; + return ResultStatus::ErrorInvalidFormat; } // Section is uncompressed... } else { buffer.resize(exefs_header.section[i].size); file.ReadBytes(&buffer[0], exefs_header.section[i].size); } - error = ResultStatus::Success; - return buffer; + return ResultStatus::Success; } } - error = ResultStatus::ErrorNotUsed; - return buffer; + return ResultStatus::ErrorNotUsed; } /** @@ -247,46 +241,46 @@ ResultStatus AppLoader_NCCH::Load() { /** * Get the code (typically .code section) of the application - * @param error ResultStatus result of function - * @return Reference to code buffer + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ -const std::vector& AppLoader_NCCH::ReadCode(ResultStatus& error) { - return LoadSectionExeFS(".code", code, error); +ResultStatus AppLoader_NCCH::ReadCode(std::vector& buffer) { + return LoadSectionExeFS(".code", buffer); } /** * Get the icon (typically icon section) of the application - * @param error ResultStatus result of function - * @return Reference to icon buffer + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ -const std::vector& AppLoader_NCCH::ReadIcon(ResultStatus& error) { - return LoadSectionExeFS("icon", icon, error); +ResultStatus AppLoader_NCCH::ReadIcon(std::vector& buffer) { + return LoadSectionExeFS("icon", buffer); } /** * Get the banner (typically banner section) of the application - * @param error ResultStatus result of function - * @return Reference to banner buffer + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ -const std::vector& AppLoader_NCCH::ReadBanner(ResultStatus& error) { - return LoadSectionExeFS("banner", banner, error); +ResultStatus AppLoader_NCCH::ReadBanner(std::vector& buffer) { + return LoadSectionExeFS("banner", buffer); } /** * Get the logo (typically logo section) of the application - * @param error ResultStatus result of function - * @return Reference to logo buffer + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ -const std::vector& AppLoader_NCCH::ReadLogo(ResultStatus& error) { - return LoadSectionExeFS("logo", logo, error); +ResultStatus AppLoader_NCCH::ReadLogo(std::vector& buffer) { + return LoadSectionExeFS("logo", buffer); } /** - * Get the RomFs archive of the application - * @param error ResultStatus result of function - * @return Reference to RomFs archive buffer + * Get the RomFS of the application + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ -const std::vector& AppLoader_NCCH::ReadRomFS(ResultStatus& error) { +ResultStatus AppLoader_NCCH::ReadRomFS(std::vector& buffer) { // 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; @@ -295,18 +289,15 @@ const std::vector& AppLoader_NCCH::ReadRomFS(ResultStatus& error) { INFO_LOG(LOADER, "RomFS offset: 0x%08X", romfs_offset); INFO_LOG(LOADER, "RomFS size: 0x%08X", romfs_size); - romfs.resize(romfs_size); + buffer.resize(romfs_size); file.Seek(romfs_offset, 0); - file.ReadBytes(&romfs[0], romfs_size); + file.ReadBytes(&buffer[0], romfs_size); - error = ResultStatus::Success; - return romfs; - } else { - NOTICE_LOG(LOADER, "RomFS unused"); + return ResultStatus::Success; } - error = ResultStatus::ErrorNotUsed; - return romfs; + NOTICE_LOG(LOADER, "RomFS unused"); + return ResultStatus::ErrorNotUsed; } } // namespace Loader diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h index bf65425a4..99753b244 100644 --- a/src/core/loader/ncch.h +++ b/src/core/loader/ncch.h @@ -158,38 +158,38 @@ public: /** * Get the code (typically .code section) of the application - * @param error ResultStatus result of function - * @return Reference to code buffer + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ - const std::vector& ReadCode(ResultStatus& error); + ResultStatus ReadCode(std::vector& buffer); /** * Get the icon (typically icon section) of the application - * @param error ResultStatus result of function - * @return Reference to icon buffer + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ - const std::vector& ReadIcon(ResultStatus& error); + ResultStatus ReadIcon(std::vector& buffer); /** * Get the banner (typically banner section) of the application - * @param error ResultStatus result of function - * @return Reference to banner buffer + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ - const std::vector& ReadBanner(ResultStatus& error); + ResultStatus ReadBanner(std::vector& buffer); /** * Get the logo (typically logo section) of the application - * @param error ResultStatus result of function - * @return Reference to logo buffer + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ - const std::vector& ReadLogo(ResultStatus& error); + ResultStatus ReadLogo(std::vector& buffer); /** - * Get the RomFs archive of the application - * @param error ResultStatus result of function - * @return Reference to RomFs archive buffer + * Get the RomFS of the application + * @param buffer Reference to buffer to store data + * @return ResultStatus result of function */ - const std::vector& ReadRomFS(ResultStatus& error); + ResultStatus ReadRomFS(std::vector& buffer); private: @@ -197,11 +197,9 @@ private: * Reads an application ExeFS section of an NCCH file into AppLoader (e.g. .code, .logo, etc.) * @param name Name of section to read out of NCCH file * @param buffer Vector to read data into - * @param error ResultStatus result of function - * @return Reference to buffer of data that was read + * @return ResultStatus result of function */ - const std::vector& LoadSectionExeFS(const char* name, std::vector& buffer, - ResultStatus& error); + ResultStatus LoadSectionExeFS(const char* name, std::vector& buffer); /** * Loads .code section into memory for booting -- cgit v1.2.3 From 17a6148f9df406a6ca4bdca98777e0aaf21f582a Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 27 Jun 2014 16:18:56 -0400 Subject: FileSys: Added preliminary support for applications reading the RomFS archive. Archive: Fixed brace ugliness for neobrain :) FS: Commented out unused local variables to prevent warnings. ...But keeping them here for future use. archive_romfs: Removed unused #include. --- src/core/CMakeLists.txt | 4 +- src/core/core.vcxproj | 4 +- src/core/core.vcxproj.filters | 12 +++- src/core/file_sys/archive.h | 54 ++++++++++++++ src/core/file_sys/archive_romfs.cpp | 46 ++++++++++++ src/core/file_sys/archive_romfs.h | 50 +++++++++++++ src/core/file_sys/file_sys.h | 138 ------------------------------------ src/core/hle/kernel/archive.cpp | 98 +++++++++++++++++++++++-- src/core/hle/kernel/archive.h | 17 +++-- src/core/hle/service/fs.cpp | 33 ++++++++- src/core/loader/loader.cpp | 15 ++-- 11 files changed, 311 insertions(+), 160 deletions(-) create mode 100644 src/core/file_sys/archive.h create mode 100644 src/core/file_sys/archive_romfs.cpp create mode 100644 src/core/file_sys/archive_romfs.h delete mode 100644 src/core/file_sys/file_sys.h (limited to 'src/core/loader') diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 978e956dc..9ee803fda 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -8,6 +8,7 @@ set(SRCS core.cpp system.cpp arm/disassembler/arm_disasm.cpp arm/disassembler/load_symbol_map.cpp + file_sys/archive_romfs.cpp arm/interpreter/arm_interpreter.cpp arm/interpreter/armcopro.cpp arm/interpreter/armemu.cpp @@ -75,7 +76,8 @@ set(HEADERS core.h arm/interpreter/vfp/asm_vfp.h arm/interpreter/vfp/vfp.h arm/interpreter/vfp/vfp_helper.h - file_sys/file_sys.h + file_sys/archive.h + file_sys/archive_romfs.h hle/config_mem.h hle/coprocessor.h hle/hle.h diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 63efe7c4d..4e521903c 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -162,6 +162,7 @@ + @@ -211,7 +212,8 @@ - + + diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 39a3cdc4b..17829b8b1 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -176,6 +176,9 @@ hle\service + + file_sys + @@ -205,9 +208,6 @@ arm\interpreter - - file_sys - hw @@ -314,6 +314,12 @@ hle\service + + file_sys + + + file_sys + diff --git a/src/core/file_sys/archive.h b/src/core/file_sys/archive.h new file mode 100644 index 000000000..ed2d83640 --- /dev/null +++ b/src/core/file_sys/archive.h @@ -0,0 +1,54 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once + +#include "common/common_types.h" + +#include "core/hle/kernel/kernel.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// FileSys namespace + +namespace FileSys { + +class Archive : NonCopyable { +public: + /// Supported archive types + enum class IdCode : u32 { + RomFS = 0x00000003, + SaveData = 0x00000004, + ExtSaveData = 0x00000006, + SharedExtSaveData = 0x00000007, + SystemSaveData = 0x00000008, + SDMC = 0x00000009, + SDMCWriteOnly = 0x0000000A, + }; + + Archive() { } + virtual ~Archive() { } + + /** + * Get the IdCode of the archive (e.g. RomFS, SaveData, etc.) + * @return IdCode of the archive + */ + virtual IdCode GetIdCode() const = 0; + + /** + * Read data from the archive + * @param offset Offset in bytes to start reading archive from + * @param length Length in bytes to read data from archive + * @param buffer Buffer to read data into + * @return Number of bytes read + */ + virtual size_t Read(const u64 offset, const u32 length, u8* buffer) const = 0; + + /** + * Get the size of the archive in bytes + * @return Size of the archive in bytes + */ + virtual size_t GetSize() const = 0; +}; + +} // namespace FileSys diff --git a/src/core/file_sys/archive_romfs.cpp b/src/core/file_sys/archive_romfs.cpp new file mode 100644 index 000000000..6fdb768d6 --- /dev/null +++ b/src/core/file_sys/archive_romfs.cpp @@ -0,0 +1,46 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include "common/common_types.h" + +#include "core/file_sys/archive_romfs.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// FileSys namespace + +namespace FileSys { + +Archive_RomFS::Archive_RomFS(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!"); + } +} + +Archive_RomFS::~Archive_RomFS() { +} + +/** + * Read data from the archive + * @param offset Offset in bytes to start reading archive from + * @param length Length in bytes to read data from archive + * @param buffer Buffer to read data into + * @return Number of bytes read + */ +size_t Archive_RomFS::Read(const u64 offset, const u32 length, u8* buffer) const { + DEBUG_LOG(FILESYS, "called offset=%d, length=%d", offset, length); + memcpy(buffer, &raw_data[(u32)offset], length); + return length; +} + +/** + * Get the size of the archive in bytes + * @return Size of the archive in bytes + */ +size_t Archive_RomFS::GetSize() const { + ERROR_LOG(FILESYS, "(UNIMPLEMENTED)"); + return 0; +} + +} // namespace FileSys diff --git a/src/core/file_sys/archive_romfs.h b/src/core/file_sys/archive_romfs.h new file mode 100644 index 000000000..60af8ff0d --- /dev/null +++ b/src/core/file_sys/archive_romfs.h @@ -0,0 +1,50 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once + +#include + +#include "common/common_types.h" + +#include "core/file_sys/archive.h" +#include "core/loader/loader.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// FileSys namespace + +namespace FileSys { + +/// File system interface to the RomFS archive +class Archive_RomFS : public Archive { +public: + Archive_RomFS(Loader::AppLoader& app_loader); + ~Archive_RomFS(); + + /** + * Get the IdCode of the archive (e.g. RomFS, SaveData, etc.) + * @return IdCode of the archive + */ + IdCode GetIdCode() const { return IdCode::RomFS; }; + + /** + * Read data from the archive + * @param offset Offset in bytes to start reading archive from + * @param length Length in bytes to read data from archive + * @param buffer Buffer to read data into + * @return Number of bytes read + */ + size_t Read(const u64 offset, const u32 length, u8* buffer) const; + + /** + * Get the size of the archive in bytes + * @return Size of the archive in bytes + */ + size_t GetSize() const; + +private: + std::vector raw_data; +}; + +} // namespace FileSys diff --git a/src/core/file_sys/file_sys.h b/src/core/file_sys/file_sys.h deleted file mode 100644 index bb8503e62..000000000 --- a/src/core/file_sys/file_sys.h +++ /dev/null @@ -1,138 +0,0 @@ -// Copyright (c) 2012- PPSSPP Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0 or later versions. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official git repository and contact information can be found at -// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. - -#pragma once - -#include "common/common.h" -#include "common/chunk_file.h" - -enum FileAccess { - FILEACCESS_NONE=0, - FILEACCESS_READ=1, - FILEACCESS_WRITE=2, - FILEACCESS_APPEND=4, - FILEACCESS_CREATE=8 -}; - -enum FileMove { - FILEMOVE_BEGIN=0, - FILEMOVE_CURRENT=1, - FILEMOVE_END=2 -}; - -enum FileType { - FILETYPE_NORMAL=1, - FILETYPE_DIRECTORY=2 -}; - - -class IHandleAllocator { -public: - virtual ~IHandleAllocator() {} - virtual u32 GetNewHandle() = 0; - virtual void FreeHandle(u32 handle) = 0; -}; - -class SequentialHandleAllocator : public IHandleAllocator { -public: - SequentialHandleAllocator() : handle_(1) {} - virtual u32 GetNewHandle() { return handle_++; } - virtual void FreeHandle(u32 handle) {} -private: - int handle_; -}; - -struct FileInfo { - FileInfo() - : size(0), access(0), exists(false), type(FILETYPE_NORMAL), isOnSectorSystem(false), startSector(0), numSectors(0) {} - - void DoState(PointerWrap &p) { - auto s = p.Section("FileInfo", 1); - if (!s) - return; - - p.Do(name); - p.Do(size); - p.Do(access); - p.Do(exists); - p.Do(type); - p.Do(atime); - p.Do(ctime); - p.Do(mtime); - p.Do(isOnSectorSystem); - p.Do(startSector); - p.Do(numSectors); - p.Do(sectorSize); - } - - std::string name; - s64 size; - u32 access; //unix 777 - bool exists; - FileType type; - - tm atime; - tm ctime; - tm mtime; - - bool isOnSectorSystem; - u32 startSector; - u32 numSectors; - u32 sectorSize; -}; - - -class IFileSystem { -public: - virtual ~IFileSystem() {} - - virtual void DoState(PointerWrap &p) = 0; - virtual std::vector GetDirListing(std::string path) = 0; - virtual u32 OpenFile(std::string filename, FileAccess access, const char *devicename=NULL) = 0; - virtual void CloseFile(u32 handle) = 0; - virtual size_t ReadFile(u32 handle, u8 *pointer, s64 size) = 0; - virtual size_t WriteFile(u32 handle, const u8 *pointer, s64 size) = 0; - virtual size_t SeekFile(u32 handle, s32 position, FileMove type) = 0; - virtual FileInfo GetFileInfo(std::string filename) = 0; - virtual bool OwnsHandle(u32 handle) = 0; - virtual bool MkDir(const std::string &dirname) = 0; - virtual bool RmDir(const std::string &dirname) = 0; - virtual int RenameFile(const std::string &from, const std::string &to) = 0; - virtual bool RemoveFile(const std::string &filename) = 0; - virtual bool GetHostPath(const std::string &inpath, std::string &outpath) = 0; -}; - - -class EmptyFileSystem : public IFileSystem { -public: - virtual void DoState(PointerWrap &p) {} - std::vector GetDirListing(std::string path) {std::vector vec; return vec;} - u32 OpenFile(std::string filename, FileAccess access, const char *devicename=NULL) {return 0;} - void CloseFile(u32 handle) {} - size_t ReadFile(u32 handle, u8 *pointer, s64 size) {return 0;} - size_t WriteFile(u32 handle, const u8 *pointer, s64 size) {return 0;} - size_t SeekFile(u32 handle, s32 position, FileMove type) {return 0;} - FileInfo GetFileInfo(std::string filename) {FileInfo f; return f;} - bool OwnsHandle(u32 handle) {return false;} - virtual bool MkDir(const std::string &dirname) {return false;} - virtual bool RmDir(const std::string &dirname) {return false;} - virtual int RenameFile(const std::string &from, const std::string &to) {return -1;} - virtual bool RemoveFile(const std::string &filename) {return false;} - virtual bool GetHostPath(const std::string &inpath, std::string &outpath) {return false;} -}; - - diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/kernel/archive.cpp index d7351e702..f31c02ea9 100644 --- a/src/core/hle/kernel/archive.cpp +++ b/src/core/hle/kernel/archive.cpp @@ -4,6 +4,8 @@ #include "common/common_types.h" +#include "core/file_sys/archive.h" +#include "core/hle/service/service.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/archive.h" @@ -12,6 +14,21 @@ namespace Kernel { +// Command to access archive file +enum class FileCommand : u32 { + Dummy1 = 0x000100C6, + Control = 0x040100C4, + OpenSubFile = 0x08010100, + Read = 0x080200C2, + Write = 0x08030102, + GetSize = 0x08040000, + SetSize = 0x08050080, + GetAttributes = 0x08060000, + SetAttributes = 0x08070040, + Close = 0x08080000, + Flush = 0x08090000, +}; + class Archive : public Object { public: const char* GetTypeName() const { return "Archive"; } @@ -20,7 +37,37 @@ public: static Kernel::HandleType GetStaticHandleType() { return HandleType::Archive; } Kernel::HandleType GetHandleType() const { return HandleType::Archive; } - std::string name; ///< Name of archive (optional) + std::string name; ///< Name of archive (optional) + FileSys::Archive* backend; ///< Archive backend interface + + /** + * Synchronize kernel object + * @param wait Boolean wait set if current thread should wait as a result of sync operation + * @return Result of operation, 0 on success, otherwise error code + */ + Result SyncRequest(bool* wait) { + u32* cmd_buff = Service::GetCommandBuffer(); + FileCommand cmd = static_cast(cmd_buff[0]); + switch (cmd) { + + // Read from archive... + case FileCommand::Read: + { + u64 offset = cmd_buff[1] | ((u64) cmd_buff[2]) << 32; + u32 length = cmd_buff[3]; + u32 address = cmd_buff[5]; + cmd_buff[2] = backend->Read(offset, length, Memory::GetPointer(address)); + break; + } + + // Unknown command... + default: + ERROR_LOG(KERNEL, "Unknown command=0x%08X!", cmd); + return -1; + } + cmd_buff[1] = 0; // No error + return 0; + } /** * Wait for kernel object to synchronize @@ -29,32 +76,71 @@ public: */ Result WaitSynchronization(bool* wait) { // TODO(bunnei): ImplementMe - ERROR_LOG(OSHLE, "unimplemented function"); + ERROR_LOG(OSHLE, "(UNIMPLEMENTED)"); return 0; } }; +//////////////////////////////////////////////////////////////////////////////////////////////////// + +std::map g_archive_map; ///< Map of file archives by IdCode + +/** + * Opens an archive + * @param id_code IdCode of the archive to open + * @return Handle to archive if it exists, otherwise a null handle (0) + */ +Handle OpenArchive(FileSys::Archive::IdCode id_code) { + auto itr = g_archive_map.find(id_code); + if (itr == g_archive_map.end()) { + return 0; + } + return itr->second; +} + +/** + * Mounts an archive + * @param archive Pointer to the archive to mount + * @return Result of operation, 0 on success, otherwise error code + */ +Result MountArchive(Archive* archive) { + FileSys::Archive::IdCode id_code = archive->backend->GetIdCode(); + if (0 != OpenArchive(id_code)) { + ERROR_LOG(KERNEL, "Cannot mount two archives with the same ID code! (%d)", (int) id_code); + return -1; + } + g_archive_map[id_code] = archive->GetHandle(); + INFO_LOG(KERNEL, "Mounted archive %s", archive->GetName()); + return 0; +} + /** * Creates an Archive - * @param name Optional name of Archive * @param handle Handle to newly created archive object + * @param backend File system backend interface to the archive + * @param name Optional name of Archive * @return Newly created Archive object */ -Archive* CreateArchive(Handle& handle, const std::string& name) { +Archive* CreateArchive(Handle& handle, FileSys::Archive* backend, const std::string& name) { Archive* archive = new Archive; handle = Kernel::g_object_pool.Create(archive); archive->name = name; + archive->backend = backend; + + MountArchive(archive); + return archive; } /** * Creates an Archive + * @param backend File system backend interface to the archive * @param name Optional name of Archive * @return Handle to newly created Archive object */ -Handle CreateArchive(const std::string& name) { +Handle CreateArchive(FileSys::Archive* backend, const std::string& name) { Handle handle; - Archive* archive = CreateArchive(handle, name); + Archive* archive = CreateArchive(handle, backend, name); return handle; } diff --git a/src/core/hle/kernel/archive.h b/src/core/hle/kernel/archive.h index 98670f06c..07fb37ae7 100644 --- a/src/core/hle/kernel/archive.h +++ b/src/core/hle/kernel/archive.h @@ -7,6 +7,7 @@ #include "common/common_types.h" #include "core/hle/kernel/kernel.h" +#include "core/file_sys/archive.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // Kernel namespace @@ -14,10 +15,18 @@ namespace Kernel { /** - * Creates an archive - * @param name Optional name of archive - * @return Handle to newly created archive object + * Opens an archive + * @param id_code IdCode of the archive to open + * @return Handle to archive if it exists, otherwise a null handle (0) */ -Handle CreateArchive(const std::string& name="Unknown"); +Handle OpenArchive(FileSys::Archive::IdCode id_code); + +/** + * Creates an Archive + * @param backend File system backend interface to the archive + * @param name Optional name of Archive + * @return Handle to newly created Archive object + */ +Handle CreateArchive(FileSys::Archive* backend, const std::string& name); } // namespace FileSys diff --git a/src/core/hle/service/fs.cpp b/src/core/hle/service/fs.cpp index 3a5afaa3c..5eabf36ad 100644 --- a/src/core/hle/service/fs.cpp +++ b/src/core/hle/service/fs.cpp @@ -2,11 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - #include "common/common.h" +#include "core/loader/loader.h" #include "core/hle/hle.h" #include "core/hle/service/fs.h" +#include "core/hle/kernel/archive.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // Namespace FS_User @@ -15,8 +16,34 @@ namespace FS_User { void Initialize(Service::Interface* self) { u32* cmd_buff = Service::GetCommandBuffer(); - DEBUG_LOG(KERNEL, "called"); cmd_buff[1] = 0; // No error + DEBUG_LOG(KERNEL, "called"); +} + +void OpenFileDirectly(Service::Interface* self) { + u32* cmd_buff = Service::GetCommandBuffer(); + + FileSys::Archive::IdCode arch_id = static_cast(cmd_buff[2]); + + // TODO(bunnei): Properly implement use of these... + //u32 transaction = cmd_buff[1]; + //u32 arch_lowpath_type = cmd_buff[3]; + //u32 arch_lowpath_sz = cmd_buff[4]; + //u32 file_lowpath_type = cmd_buff[5]; + //u32 file_lowpath_sz = cmd_buff[6]; + //u32 flags = cmd_buff[7]; + //u32 attr = cmd_buff[8]; + //u32 arch_lowpath_desc = cmd_buff[9]; + //u32 arch_lowpath_ptr = cmd_buff[10]; + //u32 file_lowpath_desc = cmd_buff[11]; + //u32 file_lowpath_ptr = cmd_buff[12]; + + Handle handle = Kernel::OpenArchive(arch_id); + if (0 != handle) { + cmd_buff[1] = 0; // No error + cmd_buff[3] = handle; + } + DEBUG_LOG(KERNEL, "called"); } const Interface::FunctionInfo FunctionTable[] = { @@ -24,7 +51,7 @@ const Interface::FunctionInfo FunctionTable[] = { {0x040100C4, nullptr, "Control"}, {0x08010002, Initialize, "Initialize"}, {0x080201C2, nullptr, "OpenFile"}, - {0x08030204, nullptr, "OpenFileDirectly"}, + {0x08030204, OpenFileDirectly, "OpenFileDirectly"}, {0x08040142, nullptr, "DeleteFile"}, {0x08050244, nullptr, "RenameFile"}, {0x08060142, nullptr, "DeleteDirectory"}, diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 96cb81de0..2b42e3c64 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -4,9 +4,11 @@ #include +#include "core/file_sys/archive_romfs.h" #include "core/loader/loader.h" #include "core/loader/elf.h" #include "core/loader/ncch.h" +#include "core/hle/kernel/archive.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -51,14 +53,20 @@ ResultStatus LoadFile(const std::string& filename) { switch (IdentifyFile(filename)) { // Standard ELF file format... - case FileType::ELF: { + case FileType::ELF: return AppLoader_ELF(filename).Load(); - } // NCCH/NCSD container formats... case FileType::CXI: case FileType::CCI: { - return AppLoader_NCCH(filename).Load(); + AppLoader_NCCH app_loader(filename); + + // Load application and RomFS + if (ResultStatus::Success == app_loader.Load()) { + Kernel::CreateArchive(new FileSys::Archive_RomFS(app_loader), "RomFS"); + return ResultStatus::Success; + } + break; } // Error occurred durring IdentifyFile... @@ -70,7 +78,6 @@ ResultStatus LoadFile(const std::string& filename) { default: return ResultStatus::ErrorInvalidFormat; } - return ResultStatus::Error; } -- cgit v1.2.3 From 2c62d9255160b7302942d536c9c990b86c7fb907 Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 4 Jul 2014 13:11:09 -0400 Subject: Loader: Updated read methods to be const - Required "file" handle to be made local and explicitly opened/closed as needed --- src/core/file_sys/archive_romfs.cpp | 2 +- src/core/file_sys/archive_romfs.h | 2 +- src/core/loader/loader.h | 10 +-- src/core/loader/ncch.cpp | 118 ++++++++++++++++++++---------------- src/core/loader/ncch.h | 15 +++-- 5 files changed, 79 insertions(+), 68 deletions(-) (limited to 'src/core/loader') diff --git a/src/core/file_sys/archive_romfs.cpp b/src/core/file_sys/archive_romfs.cpp index 6fdb768d6..fd84b9c8c 100644 --- a/src/core/file_sys/archive_romfs.cpp +++ b/src/core/file_sys/archive_romfs.cpp @@ -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!"); diff --git a/src/core/file_sys/archive_romfs.h b/src/core/file_sys/archive_romfs.h index 60af8ff0d..5ef4fed50 100644 --- a/src/core/file_sys/archive_romfs.h +++ b/src/core/file_sys/archive_romfs.h @@ -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(); /** diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index 7891c1ed7..c27b5b4b6 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h @@ -51,7 +51,7 @@ public: * @param buffer Reference to buffer to store data * @return ResultStatus result of function */ - virtual ResultStatus ReadCode(std::vector& buffer) { + virtual ResultStatus ReadCode(std::vector& 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& buffer) { + virtual ResultStatus ReadIcon(std::vector& 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& buffer) { + virtual ResultStatus ReadBanner(std::vector& 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& buffer) { + virtual ResultStatus ReadLogo(std::vector& 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& buffer) { + virtual ResultStatus ReadRomFS(std::vector& buffer) const { return ResultStatus::ErrorNotImplemented; } }; diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index 0e3f768ce..a82338904 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp @@ -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,41 +138,48 @@ 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& buffer) { +ResultStatus AppLoader_NCCH::LoadSectionExeFS(const char* name, std::vector& buffer) const { // Iterate through the ExeFs archive until we find the .code file... - for (int i = 0; i < kMaxSections; i++) { - // Load the specified section... - if (strcmp((const char*)exefs_header.section[i].name, name) == 0) { - INFO_LOG(LOADER, "ExeFS section %d:", i); - INFO_LOG(LOADER, " name: %s", exefs_header.section[i].name); - INFO_LOG(LOADER, " offset: 0x%08X", exefs_header.section[i].offset); - INFO_LOG(LOADER, " size: 0x%08X", exefs_header.section[i].size); - - s64 section_offset = (exefs_header.section[i].offset + exefs_offset + - sizeof(ExeFs_Header) + ncch_offset); - file.Seek(section_offset, 0); - - // Section is compressed... - if (i == 0 && is_compressed) { - // Read compressed .code section... - std::unique_ptr temp_buffer(new u8[exefs_header.section[i].size]); - file.ReadBytes(&temp_buffer[0], exefs_header.section[i].size); - - // Decompress .code section... - u32 decompressed_size = LZSS_GetDecompressedSize(&temp_buffer[0], - exefs_header.section[i].size); - buffer.resize(decompressed_size); - if (!LZSS_Decompress(&temp_buffer[0], exefs_header.section[i].size, &buffer[0], - decompressed_size)) { - return ResultStatus::ErrorInvalidFormat; + 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) { + INFO_LOG(LOADER, "ExeFS section %d:", i); + INFO_LOG(LOADER, " name: %s", exefs_header.section[i].name); + INFO_LOG(LOADER, " offset: 0x%08X", exefs_header.section[i].offset); + INFO_LOG(LOADER, " size: 0x%08X", exefs_header.section[i].size); + + s64 section_offset = (exefs_header.section[i].offset + exefs_offset + + sizeof(ExeFs_Header)+ncch_offset); + file.Seek(section_offset, 0); + + // Section is compressed... + if (i == 0 && is_compressed) { + // Read compressed .code section... + std::unique_ptr temp_buffer(new u8[exefs_header.section[i].size]); + file.ReadBytes(&temp_buffer[0], exefs_header.section[i].size); + + // Decompress .code section... + u32 decompressed_size = LZSS_GetDecompressedSize(&temp_buffer[0], + exefs_header.section[i].size); + buffer.resize(decompressed_size); + if (!LZSS_Decompress(&temp_buffer[0], exefs_header.section[i].size, &buffer[0], + decompressed_size)) { + return ResultStatus::ErrorInvalidFormat; + } + // Section is uncompressed... } - // Section is uncompressed... - } else { - buffer.resize(exefs_header.section[i].size); - file.ReadBytes(&buffer[0], exefs_header.section[i].size); + else { + buffer.resize(exefs_header.section[i].size); + file.ReadBytes(&buffer[0], exefs_header.section[i].size); + } + return ResultStatus::Success; } - 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& buffer) { +ResultStatus AppLoader_NCCH::ReadCode(std::vector& buffer) const { return LoadSectionExeFS(".code", buffer); } @@ -253,7 +259,7 @@ ResultStatus AppLoader_NCCH::ReadCode(std::vector& buffer) { * @param buffer Reference to buffer to store data * @return ResultStatus result of function */ -ResultStatus AppLoader_NCCH::ReadIcon(std::vector& buffer) { +ResultStatus AppLoader_NCCH::ReadIcon(std::vector& buffer) const { return LoadSectionExeFS("icon", buffer); } @@ -262,7 +268,7 @@ ResultStatus AppLoader_NCCH::ReadIcon(std::vector& buffer) { * @param buffer Reference to buffer to store data * @return ResultStatus result of function */ -ResultStatus AppLoader_NCCH::ReadBanner(std::vector& buffer) { +ResultStatus AppLoader_NCCH::ReadBanner(std::vector& buffer) const { return LoadSectionExeFS("banner", buffer); } @@ -271,7 +277,7 @@ ResultStatus AppLoader_NCCH::ReadBanner(std::vector& buffer) { * @param buffer Reference to buffer to store data * @return ResultStatus result of function */ -ResultStatus AppLoader_NCCH::ReadLogo(std::vector& buffer) { +ResultStatus AppLoader_NCCH::ReadLogo(std::vector& buffer) const { return LoadSectionExeFS("logo", buffer); } @@ -280,24 +286,30 @@ ResultStatus AppLoader_NCCH::ReadLogo(std::vector& buffer) { * @param buffer Reference to buffer to store data * @return ResultStatus result of function */ -ResultStatus AppLoader_NCCH::ReadRomFS(std::vector& buffer) { - // 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; - u32 romfs_size = (ncch_header.romfs_size * kBlockSize) - 0x1000; +ResultStatus AppLoader_NCCH::ReadRomFS(std::vector& 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; + u32 romfs_size = (ncch_header.romfs_size * kBlockSize) - 0x1000; - INFO_LOG(LOADER, "RomFS offset: 0x%08X", romfs_offset); - INFO_LOG(LOADER, "RomFS size: 0x%08X", romfs_size); + INFO_LOG(LOADER, "RomFS offset: 0x%08X", romfs_offset); + INFO_LOG(LOADER, "RomFS size: 0x%08X", romfs_size); - buffer.resize(romfs_size); + buffer.resize(romfs_size); - file.Seek(romfs_offset, 0); - file.ReadBytes(&buffer[0], romfs_size); + file.Seek(romfs_offset, 0); + file.ReadBytes(&buffer[0], romfs_size); - return ResultStatus::Success; + return ResultStatus::Success; + } + NOTICE_LOG(LOADER, "RomFS unused"); + return ResultStatus::ErrorNotUsed; + } else { + ERROR_LOG(LOADER, "Unable to read file %s!", filename.c_str()); } - NOTICE_LOG(LOADER, "RomFS unused"); - return ResultStatus::ErrorNotUsed; + return ResultStatus::Error; } } // namespace Loader diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h index 99753b244..c9a35228e 100644 --- a/src/core/loader/ncch.h +++ b/src/core/loader/ncch.h @@ -161,35 +161,35 @@ public: * @param buffer Reference to buffer to store data * @return ResultStatus result of function */ - ResultStatus ReadCode(std::vector& buffer); + ResultStatus ReadCode(std::vector& 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& buffer); + ResultStatus ReadIcon(std::vector& 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& buffer); + ResultStatus ReadBanner(std::vector& 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& buffer); + ResultStatus ReadLogo(std::vector& 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& buffer); + ResultStatus ReadRomFS(std::vector& 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& buffer); + ResultStatus LoadSectionExeFS(const char* name, std::vector& 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; -- cgit v1.2.3 From 2d734bb6c5cf1a428f8ce2a6d13955ee4ff872eb Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 4 Jul 2014 13:20:40 -0400 Subject: Marked AppLoader_ELF, AppLoader_NCCH, and Archive_RomFS classes as "final" --- src/core/file_sys/archive_romfs.h | 2 +- src/core/loader/elf.h | 2 +- src/core/loader/ncch.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/loader') diff --git a/src/core/file_sys/archive_romfs.h b/src/core/file_sys/archive_romfs.h index 5ef4fed50..e5664ba16 100644 --- a/src/core/file_sys/archive_romfs.h +++ b/src/core/file_sys/archive_romfs.h @@ -17,7 +17,7 @@ namespace FileSys { /// File system interface to the RomFS archive -class Archive_RomFS : public Archive { +class Archive_RomFS final : public Archive { public: Archive_RomFS(const Loader::AppLoader& app_loader); ~Archive_RomFS(); diff --git a/src/core/loader/elf.h b/src/core/loader/elf.h index d3cbf414d..cec1167ca 100644 --- a/src/core/loader/elf.h +++ b/src/core/loader/elf.h @@ -13,7 +13,7 @@ namespace Loader { /// Loads an ELF/AXF file -class AppLoader_ELF : public AppLoader { +class AppLoader_ELF final : public AppLoader { public: AppLoader_ELF(const std::string& filename); ~AppLoader_ELF(); diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h index c9a35228e..de89280ea 100644 --- a/src/core/loader/ncch.h +++ b/src/core/loader/ncch.h @@ -145,7 +145,7 @@ struct ExHeader_Header{ namespace Loader { /// Loads an NCCH file (e.g. from a CCI, or the first NCCH in a CXI) -class AppLoader_NCCH : public AppLoader { +class AppLoader_NCCH final : public AppLoader { public: AppLoader_NCCH(const std::string& filename); ~AppLoader_NCCH(); -- cgit v1.2.3 From 1099d83455153f9d81b10b54a788bc9fe91f33e9 Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 4 Jul 2014 13:25:30 -0400 Subject: Marked AppLoader_ELF, AppLoader_NCCH, and Archive_RomFS virtual functions as "override". --- src/core/file_sys/archive_romfs.h | 8 ++++---- src/core/loader/elf.h | 4 ++-- src/core/loader/ncch.h | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/core/loader') diff --git a/src/core/file_sys/archive_romfs.h b/src/core/file_sys/archive_romfs.h index e5664ba16..8a31190a9 100644 --- a/src/core/file_sys/archive_romfs.h +++ b/src/core/file_sys/archive_romfs.h @@ -20,13 +20,13 @@ namespace FileSys { class Archive_RomFS final : public Archive { public: Archive_RomFS(const Loader::AppLoader& app_loader); - ~Archive_RomFS(); + ~Archive_RomFS() override; /** * Get the IdCode of the archive (e.g. RomFS, SaveData, etc.) * @return IdCode of the archive */ - IdCode GetIdCode() const { return IdCode::RomFS; }; + IdCode GetIdCode() const override { return IdCode::RomFS; }; /** * Read data from the archive @@ -35,13 +35,13 @@ public: * @param buffer Buffer to read data into * @return Number of bytes read */ - size_t Read(const u64 offset, const u32 length, u8* buffer) const; + size_t Read(const u64 offset, const u32 length, u8* buffer) const override; /** * Get the size of the archive in bytes * @return Size of the archive in bytes */ - size_t GetSize() const; + size_t GetSize() const override; private: std::vector raw_data; diff --git a/src/core/loader/elf.h b/src/core/loader/elf.h index cec1167ca..5ae88439a 100644 --- a/src/core/loader/elf.h +++ b/src/core/loader/elf.h @@ -16,13 +16,13 @@ namespace Loader { class AppLoader_ELF final : public AppLoader { public: AppLoader_ELF(const std::string& filename); - ~AppLoader_ELF(); + ~AppLoader_ELF() override; /** * Load the bootable file * @return ResultStatus result of function */ - ResultStatus Load(); + ResultStatus Load() override; private: std::string filename; diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h index de89280ea..29b59aa11 100644 --- a/src/core/loader/ncch.h +++ b/src/core/loader/ncch.h @@ -148,48 +148,48 @@ namespace Loader { class AppLoader_NCCH final : public AppLoader { public: AppLoader_NCCH(const std::string& filename); - ~AppLoader_NCCH(); + ~AppLoader_NCCH() override; /** * Load the application * @return ResultStatus result of function */ - ResultStatus Load(); + ResultStatus Load() override; /** * Get the code (typically .code section) of the application * @param buffer Reference to buffer to store data * @return ResultStatus result of function */ - ResultStatus ReadCode(std::vector& buffer) const; + ResultStatus ReadCode(std::vector& buffer) const override; /** * 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& buffer) const; + ResultStatus ReadIcon(std::vector& buffer) const override; /** * 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& buffer) const; + ResultStatus ReadBanner(std::vector& buffer) const override; /** * 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& buffer) const; + ResultStatus ReadLogo(std::vector& buffer) const override; /** * Get the RomFS of the application * @param buffer Reference to buffer to store data * @return ResultStatus result of function */ - ResultStatus ReadRomFS(std::vector& buffer) const; + ResultStatus ReadRomFS(std::vector& buffer) const override; private: -- cgit v1.2.3 From b70c4fb48ec32057e56d9c0373794670bddd4f34 Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 4 Jul 2014 20:32:06 -0400 Subject: NCCH: Updated ExeFS memory allocation to be safer. --- src/core/loader/loader.h | 1 + src/core/loader/ncch.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/core/loader') diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index c27b5b4b6..4ba10de52 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h @@ -32,6 +32,7 @@ enum class ResultStatus { ErrorNotLoaded, ErrorNotUsed, ErrorAlreadyLoaded, + ErrorMemoryAllocationFailed, }; /// Interface for loading an application diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index a82338904..ba27eb75a 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp @@ -157,7 +157,12 @@ ResultStatus AppLoader_NCCH::LoadSectionExeFS(const char* name, std::vector& // Section is compressed... if (i == 0 && is_compressed) { // Read compressed .code section... - std::unique_ptr temp_buffer(new u8[exefs_header.section[i].size]); + std::unique_ptr temp_buffer; + try { + temp_buffer.reset(new u8[exefs_header.section[i].size]); + } catch (std::bad_alloc&) { + return ResultStatus::ErrorMemoryAllocationFailed; + } file.ReadBytes(&temp_buffer[0], exefs_header.section[i].size); // Decompress .code section... -- cgit v1.2.3