OSDN Git Service

Fix single-stepping resume mode in the interpreter.
authorBen Cheng <bccheng@android.com>
Thu, 27 Oct 2011 21:04:12 +0000 (14:04 -0700)
committerBen Cheng <bccheng@android.com>
Fri, 28 Oct 2011 19:18:44 +0000 (12:18 -0700)
commitb1e2271b51cfb1f264b8966f1151652767259751
tree3d1d83effee648fc6aacfc16cb0741a5936fa605
parent21fefbaa3874c42f8a017c4794add2d7c337643a
Fix single-stepping resume mode in the interpreter.

(cherry-picked from master)

When a resume attempt is cancelled due to other pending request make sure
the old native resume PC is cleared. Otherwise the JIT code cache may be
re-entered with mismatching Dalvik PC.

Also fix a code bloat problem where single-step count is not set properly
after executing a return instruction.

BUG: 5208786

Change-Id: I54775215b11eae29ccdb6111dc0fdfa99e41e08d
vm/interp/Interp.cpp
vm/interp/Jit.cpp