diff options
| author | Ben Cheng <bccheng@android.com> | 2011-11-02 17:31:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-02 17:31:44 +0000 |
| commit | b353eec6d8635ecd514f9b7ea56497f79786e12d (patch) | |
| tree | da80c9426e8d4ff59f668579a5a78563ceee59f0 /vm/interp | |
| parent | 566a832224f09bfc683a987f4fa6d90bd5010efe (diff) | |
| parent | f51d43f0ebfa5739d1ee691d661097dbbad98041 (diff) | |
| download | android_dalvik-b353eec6d8635ecd514f9b7ea56497f79786e12d.tar.gz android_dalvik-b353eec6d8635ecd514f9b7ea56497f79786e12d.tar.bz2 android_dalvik-b353eec6d8635ecd514f9b7ea56497f79786e12d.zip | |
am f51d43f0: am e3d9cde4: Disable JIT single-stepping resume mode.
* commit 'f51d43f0ebfa5739d1ee691d661097dbbad98041':
Disable JIT single-stepping resume mode.
Diffstat (limited to 'vm/interp')
| -rw-r--r-- | vm/interp/Interp.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vm/interp/Interp.cpp b/vm/interp/Interp.cpp index 62d4469fc..7951eff29 100644 --- a/vm/interp/Interp.cpp +++ b/vm/interp/Interp.cpp @@ -1829,6 +1829,10 @@ void dvmCheckBefore(const u2 *pc, u4 *fp, Thread* self) } } #endif +#if 0 + // TODO - fix JIT single-stepping resume mode (b/5551114) + // self->jitResumeNPC needs to be cleared in callPrep + // If we've got a native return and no other reasons to // remain in singlestep/break mode, do a long jump if (self->jitResumeNPC != NULL && @@ -1845,6 +1849,7 @@ void dvmCheckBefore(const u2 *pc, u4 *fp, Thread* self) self->jitResumeDPC = NULL; self->inJitCodeCache = NULL; #endif +#endif } else { self->singleStepCount--; #if defined(WITH_JIT) |