3 files changed, 141 insertions, 74 deletions

diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index 002af1f60..95f16fcb1 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -51,37 +51,37 @@ public:
      * @param error ResultStatus result of function
      * @return Reference to code buffer
      */
-    virtual const std::vector<u8>& GetCode(ResultStatus& error) const {
+    virtual const std::vector<u8>& ReadCode(ResultStatus& error) const {
         error = ResultStatus::ErrorNotImplemented;
         return code;
     }
 
     /**
-     * Get the icon (typically .icon section) of the application
+     * Get the icon (typically icon section) of the application
      * @param error ResultStatus result of function
      * @return Reference to icon buffer
      */
-    virtual const std::vector<u8>& GetIcon(ResultStatus& error) const {
+    virtual const std::vector<u8>& ReadIcon(ResultStatus& error) const {
         error = ResultStatus::ErrorNotImplemented;
         return icon;
     }
 
     /**
-     * Get the banner (typically .banner section) of the application
+     * Get the banner (typically banner section) of the application
      * @param error ResultStatus result of function
      * @return Reference to banner buffer
      */
-    virtual const std::vector<u8>& GetBanner(ResultStatus& error) const {
+    virtual const std::vector<u8>& ReadBanner(ResultStatus& error) const {
         error = ResultStatus::ErrorNotImplemented;
         return banner;
     }
 
     /**
-     * Get the logo (typically .logo section) of the application
+     * Get the logo (typically logo section) of the application
      * @param error ResultStatus result of function
      * @return Reference to logo buffer
      */
-    virtual const std::vector<u8>& GetLogo(ResultStatus& error) const {
+    virtual const std::vector<u8>& ReadLogo(ResultStatus& error) const {
         error = ResultStatus::ErrorNotImplemented;
         return logo;
     }
@@ -91,7 +91,7 @@ public:
      * @param error ResultStatus result of function
      * @return Reference to RomFs archive buffer
      */
-    virtual const std::vector<u8>& GetRomFs(ResultStatus error) const {
+    virtual const std::vector<u8>& ReadRomFS(ResultStatus& error) const {
         error = ResultStatus::ErrorNotImplemented;
         return romfs;
     }
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index a4922c2c0..60505bdfa 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -113,36 +113,39 @@ 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() const {
+ResultStatus AppLoader_NCCH::LoadExec() {
     if (!is_loaded) 
         return ResultStatus::ErrorNotLoaded;
 
-    for (std::vector<u8>::size_type i = 0; i != code.size(); i++) {
-        Memory::Write8(entry_point + i, code[i]);
+    ResultStatus res;
+    code = ReadCode(res);
+
+    if (ResultStatus::Success == res) {
+        Memory::WriteBlock(entry_point, &code[0], code.size());
+        Kernel::LoadExec(entry_point);
     }
-    Kernel::LoadExec(entry_point);
-    
-    return ResultStatus::Success;
+    return res;
 }
 
 /**
  * Reads an application ExeFS section of an NCCH file into AppLoader (e.g. .code, .logo, etc.)
- * @param file Handle to file to read from
  * @param name Name of section to read out of NCCH file
- * @param buffer Buffer to read section into.
+ * @param buffer Vector to read data into
+ * @param error ResultStatus result of function
+ * @return Reference to buffer of data that was read
  */
-ResultStatus AppLoader_NCCH::LoadSectionExeFS(File::IOFile& file, const char* name, 
-    std::vector<u8>& buffer) {
-
+const std::vector<u8>& AppLoader_NCCH::LoadSectionExeFS(const char* name, std::vector<u8>& buffer, 
+    ResultStatus& error) {
     // 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);
@@ -161,50 +164,28 @@ ResultStatus AppLoader_NCCH::LoadSectionExeFS(File::IOFile& file, const char* na
                 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);
+                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], 
+                if (!LZSS_Decompress(&temp_buffer[0], exefs_header.section[i].size, &buffer[0],
                     decompressed_size)) {
-                    return ResultStatus::ErrorInvalidFormat;
+                    error = ResultStatus::ErrorInvalidFormat;
+                    return buffer;
                 }
             // Section is uncompressed...
             } else {
                 buffer.resize(exefs_header.section[i].size);
                 file.ReadBytes(&buffer[0], exefs_header.section[i].size);
             }
-            return ResultStatus::Success;
+            error = ResultStatus::Success;
+            return buffer;
         }
     }
-    return ResultStatus::ErrorNotUsed;
+    error = ResultStatus::ErrorNotUsed;
+    return buffer;
 } 
 
 /**
- * Reads RomFS of an NCCH file into AppLoader
- * @param file Handle to file to read from
- * @return ResultStatus result of function
- */
-ResultStatus AppLoader_NCCH::LoadRomFS(File::IOFile& file) {
-    // 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);
-
-        romfs.resize(romfs_size);
-
-        file.Seek(romfs_offset, 0);
-        file.ReadBytes(&romfs[0], romfs_size);
-
-        return ResultStatus::Success;
-    } else {
-        NOTICE_LOG(LOADER, "RomFS unused");
-    }
-    return ResultStatus::ErrorNotUsed;
-}
-
-/**
  * Loads an NCCH file (e.g. from a CCI, or the first NCCH in a CXI)
  * @param error_string Pointer to string to put error message if an error has occurred
  * @todo Move NCSD parsing out of here and create a separate function for loading these
@@ -216,7 +197,7 @@ ResultStatus AppLoader_NCCH::Load() {
     if (is_loaded)
         return ResultStatus::ErrorAlreadyLoaded;
 
-    File::IOFile file(filename, "rb");
+    file = File::IOFile(filename, "rb");
 
     if (file.IsOpen()) {
         file.ReadBytes(&ncch_header, sizeof(NCCH_Header));
@@ -255,15 +236,6 @@ ResultStatus AppLoader_NCCH::Load() {
         file.Seek(exefs_offset + ncch_offset, 0);
         file.ReadBytes(&exefs_header, sizeof(ExeFs_Header));
 
-        // TODO(bunnei): Check ResultStatus of these...
-
-        LoadSectionExeFS(file, ".code", code);
-        LoadSectionExeFS(file, "banner", banner);
-        LoadSectionExeFS(file, "icon", icon);
-        LoadSectionExeFS(file, "logo", logo);
-
-        LoadRomFS(file);
-
         is_loaded = true; // Set state to loaded
 
         LoadExec(); // Load the executable into memory for booting
@@ -273,4 +245,68 @@ ResultStatus AppLoader_NCCH::Load() {
     return ResultStatus::Error;
 }
 
+/**
+ * Get the code (typically .code section) of the application
+ * @param error ResultStatus result of function
+ * @return Reference to code buffer
+ */
+const std::vector<u8>& AppLoader_NCCH::ReadCode(ResultStatus& error) {
+    return LoadSectionExeFS(".code", code, error);
+}
+
+/**
+ * Get the icon (typically icon section) of the application
+ * @param error ResultStatus result of function
+ * @return Reference to icon buffer
+ */
+const std::vector<u8>& AppLoader_NCCH::ReadIcon(ResultStatus& error) {
+    return LoadSectionExeFS("icon", icon, error);
+}
+
+/**
+ * Get the banner (typically banner section) of the application
+ * @param error ResultStatus result of function
+ * @return Reference to banner buffer
+ */
+const std::vector<u8>& AppLoader_NCCH::ReadBanner(ResultStatus& error) {
+    return LoadSectionExeFS("banner", banner, error);
+}
+
+/**
+ * Get the logo (typically logo section) of the application
+ * @param error ResultStatus result of function
+ * @return Reference to logo buffer
+ */
+const std::vector<u8>& AppLoader_NCCH::ReadLogo(ResultStatus& error) {
+    return LoadSectionExeFS("logo", logo, error);
+}
+
+/**
+ * Get the RomFs archive of the application
+ * @param error ResultStatus result of function
+ * @return Reference to RomFs archive buffer
+ */
+const std::vector<u8>& AppLoader_NCCH::ReadRomFS(ResultStatus& error) {
+    // 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);
+
+        romfs.resize(romfs_size);
+
+        file.Seek(romfs_offset, 0);
+        file.ReadBytes(&romfs[0], romfs_size);
+
+        error = ResultStatus::Success;
+        return romfs;
+    } else {
+        NOTICE_LOG(LOADER, "RomFS unused");
+    }
+    error = ResultStatus::ErrorNotUsed;
+    return romfs;
+}
+
 } // namespace Loader
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h
index 126eb4c80..bf65425a4 100644
--- a/src/core/loader/ncch.h
+++ b/src/core/loader/ncch.h
@@ -156,35 +156,66 @@ public:
      */
     ResultStatus Load();
 
-private:
+    /**
+     * Get the code (typically .code section) of the application
+     * @param error ResultStatus result of function
+     * @return Reference to code buffer
+     */
+    const std::vector<u8>& ReadCode(ResultStatus& error);
 
     /**
-     * Reads an application ExeFS section of an NCCH file into AppLoader (e.g. .code, .logo, etc.)
-     * @param file Handle to file to read from
-     * @param name Name of section to read out of NCCH file
-     * @param buffer Buffer to read section into.
-     * @return ResultStatus result of function
+     * Get the icon (typically icon section) of the application
+     * @param error ResultStatus result of function
+     * @return Reference to icon buffer
      */
-    ResultStatus LoadSectionExeFS(File::IOFile& file, const char* name, std::vector<u8>& buffer);
+    const std::vector<u8>& ReadIcon(ResultStatus& error);
 
     /**
-     * Reads RomFS of an NCCH file into AppLoader
-     * @param file Handle to file to read from
-     * @return ResultStatus result of function
+     * Get the banner (typically banner section) of the application
+     * @param error ResultStatus result of function
+     * @return Reference to banner buffer
+     */
+    const std::vector<u8>& ReadBanner(ResultStatus& error);
+
+    /**
+     * Get the logo (typically logo section) of the application
+     * @param error ResultStatus result of function
+     * @return Reference to logo buffer
      */
-    ResultStatus LoadRomFS(File::IOFile& file);
+    const std::vector<u8>& ReadLogo(ResultStatus& error);
+
+    /**
+     * Get the RomFs archive of the application
+     * @param error ResultStatus result of function
+     * @return Reference to RomFs archive buffer
+     */
+    const std::vector<u8>& ReadRomFS(ResultStatus& error);
+
+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
+     */
+    const std::vector<u8>& LoadSectionExeFS(const char* name, std::vector<u8>& buffer, 
+        ResultStatus& error);
 
     /**
      * Loads .code section into memory for booting
      * @return ResultStatus result of function
      */
-    ResultStatus LoadExec() const;
+    ResultStatus LoadExec();
 
+    File::IOFile    file;
     std::string     filename;
+
     bool            is_loaded;
     bool            is_compressed;
-    u32             entry_point;
 
+    u32             entry_point;
     u32             ncch_offset; // Offset to NCCH header, can be 0 or after NCSD header
     u32             exefs_offset;