| commit | 45478f42a780d9852892c97c876d5d969d26533c | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Wed Jun 19 06:52:14 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 19 06:52:15 2013 +0000 |
| tree | 7aa0ea6e69e506d07cb72ea1ada2107b3be3ccd5 | |
| parent | 3e4184356b83e32721ca23c5c898f8e919efc9b0 [diff] | |
| parent | 828a07f4b378918673aa56711fa8cf487112659d [diff] |
Merge "Fix cbz disassembly bug." into dalvik-dev
diff --git a/src/disassembler_arm.cc b/src/disassembler_arm.cc index e1a1aa4..172bef8 100644 --- a/src/disassembler_arm.cc +++ b/src/disassembler_arm.cc
@@ -1260,7 +1260,7 @@ uint16_t imm5 = (instr >> 3) & 0x1F; ThumbRegister Rn(instr, 0); opcode << (op != 0 ? "cbnz" : "cbz"); - uint32_t imm32 = (i << 7) | (imm5 << 1); + uint32_t imm32 = (i << 6) | (imm5 << 1); args << Rn << ", "; DumpBranchTarget(args, instr_ptr + 4, imm32); break;