commit c6b25c79a4ec5cc83e2bc14af24e8eabad931743
author Andy McFadden <fadden@android.com> Tue Jun 22 11:01:20 2010 -0700
committer Andy McFadden <fadden@android.com> Tue Jun 22 11:03:03 2010 -0700
tree f364d98b92b9ddd01806ffa5836ef5d63a87989e
parent 45a82a133c0f8d91bce6621be1ea2f4818e8e340

Relocate OpCodeNames.[ch].

The JIT was pulling it out of the dexdump directory, which is Just
Plain Wrong[tm].  Now it's part of libdex, for all to enjoy.

Change-Id: Ic1e4c981eb2d70ccc3c841ceb5a54f4f77af2008

vm/interp/Jit.c

diff --git a/vm/interp/Jit.c b/vm/interp/Jit.c
index ebf308e..e920cfc 100644
--- a/vm/interp/Jit.c
+++ b/vm/interp/Jit.c
@@ -23,7 +23,7 @@
 #include "Jit.h"
 
 
-#include "dexdump/OpCodeNames.h"
+#include "libdex/OpCodeNames.h"
 #include <unistd.h>
 #include <pthread.h>
 #include <sys/time.h>
@@ -235,7 +235,8 @@
         offset =  (int)((u2*)addr - stackSave->method->insns);
         decInsn = &(shadowSpace->trace[i].decInsn);
         /* Not properly decoding instruction, some registers may be garbage */
-        LOGD("0x%x: (0x%04x) %s", addr, offset, getOpcodeName(decInsn->opCode));
+        LOGD("0x%x: (0x%04x) %s",
+            addr, offset, dexGetOpcodeName(decInsn->opCode));
     }
 }
 
@@ -267,7 +268,7 @@
 
     //LOGD("### DbgIntp(%d): PC: 0x%x endPC: 0x%x state: %d len: %d %s",
     //    self->threadId, (int)pc, (int)shadowSpace->endPC, state,
-    //    shadowSpace->traceLength, getOpcodeName(decInsn.opCode));
+    //    shadowSpace->traceLength, dexGetOpcodeName(decInsn.opCode));
 
     if (state == kSVSIdle || state == kSVSStart) {
         LOGD("~~~ DbgIntrp: INCORRECT PREVIOUS STATE(%d): %d",
@@ -685,7 +686,7 @@
 
 
 #if defined(SHOW_TRACE)
-            LOGD("TraceGen: adding %s",getOpcodeName(decInsn.opCode));
+            LOGD("TraceGen: adding %s", dexGetOpcodeName(decInsn.opCode));
 #endif
             flags = dexGetInstrFlags(gDvm.instrFlags, decInsn.opCode);
             len = dexGetInstrOrTableWidthAbs(gDvm.instrWidth, lastPC);
@@ -729,7 +730,7 @@
                     interpState->jitState = kJitTSelectEnd;
 #if defined(SHOW_TRACE)
                 LOGD("TraceGen: ending on %s, basic block end",
-                     getOpcodeName(decInsn.opCode));
+                     dexGetOpcodeName(decInsn.opCode));
 #endif
 
                 /*