Misc: Slim down PCH

cmake/SearchForStuff.cmake

@@ -172,5 +172,5 @@ add_subdirectory(3rdparty/demangler EXCLUDE_FROM_ALL)
 # Deliberately at the end. We don't want to set the flag on third-party projects.
 if(MSVC)
 	# Don't warn about "deprecated" POSIX functions.
-	add_definitions("-D_CRT_SECURE_NO_WARNINGS" "-DCRT_SECURE_NO_DEPRECATE")
+	add_definitions("-D_CRT_NONSTDC_NO_WARNINGS" "-D_CRT_SECURE_NO_WARNINGS" "-DCRT_SECURE_NO_DEPRECATE")
 endif()

common/vsprops/common.props

@@ -23,7 +23,7 @@
     <ClCompile>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__WIN32__;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;WINVER=0x0A00;_WIN32_WINNT=0x0A00;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__WIN32__;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;WINVER=0x0A00;_WIN32_WINNT=0x0A00;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="$(Configuration.Contains(Debug))">PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="$(Configuration.Contains(Devel))">PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="$(Configuration.Contains(Release))">NDEBUG;_SECURE_SCL_=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>

pcsx2-qt/Debugger/CpuWidget.cpp

@@ -28,14 +28,17 @@
 #include "DebugTools/MipsStackWalk.h"
 
 #include "QtUtils.h"
+
+#include "common/Console.h"
+
+#include "demangler/demangler.h"
+
 #include <QtGui/QClipboard>
 #include <QtWidgets/QMessageBox>
 #include <QtConcurrent/QtConcurrent>
 #include <QtCore/QFutureWatcher>
 #include <QtWidgets/QScrollBar>
 
-#include "demangler/demangler.h"
-
 using namespace QtUtils;
 using namespace MipsStackWalk;
 

pcsx2-qt/DisplayWidget.cpp

@@ -23,6 +23,7 @@
 #include "pcsx2/ImGui/ImGuiManager.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 
 #include <QtCore/QDebug>
 #include <QtGui/QGuiApplication>

pcsx2-qt/GameList/GameListWidget.cpp

@@ -25,6 +25,7 @@
 #include "pcsx2/Host.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/StringUtil.h"
 
 #include "fmt/format.h"

pcsx2-qt/Settings/ControllerBindingWidgets.cpp

@@ -23,6 +23,7 @@
 #include <algorithm>
 #include "fmt/format.h"
 
+#include "common/Console.h"
 #include "common/StringUtil.h"
 
 #include "pcsx2/Host.h"

pcsx2-qt/Settings/MemoryCardConvertDialog.cpp

@@ -21,6 +21,7 @@
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QProgressDialog>
 
+#include "common/Console.h"
 #include "common/Path.h"
 #include "common/StringUtil.h"
 

pcsx2-qt/Settings/MemoryCardConvertWorker.cpp

@@ -3,6 +3,7 @@
 
 #include "MemoryCardConvertWorker.h"
 
+#include "common/Console.h"
 #include "common/Path.h"
 #include "common/FileSystem.h"
 

pcsx2/CDVD/BlockdumpFileReader.cpp

@@ -16,7 +16,9 @@
 #include "PrecompiledHeader.h"
 #include "AsyncFileReader.h"
 #include "IsoFileFormats.h"
+
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/FileSystem.h"
 #include "common/Error.h"
 

pcsx2/CDVD/CDVDcommon.cpp

@@ -25,6 +25,7 @@
 #include "IconsFontAwesome5.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/FileSystem.h"
 #include "common/Path.h"
 #include "common/StringUtil.h"

pcsx2/CDVD/CDVDisoReader.cpp

@@ -19,6 +19,7 @@
 #include "CDVD/CDVD.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/Error.h"
 
 #include <cstring>

pcsx2/CDVD/ChdFileReader.cpp

@@ -17,6 +17,7 @@
 #include "ChdFileReader.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/Error.h"
 #include "common/FileSystem.h"
 #include "common/Path.h"

pcsx2/CDVD/CsoFileReader.cpp

@@ -18,6 +18,7 @@
 #include "AsyncFileReader.h"
 #include "CsoFileReader.h"
 
+#include "common/Console.h"
 #include "common/FileSystem.h"
 #include "common/Error.h"
 #include "common/StringUtil.h"

pcsx2/CDVD/GzippedFileReader.cpp

@@ -21,6 +21,7 @@
 #include "Host.h"
 #include "CDVD/zlib_indexed.h"
 
+#include "common/Console.h"
 #include "common/FileSystem.h"
 #include "common/Error.h"
 #include "common/Path.h"

pcsx2/CDVD/InputIsoFile.cpp

@@ -21,6 +21,7 @@
 #include "Host.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/Error.h"
 
 #include "fmt/format.h"

pcsx2/CDVD/IsoReader.cpp

