From 9ac0e4d4ed1b45cf8767ef1d339afcdd205bf55a Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Thu, 12 Mar 2015 18:33:05 +0000 Subject: Force word alignment of Dex register maps. Plus some cosmetic changes. Change-Id: I45e805aa87c2ef8fe8907eaae726cd2188b54897 --- compiler/optimizing/stack_map_stream.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'compiler/optimizing/stack_map_stream.h') diff --git a/compiler/optimizing/stack_map_stream.h b/compiler/optimizing/stack_map_stream.h index 79bebd2e64..76ddbf3204 100644 --- a/compiler/optimizing/stack_map_stream.h +++ b/compiler/optimizing/stack_map_stream.h @@ -129,7 +129,8 @@ class StackMapStream : public ValueObject { DexRegisterLocation entry = dex_register_maps_.Get(i); size += DexRegisterMap::EntrySize(entry); } - return size; + // On ARM, the Dex register maps must be 4-byte aligned. + return RoundUp(size, kWordAlignment); } // Compute the size of all the inline information pieces. @@ -139,12 +140,12 @@ class StackMapStream : public ValueObject { + (number_of_stack_maps_with_inline_info_ * InlineInfo::kFixedSize); } - size_t ComputeDexRegisterMapStart() const { + size_t ComputeDexRegisterMapsStart() const { return CodeInfo::kFixedSize + ComputeStackMapSize(); } size_t ComputeInlineInfoStart() const { - return ComputeDexRegisterMapStart() + ComputeDexRegisterMapsSize(); + return ComputeDexRegisterMapsStart() + ComputeDexRegisterMapsSize(); } void FillIn(MemoryRegion region) { @@ -155,7 +156,7 @@ class StackMapStream : public ValueObject { uint8_t* memory_start = region.start(); MemoryRegion dex_register_maps_region = region.Subregion( - ComputeDexRegisterMapStart(), + ComputeDexRegisterMapsStart(), ComputeDexRegisterMapsSize()); MemoryRegion inline_infos_region = region.Subregion( -- cgit v1.2.3-59-g8ed1b