Remove mterp "alternate" opcode handlers.

They are currently unused and I don't have plans to use them.

The alternate table made it possible to enable extra mterp checks.
However, it is possible to move the debug checks to the main path.

Test: test.py -b -r --interpreter -t 001-HelloWorld
Change-Id: I45a39ec73abaefaecf5b8c636f3f9d519a0a8bb0

1 files changed, 2 insertions, 33 deletions

diff --git a/runtime/thread.h b/runtime/thread.h
index 47a3af2564..d7dc5aeacb 100644
--- a/runtime/thread.h
+++ b/runtime/thread.h
@@ -743,18 +743,6 @@ class Thread {
   }
 
   template<PointerSize pointer_size>
-  static constexpr ThreadOffset<pointer_size> MterpDefaultIBaseOffset() {
-    return ThreadOffsetFromTlsPtr<pointer_size>(
-        OFFSETOF_MEMBER(tls_ptr_sized_values, mterp_default_ibase));
-  }
-
-  template<PointerSize pointer_size>
-  static constexpr ThreadOffset<pointer_size> MterpAltIBaseOffset() {
-    return ThreadOffsetFromTlsPtr<pointer_size>(
-        OFFSETOF_MEMBER(tls_ptr_sized_values, mterp_alt_ibase));
-  }
-
-  template<PointerSize pointer_size>
   static constexpr ThreadOffset<pointer_size> ExceptionOffset() {
     return ThreadOffsetFromTlsPtr<pointer_size>(OFFSETOF_MEMBER(tls_ptr_sized_values, exception));
   }
@@ -1199,30 +1187,14 @@ class Thread {
   bool ProtectStack(bool fatal_on_error = true);
   bool UnprotectStack();
 
-  void SetMterpDefaultIBase(void* ibase) {
-    tlsPtr_.mterp_default_ibase = ibase;
-  }
-
   void SetMterpCurrentIBase(void* ibase) {
     tlsPtr_.mterp_current_ibase = ibase;
   }
 
-  void SetMterpAltIBase(void* ibase) {
-    tlsPtr_.mterp_alt_ibase = ibase;
-  }
-
-  const void* GetMterpDefaultIBase() const {
-    return tlsPtr_.mterp_default_ibase;
-  }
-
   const void* GetMterpCurrentIBase() const {
     return tlsPtr_.mterp_current_ibase;
   }
 
-  const void* GetMterpAltIBase() const {
-    return tlsPtr_.mterp_alt_ibase;
-  }
-
   bool HandlingSignal() const {
     return tls32_.handling_signal_;
   }
@@ -1599,8 +1571,7 @@ class Thread {
       last_no_thread_suspension_cause(nullptr), checkpoint_function(nullptr),
       thread_local_start(nullptr), thread_local_pos(nullptr), thread_local_end(nullptr),
       thread_local_limit(nullptr),
-      thread_local_objects(0), mterp_current_ibase(nullptr), mterp_default_ibase(nullptr),
-      mterp_alt_ibase(nullptr), thread_local_alloc_stack_top(nullptr),
+      thread_local_objects(0), mterp_current_ibase(nullptr), thread_local_alloc_stack_top(nullptr),
       thread_local_alloc_stack_end(nullptr),
       flip_function(nullptr), method_verifier(nullptr), thread_local_mark_stack(nullptr),
       async_exception(nullptr) {
@@ -1737,10 +1708,8 @@ class Thread {
     JniEntryPoints jni_entrypoints;
     QuickEntryPoints quick_entrypoints;
 
-    // Mterp jump table bases.
+    // Mterp jump table base.
     void* mterp_current_ibase;
-    void* mterp_default_ibase;
-    void* mterp_alt_ibase;
 
     // There are RosAlloc::kNumThreadLocalSizeBrackets thread-local size brackets per thread.
     void* rosalloc_runs[kNumRosAllocThreadLocalSizeBracketsInThread];