Permalink
Browse files

arm64jit: Autodetect pointerify support.

Also, re-enable static alloc without pointerify, it works now.
  • Loading branch information...
unknownbrackets committed Dec 28, 2017
1 parent 2e1d85a commit 08e85d0cd4cf52cce66368862b13f85246a357a5
Showing with 6 additions and 4 deletions.
  1. +5 −0 Core/MIPS/ARM64/Arm64Jit.cpp
  2. +1 −4 Core/MIPS/JitCommon/JitState.cpp
@@ -66,6 +66,11 @@ using namespace Arm64Gen;
using namespace Arm64JitConstants;
Arm64Jit::Arm64Jit(MIPSState *mips) : blocks(mips, this), gpr(mips, &js, &jo), fpr(mips, &js, &jo), mips_(mips), fp(this) {
// Automatically disable incompatible options.
if (((intptr_t)Memory::base & 0x00000000FFFFFFFFUL) != 0) {
jo.enablePointerify = false;
}
logBlocks = 0;
dontLogBlocks = 0;
blocks.Init();
@@ -54,11 +54,8 @@ namespace MIPSComp {
enablePointerify = false;
#if PPSSPP_ARCH(ARM64)
useStaticAlloc = true;
// iOS/etc. may disable at runtime if Memory::base is not nicely aligned.
enablePointerify = true;
#endif
#if PPSSPP_PLATFORM(IOS)
useStaticAlloc = false;
enablePointerify = false;
#endif
}
}

0 comments on commit 08e85d0

Please sign in to comment.