travis: Update to clang-format 6.0

.travis.yml

@@ -6,10 +6,6 @@ matrix:
       dist: trusty
       addons:
         apt:
-          sources:
-            - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-            - sourceline: 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main'
           packages:
             - clang-format-6.0
       script: "./.travis/clang-format/script.sh"

.travis/clang-format/script.sh

@@ -7,7 +7,7 @@ if grep -nr '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis*
 fi
 
 # Default clang-format points to default 3.5 version one
-CLANG_FORMAT=clang-format-6.0
+CLANG_FORMAT=clang-format-3.9
 $CLANG_FORMAT --version
 
 if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then

CMakeLists.txt

@@ -3,17 +3,14 @@ cmake_minimum_required(VERSION 3.6)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
 include(DownloadExternals)
-include(CMakeDependentOption)
 
 project(yuzu)
 
-# Set bundled sdl2/qt as dependent options.
-# OFF by default, but if ENABLE_SDL2 and MSVC are true then ON
 option(ENABLE_SDL2 "Enable the SDL2 frontend" ON)
-CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" ON "ENABLE_SDL2;MSVC" OFF)
+option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" OFF)
 
 option(ENABLE_QT "Enable the Qt frontend" ON)
-CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" ON "ENABLE_SDL2;MSVC" OFF)
+option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" OFF)
 
 if(NOT EXISTS ${CMAKE_SOURCE_DIR}/.git/hooks/pre-commit)
     message(STATUS "Copying pre-commit hook")
@@ -322,53 +319,6 @@ if (UNIX OR MINGW)
     endif()
 endif()
 
-# Setup a custom clang-format target (if clang-format can be found) that will run
-# against all the src files. This should be used before making a pull request.
-# =======================================================================
-
-set(CLANG_FORMAT_POSTFIX "-6.0")
-find_program(CLANG_FORMAT
-    NAMES clang-format${CLANG_FORMAT_POSTFIX}
-          clang-format
-    PATHS ${CMAKE_BINARY_DIR}/externals)
-# if find_program doesn't find it, try to download from externals
-if (NOT CLANG_FORMAT)
-    if (WIN32)
-        message(STATUS "Clang format not found! Downloading...")
-        set(CLANG_FORMAT "${CMAKE_BINARY_DIR}/externals/clang-format${CLANG_FORMAT_POSTFIX}.exe")
-        file(DOWNLOAD
-            https://github.com/yuzu-emu/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe
-            "${CLANG_FORMAT}" SHOW_PROGRESS
-            STATUS DOWNLOAD_SUCCESS)
-        if (NOT DOWNLOAD_SUCCESS EQUAL 0)
-            message(WARNING "Could not download clang format! Disabling the clang format target")
-            file(REMOVE ${CLANG_FORMAT})
-            unset(CLANG_FORMAT)
-        endif()
-    else()
-        message(WARNING "Clang format not found! Disabling the clang format target")
-    endif()
-endif()
-
-if (CLANG_FORMAT)
-    set(SRCS ${CMAKE_SOURCE_DIR}/src)
-    set(CCOMMENT "Running clang format against all the .h and .cpp files in src/")
-    if (WIN32)
-        add_custom_target(clang-format
-            COMMAND powershell.exe -Command "${CLANG_FORMAT} -i @(Get-ChildItem -Recurse ${SRCS}/* -Include \'*.h\', \'*.cpp\')"
-            COMMENT ${CCOMMENT})
-    elseif(MINGW)
-        add_custom_target(clang-format
-            COMMAND find `cygpath -u ${SRCS}` -iname *.h -o -iname *.cpp | xargs `cygpath -u ${CLANG_FORMAT}` -i
-            COMMENT ${CCOMMENT})
-    else()
-        add_custom_target(clang-format
-            COMMAND find ${SRCS} -iname *.h -o -iname *.cpp | xargs ${CLANG_FORMAT} -i
-            COMMENT ${CCOMMENT})
-    endif()
-    unset(SRCS)
-    unset(CCOMMENT)
-endif()
 
 # Include source code
 # ===================

CONTRIBUTING.md

@@ -5,16 +5,7 @@
 If you believe you have a valid issue report, please post text or a screenshot from the log (the console window that opens alongside yuzu) and build version (hex string visible in the titlebar and zip filename), as well as your hardware and software information if applicable.
 
 # Contributing
-yuzu is a brand new project, so we have a great opportunity to keep things clean and well organized early on. As such, coding style is very important when making commits. We run clang-format on our CI to check the code. Please use it to format your code when contributing. However, it doesn't cover all the rules below. Some of them aren't very strict rules since we want to be flexible and we understand that under certain circumstances some of them can be counterproductive. Just try to follow as many of them as possible.
-
-# Using clang format (version 6.0)
-When generating the native build script for your toolset, cmake will try to find the correct version of clang format (or will download it on windows). Before running cmake, please install clang format version 6.0 for your platform as follows:
-
-* Windows: do nothing; cmake will download a pre built binary for MSVC and MINGW. MSVC users can additionally install a clang format Visual Studio extension to add features like format on save.
-* OSX: run `brew install clang-format`.
-* Linux: use your package manager to get an appropriate binary.
-
-If clang format is found, then cmake will add a custom build target that can be run at any time to run clang format against *all* source files and update the formatting in them. This should be used before making a pull request so that the reviewers can spend more time reviewing the code instead of having to worry about minor style violations. On MSVC, you can run clang format by building the clang-format project in the solution. On OSX, you can either use the Makefile target `make clang-format` or by building the clang-format target in XCode. For Makefile builds, you can use the clang-format target with `make clang-format`
+yuzu is a brand new project, so we have a great opportunity to keep things clean and well organized early on. As such, coding style is very important when making commits. We run clang-format on our CI to check the code. Please use it to format your code when contributing. However, it doesn't cover all the rules below. Some of them aren't very strict rules since we want to be flexible and we understand that under certain circumstances some of them can be counterproductive. Just try to follow as many of them as possible:
 
 ### General Rules
 * A lot of code was taken from other projects (e.g. Citra, Dolphin, PPSSPP, Gekko). In general, when editing other people's code, follow the style of the module you're in (or better yet, fix the style if it drastically differs from our guide).

src/common/CMakeLists.txt

@@ -17,7 +17,7 @@ if ($ENV{CI})
       string(SUBSTRING ${WORD} 1 -1 REMAINDER)
       string(TOUPPER ${FIRST_LETTER} FIRST_LETTER)
       # this leaves a trailing space on the last word, but we actually want that
-      # because of how it's styled in the title bar.
+      # because of how its styled in the title bar.
       set(REPO_NAME "${REPO_NAME}${FIRST_LETTER}${REMAINDER} ")
     endforeach()
   endif()

src/common/bit_set.h

@@ -236,7 +236,7 @@ public:
     IntTy m_val;
 };
 
-} // namespace Common
+} // Common
 
 typedef Common::BitSet<u8> BitSet8;
 typedef Common::BitSet<u16> BitSet16;

src/common/chunk_file.h