@@ -19,6 +19,7 @@
 #include "CDVD/IsoReader.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/Error.h"
 #include "common/StringUtil.h"
 

pcsx2/CDVD/OutputIsoFile.cpp

@@ -18,6 +18,7 @@
 #include "CDVD/IsoFileFormats.h"
 #include "Host.h"
 
+#include "common/Console.h"
 #include "common/FileSystem.h"
 #include "common/StringUtil.h"
 

pcsx2/DEV9/ATA/HddCreate.cpp

@@ -22,7 +22,6 @@
 
 #if _WIN32
 #include "common/RedtapeWindows.h"
-#include "common/StringUtil.h"
 #include <winioctl.h>
 #include <io.h>
 #elif defined(__POSIX__)
@@ -32,6 +31,9 @@
 #include <fcntl.h>
 #endif
 
+#include "common/Console.h"
+#include "common/StringUtil.h"
+
 void HddCreate::Start()
 {
 	Init();

pcsx2/DEV9/AdapterUtils.cpp

@@ -15,6 +15,12 @@
 
 #include "PrecompiledHeader.h"
 
+#include "AdapterUtils.h"
+
+#include "common/Assertions.h"
+#include "common/Console.h"
+#include "common/StringUtil.h"
+
 #ifdef __POSIX__
 #include <vector>
 #include <fstream>
@@ -23,8 +29,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "common/StringUtil.h"
-
 #ifdef __linux__
 #include <unistd.h>
 #include <sys/ioctl.h>
@@ -34,14 +38,9 @@
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <net/route.h>
-
-#include "common/Assertions.h"
-
 #endif
 #endif
 
-#include "AdapterUtils.h"
-
 using namespace PacketReader;
 using namespace PacketReader::IP;
 

pcsx2/DEV9/InternalServers/DNS_Logger.cpp

@@ -19,6 +19,8 @@
 #include "DEV9/PacketReader/IP/UDP/UDP_Packet.h"
 #include "DEV9/PacketReader/IP/UDP/DNS/DNS_Packet.h"
 
+#include "common/Console.h"
+
 using PacketReader::PayloadPtr;
 using namespace PacketReader::IP;
 using namespace PacketReader::IP::UDP;

pcsx2/DEV9/PacketReader/IP/IP_Packet.cpp

@@ -18,6 +18,8 @@
 #include "IP_Packet.h"
 #include "DEV9/PacketReader/NetLib.h"
 
+#include "common/Console.h"
+
 namespace PacketReader::IP
 {
 	int IP_Packet::GetHeaderLength()

pcsx2/DEV9/PacketReader/IP/TCP/TCP_Packet.cpp

@@ -18,6 +18,8 @@
 #include "TCP_Packet.h"
 #include "DEV9/PacketReader/NetLib.h"
 
+#include "common/Console.h"
+
 namespace PacketReader::IP::TCP
 {
 	//Need flags

pcsx2/DEV9/PacketReader/IP/UDP/DHCP/DHCP_Options.cpp

@@ -18,6 +18,8 @@
 #include "DHCP_Options.h"
 #include "DEV9/PacketReader/NetLib.h"
 
+#include "common/Console.h"
+
 namespace PacketReader::IP::UDP::DHCP
 {
 	DHCPopSubnet::DHCPopSubnet(IP_Address mask)

pcsx2/DEV9/PacketReader/IP/UDP/DHCP/DHCP_Packet.cpp

@@ -17,6 +17,8 @@
 #include "DHCP_Packet.h"
 #include "DEV9/PacketReader/NetLib.h"
 
+#include "common/Console.h"
+
 namespace PacketReader::IP::UDP::DHCP
 {
 	DHCP_Packet::DHCP_Packet(u8* buffer, int bufferSize)

pcsx2/DEV9/PacketReader/IP/UDP/UDP_Packet.cpp

@@ -18,6 +18,8 @@
 #include "UDP_Packet.h"
 #include "DEV9/PacketReader/NetLib.h"
 
+#include "common/Console.h"
+
 namespace PacketReader::IP::UDP
 {
 	UDP_Packet::UDP_Packet(Payload* data)

pcsx2/DEV9/Sessions/UDP_Session/UDP_FixedPort.cpp

@@ -16,6 +16,7 @@
 #include "PrecompiledHeader.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 
 #ifdef __POSIX__
 #define SOCKET_ERROR -1

pcsx2/DEV9/Sessions/UDP_Session/UDP_Session.cpp

@@ -16,6 +16,7 @@
 #include "PrecompiledHeader.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 
 #ifdef __POSIX__
 #define SOCKET_ERROR -1

pcsx2/DebugTools/DebugInterface.cpp

@@ -39,10 +39,6 @@
 R5900DebugInterface r5900Debug;
 R3000DebugInterface r3000Debug;
 
-#ifdef _WIN32
-#define strcasecmp stricmp
-#endif
-
 enum ReferenceIndexType
 {
 	REF_INDEX_PC       = 32,
@@ -74,44 +70,44 @@ public:
 			char reg[8];
 			std::snprintf(reg, std::size(reg), "r%d", i);
 
-			if (strcasecmp(str, reg) == 0 || strcasecmp(str, cpu->getRegisterName(0, i)) == 0)
+			if (StringUtil::Strcasecmp(str, reg) == 0 || StringUtil::Strcasecmp(str, cpu->getRegisterName(0, i)) == 0)
 			{
 				referenceIndex = i;
 				return true;
 			}
 		}
 
-		if (strcasecmp(str, "pc") == 0)
+		if (StringUtil::Strcasecmp(str, "pc") == 0)
 		{
 			referenceIndex = REF_INDEX_PC;
 			return true;
 		}
 
-		if (strcasecmp(str, "hi") == 0)
+		if (StringUtil::Strcasecmp(str, "hi") == 0)
 		{
 			referenceIndex = REF_INDEX_HI;
 			return true;
 		}
 
-		if (strcasecmp(str, "lo") == 0)
+		if (StringUtil::Strcasecmp(str, "lo") == 0)
 		{
 			referenceIndex = REF_INDEX_LO;
 			return true;
 		}
 
-		if (strcasecmp(str, "target") == 0)
+		if (StringUtil::Strcasecmp(str, "target") == 0)
 		{
 			referenceIndex = REF_INDEX_OPTARGET;
 			return true;
 		}
 
-		if (strcasecmp(str, "load") == 0)
+		if (StringUtil::Strcasecmp(str, "load") == 0)
 		{
 			referenceIndex = REF_INDEX_OPLOAD;
 			return true;
 		}
 
-		if (strcasecmp(str, "store") == 0)
+		if (StringUtil::Strcasecmp(str, "store") == 0)
 		{
 			referenceIndex = REF_INDEX_OPSTORE;
 			return true;

pcsx2/DebugTools/SymbolMap.cpp

@@ -1,5 +1,5 @@
 /*  PCSX2 - PS2 Emulator for PCs
- *  Copyright (C) 2002-2014  PCSX2 Dev Team
+ *  Copyright (C) 2002-2023 PCSX2 Dev Team
  *
  *  PCSX2 is free software: you can redistribute it and/or modify it under the terms
  *  of the GNU Lesser General Public License as published by the Free Software Found-
@@ -14,20 +14,17 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "common/FileSystem.h"
 
 #include "SymbolMap.h"
+
+#include "common/FileSystem.h"
+#include "common/StringUtil.h"
+
 #include <algorithm>
 
 SymbolMap R5900SymbolMap;
 SymbolMap R3000SymbolMap;
 
-#ifdef _WIN32
-#define strcasecmp stricmp
-#endif
-
-#define ARRAY_SIZE(x) (sizeof((x)) / sizeof(*(x)))
-
 void SymbolMap::SortSymbols()
 {
 	std::lock_guard<std::recursive_mutex> guard(m_lock);
@@ -76,19 +73,19 @@ bool SymbolMap::LoadNocashSym(const std::string& filename)
 				if (sscanf(s + 1, "%04X", &size) != 1)
 					continue;
 
-				if (strcasecmp(value, ".byt") == 0)
+				if (StringUtil::Strcasecmp(value, ".byt") == 0)
 				{
 					AddData(address, size, DATATYPE_BYTE, 0);
 				}
-				else if (strcasecmp(value, ".wrd") == 0)
+				else if (StringUtil::Strcasecmp(value, ".wrd") == 0)
 				{
 					AddData(address, size, DATATYPE_HALFWORD, 0);
 				}
-				else if (strcasecmp(value, ".dbl") == 0)
+				else if (StringUtil::Strcasecmp(value, ".dbl") == 0)
 				{
 					AddData(address, size, DATATYPE_WORD, 0);
 				}
-				else if (strcasecmp(value, ".asc") == 0)
+				else if (StringUtil::Strcasecmp(value, ".asc") == 0)
 				{
 					AddData(address, size, DATATYPE_ASCII, 0);
 				}

pcsx2/FW.cpp

@@ -16,13 +16,14 @@
 #include "PrecompiledHeader.h"
 #include "IopDma.h"
 #include "R3000A.h"
-#include <stdlib.h>
-#include <string>
-using namespace std;
-
 #include "FW.h"
 
-u8 phyregs[16];
+#include "common/Console.h"
+
+#include <cstdlib>
+#include <string>
+
+static u8 phyregs[16];
 s8* fwregs;
 
 s32 FWopen()

pcsx2/GS/GSCapture.cpp

@@ -25,6 +25,7 @@
 #include "Host.h"
 #include "IconsFontAwesome5.h"
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/BitUtils.h"
 #include "common/DynamicLibrary.h"
 #include "common/Path.h"
@@ -36,7 +37,9 @@
 #include <mutex>
 #include <string>
 
-#ifdef __clang__
+#if defined(_MSC_VER)
+#pragma warning(disable:4996) // warning C4996: 'AVCodecContext::channels': was declared deprecated
+#elif defined (__clang__)
 // We're using deprecated fields because we're targeting multiple ffmpeg versions.
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif

pcsx2/GS/GSLzma.cpp

@@ -16,6 +16,7 @@
 #include "PrecompiledHeader.h"
 
 #include "common/AlignedMalloc.h"
+#include "common/Console.h"
 #include "common/FileSystem.h"
 #include "common/StringUtil.h"
 

pcsx2/GS/GSState.cpp

@@ -19,6 +19,8 @@
 #include "GS/GSGL.h"
 #include "GS/GSPerfMon.h"
 #include "GS/GSUtil.h"
+
+#include "common/Console.h"
 #include "common/BitUtils.h"
 #include "common/Path.h"
 #include "common/StringUtil.h"

pcsx2/GS/Renderers/Common/GSDevice.cpp

@@ -20,6 +20,7 @@
 #include "GS/GS.h"
 #include "Host.h"
 
+#include "common/Console.h"
 #include "common/BitUtils.h"
 #include "common/FileSystem.h"
 #include "common/Path.h"

pcsx2/GS/Renderers/Common/GSTexture.cpp

@@ -17,8 +17,11 @@
 #include "GS/Renderers/Common/GSTexture.h"
 #include "GS/Renderers/Common/GSDevice.h"
 #include "GS/GSPng.h"
+
+#include "common/Console.h"
 #include "common/BitUtils.h"
 #include "common/StringUtil.h"
+
 #include <bit>
 #include <bitset>
 

pcsx2/GS/Renderers/Common/GSVertexTrace.cpp

@@ -18,6 +18,8 @@
 #include "GS/GSUtil.h"
 #include "GS/GSState.h"
 
+#include "common/Console.h"
+
 GSVertexTrace::GSVertexTrace(const GSState* state, bool provoking_vertex_first)
 	: m_state(state)
 {

pcsx2/GS/Renderers/DX11/GSTexture11.cpp

@@ -18,6 +18,7 @@
 #include "GSTexture11.h"
 #include "GS/GSPng.h"
 #include "GS/GSPerfMon.h"
+#include "common/Console.h"
 #include "common/BitUtils.h"
 
 GSTexture11::GSTexture11(wil::com_ptr_nothrow<ID3D11Texture2D> texture, const D3D11_TEXTURE2D_DESC& desc,

pcsx2/GS/Renderers/DX12/GSDevice12.cpp

@@ -26,6 +26,7 @@
 #include "Host.h"
 #include "ShaderCacheVersion.h"
 
+#include "common/Console.h"
 #include "common/BitUtils.h"
 #include "common/ScopedGuard.h"
 #include "common/StringUtil.h"

pcsx2/GS/Renderers/DX12/GSTexture12.cpp

@@ -22,6 +22,7 @@
 #include "GS/GSGL.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/BitUtils.h"
 #include "common/StringUtil.h"
 

pcsx2/GS/Renderers/HW/GSRendererHW.cpp

@@ -20,6 +20,7 @@
 #include "GS/GSPerfMon.h"
 #include "GS/GSUtil.h"
 #include "Host.h"
+#include "common/Console.h"
 #include "common/BitUtils.h"
 #include "common/StringUtil.h"
 #include <bit>

pcsx2/GS/Renderers/HW/GSTextureCache.cpp

@@ -22,6 +22,8 @@
 #include "GS/GSPerfMon.h"
 #include "GS/GSUtil.h"
 #include "GS/GSXXH.h"
+
+#include "common/Console.h"
 #include "common/BitUtils.h"
 #include "common/HashCombine.h"
 

pcsx2/GS/Renderers/HW/GSTextureReplacementLoaders.cpp

@@ -16,6 +16,7 @@
 #include "PrecompiledHeader.h"
 
 #include "common/BitUtils.h"
+#include "common/Console.h"
 #include "common/FileSystem.h"
 #include "common/Path.h"
 #include "common/StringUtil.h"

pcsx2/GS/Renderers/HW/GSTextureReplacements.cpp

@@ -16,6 +16,7 @@
 #include "PrecompiledHeader.h"
 
 #include "common/AlignedMalloc.h"
+#include "common/Console.h"
 #include "common/HashCombine.h"
 #include "common/FileSystem.h"
 #include "common/Path.h"

pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp

@@ -24,6 +24,7 @@
 #include "GS/GSUtil.h"
 #include "Host.h"
 
+#include "common/Console.h"
 #include "common/StringUtil.h"
 
 #include "imgui.h"

pcsx2/GS/Renderers/OpenGL/GSTextureOGL.cpp

@@ -21,6 +21,7 @@
 #include "GS/GSExtra.h"
 #include "GS/GSPerfMon.h"
 #include "GS/GSGL.h"
+#include "common/Console.h"
 #include "common/BitUtils.h"
 #include "common/AlignedMalloc.h"
 #include "common/StringUtil.h"

pcsx2/GS/Renderers/SW/GSDrawScanline.cpp

@@ -19,6 +19,8 @@
 #include "GS/Renderers/SW/GSScanlineEnvironment.h"
 #include "GS/Renderers/SW/GSRasterizer.h"
 
+#include "common/Console.h"
+
 // Comment to disable all dynamic code generation.
 #define ENABLE_JIT_RASTERIZER
 

pcsx2/GS/Renderers/SW/GSDrawScanlineCodeGenerator.cpp

@@ -17,6 +17,9 @@
 #include "GSDrawScanlineCodeGenerator.h"
 #include "GSDrawScanlineCodeGenerator.all.h"
 #include "GSDrawScanline.h"
+
+#include "common/Console.h"
+
 #include <fstream>
 #include <map>
 #include <mutex>

pcsx2/GS/Renderers/SW/GSRasterizer.cpp

@@ -20,10 +20,12 @@
 #include "GS/Renderers/SW/GSDrawScanline.h"
 #include "GS/GSExtra.h"
 #include "PerformanceMetrics.h"
+#include "VMManager.h"
+
 #include "common/AlignedMalloc.h"
+#include "common/Console.h"
 #include "common/General.h"
 #include "common/StringUtil.h"
-#include "VMManager.h"
 
 #define ENABLE_DRAW_STATS 0
 

pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp

@@ -26,6 +26,7 @@
 
 #include "Host.h"
 
+#include "common/Console.h"
 #include "common/BitUtils.h"
 #include "common/Path.h"
 #include "common/ScopedGuard.h"

pcsx2/GS/Renderers/Vulkan/GSTextureVK.cpp

@@ -22,6 +22,7 @@
 #include "GS/Renderers/Vulkan/VKBuilders.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/BitUtils.h"
 
 static constexpr const VkComponentMapping s_identity_swizzle{VK_COMPONENT_SWIZZLE_IDENTITY,

pcsx2/GS/Renderers/Vulkan/VKBuilders.cpp

@@ -18,6 +18,7 @@
 #include "GS/Renderers/Vulkan/VKBuilders.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 
 #include <limits>
 

pcsx2/GameDatabase.cpp

@@ -21,6 +21,7 @@
 #include "IconsFontAwesome5.h"
 #include "vtlb.h"
 
+#include "common/Console.h"
 #include "common/Error.h"
 #include "common/FileSystem.h"
 #include "common/Path.h"

pcsx2/ImGui/ImGuiFullscreen.cpp

@@ -25,6 +25,7 @@
 #include "ImGui/ImGuiFullscreen.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/Easing.h"
 #include "common/Image.h"
 #include "common/LRUCache.h"

pcsx2/Input/InputManager.cpp

@@ -24,6 +24,7 @@
 #include "VMManager.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/StringUtil.h"
 #include "common/Timer.h"
 

pcsx2/MultipartFileReader.cpp

@@ -17,6 +17,7 @@
 #include "AsyncFileReader.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/FileSystem.h"
 #include "common/Error.h"
 #include "common/Path.h"

pcsx2/PINE.cpp

@@ -75,7 +75,7 @@ bool PINEServer::Initialize(int slot)
 	// yes very good windows s/sun/sin/g sure is fine
 	server.sin_family = AF_INET;
 	// localhost only
-	server.sin_addr.s_addr = inet_addr("127.0.0.1");
+	server.sin_addr.s_addr = INADDR_LOOPBACK;
 	server.sin_port = htons(slot);
 
 	if (bind(m_sock, (struct sockaddr*)&server, sizeof(server)) == SOCKET_ERROR)

pcsx2/PrecompiledHeader.h

@@ -1,5 +1,5 @@
 /*  PCSX2 - PS2 Emulator for PCs
- *  Copyright (C) 2002-2010  PCSX2 Dev Team
+ *  Copyright (C) 2002-2023 PCSX2 Dev Team
  *
  *  PCSX2 is free software: you can redistribute it and/or modify it under the terms
  *  of the GNU Lesser General Public License as published by the Free Software Found-
@@ -13,13 +13,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PCSX2_PRECOMPILED_HEADER
+#pragma once
-#define PCSX2_PRECOMPILED_HEADER
 
 // Disable some pointless warnings...
 #ifdef _MSC_VER
 #	pragma warning(disable:4250) //'class' inherits 'method' via dominance
-#	pragma warning(disable:4996) //ignore the stricmp deprecated warning
 #endif
 
 #include "common/Pcsx2Defs.h"
@@ -64,27 +62,3 @@
 // need a full recompile anyway, when modified (etc)
 
 #include "PCSX2Base.h"
-
-#include "common/Console.h"
-#include "common/General.h"
-#include "common/emitter/tools.h"
-
-typedef void FnType_Void();
-typedef FnType_Void* Fnptr_Void;
-
-// --------------------------------------------------------------------------------------
-//  Compiler/OS specific macros and defines
-// --------------------------------------------------------------------------------------
-
-#if defined(_MSC_VER)
-
-#	define strnicmp _strnicmp
-#	define stricmp _stricmp
-
-#else	// must be GCC or Clang
-
-#include <sys/types.h>
-
-#endif
-
-#endif

pcsx2/R3000AOpcodeTables.cpp

@@ -19,6 +19,8 @@
 #include "IopGte.h"
 #include "IopMem.h"
 
+#include "common/Console.h"
+
 // Note: Branch instructions of the Interpreter are defined externally because
 // the recompiler shouldn't be using them (it isn't entirely safe, due to the
 // delay slot and event handling differences between recs and ints)

pcsx2/SIO/Memcard/MemoryCardFile.cpp

@@ -21,6 +21,7 @@
 #include "SIO/Sio.h"
 
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/FileSystem.h"
 #include "common/Path.h"
 #include "common/StringUtil.h"

pcsx2/SIO/Memcard/MemoryCardFolder.cpp

@@ -26,6 +26,7 @@
 #include "Host.h"
 #include "IconsFontAwesome5.h"
 
+#include "common/Console.h"
 #include "common/FileSystem.h"
 #include "common/Path.h"
 #include "common/StringUtil.h"

pcsx2/SIO/Memcard/MemoryCardProtocol.cpp

@@ -21,6 +21,8 @@
 #include "SIO/Sio2.h"
 #include "SIO/Sio0.h"
 
+#include "common/Console.h"
+
 #define MC_LOG_ENABLE 0
 #define MC_LOG if (MC_LOG_ENABLE) DevCon
 

pcsx2/SIO/Pad/Pad.cpp

@@ -27,6 +27,7 @@
 
 #include "VMManager.h"
 #include "common/Assertions.h"
+#include "common/Console.h"
 #include "common/FileSystem.h"
 #include "common/Path.h"
 #include "common/SettingsInterface.h"

pcsx2/SIO/Pad/PadGuitar.cpp

@@ -23,6 +23,8 @@
 
 #include "IconsPromptFont.h"
 
+#include "common/Console.h"
+
 // The generic input bindings on this might seem bizarre, but they are intended to match what DS2 buttons
 // would do what actions, if you played Guitar Hero on a PS2 with a DS2 instead of a controller.
 static const InputBindingInfo s_bindings[] = {

pcsx2/SPU2/Debug.cpp

@@ -18,6 +18,7 @@
 #include "SPU2/Global.h"
 #include "Config.h"
 
+#include "common/Console.h"
 #include "common/FileSystem.h"
 
 #include <cstdarg>

pcsx2/SPU2/Reverb.cpp

@@ -17,6 +17,8 @@
 #include "Global.h"
 #include "GS/GSVector.h"
 
+#include "common/Console.h"
+
 #include <array>
 
 void V_Core::AnalyzeReverbPreset()

pcsx2/SPU2/Wavedump_wav.cpp

@@ -19,6 +19,7 @@
 #include "pcsx2/Config.h"
 #include "fmt/format.h"
 
+#include "common/Console.h"
 #include "common/Path.h"
 #include "common/StringUtil.h"
 #include "common/WAVWriter.h"

pcsx2/SPU2/spu2sys.cpp

@@ -30,6 +30,8 @@
 #include "SPU2/Global.h"
 #include "SPU2/spu2.h"
 
+#include "common/Console.h"
+
 s16 spu2regs[0x010000 / sizeof(s16)];
 s16 _spu2mem[0x200000 / sizeof(s16)];
 

pcsx2/USB/USB.cpp

@@ -22,6 +22,7 @@
 #include "USB/qemu-usb/USBinternal.h"
 #include "USB/qemu-usb/desc.h"
 
+#include "common/Console.h"
 #include "common/SettingsInterface.h"
 #include "common/WindowInfo.h"
 

pcsx2/USB/qemu-usb/core.cpp

@@ -28,6 +28,8 @@
 #include "USB/qemu-usb/qusb.h"
 #include <utility>
 
+#include "common/Console.h"
+
 void usb_pick_speed(USBPort* port)
 {
 	static const int speeds[] = {

pcsx2/USB/qemu-usb/input-keymap-qcode-to-qnum.cpp

@@ -16,6 +16,8 @@
 #include "PrecompiledHeader.h"
 #include "input-keymap.h"
 
+#include <map>
+
 //TODO how much does std::map kill perf if any?
 static const std::map<const QKeyCode, unsigned short> qemu_input_map_qcode_to_qnum = {
 	{Q_KEY_CODE_0, 0xb},                 /* qcode:Q_KEY_CODE_0 (0) -> linux:11 (KEY_0) -> qnum:11 */

pcsx2/USB/qemu-usb/usb-ohci.cpp

@@ -34,6 +34,8 @@
 #include "USB/qemu-usb/USBinternal.h"
 #include "IopMem.h"
 
+#include "common/Console.h"
+
 #define DMA_DIRECTION_TO_DEVICE 0
 #define DMA_DIRECTION_FROM_DEVICE 1
 #define ED_LINK_LIMIT 32

pcsx2/USB/usb-eyetoy/cam-windows.cpp

@@ -15,6 +15,7 @@
 
 #include "PrecompiledHeader.h"
 
+#include "common/Console.h"
 #include "common/StringUtil.h"
 
 #include "jpge.h"

pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.cpp

@@ -22,6 +22,8 @@
 #include "USB/USB.h"
 #include "StateWrapper.h"
 
+#include "common/Console.h"
+
 namespace usb_eyetoy
 {
 	typedef struct EYETOYState

pcsx2/USB/usb-hid/usb-hid.cpp

@@ -34,6 +34,8 @@
 #include "USB/qemu-usb/desc.h"
 #include "USB/usb-hid/usb-hid.h"
 
+#include "common/Console.h"
+
 namespace usb_hid
 {
 	struct UsbHIDState

pcsx2/USB/usb-lightgun/guncon2.cpp

@@ -27,6 +27,7 @@
 #include "USB/usb-lightgun/guncon2.h"
 #include "VMManager.h"
 
+#include "common/Console.h"
 #include "common/StringUtil.h"
 
 #include <tuple>

pcsx2/USB/usb-mic/usb-headset.cpp

@@ -35,6 +35,8 @@
 #include "USB/USB.h"
 #include "StateWrapper.h"
 
+#include "common/Console.h"
+
 #define BUFFER_FRAMES 200
 
 /*

pcsx2/USB/usb-mic/usb-mic-singstar.cpp

@@ -36,6 +36,9 @@
 #include "USB/USB.h"
 #include "Host.h"
 #include "StateWrapper.h"
+
+#include "common/Console.h"
+
 #include "fmt/format.h"
 
 static FILE* file = NULL;

pcsx2/USB/usb-msd/usb-msd.cpp

@@ -8,18 +8,21 @@
  */
 
 #include "PrecompiledHeader.h"
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #include "USB/qemu-usb/qusb.h"
 #include "USB/qemu-usb/desc.h"
 #include "USB/qemu-usb/USBinternal.h"
 #include "USB/usb-msd/usb-msd.h"
 #include "USB/USB.h"
-#include "common/FileSystem.h"
 #include "Host.h"
 #include "StateWrapper.h"
 
+#include "common/Console.h"
+#include "common/FileSystem.h"
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
 #define le32_to_cpu(x) (x)
 #define cpu_to_le32(x) (x)
 

pcsx2/USB/usb-pad/usb-pad-ff.cpp

@@ -17,6 +17,8 @@
 #include "usb-pad.h"
 #include "lg/lg_ff.h"
 
+#include "common/Console.h"
+
 namespace usb_pad
 {
 	static void SetConstantForce(FFDevice* ffdev, int force)

pcsx2/USB/usb-pad/usb-pad.cpp

@@ -21,6 +21,8 @@
 #include "Host.h"
 #include "StateWrapper.h"
 
+#include "common/Console.h"
+
 namespace usb_pad
 {
 	static const USBDescStrings df_desc_strings = {

pcsx2/USB/usb-pad/usb-seamic.cpp

@@ -20,6 +20,8 @@
 #include "USB/usb-mic/usb-mic-singstar.h"
 #include "USB/USB.h"
 
+#include "common/Console.h"
+
 namespace usb_pad
 {
 

pcsx2/USB/usb-printer/usb-printer.cpp

@@ -18,6 +18,7 @@
 #include "USB/qemu-usb/USBinternal.h"
 #include "USB/usb-printer/usb-printer.h"
 #include "USB/USB.h"
+#include "common/Console.h"
 #include "common/FileSystem.h"
 #include "common/Path.h"
 #include "common/StringUtil.h"

pcsx2/VUops.cpp

@@ -4675,15 +4675,15 @@ alignas(16) const FNTYPE PREFIX##_UPPER_OPCODE[64] = { \
 } \
 
 _vuTablesPre(VU0, VU0)
-_vuTablesMess(VU0, Fnptr_Void)
+_vuTablesMess(VU0, FnPtr_VuVoid)
 _vuTablesPost(VU0, VU0)
 
 _vuTablesPre(VU1, VU1)
-_vuTablesMess(VU1, Fnptr_Void)
+_vuTablesMess(VU1, FnPtr_VuVoid)
 _vuTablesPost(VU1, VU1)
 
-_vuRegsTables(VU0, VU0regs, Fnptr_VuRegsN)
+_vuRegsTables(VU0, VU0regs, FnPtr_VuRegsN)
-_vuRegsTables(VU1, VU1regs, Fnptr_VuRegsN)
+_vuRegsTables(VU1, VU1regs, FnPtr_VuRegsN)
 
 
 // --------------------------------------------------------------------------------------

pcsx2/VUops.h

@@ -38,18 +38,18 @@ struct _VURegsNum {
 	int cycles;
 };
 
-typedef void FnType_VuRegsN(_VURegsNum *VUregsn);
+using FnPtr_VuVoid = void (*)();
-typedef FnType_VuRegsN* Fnptr_VuRegsN;
+using FnPtr_VuRegsN = void(*)(_VURegsNum *VUregsn);
 
-alignas(16) extern const Fnptr_Void VU0_LOWER_OPCODE[128];
+alignas(16) extern const FnPtr_VuVoid VU0_LOWER_OPCODE[128];
-alignas(16) extern const Fnptr_Void VU0_UPPER_OPCODE[64];
+alignas(16) extern const FnPtr_VuVoid VU0_UPPER_OPCODE[64];
-alignas(16) extern const Fnptr_VuRegsN VU0regs_LOWER_OPCODE[128];
+alignas(16) extern const FnPtr_VuRegsN VU0regs_LOWER_OPCODE[128];
-alignas(16) extern const Fnptr_VuRegsN VU0regs_UPPER_OPCODE[64];
+alignas(16) extern const FnPtr_VuRegsN VU0regs_UPPER_OPCODE[64];
 
-alignas(16) extern const Fnptr_Void VU1_LOWER_OPCODE[128];
+alignas(16) extern const FnPtr_VuVoid VU1_LOWER_OPCODE[128];
-alignas(16) extern const Fnptr_Void VU1_UPPER_OPCODE[64];
+alignas(16) extern const FnPtr_VuVoid VU1_UPPER_OPCODE[64];
-alignas(16) extern const Fnptr_VuRegsN VU1regs_LOWER_OPCODE[128];
+alignas(16) extern const FnPtr_VuRegsN VU1regs_LOWER_OPCODE[128];
-alignas(16) extern const Fnptr_VuRegsN VU1regs_UPPER_OPCODE[64];
+alignas(16) extern const FnPtr_VuRegsN VU1regs_UPPER_OPCODE[64];
 extern void _vuClearFMAC(VURegs * VU);
 extern void _vuTestPipes(VURegs * VU);
 extern void _vuTestUpperStalls(VURegs * VU, _VURegsNum *VUregsn);

pcsx2/x86/iR3000Atables.cpp

@@ -22,6 +22,8 @@
 #include "IopDma.h"
 #include "IopGte.h"
 
+#include "common/Console.h"
+
 using namespace x86Emitter;
 
 extern int g_psxWriteOk;

pcsx2/x86/ix86-32/iCore.cpp

@@ -22,6 +22,7 @@
 #include "x86/iR3000A.h"
 #include "x86/iR5900.h"
 
+#include "common/Console.h"
 #include "common/emitter/x86emitter.h"
 
 using namespace x86Emitter;

pcsx2/x86/microVU.h

@@ -1,5 +1,5 @@
 /*  PCSX2 - PS2 Emulator for PCs
- *  Copyright (C) 2002-2010  PCSX2 Dev Team
+ *  Copyright (C) 2002-2023 PCSX2 Dev Team
  *
  *  PCSX2 is free software: you can redistribute it and/or modify it under the terms
  *  of the GNU Lesser General Public License as published by the Free Software Found-
@@ -14,11 +14,9 @@
  */
 
 #pragma once
-//#define mVUlogProg // Dumps MicroPrograms to \logs\*.html
-//#define mVUprofileProg // Shows opcode statistics in console
 
-class AsciiFile;
+ //#define mVUlogProg // Dumps MicroPrograms to \logs\*.html
-using namespace x86Emitter;
+//#define mVUprofileProg // Shows opcode statistics in console
 
 #include <deque>
 #include <algorithm>

pcsx2/x86/microVU_Macro.inl

@@ -405,7 +405,7 @@ static void mVUFinishVU0()
 	skipvuidle.SetTarget();
 }
 
-static void TEST_FBRST_RESET(int flagreg, FnType_Void* resetFunct, int vuIndex)
+static void TEST_FBRST_RESET(int flagreg, void(*resetFunct)(), int vuIndex)
 {
 	xTEST(xRegister32(flagreg), (vuIndex) ? 0x200 : 0x002);
 	xForwardJZ8 skip;

tests/ctest/core/GS/swizzle_test_main.cpp

@@ -17,6 +17,7 @@
 #include "pcsx2/GS/GSBlock.h"
 #include "pcsx2/GS/GSClut.h"
 #include "pcsx2/GS/MultiISA.h"
+#include "common/emitter/tools.h"
 #include <gtest/gtest.h>
 #include <string.h>