Various miscelaneous changes (#6496)

src/core/arm/dyncom/arm_dyncom_interpreter.cpp

@@ -5,7 +5,6 @@
 #define CITRA_IGNORE_EXIT(x)
 
 #include <algorithm>
-#include <cinttypes>
 #include <cstdio>
 #include "common/common_types.h"
 #include "common/logging/log.h"

src/core/arm/skyeye_common/vfp/vfp_helper.h

@@ -32,7 +32,6 @@
 
 #pragma once
 
-#include <cstdio>
 #include "common/common_types.h"
 #include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/vfp/asm_vfp.h"

src/core/core.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <fstream>
 #include <memory>
 #include <stdexcept>
 #include <utility>
@@ -377,6 +376,7 @@ System::ResultStatus System::Init(Frontend::EmuWindow& emu_window,
         *memory, *timing, [this] { PrepareReschedule(); }, system_mode, num_cores, n3ds_mode);
 
     exclusive_monitor = MakeExclusiveMonitor(*memory, num_cores);
+    cpu_cores.reserve(num_cores);
     if (Settings::values.use_cpu_jit) {
 #if CITRA_ARCH(x86_64) || CITRA_ARCH(arm64)
         for (u32 i = 0; i < num_cores; ++i) {

src/core/core_timing.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include <cinttypes>
 #include <tuple>
 #include "common/assert.h"
 #include "common/logging/log.h"

src/core/dumping/ffmpeg_backend.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <unordered_set>
+#include <unordered_map>
 #include "common/assert.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"

src/core/file_sys/archive_ncch.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include <cinttypes>
 #include <memory>
 #include <utility>
 #include <vector>

src/core/file_sys/archive_selfncch.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include <array>
-#include <cinttypes>
 #include "common/archives.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"

src/core/file_sys/cia_container.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <cinttypes>
 #include <cryptopp/sha.h>
 #include "common/alignment.h"
 #include "common/file_util.h"

src/core/file_sys/disk_archive.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include <cstdio>
 #include <memory>
 #include "common/archives.h"
 #include "common/common_types.h"

src/core/file_sys/ncch_container.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <cinttypes>
 #include <cstring>
 #include <memory>
 #include <cryptopp/aes.h>

src/core/file_sys/plugin_3gx.cpp

@@ -112,6 +112,7 @@ Loader::ResultStatus FileSys::Plugin3GXLoader::Load(
                          header.targets.count * sizeof(u32))) {
             return Loader::ResultStatus::Error;
         }
+        compatible_TID.reserve(header.targets.count); // compatible_TID should be empty right now
         for (u32 i = 0; i < u32(header.targets.count); i++) {
             compatible_TID.push_back(
                 u32_le(*reinterpret_cast<u32*>(raw_TID_data.data() + i * sizeof(u32))));

src/core/file_sys/title_metadata.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <cinttypes>
 #include <cryptopp/sha.h>
 #include "common/alignment.h"
 #include "common/file_util.h"

src/core/frontend/applets/swkbd.h

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <unordered_map>
 #include <utility>
 #include <vector>
 #include "common/assert.h"

src/core/frontend/framebuffer_layout.h

@@ -5,7 +5,10 @@
 #pragma once
 
 #include "common/math_util.h"
-#include "common/settings.h"
+
+namespace Settings {
+enum class LayoutOption : u32;
+}
 
 namespace Layout {
 

src/core/gdbstub/gdbstub.cpp

@@ -6,7 +6,6 @@
 
 #include <algorithm>
 #include <atomic>
-#include <climits>
 #include <csignal>
 #include <cstdarg>
 #include <cstdio>

src/core/hle/applets/applet.cpp

@@ -18,23 +18,6 @@
 #include "core/hle/applets/swkbd.h"
 #include "core/hle/result.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Specializes std::hash for AppletId, so that we can use it in std::unordered_map.
-// Workaround for libstdc++ bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60970
-namespace std {
-template <>
-struct hash<Service::APT::AppletId> {
-    typedef Service::APT::AppletId argument_type;
-    typedef std::size_t result_type;
-
-    result_type operator()(const argument_type& id_code) const {
-        typedef std::underlying_type<argument_type>::type Type;
-        return std::hash<Type>()(static_cast<Type>(id_code));
-    }
-};
-} // namespace std
-
 namespace HLE::Applets {
 
 static std::unordered_map<Service::APT::AppletId, std::shared_ptr<Applet>> applets;

src/core/hle/kernel/event.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include <map>
 #include <vector>
 #include "common/archives.h"
 #include "common/assert.h"

src/core/hle/kernel/memory.cpp

@@ -3,8 +3,6 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include <cinttypes>
-#include <map>
 #include <memory>
 #include <utility>
 #include <vector>

src/core/hle/kernel/mutex.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <map>
 #include <vector>
 #include "common/archives.h"
 #include "common/assert.h"

src/core/hle/kernel/svc.cpp

@@ -4,8 +4,6 @@
 
 #include <algorithm>
 #include <array>
-#include <cinttypes>
-#include <map>
 #include <fmt/format.h>
 #include "common/logging/log.h"
 #include "common/microprofile.h"

src/core/hle/kernel/thread.cpp

@@ -4,7 +4,6 @@
 
 #include <algorithm>
 #include <list>
-#include <unordered_map>
 #include <vector>
 #include <boost/serialization/string.hpp>
 #include "common/archives.h"

src/core/hle/kernel/timer.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <cinttypes>
-#include <unordered_map>
 #include "common/archives.h"
 #include "common/assert.h"
 #include "common/logging/log.h"

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

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include <cinttypes>
 #include <cstddef>
 #include <cstring>
 #include <cryptopp/aes.h>

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

@@ -14,6 +14,7 @@
 #include <boost/serialization/vector.hpp>
 #include "common/common_types.h"
 #include "common/construct.h"
+#include "common/swap.h"
 #include "core/file_sys/cia_container.h"
 #include "core/file_sys/file_backend.h"
 #include "core/global.h"

src/core/hle/service/apt/ns.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <cinttypes>
 #include "core/core.h"
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/apt/ns.h"

src/core/hle/service/apt/ns.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "common/common_types.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/service/fs/archive.h"
 #include "core/hle/service/service.h"

src/core/hle/service/cfg/cfg.cpp

@@ -313,7 +313,7 @@ void Module::Interface::GetRegionCanadaUSA(Kernel::HLERequestContext& ctx) {
 void Module::Interface::GetSystemModel(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp(ctx, 0x05, 0, 0);
     IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
-    u32 data;
+    u32 data{};
 
     // TODO(Subv): Find out the correct error codes
     rb.Push(cfg->GetConfigInfoBlock(ConsoleModelBlockID, 4, 0x8, reinterpret_cast<u8*>(&data)));
@@ -879,13 +879,13 @@ ResultCode Module::SetConsoleUniqueId(u32 random_number, u64 console_id) {
 }
 
 u64 Module::GetConsoleUniqueId() {
-    u64_le console_id_le;
+    u64_le console_id_le{};
     GetConfigInfoBlock(ConsoleUniqueID2BlockID, sizeof(console_id_le), 0xE, &console_id_le);
     return console_id_le;
 }
 
 EULAVersion Module::GetEULAVersion() {
-    u32_le data;
+    u32_le data{};
     GetConfigInfoBlock(EULAVersionBlockID, sizeof(data), 0xE, &data);
     EULAVersion version;
     version.minor = data & 0xFF;

src/core/hle/service/fs/archive.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include <cinttypes>
 #include <cstddef>
 #include <memory>
 #include <system_error>

src/core/hle/service/fs/fs_user.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <cinttypes>
 #include "common/archives.h"
 #include "common/assert.h"
 #include "common/common_types.h"

src/core/hle/service/http_c.cpp

@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <atomic>
+#include <unordered_map>
 #include <cryptopp/aes.h>
 #include <cryptopp/modes.h>
 #include "common/archives.h"

src/core/hle/service/ptm/ptm.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <cinttypes>
 #include "common/archives.h"
 #include "common/common_paths.h"
 #include "common/file_util.h"

src/core/hle/service/soc_u.cpp

@@ -5,6 +5,7 @@
 #include <algorithm>
 #include <cstring>
 #include <type_traits>
+#include <unordered_map>
 #include <vector>
 #include "common/archives.h"
 #include "common/assert.h"

src/core/hw/aes/key.cpp

@@ -4,6 +4,7 @@
 
 #include <algorithm>
 #include <exception>
+#include <fstream>
 #include <optional>
 #include <sstream>
 #include <boost/iostreams/device/file_descriptor.hpp>

src/core/loader/ncch.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include <cinttypes>
 #include <codecvt>
 #include <cstring>
 #include <locale>

src/core/savestate.cpp

@@ -67,6 +67,7 @@ static bool ValidateSaveState(const CSTHeader& header, SaveStateInfo& info, u64
 
 std::vector<SaveStateInfo> ListSaveStates(u64 program_id) {
     std::vector<SaveStateInfo> result;
+    result.reserve(SaveStateSlotCount);
     for (u32 slot = 1; slot <= SaveStateSlotCount; ++slot) {
         const auto path = GetSaveStatePath(program_id, slot);
         if (!FileUtil::Exists(path)) {