@@ -607,9 +607,8 @@ public:
         u32 cookie = arbitraryNumber;
         Do(cookie);
         if (mode == PointerWrap::MODE_READ && cookie != arbitraryNumber) {
-            LOG_ERROR(Common,
-                      "After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
-                      "Aborting savestate load...",
+            LOG_ERROR(Common, "After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
+                              "Aborting savestate load...",
                       prevName, cookie, cookie, arbitraryNumber, arbitraryNumber);
             SetError(ERROR_FAILURE);
         }

src/common/color.h

@@ -256,4 +256,4 @@ inline void EncodeX24S8(u8 stencil, u8* bytes) {
     bytes[3] = stencil;
 }
 
-} // namespace Color
+} // namespace

src/common/file_util.cpp

@@ -873,19 +873,20 @@ bool IOFile::Flush() {
 }
 
 bool IOFile::Resize(u64 size) {
-    if (!IsOpen() || 0 !=
+    if (!IsOpen() ||
+        0 !=
 #ifdef _WIN32
-                         // ector: _chsize sucks, not 64-bit safe
-                         // F|RES: changed to _chsize_s. i think it is 64-bit safe
-                         _chsize_s(_fileno(m_file), size)
+            // ector: _chsize sucks, not 64-bit safe
+            // F|RES: changed to _chsize_s. i think it is 64-bit safe
+            _chsize_s(_fileno(m_file), size)
 #else
-                         // TODO: handle 64bit and growing
-                         ftruncate(fileno(m_file), size)
+            // TODO: handle 64bit and growing
+            ftruncate(fileno(m_file), size)
 #endif
-    )
+            )
         m_good = false;
 
     return m_good;
 }
 
-} // namespace FileUtil
+} // namespace

src/common/file_util.h

@@ -253,7 +253,7 @@ private:
     bool m_good = true;
 };
 
-} // namespace FileUtil
+} // namespace
 
 // To deal with Windows being dumb at unicode:
 template <typename T>

src/common/logging/backend.cpp

@@ -132,4 +132,4 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned
 
     PrintColoredMessage(entry);
 }
-} // namespace Log
+}

src/common/logging/backend.h

@@ -47,4 +47,4 @@ Entry CreateEntry(Class log_class, Level log_level, const char* filename, unsign
                   const char* function, const char* format, va_list args);
 
 void SetFilter(Filter* filter);
-} // namespace Log
+}

src/common/logging/filter.cpp

@@ -94,4 +94,4 @@ bool Filter::ParseFilterRule(const std::string::const_iterator begin,
 bool Filter::CheckMessage(Class log_class, Level level) const {
     return static_cast<u8>(level) >= static_cast<u8>(class_levels[static_cast<size_t>(log_class)]);
 }
-} // namespace Log
+}

src/common/logging/filter.h

@@ -50,4 +50,4 @@ public:
 private:
     std::array<Level, (size_t)Class::Count> class_levels;
 };
-} // namespace Log
+}

src/common/logging/text_formatter.cpp

@@ -129,4 +129,4 @@ void PrintColoredMessage(const Entry& entry) {
 #undef ESC
 #endif
 }
-} // namespace Log
+}

src/common/logging/text_formatter.h

@@ -28,4 +28,4 @@ void FormatLogMessage(const Entry& entry, char* out_text, size_t text_len);
 void PrintMessage(const Entry& entry);
 /// Prints the same message as `PrintMessage`, but colored acoording to the severity level.
 void PrintColoredMessage(const Entry& entry);
-} // namespace Log
+}

src/common/memory_util.cpp

@@ -40,12 +40,11 @@ void* AllocateExecutableMemory(size_t size, bool low) {
     if (low && (!map_hint))
         map_hint = (char*)round_page(512 * 1024 * 1024); /* 0.5 GB rounded up to the next page */
 #endif
-    void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC,
-                     MAP_ANON | MAP_PRIVATE
+    void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE
 #if defined(ARCHITECTURE_X64) && defined(MAP_32BIT)
-                         | (low ? MAP_32BIT : 0)
+                                                                             | (low ? MAP_32BIT : 0)
 #endif
-                         ,
+                                                                             ,
                      -1, 0);
 #endif /* defined(_WIN32) */
 

src/common/quaternion.h

@@ -46,4 +46,4 @@ inline Quaternion<float> MakeQuaternion(const Math::Vec3<float>& axis, float ang
     return {axis * std::sin(angle / 2), std::cos(angle / 2)};
 }
 
-} // namespace Math
+} // namspace Math

src/common/scm_rev.h

@@ -12,4 +12,4 @@ extern const char g_scm_desc[];
 extern const char g_build_name[];
 extern const char g_build_date[];
 
-} // namespace Common
+} // namespace

src/common/scope_exit.h

@@ -22,7 +22,7 @@ template <typename Func>
 ScopeExitHelper<Func> ScopeExit(Func&& func) {
     return ScopeExitHelper<Func>(std::move(func));
 }
-} // namespace detail
+}
 
 /**
  * This macro allows you to conveniently specify a block of code that will run on scope exit. Handy

src/common/string_util.cpp

@@ -202,7 +202,7 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _
 #ifdef _WIN32
                                             ":"
 #endif
-    );
+                                            );
     if (std::string::npos == dir_end)
         dir_end = 0;
     else
@@ -462,4 +462,4 @@ std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, size_t max_l
 
     return std::string(buffer, len);
 }
-} // namespace Common
+}

src/common/string_util.h

@@ -134,4 +134,4 @@ bool ComparePartialString(InIt begin, InIt end, const char* other) {
  * NUL-terminated then the string ends at max_len characters.
  */
 std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, size_t max_len);
-} // namespace Common
+}

src/common/thread_queue_list.h

@@ -158,4 +158,4 @@ private:
     std::array<Queue, NUM_QUEUES> queues;
 };
 
-} // namespace Common
+} // namespace

src/common/x64/xbyak_abi.h

@@ -60,41 +60,20 @@ const Xbyak::Reg ABI_PARAM4 = Xbyak::util::r9;
 
 const BitSet32 ABI_ALL_CALLER_SAVED = BuildRegSet({
     // GPRs
-    Xbyak::util::rcx,
-    Xbyak::util::rdx,
-    Xbyak::util::r8,
-    Xbyak::util::r9,
-    Xbyak::util::r10,
+    Xbyak::util::rcx, Xbyak::util::rdx, Xbyak::util::r8, Xbyak::util::r9, Xbyak::util::r10,
     Xbyak::util::r11,
     // XMMs
-    Xbyak::util::xmm0,
-    Xbyak::util::xmm1,
-    Xbyak::util::xmm2,
-    Xbyak::util::xmm3,
-    Xbyak::util::xmm4,
+    Xbyak::util::xmm0, Xbyak::util::xmm1, Xbyak::util::xmm2, Xbyak::util::xmm3, Xbyak::util::xmm4,
     Xbyak::util::xmm5,
 });
 
 const BitSet32 ABI_ALL_CALLEE_SAVED = BuildRegSet({
     // GPRs
-    Xbyak::util::rbx,
-    Xbyak::util::rsi,
-    Xbyak::util::rdi,
-    Xbyak::util::rbp,
-    Xbyak::util::r12,
-    Xbyak::util::r13,
-    Xbyak::util::r14,
-    Xbyak::util::r15,
+    Xbyak::util::rbx, Xbyak::util::rsi, Xbyak::util::rdi, Xbyak::util::rbp, Xbyak::util::r12,
+    Xbyak::util::r13, Xbyak::util::r14, Xbyak::util::r15,
     // XMMs
-    Xbyak::util::xmm6,
-    Xbyak::util::xmm7,
-    Xbyak::util::xmm8,
-    Xbyak::util::xmm9,
-    Xbyak::util::xmm10,
-    Xbyak::util::xmm11,
-    Xbyak::util::xmm12,
-    Xbyak::util::xmm13,
-    Xbyak::util::xmm14,
+    Xbyak::util::xmm6, Xbyak::util::xmm7, Xbyak::util::xmm8, Xbyak::util::xmm9, Xbyak::util::xmm10,
+    Xbyak::util::xmm11, Xbyak::util::xmm12, Xbyak::util::xmm13, Xbyak::util::xmm14,
     Xbyak::util::xmm15,
 });
 
