Use the generated opcode info tables.

This is, once again, an intermediate step. Soon, I'm going to try to
remove need to keep and pass copies of the opcode info pointers all
over the place.

Change-Id: Ic6af849310b22ca604a7f2d18c78ff8d112459b4

1 files changed, 2 insertions, 7 deletions

diff --git a/dexdump/DexDump.c b/dexdump/DexDump.c
index 594930376..556dbc22a 100644
--- a/dexdump/DexDump.c
+++ b/dexdump/DexDump.c
@@ -1097,7 +1097,7 @@ void dumpBytecodes(DexFile* pDexFile, const DexMethod* pDexMethod)
             }
         }
 
-        dexDecodeInstruction(&gInstrInfo, insns, &decInsn);
+        dexDecodeInstruction(insns, &decInsn);
         dumpInstruction(pDexFile, pCode, insnIdx, insnWidth, &decInsn);
 
         insns += insnWidth;
@@ -1891,10 +1891,7 @@ int main(int argc, char* const argv[])
     }
 
     /* initialize some VM tables */
-    if (dexCreateInstructionInfoTables(&gInstrInfo)) {
-        fprintf(stderr, "Failed to construct instruction tables\n");
-        return 1;
-    }
+    dexGetInstructionInfoTables(&gInstrInfo);
 
     if (wantUsage) {
         usage();
@@ -1906,7 +1903,5 @@ int main(int argc, char* const argv[])
         result |= process(argv[optind++]);
     }
 
-    dexFreeInstructionInfoTables(&gInstrInfo);
-
     return (result != 0);
 }