From 0c2c71c1a2e010fa8905e4c83189b3ffd6260bac Mon Sep 17 00:00:00 2001 From: "rodolph.perfetta@arm.com" Date: Fri, 4 Apr 2014 12:54:12 +0000 Subject: [PATCH] ARM64: fix constant pool size used by disassembler BUG= R=ulan@chromium.org, bmeurer@chromium.org Review URL: https://codereview.chromium.org/225403005 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20512 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/arm64/assembler-arm64.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arm64/assembler-arm64.cc b/src/arm64/assembler-arm64.cc index c5280f2..744cfcc 100644 --- a/src/arm64/assembler-arm64.cc +++ b/src/arm64/assembler-arm64.cc @@ -647,7 +647,7 @@ int Assembler::ConstantPoolSizeAt(Instruction* instr) { void Assembler::ConstantPoolMarker(uint32_t size) { ASSERT(is_const_pool_blocked()); // + 1 is for the crash guard. - Emit(LDR_x_lit | ImmLLiteral(2 * size + 1) | Rt(xzr)); + Emit(LDR_x_lit | ImmLLiteral(size + 1) | Rt(xzr)); } @@ -2590,7 +2590,6 @@ void Assembler::CheckConstPool(bool force_emit, bool require_jump) { { // Block recursive calls to CheckConstPool and protect from veneer pools. BlockPoolsScope block_pools(this); - RecordComment("[ Constant Pool"); RecordConstPool(pool_size); // Emit jump over constant pool if necessary. @@ -2610,6 +2609,7 @@ void Assembler::CheckConstPool(bool force_emit, bool require_jump) { // beginning of the constant pool. // TODO(all): currently each relocated constant is 64 bits, consider adding // support for 32-bit entries. + RecordComment("[ Constant Pool"); ConstantPoolMarker(2 * num_pending_reloc_info_); ConstantPoolGuard(); -- 2.7.4