diff options
| author | Elliott Hughes <enh@google.com> | 2012-04-30 22:15:31 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-04-30 22:15:31 -0700 |
| commit | c73a456cf9170d3838a626502c5fad17ae65737c (patch) | |
| tree | 6cbbfb3755c18a0c0f3b9c2819fde210c35b9f6c /vm/interp | |
| parent | 37c16f81e3c170c4e54f62c1bd1c0b00d4e9b774 (diff) | |
| parent | 4c5f9711c7ade276a93939ccd1cddb1d68092f33 (diff) | |
| download | android_dalvik-c73a456cf9170d3838a626502c5fad17ae65737c.tar.gz android_dalvik-c73a456cf9170d3838a626502c5fad17ae65737c.tar.bz2 android_dalvik-c73a456cf9170d3838a626502c5fad17ae65737c.zip | |
resolved conflicts for merge of 4c5f9711 to jb-dev-plus-aosp
Change-Id: I4c724c3df990a5abf42cec748bbbba25ee5bc112
Diffstat (limited to 'vm/interp')
| -rw-r--r-- | vm/interp/Interp.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vm/interp/Interp.cpp b/vm/interp/Interp.cpp index 41097644f..ba7e67c05 100644 --- a/vm/interp/Interp.cpp +++ b/vm/interp/Interp.cpp @@ -1483,8 +1483,10 @@ void updateInterpBreak(Thread* thread, ExecutionSubModes subMode, bool enable) newValue.ctl.breakFlags |= kInterpSingleStep; if (newValue.ctl.subMode & SAFEPOINT_BREAK_MASK) newValue.ctl.breakFlags |= kInterpSafePoint; +#ifndef DVM_NO_ASM_INTERP newValue.ctl.curHandlerTable = (newValue.ctl.breakFlags) ? thread->altHandlerTable : thread->mainHandlerTable; +#endif } while (dvmQuasiAtomicCas64(oldValue.all, newValue.all, &thread->interpBreak.all) != 0); } @@ -1556,12 +1558,16 @@ void dvmCheckInterpStateConsistency() Thread* thread; uint8_t breakFlags; uint8_t subMode; +#ifndef DVM_NO_ASM_INTERP void* handlerTable; +#endif dvmLockThreadList(self); breakFlags = self->interpBreak.ctl.breakFlags; subMode = self->interpBreak.ctl.subMode; +#ifndef DVM_NO_ASM_INTERP handlerTable = self->interpBreak.ctl.curHandlerTable; +#endif for (thread = gDvm.threadList; thread != NULL; thread = thread->next) { if (subMode != thread->interpBreak.ctl.subMode) { ALOGD("Warning: subMode mismatch - %#x:%#x, tid[%d]", @@ -1571,11 +1577,13 @@ void dvmCheckInterpStateConsistency() ALOGD("Warning: breakFlags mismatch - %#x:%#x, tid[%d]", breakFlags,thread->interpBreak.ctl.breakFlags,thread->threadId); } +#ifndef DVM_NO_ASM_INTERP if (handlerTable != thread->interpBreak.ctl.curHandlerTable) { ALOGD("Warning: curHandlerTable mismatch - %#x:%#x, tid[%d]", (int)handlerTable,(int)thread->interpBreak.ctl.curHandlerTable, thread->threadId); } +#endif #if defined(WITH_JIT) if (thread->pJitProfTable != gDvmJit.pProfTable) { ALOGD("Warning: pJitProfTable mismatch - %#x:%#x, tid[%d]", |