commit 807a25640d4f4de8143b160b3bb8f552ffbf6f4a
author Sebastien Hertz <shertz@google.com> Mon Apr 15 09:33:39 2013 +0200
committer Sebastien Hertz <shertz@google.com> Tue May 14 17:48:52 2013 +0200
tree 3972b74f95282a292f9fa8bfca82bd8bbe736cfc
parent cf479b20dc78d08af75fac7192a92f7c4b259d54

Improve interpreter performance.

Bug: 8196227

This CL removes the use of DecodedInstruction to read instruction opcode and
operands. It now directly access to each operand according to instruction
format (like VRegA_11x for accessing register vA with format 11x).

It also caches some information used for instrumentation like 'this' object
and current method and add missing check about pending exception.

Change-Id: I8c03c0aea9d75068b89e3cb2c8c12383d7928281

src/dex_instruction.cc

diff --git a/src/dex_instruction.cc b/src/dex_instruction.cc
index 3224d77..414e78f 100644
--- a/src/dex_instruction.cc
+++ b/src/dex_instruction.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "dex_instruction.h"
+#include "dex_instruction-inl.h"
 
 #include "dex_file-inl.h"
 #include "utils.h"
@@ -72,13 +72,13 @@
  * Handy macros for helping decode instructions.
  */
 #define FETCH(_offset)      (insns[(_offset)])
-#define FETCH_u4(_offset)   (fetch_u4_impl((_offset), insns))
+#define FETCH_uint32(_offset)   (fetch_uint32_impl((_offset), insns))
 #define INST_A(_insn)       (((uint16_t)(_insn) >> 8) & 0x0f)
 #define INST_B(_insn)       ((uint16_t)(_insn) >> 12)
 #define INST_AA(_insn)      ((_insn) >> 8)
 
-/* Helper for FETCH_u4, above. */
-static inline uint32_t fetch_u4_impl(uint32_t offset, const uint16_t* insns) {
+/* Helper for FETCH_uint32, above. */
+static inline uint32_t fetch_uint32_impl(uint32_t offset, const uint16_t* insns) {
   return insns[offset] | ((uint32_t) insns[offset+1] << 16);
 }
 
@@ -150,12 +150,12 @@
       vC = FETCH(1);
       break;
     case k30t:       // op +AAAAAAAA
-      vA = FETCH_u4(1);                     // signed 32-bit value
+      vA = FETCH_uint32(1);                     // signed 32-bit value
       break;
     case k31t:       // op vAA, +BBBBBBBB
     case k31c:       // op vAA, string@BBBBBBBB
       vA = INST_AA(insn);
-      vB = FETCH_u4(1);                     // 32-bit value
+      vB = FETCH_uint32(1);                     // 32-bit value
       break;
     case k32x:       // op vAAAA, vBBBB
       vA = FETCH(1);
@@ -163,7 +163,7 @@
       break;
     case k31i:       // op vAA, #+BBBBBBBB
       vA = INST_AA(insn);
-      vB = FETCH_u4(1);                     // signed 32-bit value
+      vB = FETCH_uint32(1);                     // signed 32-bit value
       break;
     case k35c:       // op {vC, vD, vE, vF, vG}, thing@BBBB
       {
@@ -213,7 +213,7 @@
         break;
     case k51l:       // op vAA, #+BBBBBBBBBBBBBBBB
       vA = INST_AA(insn);
-      vB_wide = FETCH_u4(1) | ((uint64_t) FETCH_u4(3) << 32);
+      vB_wide = FETCH_uint32(1) | ((uint64_t) FETCH_uint32(3) << 32);
       break;
     default:
       LOG(ERROR) << "Can't decode unexpected format " << FormatOf(opcode) << " (op=" << opcode << ")";