From 609ed2811101919c05b171e21da85acca821b0d8 Mon Sep 17 00:00:00 2001 From: "bmeurer@chromium.org" Date: Fri, 30 Aug 2013 08:16:04 +0000 Subject: [PATCH] Revert "ConstantPoolSizeAt() should return number of Instructions instead, otherwise, some of the code will be treated as constant pool when printing code in ARM disassembler." This reverts commit r16419 for breaking the ARM simulator tests. TEST=mjsunit/regress/regress-2624 R=machenbach@chromium.org Review URL: https://codereview.chromium.org/23531013 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16441 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/arm/disasm-arm.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arm/disasm-arm.cc b/src/arm/disasm-arm.cc index bbddeb2..acffaa3 100644 --- a/src/arm/disasm-arm.cc +++ b/src/arm/disasm-arm.cc @@ -1655,7 +1655,7 @@ bool Decoder::IsConstantPoolAt(byte* instr_ptr) { int Decoder::ConstantPoolSizeAt(byte* instr_ptr) { if (IsConstantPoolAt(instr_ptr)) { int instruction_bits = *(reinterpret_cast(instr_ptr)); - return DecodeConstantPoolLength(instruction_bits) / Assembler::kInstrSize; + return DecodeConstantPoolLength(instruction_bits); } else { return -1; } -- 2.7.4