Address review comments

CMakeLists.txt

@@ -431,9 +431,6 @@ enable_testing()
 add_subdirectory(externals)
 add_subdirectory(src)
 
-# Set yuzu project as default StartUp Project in Visual Studio
-set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT yuzu)
-
 
 # Installation instructions
 # =========================

externals/open_source_archives/CMakeLists.txt

@@ -1,16 +1,3 @@
-add_library(open_source_archives
-    src/FontChineseSimplified.cpp
-    src/FontChineseTraditional.cpp
-    src/FontExtendedChineseSimplified.cpp
-    src/FontKorean.cpp
-    src/FontNintendoExtended.cpp
-    src/FontStandard.cpp
-    include/FontChineseSimplified.h
-    include/FontChineseTraditional.h
-    include/FontExtendedChineseSimplified.h
-    include/FontKorean.h
-    include/FontNintendoExtended.h
-    include/FontStandard.h
-)
+add_library(open_source_archives INTERFACE)
 
-target_include_directories(open_source_archives PUBLIC include)
+target_include_directories(open_source_archives INTERFACE "include/")

externals/open_source_archives/include/FontChineseSimplified.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <array>
-
-extern const std::array<unsigned char, 217276> FontChineseSimplified;
-

externals/open_source_archives/include/FontChineseTraditional.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <array>
-
-extern const std::array<unsigned char, 222236> FontChineseTraditional;
-

externals/open_source_archives/include/FontExtendedChineseSimplified.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <array>
-
-extern const std::array<unsigned char, 293516> FontExtendedChineseSimplified;
-

externals/open_source_archives/include/FontKorean.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <array>
-
-extern const std::array<unsigned char, 217276> FontKorean;
-

externals/open_source_archives/include/FontNintendoExtended.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <array>
-
-extern const std::array<unsigned char, 172064> FontNintendoExtended;
-

externals/open_source_archives/include/FontStandard.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <array>
-
-extern const std::array<unsigned char, 217276> FontStandard;
-

src/audio_core/audio_renderer.cpp

@@ -17,10 +17,10 @@ AudioRenderer::AudioRenderer(AudioRendererParameter params,
                              Kernel::SharedPtr<Kernel::Event> buffer_event)
     : worker_params{params}, buffer_event{buffer_event}, voices(params.voice_count) {
 
-    audio_out = std::make_unique<AudioCore::AudioOut>();
-    stream = audio_out->OpenStream(STREAM_SAMPLE_RATE, STREAM_NUM_CHANNELS, "AudioRenderer",
-                                   [=]() { buffer_event->Signal(); });
-    audio_out->StartStream(stream);
+    audio_core = std::make_unique<AudioCore::AudioOut>();
+    stream = audio_core->OpenStream(STREAM_SAMPLE_RATE, STREAM_NUM_CHANNELS, "AudioRenderer",
+                                    [=]() { buffer_event->Signal(); });
+    audio_core->StartStream(stream);
 
     QueueMixedBuffer(0);
     QueueMixedBuffer(1);
@@ -236,11 +236,11 @@ void AudioRenderer::QueueMixedBuffer(Buffer::Tag tag) {
             }
         }
     }
-    audio_out->QueueBuffer(stream, tag, std::move(buffer));
+    audio_core->QueueBuffer(stream, tag, std::move(buffer));
 }
 
 void AudioRenderer::ReleaseAndQueueBuffers() {
-    const auto released_buffers{audio_out->GetTagsAndReleaseBuffers(stream, 2)};
+    const auto released_buffers{audio_core->GetTagsAndReleaseBuffers(stream, 2)};
     for (const auto& tag : released_buffers) {
         QueueMixedBuffer(tag);
     }

src/audio_core/audio_renderer.h

@@ -204,7 +204,7 @@ private:
     AudioRendererParameter worker_params;
     Kernel::SharedPtr<Kernel::Event> buffer_event;
     std::vector<VoiceState> voices;
-    std::unique_ptr<AudioCore::AudioOut> audio_out;
+    std::unique_ptr<AudioCore::AudioOut> audio_core;
     AudioCore::StreamPtr stream;
 };
 

src/common/CMakeLists.txt

@@ -1,16 +1,13 @@
 # Generate cpp with Git revision from template
-# Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well
+# Also if this is a CI build, add the build name (ie: Nightly, Bleeding Edge) to the scm_rev file as well
 set(REPO_NAME "")
-set(BUILD_VERSION "0")
 if ($ENV{CI})
   if ($ENV{TRAVIS})
     set(BUILD_REPOSITORY $ENV{TRAVIS_REPO_SLUG})
-    set(BUILD_TAG $ENV{TRAVIS_TAG})
   elseif($ENV{APPVEYOR})
     set(BUILD_REPOSITORY $ENV{APPVEYOR_REPO_NAME})
-    set(BUILD_TAG $ENV{APPVEYOR_REPO_TAG_NAME})
   endif()
-  # regex capture the string nightly or canary into CMAKE_MATCH_1
+  # regex capture the string nightly or bleeding-edge into CMAKE_MATCH_1
   string(REGEX MATCH "yuzu-emu/yuzu-?(.*)" OUTVAR ${BUILD_REPOSITORY})
   if (${CMAKE_MATCH_COUNT} GREATER 0)
     # capitalize the first letter of each word in the repo name.
@@ -19,21 +16,10 @@ if ($ENV{CI})
       string(SUBSTRING ${WORD} 0 1 FIRST_LETTER)
       string(SUBSTRING ${WORD} 1 -1 REMAINDER)
       string(TOUPPER ${FIRST_LETTER} FIRST_LETTER)
-      set(REPO_NAME "${REPO_NAME}${FIRST_LETTER}${REMAINDER}")
+      # this leaves a trailing space on the last word, but we actually want that
+      # because of how it's styled in the title bar.
+      set(REPO_NAME "${REPO_NAME}${FIRST_LETTER}${REMAINDER} ")
     endforeach()
