summaryrefslogtreecommitdiffstats
path: root/vm/interp/Jit.c
diff options
context:
space:
mode:
Diffstat (limited to 'vm/interp/Jit.c')
-rw-r--r--vm/interp/Jit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/vm/interp/Jit.c b/vm/interp/Jit.c
index 34a7736d6..6adbf3d97 100644
--- a/vm/interp/Jit.c
+++ b/vm/interp/Jit.c
@@ -776,6 +776,7 @@ int dvmCheckJit(const u2* pc, Thread* self, InterpState* interpState)
interpState->entryPoint = kInterpEntryResume;
switchInterp = !debugOrProfile;
break;
+ case kJitTSelectRequest:
case kJitTSelectAbort:
#if defined(SHOW_TRACE)
LOGD("TraceGen: trace abort");
@@ -833,7 +834,8 @@ JitEntry *dvmFindJitEntry(const u2* pc)
void* dvmJitGetCodeAddr(const u2* dPC)
{
int idx = dvmJitHash(dPC);
- const u2* npc = gDvmJit.pJitEntryTable[idx].dPC;
+ const u2* npc = (gDvmJit.pProfTable == NULL) ? NULL :
+ gDvmJit.pJitEntryTable[idx].dPC;
if (npc != NULL) {
if (npc == dPC) {
@@ -1130,5 +1132,4 @@ s8 dvmJitf2l(float f)
return (s8)f;
}
-
#endif /* WITH_JIT */