summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-04-01 14:39:24 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-01 14:39:24 +0000
commit382028d0c0dfeab66428759c0740921c404b8ed3 (patch)
treec4e76705166850b67efe295994a882b125e40656
parentd0b86c7ec593a552f726a15e532bb48170fbf487 (diff)
parent7aca91db1571594cdb7e0a9ee704530b09c066e4 (diff)
downloadandroid_art-382028d0c0dfeab66428759c0740921c404b8ed3.tar.gz
android_art-382028d0c0dfeab66428759c0740921c404b8ed3.tar.bz2
android_art-382028d0c0dfeab66428759c0740921c404b8ed3.zip
Merge "Fix instruction printing for filled-new-array"
-rw-r--r--runtime/dex_instruction.cc14
1 files changed, 14 insertions, 0 deletions
diff --git a/runtime/dex_instruction.cc b/runtime/dex_instruction.cc
index 8fccd6da3e..754624538d 100644
--- a/runtime/dex_instruction.cc
+++ b/runtime/dex_instruction.cc
@@ -551,6 +551,20 @@ std::string Instruction::DumpString(const DexFile* file) const {
uint32_t arg[5];
GetArgs(arg);
switch (Opcode()) {
+ case FILLED_NEW_ARRAY:
+ {
+ const int32_t a = VRegA_35c();
+ os << opcode << " {";
+ for (int i = 0; i < a; ++i) {
+ if (i > 0) {
+ os << ", ";
+ }
+ os << "v" << arg[i];
+ }
+ os << "}, type@" << VRegB_35c();
+ }
+ break;
+
case INVOKE_VIRTUAL:
case INVOKE_SUPER:
case INVOKE_DIRECT: