diff --git a/Source/Core/Common/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp index 08a2aa00ea..6f2aa0b977 100644 --- a/Source/Core/Common/Crypto/ec.cpp +++ b/Source/Core/Common/Crypto/ec.cpp @@ -11,11 +11,6 @@ #include "Common/Random.h" #include "Common/StringUtil.h" -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4505) -#endif - namespace Common::ec { static const u8 square[16] = {0x00, 0x01, 0x04, 0x05, 0x10, 0x11, 0x14, 0x15, @@ -298,7 +293,4 @@ std::array ComputeSharedSecret(const u8* private_key, const u8* public_k std::copy_n(data.Data(), shared_secret.size(), shared_secret.begin()); return shared_secret; } -#ifdef _MSC_VER -#pragma warning(pop) -#endif } // namespace Common::ec diff --git a/Source/Core/Common/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp index c3a8eec6d8..1a59913458 100644 --- a/Source/Core/Common/SDCardUtil.cpp +++ b/Source/Core/Common/SDCardUtil.cpp @@ -49,11 +49,6 @@ #include // for unlink() #endif -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4310) -#endif - namespace Common { // Believe me, you *don't* want to change these constants !! @@ -288,7 +283,3 @@ FailWrite: return false; } } // namespace Common - -#ifdef _MSC_VER -#pragma warning(pop) -#endif diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index c9a966267a..24fe44a5ff 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -163,8 +163,6 @@ add_library(core HW/DSPLLE/DSPHost.cpp HW/DSPLLE/DSPLLE.cpp HW/DSPLLE/DSPLLE.h - HW/DSPLLE/DSPLLEGlobals.cpp - HW/DSPLLE/DSPLLEGlobals.h HW/DSPLLE/DSPSymbols.cpp HW/DSPLLE/DSPSymbols.h HW/DVD/DVDInterface.cpp diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp index 0adb3a305c..07efb5b5ad 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp @@ -24,7 +24,6 @@ #include "Core/DSP/DSPTables.h" #include "Core/DSP/Interpreter/DSPInterpreter.h" #include "Core/DSP/Jit/DSPEmitterBase.h" -#include "Core/HW/DSPLLE/DSPLLEGlobals.h" #include "Core/HW/Memmap.h" #include "Core/Host.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp deleted file mode 100644 index 48950ae40d..0000000000 --- a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright 2008 Dolphin Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "Core/HW/DSPLLE/DSPLLEGlobals.h" - -#include - -#include "Common/CommonTypes.h" -#include "Common/IOFile.h" - -#include "Core/DSP/DSPCore.h" - -namespace DSP -{ -#if PROFILE - -#define PROFILE_MAP_SIZE 0x10000 - -u64 g_profileMap[PROFILE_MAP_SIZE]; -bool g_profile = false; - -void ProfilerStart() -{ - g_profile = true; -} - -void ProfilerAddDelta(int _addr, int _delta) -{ - if (g_profile) - { - g_profileMap[_addr] += _delta; - } -} - -void ProfilerInit() -{ - memset(g_profileMap, 0, sizeof(g_profileMap)); -} - -void ProfilerDump(u64 count) -{ - File::IOFile pFile("DSP_Prof.txt", "wt"); - if (pFile) - { - fprintf(pFile.GetHandle(), "Number of DSP steps: %" PRIu64 "\n\n", count); - for (int i = 0; i < PROFILE_MAP_SIZE; i++) - { - if (g_profileMap[i] > 0) - { - fprintf(pFile.GetHandle(), "0x%04X: %" PRIu64 "\n", i, g_profileMap[i]); - } - } - } -} - -#elif defined(_MSC_VER) - -namespace -{ -char SilenceLNK4221; -}; - -#endif -} // namespace DSP diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h deleted file mode 100644 index a0c2829b8a..0000000000 --- a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2008 Dolphin Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "Common/CommonTypes.h" - -// TODO: Get rid of this file. - -namespace DSP -{ -#define PROFILE 0 - -#if PROFILE -void ProfilerDump(u64 _count); -void ProfilerInit(); -void ProfilerAddDelta(int _addr, int _delta); -void ProfilerStart(); -#endif -} // namespace DSP diff --git a/Source/Core/Core/HW/WiimoteCommon/WiimoteReport.h b/Source/Core/Core/HW/WiimoteCommon/WiimoteReport.h index e28ac217c7..742f877fa2 100644 --- a/Source/Core/Core/HW/WiimoteCommon/WiimoteReport.h +++ b/Source/Core/Core/HW/WiimoteCommon/WiimoteReport.h @@ -10,12 +10,6 @@ #include "Core/HW/WiimoteCommon/WiimoteConstants.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" -#ifdef _MSC_VER -#pragma warning(push) -// Disable warning for zero-sized array: -#pragma warning(disable : 4200) -#endif - namespace WiimoteCommon { #pragma pack(push, 1) @@ -27,7 +21,8 @@ struct OutputReportGeneric union { - u8 data[0]; + // Actual size varies + u8 data[1]; struct { // Enable/disable rumble. (Valid for ALL output reports) @@ -309,7 +304,3 @@ struct AccelCalibrationData } // namespace WiimoteCommon #pragma pack(pop) - -#ifdef _MSC_VER -#pragma warning(pop) -#endif diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp index a8b685e29f..f74b7722a9 100644 --- a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp @@ -53,7 +53,7 @@ void Wiimote::InvokeHandler(H&& handler, const WiimoteCommon::OutputReportGeneri return; } - (this->*handler)(Common::BitCastPtr(rpt.data)); + (this->*handler)(Common::BitCastPtr(&rpt.data[0])); } void Wiimote::EventLinked() diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props index 67c1a2eace..efacf440cd 100644 --- a/Source/Core/DolphinLib.props +++ b/Source/Core/DolphinLib.props @@ -246,7 +246,6 @@ - @@ -825,7 +824,6 @@ -