commit 4c5dd5aa7a2cdbec8c298569c5a84d0ef5357363
author Ian Rogers <irogers@google.com> Fri Sep 07 11:27:28 2012 -0700
committer Ian Rogers <irogers@google.com> Fri Sep 07 11:27:28 2012 -0700
tree 1b1503336afaec9f1d6a17e04961d59e9e760bde
parent 581b2ea85d9b382f6b14efadc9d2d36b526ef7c5

Disassembly support of invoke range instructions.

Also tidy regular invoke instructions to use PrettyMethod.

Change-Id: I1df92de053bf88f30b529f5d4967d8e2f2ec0726

src/dex_instruction.cc

diff --git a/src/dex_instruction.cc b/src/dex_instruction.cc
index aa1a5fe..d06a346 100644
--- a/src/dex_instruction.cc
+++ b/src/dex_instruction.cc
@@ -430,7 +430,6 @@
         case INVOKE_STATIC:
         case INVOKE_INTERFACE:
           if (file != NULL) {
-            const DexFile::MethodId& meth_id = file->GetMethodId(insn.vB);
             os << opcode << " {";
             for (size_t i = 0; i < insn.vA; ++i) {
               if (i != 0) {
@@ -438,10 +437,7 @@
               }
               os << "v" << insn.arg[i];
             }
-            os << "}, "
-               << file->GetMethodDeclaringClassDescriptor(meth_id) << "."
-               << file->GetMethodName(meth_id) << file->GetMethodSignature(meth_id)
-               << " // method@" << insn.vB;
+            os << "}, " << PrettyMethod(insn.vB, *file) << " // method@" << insn.vB;
             break;
           }  // else fall-through
         default:
@@ -451,7 +447,25 @@
       }
       break;
     }
-    case k3rc: os << StringPrintf("%s, {v%d .. v%d}, method@%d", opcode, insn.vC, (insn.vC + insn.vA - 1), insn.vB); break;
+    case k3rc: {
+      switch (insn.opcode) {
+        case INVOKE_VIRTUAL_RANGE:
+        case INVOKE_SUPER_RANGE:
+        case INVOKE_DIRECT_RANGE:
+        case INVOKE_STATIC_RANGE:
+        case INVOKE_INTERFACE_RANGE:
+          if (file != NULL) {
+            os << StringPrintf("%s, {v%d .. v%d}, ", opcode, insn.vC, (insn.vC + insn.vA - 1))
+               << PrettyMethod(insn.vB, *file) << " // method@" << insn.vB;
+            break;
+          }  // else fall-through
+        default:
+          os << StringPrintf("%s, {v%d .. v%d}, thing@%d", opcode, insn.vC, (insn.vC + insn.vA - 1),
+                             insn.vB);
+          break;
+      }
+      break;
+    }
     case k51l: os << StringPrintf("%s v%d, #%+d", opcode, insn.vA, insn.vB); break;
     default: os << " unknown format (" << DumpHex(5) << ")"; break;
   }