mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-20 19:45:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove more offsetof calls on linux and add asmjit linkage

Browse source
This commit is contained in:
Peter Tissen 2014-04-27 18:37:21 +02:00
parent 1ba5cafc5f
commit f906d031fa
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/CMakeLists.txt
View file

@ -79,5 +79,5 @@ RPCS3_SRC
add_executable(rpcs3 ${RPCS3_SRC})
target_link_libraries(rpcs3 ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES} libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a ${ZLIB_LIBRARIES})
target_link_libraries(rpcs3 "${CMAKE_CURRENT_BINARY_DIR}/asmjit/asmjit.a" ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES} libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a ${ZLIB_LIBRARIES})

8
rpcs3/Emu/Cell/SPURecompiler.h
View file

@ -109,16 +109,20 @@ public:
#define cpu_dword(x) dword_ptr(*cpu_var, (sizeof((*(SPUThread*)nullptr).x) == 4) ? offsetof(SPUThread, x) : throw "sizeof("#x") != 4")
#define cpu_word(x) word_ptr(*cpu_var, (sizeof((*(SPUThread*)nullptr).x) == 2) ? offsetof(SPUThread, x) : throw "sizeof("#x") != 2")
#define cpu_byte(x) byte_ptr(*cpu_var, (sizeof((*(SPUThread*)nullptr).x) == 1) ? offsetof(SPUThread, x) : throw "sizeof("#x") != 1")
#define g_imm_xmm(x) oword_ptr(*g_imm_var, offsetof(g_imm_table_struct, x))
#define g_imm2_xmm(x, y) oword_ptr(*g_imm_var, y, 0, offsetof(g_imm_table_struct, x))
#else
#define cpu_xmm(x) oword_ptr(*cpu_var, &(((SPUThread*)0)->x) )
#define cpu_qword(x) qword_ptr(*cpu_var, &(((SPUThread*)0)->x) )
#define cpu_dword(x) dword_ptr(*cpu_var, &(((SPUThread*)0)->x) )
#define cpu_word(x) word_ptr(*cpu_var, &(((SPUThread*)0)->x) )
#define cpu_byte(x) byte_ptr(*cpu_var, &(((SPUThread*)0)->x) )
#define g_imm_xmm(x) oword_ptr(*g_imm_var, &(((g_imm_table_struct*)0)->x))
#define g_imm2_xmm(x, y) oword_ptr(*g_imm_var, y, 0, &(((g_imm_table_struct*)0)->x))
#endif
#define g_imm_xmm(x) oword_ptr(*g_imm_var, offsetof(g_imm_table_struct, x))
#define g_imm2_xmm(x, y) oword_ptr(*g_imm_var, y, 0, offsetof(g_imm_table_struct, x))
#define LOG_OPCODE(...) //ConLog.Write("Compiled "__FUNCTION__"(): "__VA_ARGS__)