-    if (BUILD_TAG)
-      string(REGEX MATCH "${CMAKE_MATCH_1}-([0-9]+)" OUTVAR ${BUILD_TAG})
-      if (${CMAKE_MATCH_COUNT} GREATER 0)
-        set(BUILD_VERSION ${CMAKE_MATCH_1})
-      endif()
-      if (BUILD_VERSION)
-        # This leaves a trailing space on the last word, but we actually want that
-        # because of how it's styled in the title bar.
-        set(BUILD_FULLNAME "${REPO_NAME} #${BUILD_VERSION} ")
-      else()
-        set(BUILD_FULLNAME "")
-      endif()
-    endif()
   endif()
 endif()
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp" @ONLY)

src/common/scm_rev.cpp.in

@@ -9,8 +9,6 @@
 #define GIT_DESC     "@GIT_DESC@"
 #define BUILD_NAME   "@REPO_NAME@"
 #define BUILD_DATE   "@BUILD_DATE@"
-#define BUILD_FULLNAME "@BUILD_FULLNAME@"
-#define BUILD_VERSION "@BUILD_VERSION@"
 
 namespace Common {
 
@@ -19,8 +17,6 @@ const char g_scm_branch[]   = GIT_BRANCH;
 const char g_scm_desc[]     = GIT_DESC;
 const char g_build_name[]   = BUILD_NAME;
 const char g_build_date[]   = BUILD_DATE;
-const char g_build_fullname[] = BUILD_FULLNAME;
-const char g_build_version[]  = BUILD_VERSION;
 
 } // namespace
 

src/common/scm_rev.h

@@ -11,7 +11,5 @@ extern const char g_scm_branch[];
 extern const char g_scm_desc[];
 extern const char g_build_name[];
 extern const char g_build_date[];
-extern const char g_build_fullname[];
-extern const char g_build_version[];
 
 } // namespace Common

src/core/core.cpp

@@ -24,6 +24,7 @@
 #include "core/hle/kernel/scheduler.h"
 #include "core/hle/kernel/thread.h"
 #include "core/hle/service/service.h"
+#include "core/hle/service/sm/controller.h"
 #include "core/hle/service/sm/sm.h"
 #include "core/loader/loader.h"
 #include "core/perf_stats.h"
@@ -136,7 +137,7 @@ struct System::Impl {
         if (virtual_filesystem == nullptr)
             virtual_filesystem = std::make_shared<FileSys::RealVfsFilesystem>();
 
-        kernel.MakeCurrentProcess(Kernel::Process::Create(kernel, "main"));
+        current_process = Kernel::Process::Create(kernel, "main");
 
         cpu_barrier = std::make_shared<CpuBarrier>();
         cpu_exclusive_monitor = Cpu::MakeExclusiveMonitor(cpu_cores.size());
@@ -202,7 +203,7 @@ struct System::Impl {
             return init_result;
         }
 
-        const Loader::ResultStatus load_result{app_loader->Load(kernel.CurrentProcess())};
+        const Loader::ResultStatus load_result{app_loader->Load(current_process)};
         if (load_result != Loader::ResultStatus::Success) {
             LOG_CRITICAL(Core, "Failed to load ROM (Error {})!", static_cast<int>(load_result));
             Shutdown();
@@ -281,6 +282,7 @@ struct System::Impl {
     std::unique_ptr<VideoCore::RendererBase> renderer;
     std::unique_ptr<Tegra::GPU> gpu_core;
     std::shared_ptr<Tegra::DebugContext> debug_context;
+    Kernel::SharedPtr<Kernel::Process> current_process;
     std::shared_ptr<ExclusiveMonitor> cpu_exclusive_monitor;
     std::shared_ptr<CpuBarrier> cpu_barrier;
     std::array<std::shared_ptr<Cpu>, NUM_CPU_CORES> cpu_cores;
@@ -362,11 +364,7 @@ const std::shared_ptr<Kernel::Scheduler>& System::Scheduler(size_t core_index) {
 }
 
 Kernel::SharedPtr<Kernel::Process>& System::CurrentProcess() {
-    return impl->kernel.CurrentProcess();
-}
-
-const Kernel::SharedPtr<Kernel::Process>& System::CurrentProcess() const {
-    return impl->kernel.CurrentProcess();
+    return impl->current_process;
 }
 
 ARM_Interface& System::ArmInterface(size_t core_index) {

src/core/core.h

@@ -174,12 +174,9 @@ public:
     /// Gets the scheduler for the CPU core with the specified index
     const std::shared_ptr<Kernel::Scheduler>& Scheduler(size_t core_index);
 
-    /// Provides a reference to the current process
+    /// Gets the current process
     Kernel::SharedPtr<Kernel::Process>& CurrentProcess();
 
-    /// Provides a constant reference to the current process.
-    const Kernel::SharedPtr<Kernel::Process>& CurrentProcess() const;
-
     /// Provides a reference to the kernel instance.
     Kernel::KernelCore& Kernel();
 

src/core/file_sys/nca_patch.cpp

@@ -2,10 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <algorithm>
-#include <cstddef>
-#include <cstring>
-
 #include "common/assert.h"
 #include "core/crypto/aes_util.h"
 #include "core/file_sys/nca_patch.h"
@@ -17,9 +13,9 @@ BKTR::BKTR(VirtualFile base_romfs_, VirtualFile bktr_romfs_, RelocationBlock rel
            std::vector<SubsectionBucket> subsection_buckets_, bool is_encrypted_,
            Core::Crypto::Key128 key_, u64 base_offset_, u64 ivfc_offset_,
            std::array<u8, 8> section_ctr_)
-    : relocation(relocation_), relocation_buckets(std::move(relocation_buckets_)),
+    : base_romfs(std::move(base_romfs_)), bktr_romfs(std::move(bktr_romfs_)),
+      relocation(relocation_), relocation_buckets(std::move(relocation_buckets_)),
       subsection(subsection_), subsection_buckets(std::move(subsection_buckets_)),
-      base_romfs(std::move(base_romfs_)), bktr_romfs(std::move(bktr_romfs_)),
       encrypted(is_encrypted_), key(key_), base_offset(base_offset_), ivfc_offset(ivfc_offset_),
       section_ctr(section_ctr_) {
     for (size_t i = 0; i < relocation.number_buckets - 1; ++i) {

src/core/file_sys/nca_patch.h

@@ -5,13 +5,10 @@
 #pragma once
 
 #include <array>
-#include <memory>
 #include <vector>
-
-#include "common/common_funcs.h"
-#include "common/common_types.h"
-#include "common/swap.h"
+#include <common/common_funcs.h>
 #include "core/crypto/key_manager.h"
+#include "core/file_sys/romfs.h"
 
 namespace FileSys {
 

src/core/file_sys/patch_manager.cpp

@@ -2,10 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <array>
-#include <cstddef>
-
-#include "common/logging/log.h"
 #include "core/file_sys/content_archive.h"
 #include "core/file_sys/control_metadata.h"
 #include "core/file_sys/patch_manager.h"

src/core/file_sys/patch_manager.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <map>
-#include <memory>
 #include <string>
 #include "common/common_types.h"
 #include "core/file_sys/nca_metadata.h"

src/core/hle/kernel/kernel.cpp

@@ -116,7 +116,6 @@ struct KernelCore::Impl {
         next_thread_id = 1;
 
         process_list.clear();
-        current_process.reset();
 
         handle_table.Clear();
         resource_limits.fill(nullptr);
@@ -207,7 +206,6 @@ struct KernelCore::Impl {
 
     // Lists all processes that exist in the current session.
     std::vector<SharedPtr<Process>> process_list;
-    SharedPtr<Process> current_process;
 
     Kernel::HandleTable handle_table;
     std::array<SharedPtr<ResourceLimit>, 4> resource_limits;
@@ -266,18 +264,6 @@ void KernelCore::AppendNewProcess(SharedPtr<Process> process) {
     impl->process_list.push_back(std::move(process));
 }
 
-void KernelCore::MakeCurrentProcess(SharedPtr<Process> process) {
-    impl->current_process = std::move(process);
-}
-
-SharedPtr<Process>& KernelCore::CurrentProcess() {
-    return impl->current_process;
-}
-
-const SharedPtr<Process>& KernelCore::CurrentProcess() const {
-    return impl->current_process;
-}
-
 void KernelCore::AddNamedPort(std::string name, SharedPtr<ClientPort> port) {
     impl->named_ports.emplace(std::move(name), std::move(port));
 }

src/core/hle/kernel/kernel.h

@@ -65,15 +65,6 @@ public:
     /// Adds the given shared pointer to an internal list of active processes.
     void AppendNewProcess(SharedPtr<Process> process);
 
-    /// Makes the given process the new current process.
-    void MakeCurrentProcess(SharedPtr<Process> process);
-
-    /// Retrieves a reference to the current process.
-    SharedPtr<Process>& CurrentProcess();
-
-    /// Retrieves a const reference to the current process.
-    const SharedPtr<Process>& CurrentProcess() const;
-
     /// Adds a port to the named port table
     void AddNamedPort(std::string name, SharedPtr<ClientPort> port);
 

src/core/hle/service/acc/acc_aa.cpp

@@ -18,6 +18,4 @@ ACC_AA::ACC_AA(std::shared_ptr<Module> module, std::shared_ptr<ProfileManager> p
     RegisterHandlers(functions);
 }
 
-ACC_AA::~ACC_AA() = default;
-
 } // namespace Service::Account

src/core/hle/service/acc/acc_aa.h

@@ -12,7 +12,6 @@ class ACC_AA final : public Module::Interface {
 public:
     explicit ACC_AA(std::shared_ptr<Module> module,
                     std::shared_ptr<ProfileManager> profile_manager);
-    ~ACC_AA() override;
 };
 
 } // namespace Service::Account

src/core/hle/service/acc/acc_su.cpp

@@ -51,6 +51,4 @@ ACC_SU::ACC_SU(std::shared_ptr<Module> module, std::shared_ptr<ProfileManager> p
     RegisterHandlers(functions);
 }
 
-ACC_SU::~ACC_SU() = default;
-
 } // namespace Service::Account

src/core/hle/service/acc/acc_su.h

@@ -13,7 +13,6 @@ class ACC_SU final : public Module::Interface {
 public:
     explicit ACC_SU(std::shared_ptr<Module> module,
                     std::shared_ptr<ProfileManager> profile_manager);
-    ~ACC_SU() override;
 };
 
 } // namespace Account

src/core/hle/service/acc/acc_u0.cpp

@@ -31,6 +31,4 @@ ACC_U0::ACC_U0(std::shared_ptr<Module> module, std::shared_ptr<ProfileManager> p
     RegisterHandlers(functions);
 }
 
-ACC_U0::~ACC_U0() = default;
-
 } // namespace Service::Account

src/core/hle/service/acc/acc_u0.h

@@ -12,7 +12,6 @@ class ACC_U0 final : public Module::Interface {
 public:
     explicit ACC_U0(std::shared_ptr<Module> module,
                     std::shared_ptr<ProfileManager> profile_manager);
-    ~ACC_U0() override;
 };
 
 } // namespace Service::Account

src/core/hle/service/acc/acc_u1.cpp

@@ -38,6 +38,4 @@ ACC_U1::ACC_U1(std::shared_ptr<Module> module, std::shared_ptr<ProfileManager> p
     RegisterHandlers(functions);
 }
 
-ACC_U1::~ACC_U1() = default;
-
 } // namespace Service::Account

src/core/hle/service/acc/acc_u1.h

@@ -12,7 +12,6 @@ class ACC_U1 final : public Module::Interface {
 public:
     explicit ACC_U1(std::shared_ptr<Module> module,
                     std::shared_ptr<ProfileManager> profile_manager);
-    ~ACC_U1() override;
 };
 
 } // namespace Service::Account

src/core/hle/service/acc/profile_manager.cpp

@@ -29,8 +29,6 @@ ProfileManager::ProfileManager() {
     OpenUser(user_uuid);
 }
 
-ProfileManager::~ProfileManager() = default;
-
 /// After a users creation it needs to be "registered" to the system. AddToProfiles handles the
 /// internal management of the users profiles
 boost::optional<size_t> ProfileManager::AddToProfiles(const ProfileInfo& user) {

src/core/hle/service/acc/profile_manager.h

@@ -82,8 +82,6 @@ static_assert(sizeof(ProfileBase) == 0x38, "ProfileBase is an invalid size");
 class ProfileManager {
 public:
     ProfileManager(); // TODO(ogniK): Load from system save
-    ~ProfileManager();
-
     ResultCode AddUser(const ProfileInfo& user);
     ResultCode CreateNewUser(UUID uuid, const ProfileUsername& username);
     ResultCode CreateNewUser(UUID uuid, const std::string& username);

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

@@ -35,8 +35,6 @@ IWindowController::IWindowController() : ServiceFramework("IWindowController") {
     RegisterHandlers(functions);
 }
 
-IWindowController::~IWindowController() = default;
-
 void IWindowController::GetAppletResourceUserId(Kernel::HLERequestContext& ctx) {
     LOG_WARNING(Service_AM, "(STUBBED) called");
     IPC::ResponseBuilder rb{ctx, 4};
@@ -63,8 +61,6 @@ IAudioController::IAudioController() : ServiceFramework("IAudioController") {
     RegisterHandlers(functions);
 }
 
-IAudioController::~IAudioController() = default;
-
 void IAudioController::SetExpectedMasterVolume(Kernel::HLERequestContext& ctx) {
     LOG_WARNING(Service_AM, "(STUBBED) called");
     IPC::ResponseBuilder rb{ctx, 2};
@@ -120,10 +116,7 @@ IDisplayController::IDisplayController() : ServiceFramework("IDisplayController"
     RegisterHandlers(functions);
 }
 
-IDisplayController::~IDisplayController() = default;
-
 IDebugFunctions::IDebugFunctions() : ServiceFramework("IDebugFunctions") {}
-IDebugFunctions::~IDebugFunctions() = default;
 
 ISelfController::ISelfController(std::shared_ptr<NVFlinger::NVFlinger> nvflinger)
     : ServiceFramework("ISelfController"), nvflinger(std::move(nvflinger)) {
@@ -172,8 +165,6 @@ ISelfController::ISelfController(std::shared_ptr<NVFlinger::NVFlinger> nvflinger
         Kernel::Event::Create(kernel, Kernel::ResetType::Sticky, "ISelfController:LaunchableEvent");
 }
 
-ISelfController::~ISelfController() = default;
-
 void ISelfController::SetFocusHandlingMode(Kernel::HLERequestContext& ctx) {
     // Takes 3 input u8s with each field located immediately after the previous u8, these are
     // bool flags. No output.
@@ -346,8 +337,6 @@ ICommonStateGetter::ICommonStateGetter() : ServiceFramework("ICommonStateGetter"
     event = Kernel::Event::Create(kernel, Kernel::ResetType::OneShot, "ICommonStateGetter:Event");
 }
 
-ICommonStateGetter::~ICommonStateGetter() = default;
-
 void ICommonStateGetter::GetBootMode(Kernel::HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 3};
     rb.Push(RESULT_SUCCESS);
@@ -584,8 +573,6 @@ ILibraryAppletCreator::ILibraryAppletCreator() : ServiceFramework("ILibraryApple
     RegisterHandlers(functions);
 }
 
-ILibraryAppletCreator::~ILibraryAppletCreator() = default;
-
 void ILibraryAppletCreator::CreateLibraryApplet(Kernel::HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
 
@@ -651,8 +638,6 @@ IApplicationFunctions::IApplicationFunctions() : ServiceFramework("IApplicationF
     RegisterHandlers(functions);
 }
 
-IApplicationFunctions::~IApplicationFunctions() = default;
-
 void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) {
     constexpr std::array<u8, 0x88> data{{
         0xca, 0x97, 0x94, 0xc7, // Magic
@@ -775,8 +760,6 @@ IHomeMenuFunctions::IHomeMenuFunctions() : ServiceFramework("IHomeMenuFunctions"
     RegisterHandlers(functions);
 }
 
-IHomeMenuFunctions::~IHomeMenuFunctions() = default;
-
 void IHomeMenuFunctions::RequestToGetForeground(Kernel::HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(RESULT_SUCCESS);
@@ -800,8 +783,6 @@ IGlobalStateController::IGlobalStateController() : ServiceFramework("IGlobalStat
     RegisterHandlers(functions);
 }
 
-IGlobalStateController::~IGlobalStateController() = default;
-
 IApplicationCreator::IApplicationCreator() : ServiceFramework("IApplicationCreator") {
     static const FunctionInfo functions[] = {
         {0, nullptr, "CreateApplication"},
@@ -812,8 +793,6 @@ IApplicationCreator::IApplicationCreator() : ServiceFramework("IApplicationCreat
     RegisterHandlers(functions);
 }
 
-IApplicationCreator::~IApplicationCreator() = default;
-
 IProcessWindingController::IProcessWindingController()
     : ServiceFramework("IProcessWindingController") {
     static const FunctionInfo functions[] = {
@@ -828,6 +807,4 @@ IProcessWindingController::IProcessWindingController()
     };
     RegisterHandlers(functions);
 }
-
-IProcessWindingController::~IProcessWindingController() = default;
 } // namespace Service::AM

src/core/hle/service/am/am.h

@@ -42,7 +42,6 @@ enum SystemLanguage {
 class IWindowController final : public ServiceFramework<IWindowController> {
 public:
     IWindowController();
-    ~IWindowController() override;
 
 private:
     void GetAppletResourceUserId(Kernel::HLERequestContext& ctx);
@@ -52,7 +51,6 @@ private:
 class IAudioController final : public ServiceFramework<IAudioController> {
 public:
     IAudioController();
-    ~IAudioController() override;
 
 private:
     void SetExpectedMasterVolume(Kernel::HLERequestContext& ctx);
@@ -65,19 +63,16 @@ private:
 class IDisplayController final : public ServiceFramework<IDisplayController> {
 public:
     IDisplayController();
-    ~IDisplayController() override;
 };
 
 class IDebugFunctions final : public ServiceFramework<IDebugFunctions> {
 public:
     IDebugFunctions();
-    ~IDebugFunctions() override;
 };
 
 class ISelfController final : public ServiceFramework<ISelfController> {
 public:
     explicit ISelfController(std::shared_ptr<NVFlinger::NVFlinger> nvflinger);
-    ~ISelfController() override;
 
 private:
     void SetFocusHandlingMode(Kernel::HLERequestContext& ctx);
@@ -103,7 +98,6 @@ private:
 class ICommonStateGetter final : public ServiceFramework<ICommonStateGetter> {
 public:
     ICommonStateGetter();
-    ~ICommonStateGetter() override;
 
 private:
     enum class FocusState : u8 {
@@ -130,7 +124,6 @@ private:
 class ILibraryAppletCreator final : public ServiceFramework<ILibraryAppletCreator> {
 public:
     ILibraryAppletCreator();
-    ~ILibraryAppletCreator() override;
 
 private:
     void CreateLibraryApplet(Kernel::HLERequestContext& ctx);
@@ -140,7 +133,6 @@ private:
 class IApplicationFunctions final : public ServiceFramework<IApplicationFunctions> {
 public:
     IApplicationFunctions();
-    ~IApplicationFunctions() override;
 
 private:
     void PopLaunchParameter(Kernel::HLERequestContext& ctx);
@@ -158,7 +150,6 @@ private:
 class IHomeMenuFunctions final : public ServiceFramework<IHomeMenuFunctions> {
 public:
     IHomeMenuFunctions();
-    ~IHomeMenuFunctions() override;
 
 private:
     void RequestToGetForeground(Kernel::HLERequestContext& ctx);
@@ -167,19 +158,16 @@ private:
 class IGlobalStateController final : public ServiceFramework<IGlobalStateController> {
 public:
     IGlobalStateController();
-    ~IGlobalStateController() override;
 };
 
 class IApplicationCreator final : public ServiceFramework<IApplicationCreator> {
 public:
     IApplicationCreator();
-    ~IApplicationCreator() override;
 };
 
 class IProcessWindingController final : public ServiceFramework<IProcessWindingController> {
 public:
     IProcessWindingController();
-    ~IProcessWindingController() override;
 };
 
 /// Registers all AM services with the specified service manager.

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

@@ -222,6 +222,4 @@ AppletAE::AppletAE(std::shared_ptr<NVFlinger::NVFlinger> nvflinger)
     RegisterHandlers(functions);
 }
 
-AppletAE::~AppletAE() = default;
-
 } // namespace Service::AM

src/core/hle/service/am/applet_ae.h

@@ -18,7 +18,7 @@ namespace AM {
 class AppletAE final : public ServiceFramework<AppletAE> {
 public:
     explicit AppletAE(std::shared_ptr<NVFlinger::NVFlinger> nvflinger);
-    ~AppletAE() override;
+    ~AppletAE() = default;
 
 private:
     void OpenSystemAppletProxy(Kernel::HLERequestContext& ctx);

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

@@ -103,6 +103,4 @@ AppletOE::AppletOE(std::shared_ptr<NVFlinger::NVFlinger> nvflinger)
     RegisterHandlers(functions);
 }
 
-AppletOE::~AppletOE() = default;
-
 } // namespace Service::AM

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

@@ -18,7 +18,7 @@ namespace AM {
 class AppletOE final : public ServiceFramework<AppletOE> {
 public:
     explicit AppletOE(std::shared_ptr<NVFlinger::NVFlinger> nvflinger);
-    ~AppletOE() override;
+    ~AppletOE() = default;
 
 private:
     void OpenApplicationProxy(Kernel::HLERequestContext& ctx);

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

@@ -21,6 +21,4 @@ IdleSys::IdleSys() : ServiceFramework{"idle:sys"} {
     RegisterHandlers(functions);
 }
 
-IdleSys::~IdleSys() = default;
-
 } // namespace Service::AM

src/core/hle/service/am/idle.h

@@ -11,7 +11,6 @@ namespace Service::AM {
 class IdleSys final : public ServiceFramework<IdleSys> {
 public:
     explicit IdleSys();
-    ~IdleSys() override;
 };
 
 } // namespace Service::AM

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

@@ -39,6 +39,4 @@ OMM::OMM() : ServiceFramework{"omm"} {
     RegisterHandlers(functions);
 }
 
-OMM::~OMM() = default;
-
 } // namespace Service::AM

src/core/hle/service/am/omm.h

@@ -11,7 +11,6 @@ namespace Service::AM {
 class OMM final : public ServiceFramework<OMM> {
 public:
     explicit OMM();
-    ~OMM() override;
 };
 
 } // namespace Service::AM

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

@@ -27,6 +27,4 @@ SPSM::SPSM() : ServiceFramework{"spsm"} {
     RegisterHandlers(functions);
 }
 
-SPSM::~SPSM() = default;
-
 } // namespace Service::AM

src/core/hle/service/am/spsm.h

@@ -11,7 +11,6 @@ namespace Service::AM {
 class SPSM final : public ServiceFramework<SPSM> {
 public:
     explicit SPSM();
-    ~SPSM() override;
 };
 
 } // namespace Service::AM

src/core/hle/service/aoc/aoc_u.cpp

@@ -23,8 +23,6 @@ AOC_U::AOC_U() : ServiceFramework("aoc:u") {
     RegisterHandlers(functions);
 }
 
-AOC_U::~AOC_U() = default;
-
 void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(RESULT_SUCCESS);

src/core/hle/service/aoc/aoc_u.h

@@ -11,7 +11,7 @@ namespace Service::AOC {
 class AOC_U final : public ServiceFramework<AOC_U> {
 public:
     AOC_U();
-    ~AOC_U() override;
+    ~AOC_U() = default;
 
 private:
     void CountAddOnContent(Kernel::HLERequestContext& ctx);

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

@@ -9,9 +9,6 @@
 
 namespace Service::APM {
 
-Module::Module() = default;
-Module::~Module() = default;
-
 void InstallInterfaces(SM::ServiceManager& service_manager) {
     auto module_ = std::make_shared<Module>();
     std::make_shared<APM>(module_, "apm")->InstallAsService(service_manager);

src/core/hle/service/apm/apm.h

@@ -15,8 +15,8 @@ enum class PerformanceMode : u8 {
 
 class Module final {
 public:
-    Module();
-    ~Module();
+    Module() = default;
+    ~Module() = default;
 };
 
 /// Registers all AM services with the specified service manager.

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

@@ -70,8 +70,6 @@ APM::APM(std::shared_ptr<Module> apm, const char* name)
     RegisterHandlers(functions);
 }
 
-APM::~APM() = default;
-
 void APM::OpenSession(Kernel::HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     rb.Push(RESULT_SUCCESS);
@@ -95,8 +93,6 @@ APM_Sys::APM_Sys() : ServiceFramework{"apm:sys"} {
     RegisterHandlers(functions);
 }
 
-APM_Sys::~APM_Sys() = default;
-
 void APM_Sys::GetPerformanceEvent(Kernel::HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     rb.Push(RESULT_SUCCESS);

src/core/hle/service/apm/interface.h

@@ -11,7 +11,7 @@ namespace Service::APM {
 class APM final : public ServiceFramework<APM> {
 public:
     explicit APM(std::shared_ptr<Module> apm, const char* name);
-    ~APM() override;
+    ~APM() = default;
 
 private:
     void OpenSession(Kernel::HLERequestContext& ctx);
@@ -22,7 +22,6 @@ private:
 class APM_Sys final : public ServiceFramework<APM_Sys> {
 public:
     explicit APM_Sys();
-    ~APM_Sys() override;
 
 private:
     void GetPerformanceEvent(Kernel::HLERequestContext& ctx);

src/core/hle/service/audio/audctl.cpp

@@ -42,6 +42,4 @@ AudCtl::AudCtl() : ServiceFramework{"audctl"} {
     RegisterHandlers(functions);
 }
 
-AudCtl::~AudCtl() = default;
-
 } // namespace Service::Audio

src/core/hle/service/audio/audctl.h

@@ -11,7 +11,6 @@ namespace Service::Audio {
 class AudCtl final : public ServiceFramework<AudCtl> {
 public:
     explicit AudCtl();
-    ~AudCtl() override;
 };
 
 } // namespace Service::Audio

src/core/hle/service/audio/auddbg.cpp

@@ -17,6 +17,4 @@ AudDbg::AudDbg(const char* name) : ServiceFramework{name} {
     RegisterHandlers(functions);
 }
 
-AudDbg::~AudDbg() = default;
-
 } // namespace Service::Audio

src/core/hle/service/audio/auddbg.h

@@ -11,7 +11,6 @@ namespace Service::Audio {
 class AudDbg final : public ServiceFramework<AudDbg> {
 public:
     explicit AudDbg(const char* name);
-    ~AudDbg() override;
 };
 
 } // namespace Service::Audio

src/core/hle/service/audio/audin_a.cpp

@@ -19,6 +19,4 @@ AudInA::AudInA() : ServiceFramework{"audin:a"} {
     RegisterHandlers(functions);
 }
 
-AudInA::~AudInA() = default;
-
 } // namespace Service::Audio

src/core/hle/service/audio/audin_a.h

@@ -11,7 +11,6 @@ namespace Service::Audio {
 class AudInA final : public ServiceFramework<AudInA> {
 public:
     explicit AudInA();
-    ~AudInA() override;
 };
 
 } // namespace Service::Audio

src/core/hle/service/audio/audin_u.cpp

@@ -41,6 +41,4 @@ AudInU::AudInU() : ServiceFramework("audin:u") {
     RegisterHandlers(functions);
 }
 
-AudInU::~AudInU() = default;
-
 } // namespace Service::Audio

src/core/hle/service/audio/audin_u.h

@@ -15,7 +15,7 @@ namespace Service::Audio {
 class AudInU final : public ServiceFramework<AudInU> {
 public:
     explicit AudInU();
-    ~AudInU() override;
+    ~AudInU() = default;
 };
 
 } // namespace Service::Audio

src/core/hle/service/audio/audio.cpp

@@ -15,7 +15,6 @@
 #include "core/hle/service/audio/audren_u.h"
 #include "core/hle/service/audio/codecctl.h"
 #include "core/hle/service/audio/hwopus.h"
-#include "core/hle/service/service.h"
 
 namespace Service::Audio {
 

src/core/hle/service/audio/audio.h

@@ -4,9 +4,7 @@
 
 #pragma once
 
-namespace Service::SM {
-class ServiceManager;
-}
+#include "core/hle/service/service.h"
 
 namespace Service::Audio {
 

src/core/hle/service/audio/audout_a.cpp

@@ -21,6 +21,4 @@ AudOutA::AudOutA() : ServiceFramework{"audout:a"} {
     RegisterHandlers(functions);
 }
 
-AudOutA::~AudOutA() = default;
-
 } // namespace Service::Audio

src/core/hle/service/audio/audout_a.h

@@ -11,7 +11,6 @@ namespace Service::Audio {
 class AudOutA final : public ServiceFramework<AudOutA> {
 public:
     explicit AudOutA();
-    ~AudOutA() override;
 };
 
 } // namespace Service::Audio

src/core/hle/service/audio/audout_u.cpp

@@ -3,20 +3,15 @@
 // Refer to the license.txt file included.
 
 #include <array>
-#include <cstring>
 #include <vector>
 
-#include "audio_core/audio_out.h"
 #include "audio_core/codec.h"
-#include "common/common_funcs.h"
 #include "common/logging/log.h"
-#include "common/swap.h"
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/service/audio/audout_u.h"
-#include "core/memory.h"
 
 namespace Service::Audio {
 
@@ -30,18 +25,6 @@ enum {
 constexpr std::array<char, 10> DefaultDevice{{"DeviceOut"}};
 constexpr int DefaultSampleRate{48000};
 
-struct AudoutParams {
-    s32_le sample_rate;
-    u16_le channel_count;
-    INSERT_PADDING_BYTES(2);
-};
-static_assert(sizeof(AudoutParams) == 0x8, "AudoutParams is an invalid size");
-
-enum class AudioState : u32 {
-    Started,
-    Stopped,
-};
-
 class IAudioOut final : public ServiceFramework<IAudioOut> {
 public:
     IAudioOut(AudoutParams audio_params, AudioCore::AudioOut& audio_core)
@@ -235,6 +218,4 @@ AudOutU::AudOutU() : ServiceFramework("audout:u") {
     audio_core = std::make_unique<AudioCore::AudioOut>();
 }
 
-AudOutU::~AudOutU() = default;
-
 } // namespace Service::Audio

src/core/hle/service/audio/audout_u.h

@@ -4,24 +4,33 @@
 
 #pragma once
 
+#include "audio_core/audio_out.h"
 #include "core/hle/service/service.h"
 
-namespace AudioCore {
-class AudioOut;
-}
-
 namespace Kernel {
 class HLERequestContext;
 }
 
 namespace Service::Audio {
 
+struct AudoutParams {
+    s32_le sample_rate;
+    u16_le channel_count;
+    INSERT_PADDING_BYTES(2);
+};
+static_assert(sizeof(AudoutParams) == 0x8, "AudoutParams is an invalid size");
+
+enum class AudioState : u32 {
+    Started,
+    Stopped,
+};
+
 class IAudioOut;
 
 class AudOutU final : public ServiceFramework<AudOutU> {
 public:
     AudOutU();
-    ~AudOutU() override;
+    ~AudOutU() = default;
 
 private:
     std::shared_ptr<IAudioOut> audio_out_interface;

src/core/hle/service/audio/audrec_a.cpp

@@ -17,6 +17,4 @@ AudRecA::AudRecA() : ServiceFramework{"audrec:a"} {
     RegisterHandlers(functions);
 }
 
-AudRecA::~AudRecA() = default;
-
 } // namespace Service::Audio

src/core/hle/service/audio/audrec_a.h

@@ -11,7 +11,6 @@ namespace Service::Audio {
 class AudRecA final : public ServiceFramework<AudRecA> {
 public:
     explicit AudRecA();
-    ~AudRecA() override;
 };
 
 } // namespace Service::Audio

src/core/hle/service/audio/audrec_u.cpp

@@ -36,6 +36,4 @@ AudRecU::AudRecU() : ServiceFramework("audrec:u") {
     RegisterHandlers(functions);
 }
 
-AudRecU::~AudRecU() = default;
-
 } // namespace Service::Audio

src/core/hle/service/audio/audrec_u.h

@@ -15,7 +15,7 @@ namespace Service::Audio {
 class AudRecU final : public ServiceFramework<AudRecU> {
 public:
     explicit AudRecU();
-    ~AudRecU() override;
+    ~AudRecU() = default;
 };
 
 } // namespace Service::Audio

src/core/hle/service/audio/audren_a.cpp

@@ -23,6 +23,4 @@ AudRenA::AudRenA() : ServiceFramework{"audren:a"} {
     RegisterHandlers(functions);
 }
 
-AudRenA::~AudRenA() = default;
-
 } // namespace Service::Audio

src/core/hle/service/audio/audren_a.h

@@ -11,7 +11,6 @@ namespace Service::Audio {
 class AudRenA final : public ServiceFramework<AudRenA> {
 public:
     explicit AudRenA();
-    ~AudRenA() override;
 };
 
 } // namespace Service::Audio

src/core/hle/service/audio/audren_u.cpp

@@ -2,14 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <algorithm>
 #include <array>
-#include <memory>
 
-#include "audio_core/audio_renderer.h"
 #include "common/alignment.h"
-#include "common/common_funcs.h"
 #include "common/logging/log.h"
+#include "core/core_timing.h"
+#include "core/core_timing_util.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/hle_ipc.h"
@@ -200,8 +198,6 @@ AudRenU::AudRenU() : ServiceFramework("audren:u") {
     RegisterHandlers(functions);
 }
 
-AudRenU::~AudRenU() = default;
-
 void AudRenU::OpenAudioRenderer(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
     auto params = rp.PopRaw<AudioCore::AudioRendererParameter>();

src/core/hle/service/audio/audren_u.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "audio_core/audio_renderer.h"
 #include "core/hle/service/service.h"
 
 namespace Kernel {
@@ -15,7 +16,7 @@ namespace Service::Audio {
 class AudRenU final : public ServiceFramework<AudRenU> {
 public:
     explicit AudRenU();
-    ~AudRenU() override;
+    ~AudRenU() = default;
 
 private:
     void OpenAudioRenderer(Kernel::HLERequestContext& ctx);

src/core/hle/service/audio/codecctl.cpp

@@ -28,6 +28,4 @@ CodecCtl::CodecCtl() : ServiceFramework("codecctl") {
     RegisterHandlers(functions);
 }
 
-CodecCtl::~CodecCtl() = default;
-
 } // namespace Service::Audio

src/core/hle/service/audio/codecctl.h

@@ -15,7 +15,7 @@ namespace Service::Audio {
 class CodecCtl final : public ServiceFramework<CodecCtl> {
 public:
     explicit CodecCtl();
-    ~CodecCtl() override;
+    ~CodecCtl() = default;
 };
 
 } // namespace Service::Audio

src/core/hle/service/audio/hwopus.cpp

@@ -3,12 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <cstring>
-#include <memory>
-#include <vector>
-
 #include <opus.h>
-
-#include "common/common_funcs.h"
 #include "common/logging/log.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/kernel/hle_ipc.h"
@@ -156,6 +151,4 @@ HwOpus::HwOpus() : ServiceFramework("hwopus") {
     RegisterHandlers(functions);
 }
 
-HwOpus::~HwOpus() = default;
-
 } // namespace Service::Audio

src/core/hle/service/audio/hwopus.h

@@ -11,7 +11,7 @@ namespace Service::Audio {
 class HwOpus final : public ServiceFramework<HwOpus> {
 public:
     explicit HwOpus();
-    ~HwOpus() override;
+    ~HwOpus() = default;
 
 private:
     void OpenOpusDecoder(Kernel::HLERequestContext& ctx);

src/core/hle/service/bcat/bcat.cpp

@@ -13,6 +13,4 @@ BCAT::BCAT(std::shared_ptr<Module> module, const char* name)
     };
     RegisterHandlers(functions);
 }
-
-BCAT::~BCAT() = default;
 } // namespace Service::BCAT

src/core/hle/service/bcat/bcat.h

@@ -11,7 +11,6 @@ namespace Service::BCAT {
 class BCAT final : public Module::Interface {
 public:
     explicit BCAT(std::shared_ptr<Module> module, const char* name);
-    ~BCAT() override;
 };
 
 } // namespace Service::BCAT

src/core/hle/service/bcat/module.cpp

@@ -42,8 +42,6 @@ void Module::Interface::CreateBcatService(Kernel::HLERequestContext& ctx) {
 Module::Interface::Interface(std::shared_ptr<Module> module, const char* name)
     : ServiceFramework(name), module(std::move(module)) {}
 
-Module::Interface::~Interface() = default;
-
 void InstallInterfaces(SM::ServiceManager& service_manager) {
     auto module = std::make_shared<Module>();
     std::make_shared<BCAT>(module, "bcat:a")->InstallAsService(service_manager);

src/core/hle/service/bcat/module.h

@@ -13,7 +13,6 @@ public:
     class Interface : public ServiceFramework<Interface> {
     public:
         explicit Interface(std::shared_ptr<Module> module, const char* name);
-        ~Interface() override;
 
         void CreateBcatService(Kernel::HLERequestContext& ctx);
 

src/core/hle/service/fatal/fatal.cpp

@@ -13,8 +13,6 @@ namespace Service::Fatal {
 Module::Interface::Interface(std::shared_ptr<Module> module, const char* name)
     : ServiceFramework(name), module(std::move(module)) {}
 
-Module::Interface::~Interface() = default;
-
 void Module::Interface::ThrowFatalWithPolicy(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp(ctx);
     u32 error_code = rp.Pop<u32>();

src/core/hle/service/fatal/fatal.h

@@ -13,7 +13,6 @@ public:
     class Interface : public ServiceFramework<Interface> {
     public:
         explicit Interface(std::shared_ptr<Module> module, const char* name);
-        ~Interface() override;
 
         void ThrowFatalWithPolicy(Kernel::HLERequestContext& ctx);
         void ThrowFatalWithCpuContext(Kernel::HLERequestContext& ctx);

src/core/hle/service/fatal/fatal_p.cpp

@@ -9,6 +9,4 @@ namespace Service::Fatal {
 Fatal_P::Fatal_P(std::shared_ptr<Module> module)
     : Module::Interface(std::move(module), "fatal:p") {}
 
-Fatal_P::~Fatal_P() = default;
-
 } // namespace Service::Fatal

src/core/hle/service/fatal/fatal_p.h

@@ -11,7 +11,6 @@ namespace Service::Fatal {
 class Fatal_P final : public Module::Interface {
 public:
     explicit Fatal_P(std::shared_ptr<Module> module);
-    ~Fatal_P() override;
 };
 
 } // namespace Service::Fatal

src/core/hle/service/fatal/fatal_u.cpp

@@ -15,6 +15,4 @@ Fatal_U::Fatal_U(std::shared_ptr<Module> module) : Module::Interface(std::move(m
     RegisterHandlers(functions);
 }
 
-Fatal_U::~Fatal_U() = default;
-
 } // namespace Service::Fatal

src/core/hle/service/fatal/fatal_u.h

@@ -11,7 +11,6 @@ namespace Service::Fatal {
 class Fatal_U final : public Module::Interface {
 public:
     explicit Fatal_U(std::shared_ptr<Module> module);
-    ~Fatal_U() override;
 };
 
 } // namespace Service::Fatal

src/core/hle/service/filesystem/filesystem.cpp

@@ -40,8 +40,6 @@ static FileSys::VirtualDir GetDirectoryRelativeWrapped(FileSys::VirtualDir base,
 VfsDirectoryServiceWrapper::VfsDirectoryServiceWrapper(FileSys::VirtualDir backing_)
     : backing(std::move(backing_)) {}
 
-VfsDirectoryServiceWrapper::~VfsDirectoryServiceWrapper() = default;
-
 std::string VfsDirectoryServiceWrapper::GetName() const {
     return backing->GetName();
 }