@@ -111,40 +90,18 @@ const Xbyak::Reg ABI_PARAM4 = Xbyak::util::rcx;
 
 const BitSet32 ABI_ALL_CALLER_SAVED = BuildRegSet({
     // GPRs
-    Xbyak::util::rcx,
-    Xbyak::util::rdx,
-    Xbyak::util::rdi,
-    Xbyak::util::rsi,
-    Xbyak::util::r8,
-    Xbyak::util::r9,
-    Xbyak::util::r10,
-    Xbyak::util::r11,
+    Xbyak::util::rcx, Xbyak::util::rdx, Xbyak::util::rdi, Xbyak::util::rsi, Xbyak::util::r8,
+    Xbyak::util::r9, Xbyak::util::r10, Xbyak::util::r11,
     // XMMs
-    Xbyak::util::xmm0,
-    Xbyak::util::xmm1,
-    Xbyak::util::xmm2,
-    Xbyak::util::xmm3,
-    Xbyak::util::xmm4,
-    Xbyak::util::xmm5,
-    Xbyak::util::xmm6,
-    Xbyak::util::xmm7,
-    Xbyak::util::xmm8,
-    Xbyak::util::xmm9,
-    Xbyak::util::xmm10,
-    Xbyak::util::xmm11,
-    Xbyak::util::xmm12,
-    Xbyak::util::xmm13,
-    Xbyak::util::xmm14,
-    Xbyak::util::xmm15,
+    Xbyak::util::xmm0, Xbyak::util::xmm1, Xbyak::util::xmm2, Xbyak::util::xmm3, Xbyak::util::xmm4,
+    Xbyak::util::xmm5, Xbyak::util::xmm6, Xbyak::util::xmm7, Xbyak::util::xmm8, Xbyak::util::xmm9,
+    Xbyak::util::xmm10, Xbyak::util::xmm11, Xbyak::util::xmm12, Xbyak::util::xmm13,
+    Xbyak::util::xmm14, Xbyak::util::xmm15,
 });
 
 const BitSet32 ABI_ALL_CALLEE_SAVED = BuildRegSet({
     // GPRs
-    Xbyak::util::rbx,
-    Xbyak::util::rbp,
-    Xbyak::util::r12,
-    Xbyak::util::r13,
-    Xbyak::util::r14,
+    Xbyak::util::rbx, Xbyak::util::rbp, Xbyak::util::r12, Xbyak::util::r13, Xbyak::util::r14,
     Xbyak::util::r15,
 });
 

src/core/CMakeLists.txt

@@ -149,8 +149,6 @@ add_library(core STATIC
     hw/hw.h
     hw/lcd.cpp
     hw/lcd.h
-    loader/deconstructed_rom_directory.cpp
-    loader/deconstructed_rom_directory.h
     loader/elf.cpp
     loader/elf.h
     loader/linker.cpp

src/core/core.cpp

@@ -82,6 +82,7 @@ System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& file
     if (system_mode.second != Loader::ResultStatus::Success) {
         LOG_CRITICAL(Core, "Failed to determine system mode (Error %i)!",
                      static_cast<int>(system_mode.second));
+        System::Shutdown();
 
         switch (system_mode.second) {
         case Loader::ResultStatus::ErrorEncrypted:

src/core/file_sys/archive_backend.cpp

@@ -119,4 +119,4 @@ std::vector<u8> Path::AsBinary() const {
         return {};
     }
 }
-} // namespace FileSys
+}

src/core/gdbstub/gdbstub.h

@@ -91,4 +91,4 @@ bool GetCpuStepFlag();
  * @param is_step
  */
 void SetCpuStepFlag(bool is_step);
-} // namespace GDBStub
+}

src/core/hle/config_mem.cpp

@@ -28,4 +28,4 @@ void Init() {
     config_mem.firm_ctr_sdk_ver = 0x0000F297;
 }
 
-} // namespace ConfigMem
+} // namespace

src/core/hle/config_mem.h

@@ -53,4 +53,4 @@ extern ConfigMemDef config_mem;
 
 void Init();
 
-} // namespace ConfigMem
+} // namespace

src/core/hle/kernel/address_arbiter.h

@@ -57,4 +57,4 @@ private:
     ~AddressArbiter() override;
 };
 
-} // namespace Kernel
+} // namespace FileSys

src/core/hle/kernel/client_port.cpp

@@ -39,4 +39,4 @@ ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() {
     return MakeResult(std::get<SharedPtr<ClientSession>>(sessions));
 }
 
-} // namespace Kernel
+} // namespace

src/core/hle/kernel/client_port.h

@@ -47,4 +47,4 @@ private:
     ~ClientPort() override;
 };
 
-} // namespace Kernel
+} // namespace

src/core/hle/kernel/client_session.cpp

@@ -48,4 +48,4 @@ ResultCode ClientSession::SendSyncRequest(SharedPtr<Thread> thread) {
     return server->HandleSyncRequest(std::move(thread));
 }
 
-} // namespace Kernel
+} // namespace

src/core/hle/kernel/client_session.h

@@ -45,4 +45,4 @@ private:
     ~ClientSession() override;
 };
 
-} // namespace Kernel
+} // namespace

src/core/hle/kernel/condition_variable.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <string>
 #include <queue>
+#include <string>
 #include "common/common_types.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/wait_object.h"

src/core/hle/kernel/event.cpp

@@ -52,4 +52,4 @@ void Event::WakeupAllWaitingThreads() {
         signaled = false;
 }
 
-} // namespace Kernel
+} // namespace

src/core/hle/kernel/event.h

@@ -49,4 +49,4 @@ private:
     ~Event() override;
 };
 
-} // namespace Kernel
+} // namespace

src/core/hle/kernel/handle_table.cpp

@@ -104,4 +104,4 @@ void HandleTable::Clear() {
     next_free_slot = 0;
 }
 
-} // namespace Kernel
+} // namespace

src/core/hle/kernel/handle_table.h

@@ -130,4 +130,4 @@ private:
 
 extern HandleTable g_handle_table;
 
-} // namespace Kernel
+} // namespace

src/core/hle/kernel/hle_ipc.cpp

