am 40094c16: Tweak the interpreter entries and 2nd level trace filter to capture more traces.

Merge commit '40094c16d9727cc1e047a7d4bddffe04dd566211' into dalvik-dev

* commit '40094c16d9727cc1e047a7d4bddffe04dd566211':
  Tweak the interpreter entries and 2nd level trace filter to capture more traces.

1 files changed, 13 insertions, 11 deletions

diff --git a/vm/compiler/Compiler.h b/vm/compiler/Compiler.h
index 1d551a437..de3068697 100644
--- a/vm/compiler/Compiler.h
+++ b/vm/compiler/Compiler.h
@@ -76,12 +76,13 @@ typedef enum JitState {
     kJitOff = 0,
     kJitNormal = 1,            // Profiling in mterp or running native
     kJitTSelectRequest = 2,    // Transition state - start trace selection
-    kJitTSelect = 3,           // Actively selecting trace in dbg interp
-    kJitTSelectAbort = 4,      // Something threw during selection - abort
-    kJitTSelectEnd = 5,        // Done with the trace - wrap it up
-    kJitSingleStep = 6,        // Single step interpretation
-    kJitSingleStepEnd = 7,     // Done with single step, return to mterp
-    kJitSelfVerification = 8,  // Self Verification Mode
+    kJitTSelectRequestHot = 3, // Transition state - start hot trace selection
+    kJitTSelect = 4,           // Actively selecting trace in dbg interp
+    kJitTSelectAbort = 5,      // Something threw during selection - abort
+    kJitTSelectEnd = 6,        // Done with the trace - wrap it up
+    kJitSingleStep = 7,        // Single step interpretation
+    kJitSingleStepEnd = 8,     // Done with single step, return to mterp
+    kJitSelfVerification = 9,  // Self Verification Mode
 } JitState;
 
 #if defined(WITH_SELF_VERIFICATION)
@@ -90,11 +91,12 @@ typedef enum SelfVerificationState {
     kSVSStart = 1,          // Shadow space set up, running compiled code
     kSVSPunt = 2,           // Exiting compiled code by punting
     kSVSSingleStep = 3,     // Exiting compiled code by single stepping
-    kSVSTraceSelect = 4,    // Exiting compiled code by trace select
-    kSVSNormal = 5,         // Exiting compiled code normally
-    kSVSNoChain = 6,        // Exiting compiled code by no chain
-    kSVSBackwardBranch = 7, // Exiting compiled code with backward branch trace
-    kSVSDebugInterp = 8,    // Normal state restored, running debug interpreter
+    kSVSTraceSelectNoChain = 4,// Exiting compiled code by trace select no chain
+    kSVSTraceSelect = 5,    // Exiting compiled code by trace select
+    kSVSNormal = 6,         // Exiting compiled code normally
+    kSVSNoChain = 7,        // Exiting compiled code by no chain
+    kSVSBackwardBranch = 8, // Exiting compiled code with backward branch trace
+    kSVSDebugInterp = 9,    // Normal state restored, running debug interpreter
 } SelfVerificationState;
 #endif