From 547cdfd21ee21e4ab9ca8692d6ef47c62ee7ea52 Mon Sep 17 00:00:00 2001 From: Tong Shen Date: Tue, 5 Aug 2014 01:54:19 -0700 Subject: Emit CFI for x86 & x86_64 JNI compiler. Now for host-side x86 & x86_64 ART, we are able to get complete stacktrace with even mixed C/C++ & Java stack frames. Testing: 1. art/test/run-test --host --gdb [--64] --no-relocate 005 2. In gdb, run 'b art::Class_classForName' which is implementation of a Java native method, then 'r' 3. In gdb, run 'bt'. You should see stack frames down to main() Change-Id: I2d17e9aa0f6d42d374b5362a15ea35a2fce96302 --- compiler/dex/quick/codegen_util.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/dex/quick/codegen_util.cc') diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index 511297c713..be79b63931 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -1085,7 +1085,7 @@ CompiledMethod* Mir2Lir::GetCompiledMethod() { vmap_encoder.PushBackUnsigned(0u); // Size is 0. } - std::unique_ptr> cfi_info(ReturnCallFrameInformation()); + std::unique_ptr> cfi_info(ReturnFrameDescriptionEntry()); CompiledMethod* result = new CompiledMethod(cu_->compiler_driver, cu_->instruction_set, code_buffer_, frame_size_, core_spill_mask_, fp_spill_mask_, encoded_mapping_table_, @@ -1250,7 +1250,7 @@ void Mir2Lir::LoadClassType(const DexFile& dex_file, uint32_t type_idx, AppendLIR(load_pc_rel); } -std::vector* Mir2Lir::ReturnCallFrameInformation() { +std::vector* Mir2Lir::ReturnFrameDescriptionEntry() { // Default case is to do nothing. return nullptr; } -- cgit v1.2.3-59-g8ed1b