@@ -99,8 +99,9 @@ void HLERequestContext::ParseCommandBuffer(u32_le* src_cmdbuf, bool incoming) {
 
     data_payload_offset = rp.GetCurrentOffset();
 
-    if (domain_message_header && domain_message_header->command ==
-                                     IPC::DomainMessageHeader::CommandType::CloseVirtualHandle) {
+    if (domain_message_header &&
+        domain_message_header->command ==
+            IPC::DomainMessageHeader::CommandType::CloseVirtualHandle) {
         // CloseVirtualHandle command does not have SFC* or any data
         return;
     }

src/core/hle/kernel/resource_limit.cpp

@@ -151,4 +151,4 @@ void ResourceLimitsInit() {
 
 void ResourceLimitsShutdown() {}
 
-} // namespace Kernel
+} // namespace

src/core/hle/kernel/resource_limit.h

@@ -123,4 +123,4 @@ void ResourceLimitsInit();
 // Destroys the resource limits
 void ResourceLimitsShutdown();
 
-} // namespace Kernel
+} // namespace

src/core/hle/kernel/server_port.cpp

@@ -50,4 +50,4 @@ std::tuple<SharedPtr<ServerPort>, SharedPtr<ClientPort>> ServerPort::CreatePortP
     return std::make_tuple(std::move(server_port), std::move(client_port));
 }
 
-} // namespace Kernel
+} // namespace

src/core/hle/kernel/server_port.h

@@ -72,4 +72,4 @@ private:
     ~ServerPort() override;
 };
 
-} // namespace Kernel
+} // namespace

src/core/hle/kernel/server_session.h

@@ -113,4 +113,4 @@ private:
  * in the command buffer.
  */
 ResultCode TranslateHLERequest(ServerSession* server_session);
-} // namespace Kernel
+}

src/core/hle/kernel/session.cpp

@@ -9,4 +9,4 @@ namespace Kernel {
 
 Session::Session() {}
 Session::~Session() {}
-} // namespace Kernel
+}

src/core/hle/kernel/session.h

@@ -24,4 +24,4 @@ public:
     ServerSession* server = nullptr; ///< The server endpoint of the session.
     SharedPtr<ClientPort> port;      ///< The port that this session is associated with (optional).
 };
-} // namespace Kernel
+}

src/core/hle/kernel/shared_memory.h

@@ -98,10 +98,10 @@ public:
     ResultCode Unmap(Process* target_process, VAddr address);
 
     /**
-     * Gets a pointer to the shared memory block
-     * @param offset Offset from the start of the shared memory block to get pointer
-     * @return Pointer to the shared memory block from the specified offset
-     */
+    * Gets a pointer to the shared memory block
+    * @param offset Offset from the start of the shared memory block to get pointer
+    * @return Pointer to the shared memory block from the specified offset
+    */
     u8* GetPointer(u32 offset = 0);
 
     /// Process that created this shared memory block.
@@ -129,4 +129,4 @@ private:
     ~SharedMemory() override;
 };
 
-} // namespace Kernel
+} // namespace

src/core/hle/kernel/svc.cpp

@@ -255,9 +255,8 @@ static ResultCode CancelSynchronization(Handle thread_handle) {
 /// Attempts to locks a mutex, creating it if it does not already exist
 static ResultCode ArbitrateLock(Handle holding_thread_handle, VAddr mutex_addr,
                                 Handle requesting_thread_handle) {
-    LOG_TRACE(Kernel_SVC,
-              "called holding_thread_handle=0x%08X, mutex_addr=0x%llx, "
-              "requesting_current_thread_handle=0x%08X",
+    LOG_TRACE(Kernel_SVC, "called holding_thread_handle=0x%08X, mutex_addr=0x%llx, "
+                          "requesting_current_thread_handle=0x%08X",
               holding_thread_handle, mutex_addr, requesting_thread_handle);
 
     SharedPtr<Thread> holding_thread = g_handle_table.Get<Thread>(holding_thread_handle);
@@ -547,9 +546,8 @@ static ResultCode CreateThread(Handle* out_handle, VAddr entry_point, u64 arg, V
 
     Core::System::GetInstance().PrepareReschedule();
 
-    LOG_TRACE(Kernel_SVC,
-              "called entrypoint=0x%08X (%s), arg=0x%08X, stacktop=0x%08X, "
-              "threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X",
+    LOG_TRACE(Kernel_SVC, "called entrypoint=0x%08X (%s), arg=0x%08X, stacktop=0x%08X, "
+                          "threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X",
               entry_point, name.c_str(), arg, stack_top, priority, processor_id, *out_handle);
 
     return RESULT_SUCCESS;

src/core/hle/kernel/timer.cpp

@@ -111,4 +111,4 @@ void TimersInit() {
 
 void TimersShutdown() {}
 
-} // namespace Kernel
+} // namespace

src/core/hle/kernel/timer.h

@@ -76,4 +76,4 @@ void TimersInit();
 /// Tears down the timer variables
 void TimersShutdown();
 
-} // namespace Kernel
+} // namespace

src/core/hle/service/am/applet_oe.cpp

@@ -222,8 +222,7 @@ public:
     explicit IStorageAccessor(std::vector<u8> buffer)
         : ServiceFramework("IStorageAccessor"), buffer(std::move(buffer)) {
         static const FunctionInfo functions[] = {
-            {0, &IStorageAccessor::GetSize, "GetSize"},
-            {11, &IStorageAccessor::Read, "Read"},
+            {0, &IStorageAccessor::GetSize, "GetSize"}, {11, &IStorageAccessor::Read, "Read"},
         };
         RegisterHandlers(functions);
     }

src/core/hle/service/apm/apm.cpp

@@ -51,8 +51,7 @@ private:
 
 APM::APM() : ServiceFramework("apm") {
     static const FunctionInfo functions[] = {
-        {0x00000000, &APM::OpenSession, "OpenSession"},
-        {0x00000001, nullptr, "GetPerformanceMode"},
+        {0x00000000, &APM::OpenSession, "OpenSession"}, {0x00000001, nullptr, "GetPerformanceMode"},
     };
     RegisterHandlers(functions);
 }

src/core/hle/service/nvdrv/nvdrv.cpp

@@ -7,8 +7,8 @@
 #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h"
 #include "core/hle/service/nvdrv/devices/nvhost_as_gpu.h"
 #include "core/hle/service/nvdrv/devices/nvmap.h"
-#include "core/hle/service/nvdrv/interface.h"
 #include "core/hle/service/nvdrv/nvdrv.h"
+#include "core/hle/service/nvdrv/interface.h"
 
 namespace Service {
 namespace Nvidia {

src/core/hle/service/service.h

@@ -21,7 +21,7 @@ class ClientPort;
 class ServerPort;
 class ServerSession;
 class HLERequestContext;
-} // namespace Kernel
+}
 
 namespace Service {
 
@@ -189,4 +189,4 @@ extern std::unordered_map<std::string, Kernel::SharedPtr<Kernel::ClientPort>> g_
 /// Adds a port to the named port table
 void AddNamedPort(std::string name, Kernel::SharedPtr<Kernel::ClientPort> port);
 
-} // namespace Service
+} // namespace

src/core/hle/service/time/time_s.cpp

@@ -2,6 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#pragma once
+
 #include "core/hle/service/time/time_s.h"
 
 namespace Service {

src/core/hle/service/time/time_u.cpp

@@ -2,6 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#pragma once
+
 #include "core/hle/service/time/time_u.h"
 
 namespace Service {

src/core/hle/shared_page.cpp

@@ -82,4 +82,4 @@ void Init() {
     CoreTiming::ScheduleEvent(0, update_time_event);
 }
 
-} // namespace SharedPage
+} // namespace

src/core/hle/shared_page.h

@@ -66,4 +66,4 @@ extern SharedPageDef shared_page;
 
 void Init();
 
-} // namespace SharedPage
+} // namespace

