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

Simplify apple silicon changes

Browse Source
This commit is contained in:
Vitor Kiguchi 2021-05-04 03:21:29 -03:00
parent ad315fd20d
commit 94d1f7c01a
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/A64/block_of_code.cpp
View File

@ -52,9 +52,11 @@ constexpr size_t FAR_CODE_OFFSET = 100 * 1024 * 1024;
#ifdef DYNARMIC_ENABLE_NO_EXECUTE_SUPPORT
void ProtectMemory(const void* base, size_t size, bool is_executable) {
#ifdef _WIN32
#if defined(_WIN32)
DWORD oldProtect = 0;
VirtualProtect(const_cast<void*>(base), size, is_executable ? PAGE_EXECUTE_READ : PAGE_READWRITE, &oldProtect);
#elif defined(__APPLE__)
pthread_jit_write_protect_np(is_executable);
#else
static const size_t pageSize = sysconf(_SC_PAGESIZE);
const size_t iaddr = reinterpret_cast<size_t>(base);
@ -90,18 +92,12 @@ void BlockOfCode::EnableWriting() {
#ifdef DYNARMIC_ENABLE_NO_EXECUTE_SUPPORT
ProtectMemory(GetCodePtr(), TOTAL_CODE_SIZE, false);
#endif
#ifdef __APPLE__
pthread_jit_write_protect_np(false);
#endif
}
void BlockOfCode::DisableWriting() {
#ifdef DYNARMIC_ENABLE_NO_EXECUTE_SUPPORT
ProtectMemory(GetCodePtr(), TOTAL_CODE_SIZE, true);
#endif
#ifdef __APPLE__
pthread_jit_write_protect_np(true);
#endif
}
void BlockOfCode::ClearCache() {

6
src/backend/A64/emitter/a64_emitter.cpp
View File

@ -366,12 +366,10 @@ void ARM64XEmitter::FlushIcacheSection(const u8* start, const u8* end) {
if (start == end)
return;
#if defined(IOS)
#if defined(__APPLE__)
// Header file says this is equivalent to: sys_icache_invalidate(start, end -
// start);
sys_cache_control(kCacheFunctionPrepareForExecution, start, end - start);
#elif defined(__APPLE__)
sys_icache_invalidate(const_cast<u8*>(start), end - start);
sys_cache_control(kCacheFunctionPrepareForExecution, const_cast<u8*>(start), end - start);
#else
// Don't rely on GCC's __clear_cache implementation, as it caches
// icache/dcache cache line sizes, that can vary between cores on