diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-02 20:09:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-02 20:09:10 +0000 |
| commit | 1179b7b770c096e93442b9c6afea4730283256f0 (patch) | |
| tree | e5f70dc307945fd510660ebde1fd259aecdf66a1 /compiler/dex/quick/codegen_util.cc | |
| parent | 9fab32265f35c808b216210a8d5bebd931279041 (diff) | |
| parent | ae9fd93c39a341e2dffe15c61cc7d9e841fa92c4 (diff) | |
| download | android_art-1179b7b770c096e93442b9c6afea4730283256f0.tar.gz android_art-1179b7b770c096e93442b9c6afea4730283256f0.tar.bz2 android_art-1179b7b770c096e93442b9c6afea4730283256f0.zip | |
Merge "Tell GDB about Quick ART generated code"
Diffstat (limited to 'compiler/dex/quick/codegen_util.cc')
| -rw-r--r-- | compiler/dex/quick/codegen_util.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index 31854496ab..b0b8d1ea15 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -1070,10 +1070,12 @@ CompiledMethod* Mir2Lir::GetCompiledMethod() { DCHECK_EQ(fp_vmap_table_.size(), 0u); vmap_encoder.PushBackUnsigned(0u); // Size is 0. } + + UniquePtr<std::vector<uint8_t> > cfi_info(ReturnCallFrameInformation()); CompiledMethod* result = new CompiledMethod(*cu_->compiler_driver, cu_->instruction_set, code_buffer_, frame_size_, core_spill_mask_, fp_spill_mask_, encoded_mapping_table_, - vmap_encoder.GetData(), native_gc_map_); + vmap_encoder.GetData(), native_gc_map_, cfi_info.get()); return result; } @@ -1216,4 +1218,9 @@ void Mir2Lir::LoadClassType(uint32_t type_idx, SpecialTargetRegister symbolic_re AppendLIR(load_pc_rel); } +std::vector<uint8_t>* Mir2Lir::ReturnCallFrameInformation() { + // Default case is to do nothing. + return nullptr; +} + } // namespace art |