src/core/hw/hw.cpp

@@ -91,4 +91,4 @@ void Shutdown() {
     LCD::Shutdown();
     LOG_DEBUG(HW, "shutdown OK");
 }
-} // namespace HW
+}

src/core/hw/hw.h

@@ -47,4 +47,4 @@ void Init();
 /// Shutdown hardware
 void Shutdown();
 
-} // namespace HW
+} // namespace

src/core/hw/lcd.cpp

@@ -64,4 +64,4 @@ void Shutdown() {
     LOG_DEBUG(HW_LCD, "shutdown OK");
 }
 
-} // namespace LCD
+} // namespace

src/core/hw/lcd.h

@@ -83,4 +83,4 @@ void Init();
 /// Shutdown hardware
 void Shutdown();
 
-} // namespace LCD
+} // namespace

src/core/loader/deconstructed_rom_directory.cpp

@@ -1,105 +0,0 @@
-// Copyright 2018 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "common/common_funcs.h"
-#include "common/common_paths.h"
-#include "common/file_util.h"
-#include "common/logging/log.h"
-#include "common/string_util.h"
-#include "core/hle/kernel/process.h"
-#include "core/hle/kernel/resource_limit.h"
-#include "core/loader/deconstructed_rom_directory.h"
-#include "core/loader/nso.h"
-#include "core/memory.h"
-
-namespace Loader {
-
-AppLoader_DeconstructedRomDirectory::AppLoader_DeconstructedRomDirectory(FileUtil::IOFile&& file,
-                                                                         std::string filepath)
-    : AppLoader(std::move(file)), filepath(std::move(filepath)) {}
-
-FileType AppLoader_DeconstructedRomDirectory::IdentifyType(FileUtil::IOFile& file,
-                                                           const std::string& filepath) {
-    bool is_main_found{};
-    bool is_rtld_found{};
-    bool is_sdk_found{};
-
-    const auto callback = [&](unsigned* num_entries_out, const std::string& directory,
-                              const std::string& virtual_name) -> bool {
-        // Skip directories
-        std::string physical_name = directory + virtual_name;
-        if (FileUtil::IsDirectory(physical_name)) {
-            return true;
-        }
-
-        // Verify filename
-        if (Common::ToLower(virtual_name) == "main") {
-            is_main_found = true;
-        } else if (Common::ToLower(virtual_name) == "rtld") {
-            is_rtld_found = true;
-        } else if (Common::ToLower(virtual_name) == "sdk") {
-            is_sdk_found = true;
-        } else {
-            // Contrinue searching
-            return true;
-        }
-
-        // Verify file is an NSO
-        FileUtil::IOFile file(physical_name, "rb");
-        if (AppLoader_NSO::IdentifyType(file, physical_name) != FileType::NSO) {
-            return false;
-        }
-
-        // We are done if we've found and verified all required NSOs
-        return !(is_main_found && is_rtld_found && is_sdk_found);
-    };
-
-    // Search the directory recursively, looking for the required modules
-    const std::string directory = filepath.substr(0, filepath.find_last_of("/\\")) + DIR_SEP;
-    FileUtil::ForeachDirectoryEntry(nullptr, directory, callback);
-
-    if (is_main_found && is_rtld_found && is_sdk_found) {
-        return FileType::DeconstructedRomDirectory;
-    }
-
-    return FileType::Error;
-}
-
-ResultStatus AppLoader_DeconstructedRomDirectory::Load(
-    Kernel::SharedPtr<Kernel::Process>& process) {
-    if (is_loaded) {
-        return ResultStatus::ErrorAlreadyLoaded;
-    }
-    if (!file.IsOpen()) {
-        return ResultStatus::Error;
-    }
-
-    process = Kernel::Process::Create("main");
-
-    // Load NSO modules
-    VAddr next_load_addr{Memory::PROCESS_IMAGE_VADDR};
-    for (const auto& module : {"rtld", "main", "subsdk0", "subsdk1", "subsdk2", "subsdk3",
-                               "subsdk4", "subsdk5", "subsdk6", "subsdk7", "sdk"}) {
-        const std::string path =
-            filepath.substr(0, filepath.find_last_of("/\\")) + DIR_SEP + module;
-        const VAddr load_addr = next_load_addr;
-        next_load_addr = AppLoader_NSO::LoadModule(path, load_addr);
-        if (next_load_addr) {
-            LOG_DEBUG(Loader, "loaded module %s @ 0x%llx", module, load_addr);
-        } else {
-            next_load_addr = load_addr;
-        }
-    }
-
-    process->svc_access_mask.set();
-    process->address_mappings = default_address_mappings;
-    process->resource_limit =
-        Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION);
-    process->Run(Memory::PROCESS_IMAGE_VADDR, 48, Kernel::DEFAULT_STACK_SIZE);
-
-    is_loaded = true;
-    return ResultStatus::Success;
-}
-
-} // namespace Loader

src/core/loader/deconstructed_rom_directory.h

@@ -1,42 +0,0 @@
-// Copyright 2018 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <string>
-#include "common/common_types.h"
-#include "core/hle/kernel/kernel.h"
-#include "core/loader/loader.h"
-
-namespace Loader {
-
-/**
- * This class loads a "deconstructed ROM directory", which are the typical format we see for Switch
- * game dumps. The path should be a "main" NSO, which must be in a directory that contains the other
- * standard ExeFS NSOs (e.g. rtld, sdk, etc.). It will automatically find and load these.
- * Furthermore, it will look for the first .istorage file (optionally) and use this for the RomFS.
- */
-class AppLoader_DeconstructedRomDirectory final : public AppLoader {
-public:
-    AppLoader_DeconstructedRomDirectory(FileUtil::IOFile&& file, std::string filepath);
-
-    /**
-     * Returns the type of the file
-     * @param file FileUtil::IOFile open file
-     * @param filepath Path of the file that we are opening.
-     * @return FileType found, or FileType::Error if this loader doesn't know it
-     */
-    static FileType IdentifyType(FileUtil::IOFile& file, const std::string& filepath);
-
-    FileType GetFileType() override {
-        return IdentifyType(file, filepath);
-    }
-
-    ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
-
-private:
-    std::string filepath;
-};
-
-} // namespace Loader

src/core/loader/elf.cpp

