From 41ee792f95d674f281a956d9e65518234efb8f5a Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Tue, 22 Dec 2020 10:02:23 +0300 Subject: [PATCH] MSVC: remove MemLeak build support There are better memleak detection tools. 1) Requires to guard placement new and external libs 2) Doesn't work thoroughly --- Utilities/JIT.h | 2 - Utilities/rXml.cpp | 5 +-- asmjitsrc/asmjit.vcxproj | 8 ---- rpcs3.sln | 38 ------------------ rpcs3/Emu/CPU/CPUTranslator.h | 2 - rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp | 2 - rpcs3/Emu/Cell/PPUThread.cpp | 2 - rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp | 2 - rpcs3/Emu/RSX/VK/VulkanAPI.h | 2 - rpcs3/GLGSRender.vcxproj | 8 ---- rpcs3/Loader/TROPUSR.cpp | 2 - rpcs3/OpenAL.vcxproj | 8 ---- rpcs3/VKGSRender.vcxproj | 8 ---- rpcs3/XAudio.vcxproj | 8 ---- rpcs3/define_new_memleakdetect.h | 6 --- rpcs3/emucore.vcxproj | 52 ++++--------------------- rpcs3/emucore.vcxproj.filters | 6 --- rpcs3/restore_new.h | 5 --- rpcs3/stdafx.h | 11 ------ rpcs3_memleak.props | 12 ------ 20 files changed, 8 insertions(+), 181 deletions(-) delete mode 100644 rpcs3/define_new_memleakdetect.h delete mode 100644 rpcs3/restore_new.h delete mode 100644 rpcs3_memleak.props diff --git a/Utilities/JIT.h b/Utilities/JIT.h index 69ade93296..e5eb622841 100644 --- a/Utilities/JIT.h +++ b/Utilities/JIT.h @@ -170,7 +170,6 @@ inline FT build_function_asm(F&& builder) #include "util/types.hpp" #include "mutex.h" -#include "restore_new.h" #ifdef _MSC_VER #pragma warning(push, 0) #else @@ -187,7 +186,6 @@ inline FT build_function_asm(F&& builder) #else #pragma GCC diagnostic pop #endif -#include "define_new_memleakdetect.h" // Temporary compiler interface class jit_compiler final diff --git a/Utilities/rXml.cpp b/Utilities/rXml.cpp index 3505d1b056..6955d16788 100644 --- a/Utilities/rXml.cpp +++ b/Utilities/rXml.cpp @@ -1,7 +1,5 @@ #include "stdafx.h" -#include "restore_new.h" #include "Utilities/rXml.h" -#include "define_new_memleakdetect.h" rXmlNode::rXmlNode() : handle() { @@ -54,7 +52,7 @@ std::string rXmlNode::GetAttribute(const std::string &name) std::string rXmlNode::GetNodeContent() { - return handle.text().get(); + return handle.text().get(); } rXmlDocument::rXmlDocument() : handle() @@ -70,4 +68,3 @@ std::shared_ptr rXmlDocument::GetRoot() { return std::make_shared(handle.root()); } - diff --git a/asmjitsrc/asmjit.vcxproj b/asmjitsrc/asmjit.vcxproj index f8b94cef58..9de1f2f544 100644 --- a/asmjitsrc/asmjit.vcxproj +++ b/asmjitsrc/asmjit.vcxproj @@ -5,10 +5,6 @@ Debug - LLVM x64 - - Debug - MemLeak - x64 - Debug x64 @@ -108,10 +104,6 @@ - - - - diff --git a/rpcs3.sln b/rpcs3.sln index 03715db867..d717066556 100644 --- a/rpcs3.sln +++ b/rpcs3.sln @@ -98,7 +98,6 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug - LLVM|x64 = Debug - LLVM|x64 - Debug - MemLeak|x64 = Debug - MemLeak|x64 Debug|x64 = Debug|x64 Release - LLVM|x64 = Release - LLVM|x64 Release|x64 = Release|x64 @@ -106,8 +105,6 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {AC40FF01-426E-4838-A317-66354CEFAE88}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64 {AC40FF01-426E-4838-A317-66354CEFAE88}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64 - {AC40FF01-426E-4838-A317-66354CEFAE88}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64 - {AC40FF01-426E-4838-A317-66354CEFAE88}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64 {AC40FF01-426E-4838-A317-66354CEFAE88}.Debug|x64.ActiveCfg = Debug|x64 {AC40FF01-426E-4838-A317-66354CEFAE88}.Debug|x64.Build.0 = Debug|x64 {AC40FF01-426E-4838-A317-66354CEFAE88}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64 @@ -116,8 +113,6 @@ Global {AC40FF01-426E-4838-A317-66354CEFAE88}.Release|x64.Build.0 = Release|x64 {C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64 {C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64 - {C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64 - {C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64 {C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug|x64.ActiveCfg = Debug|x64 {C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug|x64.Build.0 = Debug|x64 {C4A10229-4712-4BD2-B63E-50D93C67A038}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64 @@ -125,14 +120,11 @@ Global {C4A10229-4712-4BD2-B63E-50D93C67A038}.Release|x64.ActiveCfg = Release|x64 {C4A10229-4712-4BD2-B63E-50D93C67A038}.Release|x64.Build.0 = Release|x64 {8BC303AB-25BE-4276-8E57-73F171B2D672}.Debug - LLVM|x64.ActiveCfg = Debug|x64 - {8BC303AB-25BE-4276-8E57-73F171B2D672}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 {8BC303AB-25BE-4276-8E57-73F171B2D672}.Debug|x64.ActiveCfg = Debug|x64 {8BC303AB-25BE-4276-8E57-73F171B2D672}.Release - LLVM|x64.ActiveCfg = Release|x64 {8BC303AB-25BE-4276-8E57-73F171B2D672}.Release|x64.ActiveCfg = Release|x64 {3384223A-6D97-4799-9862-359F85312892}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64 {3384223A-6D97-4799-9862-359F85312892}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64 - {3384223A-6D97-4799-9862-359F85312892}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64 - {3384223A-6D97-4799-9862-359F85312892}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64 {3384223A-6D97-4799-9862-359F85312892}.Debug|x64.ActiveCfg = Debug|x64 {3384223A-6D97-4799-9862-359F85312892}.Debug|x64.Build.0 = Debug|x64 {3384223A-6D97-4799-9862-359F85312892}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64 @@ -141,8 +133,6 @@ Global {3384223A-6D97-4799-9862-359F85312892}.Release|x64.Build.0 = Release|x64 {78CB2F39-B809-4A06-8329-8C0A19119D3D}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64 {78CB2F39-B809-4A06-8329-8C0A19119D3D}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64 - {78CB2F39-B809-4A06-8329-8C0A19119D3D}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64 - {78CB2F39-B809-4A06-8329-8C0A19119D3D}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64 {78CB2F39-B809-4A06-8329-8C0A19119D3D}.Debug|x64.ActiveCfg = Debug|x64 {78CB2F39-B809-4A06-8329-8C0A19119D3D}.Debug|x64.Build.0 = Debug|x64 {78CB2F39-B809-4A06-8329-8C0A19119D3D}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64 @@ -151,8 +141,6 @@ Global {78CB2F39-B809-4A06-8329-8C0A19119D3D}.Release|x64.Build.0 = Release|x64 {30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64 {30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64 - {30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64 - {30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64 {30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Debug|x64.ActiveCfg = Debug|x64 {30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Debug|x64.Build.0 = Debug|x64 {30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64 @@ -160,8 +148,6 @@ Global {30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Release|x64.ActiveCfg = Release|x64 {30A05C4D-F5FD-421C-A864-17A64BDEAA75}.Release|x64.Build.0 = Release|x64 {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug - LLVM|x64.ActiveCfg = Release|x64 - {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug - MemLeak|x64.ActiveCfg = Release|x64 - {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug - MemLeak|x64.Build.0 = Release|x64 {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|x64.ActiveCfg = Release|x64 {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|x64.Build.0 = Release|x64 {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release - LLVM|x64.ActiveCfg = Release|x64 @@ -170,8 +156,6 @@ Global {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|x64.Build.0 = Release|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug - LLVM|x64.ActiveCfg = Debug Library|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug - LLVM|x64.Build.0 = Debug Library|x64 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug - MemLeak|x64.ActiveCfg = Debug Library|x64 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug - MemLeak|x64.Build.0 = Debug Library|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.ActiveCfg = Debug Library|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.Build.0 = Debug Library|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release - LLVM|x64.ActiveCfg = Release Library|x64 @@ -180,8 +164,6 @@ Global {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.Build.0 = Release Library|x64 {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug - LLVM|x64.ActiveCfg = Debug|x64 {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug - LLVM|x64.Build.0 = Debug|x64 - {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 - {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug - MemLeak|x64.Build.0 = Debug|x64 {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x64.ActiveCfg = Debug|x64 {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x64.Build.0 = Debug|x64 {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release - LLVM|x64.ActiveCfg = Release|x64 @@ -189,14 +171,11 @@ Global {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x64.ActiveCfg = Release|x64 {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x64.Build.0 = Release|x64 {8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Debug - LLVM|x64.ActiveCfg = Debug|x64 - {8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 {8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Debug|x64.ActiveCfg = Debug|x64 {8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Release - LLVM|x64.ActiveCfg = Release|x64 {8F85B6CC-250F-4ACA-A617-E820A74E3E3C}.Release|x64.ActiveCfg = Release|x64 {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64 {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64 - {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64 - {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64 {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug|x64.ActiveCfg = Debug|x64 {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Debug|x64.Build.0 = Debug|x64 {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64 @@ -205,8 +184,6 @@ Global {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}.Release|x64.Build.0 = Release|x64 {FDC361C5-7734-493B-8CFB-037308B35122}.Debug - LLVM|x64.ActiveCfg = Debug|x64 {FDC361C5-7734-493B-8CFB-037308B35122}.Debug - LLVM|x64.Build.0 = Debug|x64 - {FDC361C5-7734-493B-8CFB-037308B35122}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 - {FDC361C5-7734-493B-8CFB-037308B35122}.Debug - MemLeak|x64.Build.0 = Debug|x64 {FDC361C5-7734-493B-8CFB-037308B35122}.Debug|x64.ActiveCfg = Debug|x64 {FDC361C5-7734-493B-8CFB-037308B35122}.Debug|x64.Build.0 = Debug|x64 {FDC361C5-7734-493B-8CFB-037308B35122}.Release - LLVM|x64.ActiveCfg = Release|x64 @@ -215,8 +192,6 @@ Global {FDC361C5-7734-493B-8CFB-037308B35122}.Release|x64.Build.0 = Release|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|x64.Build.0 = Debug|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.ActiveCfg = Debug|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.Build.0 = Debug|x64 {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64 @@ -225,8 +200,6 @@ Global {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.Build.0 = Release|x64 {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug - LLVM|x64.ActiveCfg = Debug|x64 {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug - LLVM|x64.Build.0 = Debug|x64 - {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 - {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug - MemLeak|x64.Build.0 = Debug|x64 {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug|x64.ActiveCfg = Debug|x64 {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug|x64.Build.0 = Debug|x64 {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Release - LLVM|x64.ActiveCfg = Release|x64 @@ -235,8 +208,6 @@ Global {A107C21C-418A-4697-BB10-20C3AA60E2E4}.Release|x64.Build.0 = Release|x64 {939FE206-1182-ABC3-1234-FEAB88E98404}.Debug - LLVM|x64.ActiveCfg = Debug|x64 {939FE206-1182-ABC3-1234-FEAB88E98404}.Debug - LLVM|x64.Build.0 = Debug|x64 - {939FE206-1182-ABC3-1234-FEAB88E98404}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 - {939FE206-1182-ABC3-1234-FEAB88E98404}.Debug - MemLeak|x64.Build.0 = Debug|x64 {939FE206-1182-ABC3-1234-FEAB88E98404}.Debug|x64.ActiveCfg = Debug|x64 {939FE206-1182-ABC3-1234-FEAB88E98404}.Debug|x64.Build.0 = Debug|x64 {939FE206-1182-ABC3-1234-FEAB88E98404}.Release - LLVM|x64.ActiveCfg = Release|x64 @@ -245,8 +216,6 @@ Global {939FE206-1182-ABC3-1234-FEAB88E98404}.Release|x64.Build.0 = Release|x64 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug - LLVM|x64.ActiveCfg = Debug|x64 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug - LLVM|x64.Build.0 = Debug|x64 - {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 - {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug - MemLeak|x64.Build.0 = Debug|x64 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.Build.0 = Debug|x64 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release - LLVM|x64.ActiveCfg = Release|x64 @@ -255,8 +224,6 @@ Global {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64 {5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Debug - LLVM|x64.ActiveCfg = Debug|x64 {5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Debug - LLVM|x64.Build.0 = Debug|x64 - {5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 - {5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Debug - MemLeak|x64.Build.0 = Debug|x64 {5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Debug|x64.ActiveCfg = Debug|x64 {5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Debug|x64.Build.0 = Debug|x64 {5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Release - LLVM|x64.ActiveCfg = Release|x64 @@ -265,8 +232,6 @@ Global {5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Release|x64.Build.0 = Release|x64 {73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug - LLVM|x64.ActiveCfg = Debug|x64 {73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug - LLVM|x64.Build.0 = Debug|x64 - {73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 - {73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug - MemLeak|x64.Build.0 = Debug|x64 {73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.ActiveCfg = Debug|x64 {73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.Build.0 = Debug|x64 {73973223-5EE8-41CA-8E88-1D60E89A237B}.Release - LLVM|x64.ActiveCfg = Release|x64 @@ -275,8 +240,6 @@ Global {73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|x64.Build.0 = Release|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 - {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug - MemLeak|x64.Build.0 = Debug|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug|x64.ActiveCfg = Debug|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Debug|x64.Build.0 = Debug|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64 @@ -284,7 +247,6 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release|x64.ActiveCfg = Release|x64 {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}.Release|x64.Build.0 = Release|x64 {4CBD3DDD-5555-49A4-A44D-DD3D8CB516A1}.Debug - LLVM|x64.ActiveCfg = Debug|x64 - {4CBD3DDD-5555-49A4-A44D-DD3D8CB516A1}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 {4CBD3DDD-5555-49A4-A44D-DD3D8CB516A1}.Debug|x64.ActiveCfg = Debug|x64 {4CBD3DDD-5555-49A4-A44D-DD3D8CB516A1}.Release - LLVM|x64.ActiveCfg = Release|x64 {4CBD3DDD-5555-49A4-A44D-DD3D8CB516A1}.Release|x64.ActiveCfg = Release|x64 diff --git a/rpcs3/Emu/CPU/CPUTranslator.h b/rpcs3/Emu/CPU/CPUTranslator.h index a117a8dc24..a44d7ef154 100644 --- a/rpcs3/Emu/CPU/CPUTranslator.h +++ b/rpcs3/Emu/CPU/CPUTranslator.h @@ -2,7 +2,6 @@ #ifdef LLVM_AVAILABLE -#include "restore_new.h" #ifdef _MSC_VER #pragma warning(push, 0) #else @@ -22,7 +21,6 @@ #else #pragma GCC diagnostic pop #endif -#include "define_new_memleakdetect.h" #include "util/types.hpp" #include "Utilities/StrFmt.h" diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp b/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp index e1a4e66a32..36932536c1 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp @@ -4,9 +4,7 @@ #include "Emu/IdManager.h" #include "Emu/Cell/PPUModule.h" -#include "restore_new.h" #include "Utilities/rXml.h" -#include "define_new_memleakdetect.h" #include "Loader/TRP.h" #include "Loader/TROPUSR.h" diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index f1b3e1e45e..301f6c14f0 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -18,7 +18,6 @@ #include "Emu/GDB.h" #ifdef LLVM_AVAILABLE -#include "restore_new.h" #ifdef _MSC_VER #pragma warning(push, 0) #else @@ -55,7 +54,6 @@ #else #pragma GCC diagnostic pop #endif -#include "define_new_memleakdetect.h" #include "PPUTranslator.h" #endif diff --git a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp b/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp index f23de3b989..203702f1ad 100644 --- a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp +++ b/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp @@ -9,9 +9,7 @@ #pragma GCC diagnostic ignored "-Wextra" #pragma GCC diagnostic ignored "-Wold-style-cast" #endif -#include "restore_new.h" #include "SPIRV/GlslangToSpv.h" -#include "define_new_memleakdetect.h" #include "spirv-tools/optimizer.hpp" #ifdef _MSC_VER #pragma warning(pop) diff --git a/rpcs3/Emu/RSX/VK/VulkanAPI.h b/rpcs3/Emu/RSX/VK/VulkanAPI.h index 8c5d7c5849..fa2ac2953c 100644 --- a/rpcs3/Emu/RSX/VK/VulkanAPI.h +++ b/rpcs3/Emu/RSX/VK/VulkanAPI.h @@ -8,8 +8,6 @@ #define VK_USE_PLATFORM_XLIB_KHR #endif -#include "restore_new.h" #include #include -#include "define_new_memleakdetect.h" #include "util/types.hpp" diff --git a/rpcs3/GLGSRender.vcxproj b/rpcs3/GLGSRender.vcxproj index e2ae2e13ad..8e726f0323 100644 --- a/rpcs3/GLGSRender.vcxproj +++ b/rpcs3/GLGSRender.vcxproj @@ -5,10 +5,6 @@ Debug - LLVM x64 - - Debug - MemLeak - x64 - Debug x64 @@ -48,10 +44,6 @@ - - - - diff --git a/rpcs3/Loader/TROPUSR.cpp b/rpcs3/Loader/TROPUSR.cpp index aafc856189..298af4db06 100644 --- a/rpcs3/Loader/TROPUSR.cpp +++ b/rpcs3/Loader/TROPUSR.cpp @@ -1,7 +1,5 @@ #include "stdafx.h" -#include "restore_new.h" #include "Utilities/rXml.h" -#include "define_new_memleakdetect.h" #include "Emu/VFS.h" #include "TROPUSR.h" diff --git a/rpcs3/OpenAL.vcxproj b/rpcs3/OpenAL.vcxproj index acbbc65f7a..4525cb4bbb 100644 --- a/rpcs3/OpenAL.vcxproj +++ b/rpcs3/OpenAL.vcxproj @@ -5,10 +5,6 @@ Debug - LLVM x64 - - Debug - MemLeak - x64 - Debug x64 @@ -49,10 +45,6 @@ - - - - diff --git a/rpcs3/VKGSRender.vcxproj b/rpcs3/VKGSRender.vcxproj index be1582e34e..74c4a14543 100644 --- a/rpcs3/VKGSRender.vcxproj +++ b/rpcs3/VKGSRender.vcxproj @@ -5,10 +5,6 @@ Debug - LLVM x64 - - Debug - MemLeak - x64 - Debug x64 @@ -102,10 +98,6 @@ - - - - diff --git a/rpcs3/XAudio.vcxproj b/rpcs3/XAudio.vcxproj index aa387bd815..1b1020db98 100644 --- a/rpcs3/XAudio.vcxproj +++ b/rpcs3/XAudio.vcxproj @@ -5,10 +5,6 @@ Debug - LLVM x64 - - Debug - MemLeak - x64 - Debug x64 @@ -48,10 +44,6 @@ - - - - diff --git a/rpcs3/define_new_memleakdetect.h b/rpcs3/define_new_memleakdetect.h deleted file mode 100644 index d331ab3a24..0000000000 --- a/rpcs3/define_new_memleakdetect.h +++ /dev/null @@ -1,6 +0,0 @@ -//Override the new operator to use the memory leak detection from visual studio -//Does not work with placement new -#if defined(MSVC_CRT_MEMLEAK_DETECTION) && defined(_DEBUG) && defined(DBG_NEW) - #pragma push_macro("new") - #define new DBG_NEW -#endif diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index 61d5e8e1f9..14251f20a7 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -5,10 +5,6 @@ Debug - LLVM x64 - - Debug - MemLeak - x64 - Debug x64 @@ -46,10 +42,6 @@ - - - - @@ -75,25 +67,13 @@ - true - true - true - true - true + true - true - true - true - true - true + true - true - true - true - true - true + true @@ -170,11 +150,7 @@ - NotUsing - NotUsing - NotUsing - NotUsing - NotUsing + NotUsing @@ -454,25 +430,13 @@ - true - true - true - true - true + true - true - true - true - true - true + true - true - true - true - true - true + true @@ -558,7 +522,6 @@ - @@ -767,7 +730,6 @@ - diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters index 5cf418f088..ebb8cdbae6 100644 --- a/rpcs3/emucore.vcxproj.filters +++ b/rpcs3/emucore.vcxproj.filters @@ -1135,12 +1135,6 @@ Emu\Memory - - Header Files - - - Header Files - Crypto diff --git a/rpcs3/restore_new.h b/rpcs3/restore_new.h deleted file mode 100644 index 592927c024..0000000000 --- a/rpcs3/restore_new.h +++ /dev/null @@ -1,5 +0,0 @@ -//Restore the new operator if previously saved before overriding -//Allow the use of placement new -#if defined(MSVC_CRT_MEMLEAK_DETECTION) && defined(_DEBUG) && defined(DBG_NEW) - #pragma pop_macro("new") -#endif diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index 17e437cc32..f62cabae2e 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -1,18 +1,7 @@ #pragma once // No BOM and only basic ASCII in this header, or a neko will die -#ifdef MSVC_CRT_MEMLEAK_DETECTION - #define _CRTDBG_MAP_ALLOC - #include - #include -#endif - #define NOMINMAX -#if defined(MSVC_CRT_MEMLEAK_DETECTION) && defined(_DEBUG) && !defined(DBG_NEW) - #define DBG_NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ ) - #include "define_new_memleakdetect.h" -#endif - #include "util/types.hpp" #include "util/atomic.hpp" #include "util/endian.hpp" diff --git a/rpcs3_memleak.props b/rpcs3_memleak.props deleted file mode 100644 index f26f6fc5b7..0000000000 --- a/rpcs3_memleak.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - MSVC_CRT_MEMLEAK_DETECTION;%(PreprocessorDefinitions) - - - - \ No newline at end of file