commit 75b2a4abea8a608d7aec3e417498b69b31026a74
author Sebastien Hertz <shertz@google.com> Tue May 21 09:25:10 2013 +0200
committer Sebastien Hertz <shertz@google.com> Tue May 21 18:29:04 2013 +0200
tree 64c349fd18332fbdc9371324e4c36f1312e1daea
parent 34d64cba998cb86867109db351113e6f7c9293f7

Remove use of DecodedInstruction at runtime.

This CL removes the use of DecodedInstruction while executing code. This is a
first step in removing its global use in Art.

Change-Id: Ic7264e0d614ffab99931fd50347394a68152a10c

src/oat/runtime/support_invoke.cc

diff --git a/src/oat/runtime/support_invoke.cc b/src/oat/runtime/support_invoke.cc
index 369858e..a96555d 100644
--- a/src/oat/runtime/support_invoke.cc
+++ b/src/oat/runtime/support_invoke.cc
@@ -15,7 +15,7 @@
  */
 
 #include "callee_save_frame.h"
-#include "dex_instruction.h"
+#include "dex_instruction-inl.h"
 #include "mirror/class-inl.h"
 #include "mirror/abstract_method-inl.h"
 #include "mirror/object-inl.h"
@@ -110,10 +110,15 @@
     CHECK(instr_code == Instruction::INVOKE_INTERFACE ||
           instr_code == Instruction::INVOKE_INTERFACE_RANGE)
         << "Unexpected call into interface trampoline: " << instr->DumpString(NULL);
-    DecodedInstruction dec_insn(instr);
-    uint32_t dex_method_idx = dec_insn.vB;
+    uint32_t dex_method_idx;
+    if (instr_code == Instruction::INVOKE_INTERFACE) {
+      dex_method_idx = instr->VRegB_35c();
+    } else {
+      DCHECK_EQ(instr_code, Instruction::INVOKE_INTERFACE_RANGE);
+      dex_method_idx = instr->VRegB_3rc();
+    }
     method = FindMethodFromCode(dex_method_idx, this_object, caller_method, self,
-                                                false, kInterface);
+                                false, kInterface);
     if (UNLIKELY(method == NULL)) {
       CHECK(self->IsExceptionPending());
       return 0;  // Failure.