@@ -323,9 +323,8 @@ SharedPtr<CodeSet> ElfReader::LoadInto(u32 vaddr) {
             }
 
             if (codeset_segment->size != 0) {
-                LOG_ERROR(Loader,
-                          "ELF has more than one segment of the same type. Skipping extra "
-                          "segment (id %i)",
+                LOG_ERROR(Loader, "ELF has more than one segment of the same type. Skipping extra "
+                                  "segment (id %i)",
                           i);
                 continue;
             }
@@ -365,10 +364,7 @@ SectionID ElfReader::GetSectionByName(const char* name, int firstSection) const
 
 namespace Loader {
 
-AppLoader_ELF::AppLoader_ELF(FileUtil::IOFile&& file, std::string filename)
-    : AppLoader(std::move(file)), filename(std::move(filename)) {}
-
-FileType AppLoader_ELF::IdentifyType(FileUtil::IOFile& file, const std::string&) {
+FileType AppLoader_ELF::IdentifyType(FileUtil::IOFile& file) {
     static constexpr u16 ELF_MACHINE_ARM{0x28};
 
     u32 magic = 0;

src/core/loader/elf.h

@@ -16,18 +16,18 @@ namespace Loader {
 /// Loads an ELF/AXF file
 class AppLoader_ELF final : public AppLoader {
 public:
-    AppLoader_ELF(FileUtil::IOFile&& file, std::string filename);
+    AppLoader_ELF(FileUtil::IOFile&& file, std::string filename)
+        : AppLoader(std::move(file)), filename(std::move(filename)) {}
 
     /**
      * Returns the type of the file
      * @param file FileUtil::IOFile open file
-     * @param filepath Path of the file that we are opening.
      * @return FileType found, or FileType::Error if this loader doesn't know it
      */
-    static FileType IdentifyType(FileUtil::IOFile& file, const std::string& filepath);
+    static FileType IdentifyType(FileUtil::IOFile& file);
 
     FileType GetFileType() override {
-        return IdentifyType(file, filename);
+        return IdentifyType(file);
     }
 
     ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;

src/core/loader/loader.cpp

@@ -1,4 +1,4 @@
-// Copyright 2018 yuzu emulator team
+// Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -7,11 +7,12 @@
 #include "common/logging/log.h"
 #include "common/string_util.h"
 #include "core/hle/kernel/process.h"
-#include "core/loader/deconstructed_rom_directory.h"
 #include "core/loader/elf.h"
 #include "core/loader/nro.h"
 #include "core/loader/nso.h"
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 namespace Loader {
 
 const std::initializer_list<Kernel::AddressMapping> default_address_mappings = {
@@ -20,15 +21,14 @@ const std::initializer_list<Kernel::AddressMapping> default_address_mappings = {
     {0x1F000000, 0x600000, false}, // entire VRAM
 };
 
-FileType IdentifyFile(FileUtil::IOFile& file, const std::string& filepath) {
+FileType IdentifyFile(FileUtil::IOFile& file) {
     FileType type;
 
 #define CHECK_TYPE(loader)                                                                         \
-    type = AppLoader_##loader::IdentifyType(file, filepath);                                       \
+    type = AppLoader_##loader::IdentifyType(file);                                                 \
     if (FileType::Error != type)                                                                   \
         return type;
 
-    CHECK_TYPE(DeconstructedRomDirectory)
     CHECK_TYPE(ELF)
     CHECK_TYPE(NSO)
     CHECK_TYPE(NRO)
@@ -45,13 +45,13 @@ FileType IdentifyFile(const std::string& file_name) {
         return FileType::Unknown;
     }
 
-    return IdentifyFile(file, file_name);
+    return IdentifyFile(file);
 }
 
 FileType GuessFromExtension(const std::string& extension_) {
     std::string extension = Common::ToLower(extension_);
 
-    if (extension == ".elf")
+    if (extension == ".elf" || extension == ".axf")
         return FileType::ELF;
     else if (extension == ".nro")
         return FileType::NRO;
@@ -69,8 +69,6 @@ const char* GetFileTypeString(FileType type) {
         return "NRO";
     case FileType::NSO:
         return "NSO";
-    case FileType::DeconstructedRomDirectory:
-        return "Directory";
     case FileType::Error:
     case FileType::Unknown:
         break;
@@ -104,10 +102,6 @@ static std::unique_ptr<AppLoader> GetFileLoader(FileUtil::IOFile&& file, FileTyp
     case FileType::NRO:
         return std::make_unique<AppLoader_NRO>(std::move(file), filepath);
 
-    // NX deconstructed ROM directory.
-    case FileType::DeconstructedRomDirectory:
-        return std::make_unique<AppLoader_DeconstructedRomDirectory>(std::move(file), filepath);
-
     default:
         return nullptr;
     }
@@ -123,7 +117,7 @@ std::unique_ptr<AppLoader> GetLoader(const std::string& filename) {
     std::string filename_filename, filename_extension;
     Common::SplitPath(filename, nullptr, &filename_filename, &filename_extension);
 
-    FileType type = IdentifyFile(file, filename);
+    FileType type = IdentifyFile(file);
     FileType filename_type = GuessFromExtension(filename_extension);
 
     if (type != filename_type) {

src/core/loader/loader.h

@@ -1,4 +1,4 @@
-// Copyright 2018 yuzu emulator team
+// Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -20,6 +20,9 @@ struct AddressMapping;
 class Process;
 } // namespace Kernel
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Loader namespace
+
 namespace Loader {
 
 /// File types supported by CTR
@@ -29,16 +32,14 @@ enum class FileType {
     ELF,
     NSO,
     NRO,
-    DeconstructedRomDirectory,
 };
 
 /**
  * Identifies the type of a bootable file based on the magic value in its header.
  * @param file open file
- * @param filepath Path of the file that we are opening.
  * @return FileType of file
  */
-FileType IdentifyFile(FileUtil::IOFile& file, const std::string& filepath);
+FileType IdentifyFile(FileUtil::IOFile& file);
 
 /**
  * Identifies the type of a bootable file based on the magic value in its header.

src/core/loader/nro.cpp

@@ -5,7 +5,6 @@
 #include <vector>
 
 #include "common/common_funcs.h"
-#include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/swap.h"
 #include "core/hle/kernel/process.h"
@@ -46,10 +45,7 @@ struct ModHeader {
 };
 static_assert(sizeof(ModHeader) == 0x1c, "ModHeader has incorrect size.");
 
-AppLoader_NRO::AppLoader_NRO(FileUtil::IOFile&& file, std::string filepath)
-    : AppLoader(std::move(file)), filepath(std::move(filepath)) {}
-
-FileType AppLoader_NRO::IdentifyType(FileUtil::IOFile& file, const std::string&) {
+FileType AppLoader_NRO::IdentifyType(FileUtil::IOFile& file) {
     // Read NSO header
     NroHeader nro_header{};
     file.Seek(0, SEEK_SET);
@@ -107,7 +103,7 @@ bool AppLoader_NRO::LoadNro(const std::string& path, VAddr load_base) {
         bss_size = PageAlignSize(mod_header.bss_end_offset - mod_header.bss_start_offset);
     }
     codeset->data.size += bss_size;
-    program_image.resize(static_cast<u32>(program_image.size()) + bss_size);
+    program_image.resize(PageAlignSize(static_cast<u32>(program_image.size()) + bss_size));
 
     // Load codeset for current process
     codeset->name = path;
@@ -138,7 +134,7 @@ ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) {
     process->address_mappings = default_address_mappings;
     process->resource_limit =
         Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION);
-    process->Run(base_addr, 48, Kernel::DEFAULT_STACK_SIZE);
+    process->Run(base_addr + sizeof(NroHeader), 48, Kernel::DEFAULT_STACK_SIZE);
 
     is_loaded = true;
     return ResultStatus::Success;

src/core/loader/nro.h

@@ -4,8 +4,10 @@
 
 #pragma once
 
+#include <map>
 #include <string>
 #include "common/common_types.h"
+#include "common/file_util.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/loader/linker.h"
 #include "core/loader/loader.h"
@@ -15,18 +17,18 @@ namespace Loader {
 /// Loads an NRO file
 class AppLoader_NRO final : public AppLoader, Linker {
 public:
-    AppLoader_NRO(FileUtil::IOFile&& file, std::string filepath);
+    AppLoader_NRO(FileUtil::IOFile&& file, std::string filepath)
+        : AppLoader(std::move(file)), filepath(std::move(filepath)) {}
 
     /**
      * Returns the type of the file
      * @param file FileUtil::IOFile open file
-     * @param filepath Path of the file that we are opening.
      * @return FileType found, or FileType::Error if this loader doesn't know it
      */
-    static FileType IdentifyType(FileUtil::IOFile& file, const std::string& filepath);
+    static FileType IdentifyType(FileUtil::IOFile& file);
 
     FileType GetFileType() override {
-        return IdentifyType(file, filepath);
+        return IdentifyType(file);
     }
 
     ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;

src/core/loader/nso.cpp

@@ -4,8 +4,8 @@
 
 #include <vector>
 #include <lz4.h>
+
 #include "common/common_funcs.h"
-#include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/swap.h"
 #include "core/hle/kernel/process.h"
@@ -47,10 +47,7 @@ struct ModHeader {
 };
 static_assert(sizeof(ModHeader) == 0x1c, "ModHeader has incorrect size.");
 
-AppLoader_NSO::AppLoader_NSO(FileUtil::IOFile&& file, std::string filepath)
-    : AppLoader(std::move(file)), filepath(std::move(filepath)) {}
-
-FileType AppLoader_NSO::IdentifyType(FileUtil::IOFile& file, const std::string&) {
+FileType AppLoader_NSO::IdentifyType(FileUtil::IOFile& file) {
     u32 magic = 0;
     file.Seek(0, SEEK_SET);
     if (1 != file.ReadArray<u32>(&magic, 1)) {
@@ -91,7 +88,7 @@ static constexpr u32 PageAlignSize(u32 size) {
     return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK;
 }
 
-VAddr AppLoader_NSO::LoadModule(const std::string& path, VAddr load_base) {
+VAddr AppLoader_NSO::LoadNso(const std::string& path, VAddr load_base) {
     FileUtil::IOFile file(path, "rb");
     if (!file.IsOpen()) {
         return {};
@@ -156,9 +153,21 @@ ResultStatus AppLoader_NSO::Load(Kernel::SharedPtr<Kernel::Process>& process) {
 
     process = Kernel::Process::Create("main");
 
-    // Load module
-    LoadModule(filepath, Memory::PROCESS_IMAGE_VADDR);
-    LOG_DEBUG(Loader, "loaded module %s @ 0x%llx", filepath.c_str(), Memory::PROCESS_IMAGE_VADDR);
+    // Load NSO modules
+    VAddr next_load_addr{Memory::PROCESS_IMAGE_VADDR};
+    for (const auto& module :
+         {"rtld", "sdk", "subsdk0", "subsdk1", "subsdk2", "subsdk3", "subsdk4"}) {
+        const std::string path = filepath.substr(0, filepath.find_last_of("/\\")) + "/" + module;
+        const VAddr load_addr = next_load_addr;
+        next_load_addr = LoadNso(path, load_addr);
+        if (next_load_addr) {
+            LOG_DEBUG(Loader, "loaded module %s @ 0x%llx", module, load_addr);
+        } else {
+            next_load_addr = load_addr;
+        }
+    }
+    // Load "main" module
+    LoadNso(filepath, next_load_addr);
 
     process->svc_access_mask.set();
     process->address_mappings = default_address_mappings;

src/core/loader/nso.h

@@ -4,8 +4,10 @@
 
 #pragma once
 
+#include <map>
 #include <string>
 #include "common/common_types.h"
+#include "common/file_util.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/loader/linker.h"
 #include "core/loader/loader.h"
@@ -15,25 +17,25 @@ namespace Loader {
 /// Loads an NSO file
 class AppLoader_NSO final : public AppLoader, Linker {
 public:
-    AppLoader_NSO(FileUtil::IOFile&& file, std::string filepath);
+    AppLoader_NSO(FileUtil::IOFile&& file, std::string filepath)
+        : AppLoader(std::move(file)), filepath(std::move(filepath)) {}
 
     /**
      * Returns the type of the file
      * @param file FileUtil::IOFile open file
-     * @param filepath Path of the file that we are opening.
      * @return FileType found, or FileType::Error if this loader doesn't know it
      */
-    static FileType IdentifyType(FileUtil::IOFile& file, const std::string& filepath);
+    static FileType IdentifyType(FileUtil::IOFile& file);
 
     FileType GetFileType() override {
-        return IdentifyType(file, filepath);
+        return IdentifyType(file);
     }
 
-    static VAddr LoadModule(const std::string& path, VAddr load_base);
-
     ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
 
 private:
+    VAddr LoadNso(const std::string& path, VAddr load_base);
+
     std::string filepath;
 };
 

src/core/memory.cpp

@@ -219,9 +219,6 @@ void Write(const VAddr vaddr, const T data) {
 bool IsValidVirtualAddress(const Kernel::Process& process, const VAddr vaddr) {
     auto& page_table = process.vm_manager.page_table;
 
-    if ((vaddr >> PAGE_BITS) >= PAGE_TABLE_NUM_ENTRIES)
-        return false;
-
     const u8* page_pointer = page_table.pointers[vaddr >> PAGE_BITS];
     if (page_pointer)
         return true;

src/core/memory_setup.h

@@ -29,4 +29,4 @@ void MapMemoryRegion(PageTable& page_table, VAddr base, u64 size, u8* target);
 void MapIoRegion(PageTable& page_table, VAddr base, u64 size, MMIORegionPointer mmio_handler);
 
 void UnmapRegion(PageTable& page_table, VAddr base, u64 size);
-} // namespace Memory
+}

src/core/mmio.h

@@ -35,4 +35,4 @@ public:
 };
 
 using MMIORegionPointer = std::shared_ptr<MMIORegion>;
-}; // namespace Memory
+};

src/core/settings.h

@@ -100,8 +100,7 @@ enum Values {
 };
 
 static const std::array<const char*, NumAnalogs> mapping = {{
-    "lstick",
-    "rstick",
+    "lstick", "rstick",
 }};
 } // namespace NativeAnalog
 

src/core/tracer/citrace.h

@@ -97,4 +97,4 @@ struct CTStreamElement {
 };
 
 #pragma pack()
-} // namespace CiTrace
+}

src/core/tracer/recorder.cpp

@@ -205,4 +205,4 @@ template void Recorder::RegisterWritten(u32, u8);
 template void Recorder::RegisterWritten(u32, u16);
 template void Recorder::RegisterWritten(u32, u32);
 template void Recorder::RegisterWritten(u32, u64);
-} // namespace CiTrace
+}

src/core/tracer/recorder.h

@@ -63,9 +63,9 @@ private:
         CTStreamElement data;
 
         /**
-         * Extra data to store along "core" data.
-         * This is e.g. used for data used in MemoryUpdates.
-         */
+          * Extra data to store along "core" data.
+          * This is e.g. used for data used in MemoryUpdates.
+          */
         std::vector<u8> extra_data;
 
         /// Optional CRC hash (e.g. for hashing memory regions)
@@ -84,4 +84,4 @@ private:
     std::unordered_map<boost::crc_32_type::value_type /*hash*/, u32 /*file_offset*/> memory_regions;
 };
 
-} // namespace CiTrace
+} // namespace

src/input_common/main.cpp

@@ -52,8 +52,7 @@ MotionEmu* GetMotionEmu() {
 
 std::string GenerateKeyboardParam(int key_code) {
     Common::ParamPackage param{
-        {"engine", "keyboard"},
-        {"code", std::to_string(key_code)},
+        {"engine", "keyboard"}, {"code", std::to_string(key_code)},
     };
     return param.Serialize();
 }

src/tests/common/param_package.cpp

@@ -10,9 +10,7 @@ namespace Common {
 
 TEST_CASE("ParamPackage", "[common]") {
     ParamPackage original{
-        {"abc", "xyz"},
-        {"def", "42"},
-        {"jkl", "$$:1:$2$,3"},
+        {"abc", "xyz"}, {"def", "42"}, {"jkl", "$$:1:$2$,3"},
     };
     original.Set("ghi", 3.14f);
     ParamPackage copy(original.Serialize());

src/video_core/renderer_opengl/gl_shader_util.h

@@ -16,4 +16,4 @@ namespace GLShader {
  */
 GLuint LoadProgram(const char* vertex_shader, const char* fragment_shader);
 
-} // namespace GLShader
+} // namespace

src/video_core/utils.h

@@ -49,4 +49,4 @@ static inline u32 GetMortonOffset(u32 x, u32 y, u32 bytes_per_pixel) {
     return (i + offset) * bytes_per_pixel;
 }
 
-} // namespace VideoCore
+} // namespace

src/video_core/video_core.cpp

@@ -39,4 +39,4 @@ void Shutdown() {
     LOG_DEBUG(Render, "shutdown OK");
 }
 
-} // namespace VideoCore
+} // namespace

src/video_core/video_core.h

@@ -31,4 +31,4 @@ bool Init(EmuWindow* emu_window);
 /// Shutdown the video core
 void Shutdown();
 
-} // namespace VideoCore
+} // namespace

src/yuzu/configuration/config.cpp

@@ -26,18 +26,10 @@ const std::array<int, Settings::NativeButton::NumButtons> Config::default_button
 
 const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{
     {
-        Qt::Key_Up,
-        Qt::Key_Down,
-        Qt::Key_Left,
-        Qt::Key_Right,
-        Qt::Key_E,
+        Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_E,
     },
     {
-        Qt::Key_I,
-        Qt::Key_K,
-        Qt::Key_J,
-        Qt::Key_L,
-        Qt::Key_R,
+        Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_R,
     },
 }};
 

src/yuzu/configuration/configure_input.cpp

@@ -14,11 +14,7 @@
 
 const std::array<std::string, ConfigureInput::ANALOG_SUB_BUTTONS_NUM>
     ConfigureInput::analog_sub_buttons{{
-        "up",
-        "down",
-        "left",
-        "right",
-        "modifier",
+        "up", "down", "left", "right", "modifier",
     }};
 
 static QString getKeyName(int key_code) {
@@ -40,8 +36,7 @@ static void SetAnalogButton(const Common::ParamPackage& input_param,
                             Common::ParamPackage& analog_param, const std::string& button_name) {
     if (analog_param.Get("engine", "") != "analog_from_button") {
         analog_param = {
-            {"engine", "analog_from_button"},
-            {"modifier_scale", "0.5"},
+            {"engine", "analog_from_button"}, {"modifier_scale", "0.5"},
         };
     }
     analog_param.Set(button_name, input_param.Serialize());
@@ -112,17 +107,11 @@ ConfigureInput::ConfigureInput(QWidget* parent)
 
     analog_map_buttons = {{
         {
-            ui->buttonLStickUp,
-            ui->buttonLStickDown,
-            ui->buttonLStickLeft,
-            ui->buttonLStickRight,
+            ui->buttonLStickUp, ui->buttonLStickDown, ui->buttonLStickLeft, ui->buttonLStickRight,
             ui->buttonLStickMod,
         },
         {
-            ui->buttonRStickUp,
-            ui->buttonRStickDown,
-            ui->buttonRStickLeft,
-            ui->buttonRStickRight,
+            ui->buttonRStickUp, ui->buttonRStickDown, ui->buttonRStickLeft, ui->buttonRStickRight,
             ui->buttonRStickMod,
         },
     }};

src/yuzu/configuration/configure_system.cpp

@@ -9,18 +9,7 @@
 #include "yuzu/ui_settings.h"
 
 static const std::array<int, 12> days_in_month = {{
-    31,
-    29,
-    31,
-    30,
-    31,
-    30,
-    31,
-    31,
-    30,
-    31,
-    30,
-    31,
+    31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31,
 }};
 
 ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureSystem) {

src/yuzu/debugger/wait_tree.h

@@ -20,7 +20,7 @@ class Mutex;
 class ConditionVariable;
 class Thread;
 class Timer;
-} // namespace Kernel
+}
 
 class WaitTreeThread;
 

src/yuzu/ui_settings.h

@@ -50,4 +50,4 @@ struct Values {
 };
 
 extern Values values;
-} // namespace UISettings
+}

src/yuzu_cmd/config.cpp

@@ -49,18 +49,10 @@ static const std::array<int, Settings::NativeButton::NumButtons> default_buttons
 
 static const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> default_analogs{{
     {
-        SDL_SCANCODE_UP,
-        SDL_SCANCODE_DOWN,
-        SDL_SCANCODE_LEFT,
-        SDL_SCANCODE_RIGHT,
-        SDL_SCANCODE_D,
+        SDL_SCANCODE_UP, SDL_SCANCODE_DOWN, SDL_SCANCODE_LEFT, SDL_SCANCODE_RIGHT, SDL_SCANCODE_D,
     },
     {
-        SDL_SCANCODE_I,
-        SDL_SCANCODE_K,
-        SDL_SCANCODE_J,
-        SDL_SCANCODE_L,
-        SDL_SCANCODE_D,
+        SDL_SCANCODE_I, SDL_SCANCODE_K, SDL_SCANCODE_J, SDL_SCANCODE_L, SDL_SCANCODE_D,
     },
 }};