From fead4e4f397455aa31905b2982d4d861126ab89d Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 13 Mar 2015 14:39:40 +0000 Subject: [optimizing] Don't record None locations in the stack maps. - moved environment recording from code generator to stack map stream - added creation/loading factory methods for the DexRegisterMap (hides internal details) - added new tests Change-Id: Ic8b6d044f0d8255c6759c19a41df332ef37876fe --- runtime/stack.cc | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'runtime/stack.cc') diff --git a/runtime/stack.cc b/runtime/stack.cc index 47b85ad..2d688ee 100644 --- a/runtime/stack.cc +++ b/runtime/stack.cc @@ -202,30 +202,33 @@ bool StackVisitor::GetVRegFromOptimizedCode(mirror::ArtMethod* m, uint16_t vreg, DCHECK(code_item != nullptr) << PrettyMethod(m); // Can't be NULL or how would we compile // its instructions? DCHECK_LT(vreg, code_item->registers_size_); + uint16_t number_of_dex_registers = code_item->registers_size_; DexRegisterMap dex_register_map = - code_info.GetDexRegisterMapOf(stack_map, code_item->registers_size_); - DexRegisterLocation::Kind location_kind = dex_register_map.GetLocationKind(vreg); + code_info.GetDexRegisterMapOf(stack_map, number_of_dex_registers); + DexRegisterLocation::Kind location_kind = + dex_register_map.GetLocationKind(vreg, number_of_dex_registers); switch (location_kind) { case DexRegisterLocation::Kind::kInStack: { - const int32_t offset = dex_register_map.GetStackOffsetInBytes(vreg); + const int32_t offset = dex_register_map.GetStackOffsetInBytes(vreg, number_of_dex_registers); const uint8_t* addr = reinterpret_cast(cur_quick_frame_) + offset; *val = *reinterpret_cast(addr); return true; } case DexRegisterLocation::Kind::kInRegister: case DexRegisterLocation::Kind::kInFpuRegister: { - uint32_t reg = dex_register_map.GetMachineRegister(vreg); + uint32_t reg = dex_register_map.GetMachineRegister(vreg, number_of_dex_registers); return GetRegisterIfAccessible(reg, kind, val); } case DexRegisterLocation::Kind::kConstant: - *val = dex_register_map.GetConstant(vreg); + *val = dex_register_map.GetConstant(vreg, number_of_dex_registers); return true; case DexRegisterLocation::Kind::kNone: return false; default: LOG(FATAL) << "Unexpected location kind" - << DexRegisterLocation::PrettyDescriptor(dex_register_map.GetLocationInternalKind(vreg)); + << DexRegisterLocation::PrettyDescriptor( + dex_register_map.GetLocationInternalKind(vreg, number_of_dex_registers)); UNREACHABLE(); } } @@ -388,21 +391,23 @@ bool StackVisitor::SetVRegFromOptimizedCode(mirror::ArtMethod* m, uint16_t vreg, const DexFile::CodeItem* code_item = m->GetCodeItem(); DCHECK(code_item != nullptr) << PrettyMethod(m); // Can't be NULL or how would we compile // its instructions? - DCHECK_LT(vreg, code_item->registers_size_); + uint16_t number_of_dex_registers = code_item->registers_size_; + DCHECK_LT(vreg, number_of_dex_registers); DexRegisterMap dex_register_map = - code_info.GetDexRegisterMapOf(stack_map, code_item->registers_size_); - DexRegisterLocation::Kind location_kind = dex_register_map.GetLocationKind(vreg); + code_info.GetDexRegisterMapOf(stack_map, number_of_dex_registers); + DexRegisterLocation::Kind location_kind = + dex_register_map.GetLocationKind(vreg, number_of_dex_registers); uint32_t dex_pc = m->ToDexPc(cur_quick_frame_pc_, false); switch (location_kind) { case DexRegisterLocation::Kind::kInStack: { - const int32_t offset = dex_register_map.GetStackOffsetInBytes(vreg); + const int32_t offset = dex_register_map.GetStackOffsetInBytes(vreg, number_of_dex_registers); uint8_t* addr = reinterpret_cast(cur_quick_frame_) + offset; *reinterpret_cast(addr) = new_value; return true; } case DexRegisterLocation::Kind::kInRegister: case DexRegisterLocation::Kind::kInFpuRegister: { - uint32_t reg = dex_register_map.GetMachineRegister(vreg); + uint32_t reg = dex_register_map.GetMachineRegister(vreg, number_of_dex_registers); return SetRegisterIfAccessible(reg, new_value, kind); } case DexRegisterLocation::Kind::kConstant: -- cgit v1.1