ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove iMisc.cpp, and move the code to System.cpp/h.

This commit is contained in:
arcum42@gmail.com 2022-04-24 14:18:29 -07:00 committed by refractionpcsx2
parent d552f8dc43
commit d45f34ee8b
9 changed files with 21 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/CMakeLists.txt
View File

@ -1415,7 +1415,6 @@ set(pcsx2x86Sources
x86/iCore.cpp
x86/iFPU.cpp
x86/iFPUd.cpp
x86/iMisc.cpp
x86/iMMI.cpp
x86/iR3000A.cpp
x86/iR3000Atables.cpp

7
pcsx2/Common.h
View File

@ -32,9 +32,4 @@ extern s64 PSXCLK; /* 36.864 Mhz */
#include "DebugTools/Debug.h"
extern wxString ShiftJIS_ConvertString( const char* src );
extern wxString ShiftJIS_ConvertString( const char* src, int maxlen );
// Some homeless externs. This is as good a spot as any for now...
extern void SetCPUState(SSE_MXCSR sseMXCSR, SSE_MXCSR sseVUMXCSR);
extern SSE_MXCSR g_sseVUMXCSR, g_sseMXCSR;
extern wxString ShiftJIS_ConvertString( const char* src, int maxlen );

17
pcsx2/System.cpp
View File

@ -29,12 +29,29 @@
#include "common/StringUtil.h"
#include "CDVD/CDVD.h"
#include "common/emitter/x86_intrin.h"
#ifdef PCSX2_CORE
#include "GSDumpReplayer.h"
extern R5900cpu GSDumpReplayerCpu;
#endif
SSE_MXCSR g_sseMXCSR = {DEFAULT_sseMXCSR};
SSE_MXCSR g_sseVUMXCSR = {DEFAULT_sseVUMXCSR};
// SetCPUState -- for assignment of SSE roundmodes and clampmodes.
//
void SetCPUState(SSE_MXCSR sseMXCSR, SSE_MXCSR sseVUMXCSR)
{
//Msgbox::Alert("SetCPUState: Config.sseMXCSR = %x; Config.sseVUMXCSR = %x \n", Config.sseMXCSR, Config.sseVUMXCSR);
g_sseMXCSR = sseMXCSR.ApplyReserveMask();
g_sseVUMXCSR = sseVUMXCSR.ApplyReserveMask();
_mm_setcsr(g_sseMXCSR.bitmask);
}
// --------------------------------------------------------------------------------------
// RecompiledCodeReserve (implementations)
// --------------------------------------------------------------------------------------

3
pcsx2/System.h
View File

@ -201,3 +201,6 @@ namespace Msgbox
#ifdef _WIN32
extern void CheckIsUserOnHighPerfPowerPlan();
#endif
extern void SetCPUState(SSE_MXCSR sseMXCSR, SSE_MXCSR sseVUMXCSR);
extern SSE_MXCSR g_sseVUMXCSR, g_sseMXCSR;

1
pcsx2/pcsx2.vcxproj
View File

@ -542,7 +542,6 @@
<ClCompile Include="GS\Renderers\Common\GSVertexTrace.cpp" />
<ClCompile Include="Utilities\FileUtils.cpp" />
<ClCompile Include="Dump.cpp" />
<ClCompile Include="x86\iMisc.cpp" />
<ClCompile Include="Pcsx2Config.cpp" />
<ClCompile Include="windows\FlatFileReaderWindows.cpp" />
<ClCompile Include="Darwin\DarwinFlatFileReader.cpp">

3
pcsx2/pcsx2.vcxproj.filters
View File

@ -443,9 +443,6 @@
<ClCompile Include="Dump.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="x86\iMisc.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="Pcsx2Config.cpp">
<Filter>System</Filter>
</ClCompile>

1
pcsx2/pcsx2core.vcxproj
View File

@ -314,7 +314,6 @@
<ClCompile Include="Dump.cpp" />
<ClCompile Include="VMManager.cpp" />
<ClCompile Include="windows\Optimus.cpp" />
<ClCompile Include="x86\iMisc.cpp" />
<ClCompile Include="Pcsx2Config.cpp" />
<ClCompile Include="windows\FlatFileReaderWindows.cpp" />
<ClCompile Include="Darwin\DarwinFlatFileReader.cpp">

3
pcsx2/pcsx2core.vcxproj.filters
View File

@ -353,9 +353,6 @@
<ClCompile Include="Dump.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="x86\iMisc.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="Pcsx2Config.cpp">
<Filter>System</Filter>
</ClCompile>

33
pcsx2/x86/iMisc.cpp
View File

@ -1,33 +0,0 @@
/* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2010 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-
* ation, either version 3 of the License, or (at your option) any later version.
*
* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with PCSX2.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "common/emitter/x86_intrin.h"
SSE_MXCSR g_sseMXCSR = {DEFAULT_sseMXCSR};
SSE_MXCSR g_sseVUMXCSR = {DEFAULT_sseVUMXCSR};
// SetCPUState -- for assignment of SSE roundmodes and clampmodes.
//
void SetCPUState(SSE_MXCSR sseMXCSR, SSE_MXCSR sseVUMXCSR)
{
//Msgbox::Alert("SetCPUState: Config.sseMXCSR = %x; Config.sseVUMXCSR = %x \n", Config.sseMXCSR, Config.sseVUMXCSR);
g_sseMXCSR = sseMXCSR.ApplyReserveMask();
g_sseVUMXCSR = sseVUMXCSR.ApplyReserveMask();
_mm_setcsr(g_sseMXCSR.bitmask);
}