summaryrefslogtreecommitdiff
path: root/runtime/stack_map.cc
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2017-01-27 23:31:59 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-01-27 23:32:00 +0000
commita0305a27fc2da2bff16415e2edf733db2adf202f (patch)
tree1e928db8f1853838753a18c40327dd5574ecdcb2 /runtime/stack_map.cc
parentde09f06e243f9548e58feec79b0cd249065a5f28 (diff)
parent12f1b99775bbf7dd82d0a897587ab6ed0e75ee22 (diff)
Merge "Remove alignment bits in between stack maps"
Diffstat (limited to 'runtime/stack_map.cc')
-rw-r--r--runtime/stack_map.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/stack_map.cc b/runtime/stack_map.cc
index 690b069c8e..e093293e75 100644
--- a/runtime/stack_map.cc
+++ b/runtime/stack_map.cc
@@ -198,7 +198,7 @@ void StackMap::Dump(VariableIndentationOutputStream* vios,
<< "StackMap" << header_suffix
<< std::hex
<< " [native_pc=0x" << code_offset + pc_offset << "]"
- << " [entry_size=0x" << encoding.stack_map_size_in_bytes << "]"
+ << " [entry_size=0x" << encoding.stack_map_size_in_bits << " bits]"
<< " (dex_pc=0x" << GetDexPc(stack_map_encoding)
<< ", native_pc_offset=0x" << pc_offset
<< ", dex_register_map_offset=0x" << GetDexRegisterMapOffset(stack_map_encoding)
@@ -206,7 +206,7 @@ void StackMap::Dump(VariableIndentationOutputStream* vios,
<< ", register_mask=0x" << GetRegisterMask(stack_map_encoding)
<< std::dec
<< ", stack_mask=0b";
- for (size_t i = 0, e = GetNumberOfStackMaskBits(stack_map_encoding); i < e; ++i) {
+ for (size_t i = 0, e = code_info.GetNumberOfStackMaskBits(encoding); i < e; ++i) {
vios->Stream() << GetStackMaskBit(stack_map_encoding, e - i - 1);
}
vios->Stream() << ")\n";