archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-04 05:51:19 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge cleanup

Browse source
This commit is contained in:
Tom Lally 2022-08-27 00:30:39 +01:00
parent c102097768
commit 82c1b4417a
4 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Cafe/HW/Espresso/Recompiler/PPCRecompiler.cpp
View file

@ -580,7 +580,7 @@ void PPCRecompiler_init()
__cpuid(cpuInfo, 0x1); __cpuid(cpuInfo, 0x1);
hasMOVBESupport = ((cpuInfo[2] >> 22) & 1) != 0; hasMOVBESupport = ((cpuInfo[2] >> 22) & 1) != 0;
hasAVXSupport = ((cpuInfo[2] >> 28) & 1) != 0; hasAVXSupport = ((cpuInfo[2] >> 28) & 1) != 0;
__cpuidex1(cpuInfo, 0x7, 0); __cpuidex(cpuInfo, 0x7, 0);
hasBMI2Support = ((cpuInfo[1] >> 8) & 1) != 0; hasBMI2Support = ((cpuInfo[1] >> 8) & 1) != 0;
forceLog_printf("Recompiler initialized. CPU extensions: %s%s%s", hasLZCNTSupport ? "LZCNT " : "", hasMOVBESupport ? "MOVBE " : "", hasAVXSupport ? "AVX " : ""); forceLog_printf("Recompiler initialized. CPU extensions: %s%s%s", hasLZCNTSupport ? "LZCNT " : "", hasMOVBESupport ? "MOVBE " : "", hasAVXSupport ? "AVX " : "");

4
src/Common/unix/platform.cpp
View file

@ -16,8 +16,10 @@ void (__cpuid)(int __cpuVal[4], unsigned int __leaf)
} }
#undef __cpuid #undef __cpuid
void __cpuidex1(int __cpuid_info[4], int __leaf, int __subleaf) #ifdef __clang__
void __cpuidex(int __cpuid_info[4], int __leaf, int __subleaf)
{ {
__cpuid_count (__leaf, __subleaf, __cpuid_info[0], __cpuid_info[1], __cpuid_count (__leaf, __subleaf, __cpuid_info[0], __cpuid_info[1],
__cpuid_info[2], __cpuid_info[3]); __cpuid_info[2], __cpuid_info[3]);
} }
#endif

2
src/Common/unix/platform.h
View file

@ -42,7 +42,7 @@ inline uint32_t GetExceptionError()
// cpu id (somewhat hacky, reorganize later) // cpu id (somewhat hacky, reorganize later)
void (__cpuid)(int __cpuVal[4], unsigned int __leaf); void (__cpuid)(int __cpuVal[4], unsigned int __leaf);
void __cpuidex1 (int __cpuid_info[4], int __leaf, int __subleaf); void __cpuidex (int __cpuid_info[4], int __leaf, int __subleaf);
// placeholder // placeholder
uint32_t GetTickCount(); uint32_t GetTickCount();

4
src/main.cpp
View file

@ -27,6 +27,8 @@
#include "Cafe/IOSU/legacy/iosu_crypto.h" #include "Cafe/IOSU/legacy/iosu_crypto.h"
#include "Cafe/OS/libs/vpad/vpad.h" #include "Cafe/OS/libs/vpad/vpad.h"
#include "Common/platform.h"
#include "audio/IAudioAPI.h" #include "audio/IAudioAPI.h"
#if BOOST_OS_WINDOWS #if BOOST_OS_WINDOWS
#pragma comment(lib,"Dbghelp.lib") #pragma comment(lib,"Dbghelp.lib")
@ -39,11 +41,13 @@
#define _putenv(__s) putenv((char*)(__s)) #define _putenv(__s) putenv((char*)(__s))
#endif #endif
#if BOOST_OS_WINDOWS
extern "C" extern "C"
{ {
__declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1; __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
__declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001; __declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
} }
#endif
bool _cpuExtension_SSSE3 = false; bool _cpuExtension_SSSE3 = false;
bool _cpuExtension_SSE4_1 = false; bool _cpuExtension_SSE4_1 = false;