Citra-emu/dynarmic-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge fastmem

Browse Source
This commit is contained in:
BreadFish64 2019-10-17 13:50:31 -05:00 committed by SachinVin
parent f7fd0cff8f
commit 45a758a6f2
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -411,3 +411,5 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
endif()
# Disable this as it relies on a non-standard feature
target_compile_definitions(dynarmic PRIVATE FMT_USE_USER_DEFINED_LITERALS=0)
#export(TARGETS dynarmic boost fmt xbyak FILE "dynarmic-config.cmake")

8
tests/A32/fuzz_arm.cpp
View File

@ -33,6 +33,14 @@
#include <fmt/format.h>
#include <fmt/ostream.h>
static Dynarmic::A32::UserConfig GetUserConfig(ArmTestEnv* testenv) {
Dynarmic::A32::UserConfig user_config;
user_config.enable_fast_dispatch = false;
user_config.callbacks = testenv;
user_config.fastmem_pointer = reinterpret_cast<void*>(0xFFFFFDDE00000000);
return user_config;
}
namespace {
using namespace Dynarmic;

1
tests/CMakeLists.txt
View File

@ -67,6 +67,7 @@ endif()
target_include_directories(dynarmic_tests PRIVATE . ../src)
target_compile_options(dynarmic_tests PRIVATE ${DYNARMIC_CXX_FLAGS})
target_compile_definitions(dynarmic_tests PRIVATE FMT_USE_USER_DEFINED_LITERALS=0)
target_compile_options(dynarmic_tests PRIVATE -DCATCH_CONFIG_NO_WINDOWS_SEH -DCATCH_CONFIG_NO_POSIX_SIGNALS)
target_link_libraries(dynarmic_print_info PRIVATE dynarmic boost catch fmt mp)
target_include_directories(dynarmic_print_info PRIVATE . ../src)