mirror of https://github.com/PCSX2/pcsx2.git
Misc: remove unneeded file and clean up a 32bit check
This commit is contained in:
rayanHappy
refractionpcsx2
parent
cdd88a6e5c
commit
c06d4f477a
|
|
@ -1,113 +0,0 @@
|
||||||
set(wx_sdl_c_code "
|
|
||||||
#include <wx/setup.h>
|
|
||||||
|
|
||||||
#if (wxUSE_LIBSDL == 0)
|
|
||||||
#error cmake_WX_SDL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
")
|
|
||||||
|
|
||||||
set(gcc7_mmx_code "
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <xmmintrin.h>
|
|
||||||
#include <emmintrin.h>
|
|
||||||
|
|
||||||
class alignas(16) GSVector4i
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
__m128i m;
|
|
||||||
|
|
||||||
explicit GSVector4i(__m128i m)
|
|
||||||
{
|
|
||||||
this->m = m;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void storel(void* p, const GSVector4i& v)
|
|
||||||
{
|
|
||||||
_mm_storel_epi64((__m128i*)p, v.m);
|
|
||||||
}
|
|
||||||
|
|
||||||
static GSVector4i loadl(const void* p)
|
|
||||||
{
|
|
||||||
return GSVector4i(_mm_loadl_epi64((__m128i*)p));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool eq(const GSVector4i& v) const
|
|
||||||
{
|
|
||||||
return _mm_movemask_epi8(_mm_cmpeq_epi32(m, v.m)) == 0xffff;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
union GIFRegTRXPOS
|
|
||||||
{
|
|
||||||
unsigned long long u64;
|
|
||||||
void operator = (const GSVector4i& v) {GSVector4i::storel(this, v);}
|
|
||||||
bool operator != (const union GIFRegTRXPOS& r) const {return !((GSVector4i)r).eq(*this);}
|
|
||||||
operator GSVector4i() const {return GSVector4i::loadl(this);}
|
|
||||||
};
|
|
||||||
|
|
||||||
extern GIFRegTRXPOS TRXPOS;
|
|
||||||
GIFRegTRXPOS TRXPOS = {};
|
|
||||||
|
|
||||||
void GIFRegHandlerTRXPOS(const GIFRegTRXPOS& p)
|
|
||||||
{
|
|
||||||
if(p != TRXPOS)
|
|
||||||
{
|
|
||||||
printf(\"foo\");
|
|
||||||
}
|
|
||||||
|
|
||||||
TRXPOS = (GSVector4i)p;
|
|
||||||
}
|
|
||||||
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
GIFRegTRXPOS r = {};
|
|
||||||
GIFRegHandlerTRXPOS(r);
|
|
||||||
|
|
||||||
uint16_t fpu[16] = {0};
|
|
||||||
__asm__ __volatile__(\"fstenv %0\" : \"=m\"(fpu));
|
|
||||||
|
|
||||||
bool ok = fpu[4] == 0xFFFF;
|
|
||||||
|
|
||||||
if (!ok) {
|
|
||||||
printf(\"Wrong MMX state !\");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
")
|
|
||||||
|
|
||||||
function(GCC7_BUG)
|
|
||||||
# try_run doesn't work when cross-compiling is enabled. It is completely silly in our case
|
|
||||||
# as i386 binaries are 100% fine on x64.
|
|
||||||
set(OLD_CMAKE_CROSSCOMPILING ${CMAKE_CROSSCOMPILING})
|
|
||||||
set(CMAKE_CROSSCOMPILING 0)
|
|
||||||
|
|
||||||
set(IN "${CMAKE_BINARY_DIR}/gcc7_mmx.cpp")
|
|
||||||
file(WRITE "${IN}" "${gcc7_mmx_code}")
|
|
||||||
|
|
||||||
enable_language(CXX)
|
|
||||||
|
|
||||||
try_run(
|
|
||||||
run_result
|
|
||||||
compile_result_unused
|
|
||||||
"${CMAKE_BINARY_DIR}"
|
|
||||||
"${IN}"
|
|
||||||
CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=-msse -msse2 -O2 -m32 -march=i686"
|
|
||||||
)
|
|
||||||
|
|
||||||
if (${run_result})
|
|
||||||
message(FATAL_ERROR "GCC 7.0/7.1 generates invalid code => https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80799\n"
|
|
||||||
"You can either backport the fix or swith to another version of GCC.")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(CMAKE_CROSSCOMPILING ${OLD_CMAKE_CROSSCOMPILING})
|
|
||||||
|
|
||||||
endfunction()
|
|
||||||
|
|
@ -12,21 +12,12 @@ find_path(VTUNE_INCLUDE_DIRS NAMES jitprofiling.h PATHS
|
||||||
/opt/intel/vtune_amplifier_xe_2016/include
|
/opt/intel/vtune_amplifier_xe_2016/include
|
||||||
)
|
)
|
||||||
|
|
||||||
if(${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386")
|
find_library(VTUNE_LIBRARIES NAMES libjitprofiling.a PATHS
|
||||||
find_library(VTUNE_LIBRARIES NAMES libjitprofiling.a PATHS
|
/opt/intel/oneapi/vtune/latest/lib64
|
||||||
/opt/intel/oneapi/vtune/latest/lib32
|
/opt/intel/vtune_amplifier_xe_2018/lib64
|
||||||
/opt/intel/vtune_amplifier_xe_2018/lib32
|
/opt/intel/vtune_amplifier_xe_2017/lib64
|
||||||
/opt/intel/vtune_amplifier_xe_2017/lib32
|
/opt/intel/vtune_amplifier_xe_2016/lib64
|
||||||
/opt/intel/vtune_amplifier_xe_2016/lib32
|
)
|
||||||
)
|
|
||||||
else()
|
|
||||||
find_library(VTUNE_LIBRARIES NAMES libjitprofiling.a PATHS
|
|
||||||
/opt/intel/oneapi/vtune/latest/lib64
|
|
||||||
/opt/intel/vtune_amplifier_xe_2018/lib64
|
|
||||||
/opt/intel/vtune_amplifier_xe_2017/lib64
|
|
||||||
/opt/intel/vtune_amplifier_xe_2016/lib64
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# handle the QUIETLY and REQUIRED arguments and set VTUNE_FOUND to TRUE if
|
# handle the QUIETLY and REQUIRED arguments and set VTUNE_FOUND to TRUE if
|
||||||
# all listed variables are TRUE
|
# all listed variables are TRUE
|
||||||
|
|
@ -41,4 +32,3 @@ if(VTUNE_LIBRARIES AND NOT TARGET Vtune::Vtune)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
mark_as_advanced(VTUNE_FOUND VTUNE_INCLUDE_DIRS VTUNE_LIBRARIES)
|
mark_as_advanced(VTUNE_FOUND VTUNE_INCLUDE_DIRS VTUNE_LIBRARIES)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -102,18 +102,7 @@ if(ENABLE_TESTS)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
#----------------------------------------
|
if(GCC_VERSION VERSION_GREATER_EQUAL "9.0" AND GCC_VERSION VERSION_LESS "9.2")
|
||||||
# Check correctness of the parameter
|
|
||||||
# Note: wxWidgets_INCLUDE_DIRS must be defined
|
|
||||||
#----------------------------------------
|
|
||||||
include(ApiValidation)
|
|
||||||
|
|
||||||
# Blacklist bad GCC
|
|
||||||
if(GCC_VERSION VERSION_EQUAL "7.0" OR GCC_VERSION VERSION_EQUAL "7.1")
|
|
||||||
GCC7_BUG()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if((GCC_VERSION VERSION_EQUAL "9.0" OR GCC_VERSION VERSION_GREATER "9.0") AND GCC_VERSION LESS "9.2")
|
|
||||||
message(WARNING "
|
message(WARNING "
|
||||||
It looks like you are compiling with 9.0.x or 9.1.x. Using these versions is not recommended,
|
It looks like you are compiling with 9.0.x or 9.1.x. Using these versions is not recommended,
|
||||||
as there is a bug known to cause the compiler to segfault while compiling. See patch
|
as there is a bug known to cause the compiler to segfault while compiling. See patch
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue