Vita3K/Vita3K-Android
1
0
Fork 0
mirror of https://github.com/Vita3K/Vita3K-Android.git synced 2025-03-04 19:29:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

external: switch to unicorn2

Browse Source
This commit is contained in:
Macdu 2023-09-07 14:44:30 +02:00 committed by Zangetsu
parent 9d87a2206a
commit de5a9a64ad
6 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
external/CMakeLists.txt vendored
View File

@ -150,37 +150,6 @@ if(WIN32)
target_link_libraries(winsock INTERFACE WSOCK32 WS2_32 IPHLPAPI)
endif()
if(WIN32)
set(UNICORN_VER "4b52942b")
set(UNICORN_PREFIX "${CMAKE_BINARY_DIR}/external/unicorn")
if(NOT EXISTS "${UNICORN_PREFIX}")
message(STATUS "Downloading unicorn...")
file(DOWNLOAD
https://github.com/Vita3K/unicorn/releases/download/${UNICORN_VER}/vita3k-unicorn.zip
"${CMAKE_BINARY_DIR}/external/unicorn.zip" SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_BINARY_DIR}/external/unicorn.zip"
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external")
endif()
message(STATUS "Using bundled binaries at ${UNICORN_PREFIX}")
set(LIBUNICORN_INCLUDE_DIR "${UNICORN_PREFIX}/include" CACHE PATH "Path to Unicorn headers" FORCE)
set(LIBUNICORN_LIBRARY "${UNICORN_PREFIX}/lib/unicorn.lib" CACHE PATH "Path to Unicorn library" FORCE)
set(UNICORN_DLL_DIR "${UNICORN_PREFIX}/lib" CACHE PATH "Path to unicorn.dll" FORCE)
add_library(unicorn INTERFACE)
target_link_libraries(unicorn INTERFACE "${LIBUNICORN_LIBRARY}")
target_include_directories(unicorn INTERFACE "${LIBUNICORN_INCLUDE_DIR}")
else()
option(UNICORN_BUILD_SHARED "Build shared instead of static library" OFF)
set(UNICORN_ARCH "arm")
add_subdirectory(unicorn)
target_include_directories(unicorn INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/unicorn/include")
endif()
set(DYNARMIC_TESTS OFF CACHE BOOL "")
set(DYNARMIC_NO_BUNDLED_FMT ON CACHE BOOL "")
set(DYNARMIC_FRONTENDS "A32" CACHE STRING "")
@ -200,6 +169,10 @@ if(MSVC)
endif()
endif()
set(UNICORN_ARCH "arm")
add_subdirectory(unicorn EXCLUDE_FROM_ALL)
set_property(TARGET unicorn PROPERTY FOLDER externals)
add_library(vita-toolchain INTERFACE)
target_include_directories(vita-toolchain INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/vita-toolchain/src")

2
external/unicorn vendored

@ -1 +1 @@
Subproject commit 4b52942ba9d13437c1a858f3ace279db88d7089a
Subproject commit 80a767105520abdf070abbb0f0b42bf79bdcb7d4

5
vita3k/CMakeLists.txt
View File

@ -243,10 +243,7 @@ elseif(WIN32)
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/../data" "$<TARGET_FILE_DIR:vita3k>/data"
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/../lang" "$<TARGET_FILE_DIR:vita3k>/lang"
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/shaders-builtin" "$<TARGET_FILE_DIR:vita3k>/shaders-builtin"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/external/sdl/windows/lib/x64/SDL2.dll" "$<TARGET_FILE_DIR:vita3k>"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${UNICORN_DLL_DIR}/unicorn.dll" "$<TARGET_FILE_DIR:vita3k>"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${UNICORN_DLL_DIR}/libgcc_s_seh-1.dll" "$<TARGET_FILE_DIR:vita3k>"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${UNICORN_DLL_DIR}/libwinpthread-1.dll" "$<TARGET_FILE_DIR:vita3k>")
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/external/sdl/windows/lib/x64/SDL2.dll" "$<TARGET_FILE_DIR:vita3k>")
if(USE_VITA3K_UPDATE)
add_custom_command(
TARGET vita3k

2
vita3k/cpu/include/cpu/impl/interface.h
View File

@ -55,7 +55,7 @@ struct CPUInterface {
virtual CPUContext save_context() = 0;
virtual void load_context(CPUContext context) = 0;
virtual void invalidate_jit_cache(Address start, size_t length) {}
virtual void invalidate_jit_cache(Address start, size_t length) = 0;
virtual bool is_thumb_mode() = 0;
virtual int step() = 0;

1
vita3k/cpu/include/cpu/impl/unicorn_cpu.h
View File

@ -97,6 +97,7 @@ public:
CPUContext save_context() override;
void load_context(CPUContext context) override;
void invalidate_jit_cache(Address start, size_t length) override;
bool hit_breakpoint() override;
void trigger_breakpoint() override;

4
vita3k/cpu/src/unicorn_cpu.cpp
View File

@ -386,6 +386,10 @@ void UnicornCPU::load_context(CPUContext ctx) {
set_pc(ctx.thumb() ? ctx.get_pc() | 1 : ctx.get_pc());
}
void UnicornCPU::invalidate_jit_cache(Address start, size_t length) {
uc_ctl_remove_cache(uc.get(), start, start + length);
}
bool UnicornCPU::hit_breakpoint() {
return did_break;
}