commit 11d8f14eef83d1b7bfa8f116de56a92d5ba9e71e
author Ben Cheng <bccheng@android.com> Wed Mar 24 15:24:19 2010 -0700
committer Ben Cheng <bccheng@android.com> Wed Mar 24 15:33:26 2010 -0700
tree 9fb56691082e14ac532c9e3da2d0e5803dde0754
parent b7b9be1343b59b429b6de9b28ffffbbbde8478c2

Fix for the JIT blocking mode plus some code cleanup.

Bug: 2517606
Change-Id: I2b5aa92ceaf23d484329330ae20de5966704280b

vm/interp/Jit.c

diff --git a/vm/interp/Jit.c b/vm/interp/Jit.c
index 1d7961e..1be8096 100644
--- a/vm/interp/Jit.c
+++ b/vm/interp/Jit.c
@@ -64,8 +64,8 @@
 {
     Thread *self = dvmThreadSelf();
     ShadowSpace *shadowSpace = self->shadowSpace;
-    int preBytes = interpState->method->outsSize*4 + sizeof(StackSaveArea);
-    int postBytes = interpState->method->registersSize*4;
+    unsigned preBytes = interpState->method->outsSize*4 + sizeof(StackSaveArea);
+    unsigned postBytes = interpState->method->registersSize*4;
 
     //LOGD("### selfVerificationSaveState(%d) pc: 0x%x fp: 0x%x",
     //    self->threadId, (int)pc, (int)fp);
@@ -79,11 +79,11 @@
     shadowSpace->selfVerificationState = kSVSStart;
 
     // Dynamically grow shadow register space if necessary
-    while (preBytes + postBytes > shadowSpace->registerSpaceSize) {
-        shadowSpace->registerSpaceSize *= 2;
+    if (preBytes + postBytes > shadowSpace->registerSpaceSize * sizeof(u4)) {
         free(shadowSpace->registerSpace);
+        shadowSpace->registerSpaceSize = (preBytes + postBytes) / sizeof(u4);
         shadowSpace->registerSpace =
-            (int*) calloc(shadowSpace->registerSpaceSize, sizeof(int));
+            (int*) calloc(shadowSpace->registerSpaceSize, sizeof(u4));
     }
 
     // Remember original state
@@ -145,7 +145,8 @@
     }
 
     // Special case when punting after a single instruction
-    if (exitPoint == kSVSPunt && pc == shadowSpace->startPC) {
+    if ((exitPoint == kSVSPunt || exitPoint == kSVSSingleStep) &&
+        pc == shadowSpace->startPC) {
         shadowSpace->selfVerificationState = kSVSIdle;
     } else {
         shadowSpace->selfVerificationState = exitPoint;
@@ -257,8 +258,7 @@
     }
 
     /* Check that the current pc is the end of the trace */
-    if ((state == kSVSSingleStep || state == kSVSDebugInterp) &&
-        pc == shadowSpace->endPC) {
+    if (state == kSVSDebugInterp && pc == shadowSpace->endPC) {
 
         shadowSpace->selfVerificationState = kSVSIdle;
 
@@ -473,9 +473,16 @@
 {
     OpCode op = decInsn->opCode;
     int flags =  dexGetInstrFlags(gDvm.instrFlags, op);
+    /*
+     * All opcodes that can throw exceptions and use the
+     * TEMPLATE_THROW_EXCEPTION_COMMON template should be excluded in the trace
+     * under self-verification mode.
+     */
     return (op == OP_MONITOR_ENTER || op == OP_MONITOR_EXIT ||
             op == OP_NEW_INSTANCE || op == OP_NEW_ARRAY ||
             op == OP_CHECK_CAST || op == OP_MOVE_EXCEPTION ||
+            op == OP_FILL_ARRAY_DATA || op == OP_EXECUTE_INLINE ||
+            op == OP_EXECUTE_INLINE_RANGE ||
             (flags & kInstrInvoke));
 }
 #endif