From 4fda4eb799c95be266f52aaf3461a440ea86b841 Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Fri, 5 Feb 2016 13:34:46 +0000 Subject: [PATCH] Move code related to debug info generation to its own directory. debug/dwarf/ contains helper classes which hide the details of the DWARF file format. It acts as independent DWARF library. debug/ contains ART-specific code which generates ELF debug sections (which includes non-DWARF sections like .symtab). Change-Id: Id351f604e4e64be2ca395a78324ea02e30481497 --- build/Android.gtest.mk | 2 +- compiler/Android.mk | 2 +- compiler/cfi_test.h | 6 +++--- compiler/{ => debug}/dwarf/debug_abbrev_writer.h | 10 +++++----- compiler/{ => debug}/dwarf/debug_frame_opcode_writer.h | 12 ++++++------ compiler/{ => debug}/dwarf/debug_info_entry_writer.h | 14 +++++++------- compiler/{ => debug}/dwarf/debug_line_opcode_writer.h | 10 +++++----- compiler/{ => debug}/dwarf/dwarf_constants.h | 6 +++--- compiler/{ => debug}/dwarf/dwarf_test.cc | 10 +++++----- compiler/{ => debug}/dwarf/dwarf_test.h | 6 +++--- compiler/{ => debug}/dwarf/expression.h | 10 +++++----- compiler/{ => debug}/dwarf/headers.h | 18 +++++++++--------- compiler/{ => debug}/dwarf/register.h | 6 +++--- compiler/{ => debug}/dwarf/writer.h | 6 +++--- compiler/{ => debug}/elf_writer_debug.cc | 10 +++++----- compiler/{ => debug}/elf_writer_debug.h | 8 ++++---- compiler/{dwarf => debug}/method_debug_info.h | 6 +++--- compiler/dex/quick/lazy_debug_frame_opcode_writer.h | 2 +- compiler/elf_writer_quick.cc | 4 ++-- compiler/image_test.cc | 2 +- compiler/jit/jit_compiler.cc | 4 ++-- compiler/oat_test.cc | 4 ++-- compiler/oat_writer.cc | 4 ++-- compiler/optimizing/optimizing_compiler.cc | 13 ++++++------- compiler/utils/arm/managed_register_arm.h | 2 +- compiler/utils/arm64/managed_register_arm64.h | 2 +- compiler/utils/assembler.h | 4 ++-- compiler/utils/mips/managed_register_mips.h | 2 +- compiler/utils/mips64/managed_register_mips64.h | 2 +- compiler/utils/x86/managed_register_x86.h | 2 +- compiler/utils/x86_64/managed_register_x86_64.h | 2 +- dex2oat/dex2oat.cc | 10 +++++----- 32 files changed, 100 insertions(+), 101 deletions(-) rename compiler/{ => debug}/dwarf/debug_abbrev_writer.h (92%) rename compiler/{ => debug}/dwarf/debug_frame_opcode_writer.h (97%) rename compiler/{ => debug}/dwarf/debug_info_entry_writer.h (95%) rename compiler/{ => debug}/dwarf/debug_line_opcode_writer.h (96%) rename compiler/{ => debug}/dwarf/dwarf_constants.h (99%) rename compiler/{ => debug}/dwarf/dwarf_test.cc (98%) rename compiler/{ => debug}/dwarf/dwarf_test.h (97%) rename compiler/{ => debug}/dwarf/expression.h (94%) rename compiler/{ => debug}/dwarf/headers.h (95%) rename compiler/{ => debug}/dwarf/register.h (94%) rename compiler/{ => debug}/dwarf/writer.h (97%) rename compiler/{ => debug}/elf_writer_debug.cc (99%) rename compiler/{ => debug}/elf_writer_debug.h (90%) rename compiler/{dwarf => debug}/method_debug_info.h (87%) diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index e3f0c2441..704d69a37 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -239,13 +239,13 @@ COMPILER_GTEST_COMMON_SRC_FILES := \ runtime/proxy_test.cc \ runtime/reflection_test.cc \ compiler/compiled_method_test.cc \ + compiler/debug/dwarf/dwarf_test.cc \ compiler/dex/gvn_dead_code_elimination_test.cc \ compiler/dex/global_value_numbering_test.cc \ compiler/dex/local_value_numbering_test.cc \ compiler/dex/mir_graph_test.cc \ compiler/dex/mir_optimization_test.cc \ compiler/dex/type_inference_test.cc \ - compiler/dwarf/dwarf_test.cc \ compiler/driver/compiled_method_storage_test.cc \ compiler/driver/compiler_driver_test.cc \ compiler/elf_writer_test.cc \ diff --git a/compiler/Android.mk b/compiler/Android.mk index 87eff8298..414f667e5 100644 --- a/compiler/Android.mk +++ b/compiler/Android.mk @@ -20,6 +20,7 @@ include art/build/Android.common_build.mk LIBART_COMPILER_SRC_FILES := \ compiled_method.cc \ + debug/elf_writer_debug.cc \ dex/global_value_numbering.cc \ dex/gvn_dead_code_elimination.cc \ dex/local_value_numbering.cc \ @@ -105,7 +106,6 @@ LIBART_COMPILER_SRC_FILES := \ utils/swap_space.cc \ compiler.cc \ elf_writer.cc \ - elf_writer_debug.cc \ elf_writer_quick.cc \ image_writer.cc \ oat_writer.cc \ diff --git a/compiler/cfi_test.h b/compiler/cfi_test.h index 508b04a16..230cb9aee 100644 --- a/compiler/cfi_test.h +++ b/compiler/cfi_test.h @@ -22,9 +22,9 @@ #include #include "arch/instruction_set.h" -#include "dwarf/dwarf_constants.h" -#include "dwarf/dwarf_test.h" -#include "dwarf/headers.h" +#include "debug/dwarf/dwarf_constants.h" +#include "debug/dwarf/dwarf_test.h" +#include "debug/dwarf/headers.h" #include "disassembler/disassembler.h" #include "gtest/gtest.h" diff --git a/compiler/dwarf/debug_abbrev_writer.h b/compiler/debug/dwarf/debug_abbrev_writer.h similarity index 92% rename from compiler/dwarf/debug_abbrev_writer.h rename to compiler/debug/dwarf/debug_abbrev_writer.h index 71367e85a..0fc843cdf 100644 --- a/compiler/dwarf/debug_abbrev_writer.h +++ b/compiler/debug/dwarf/debug_abbrev_writer.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_COMPILER_DWARF_DEBUG_ABBREV_WRITER_H_ -#define ART_COMPILER_DWARF_DEBUG_ABBREV_WRITER_H_ +#ifndef ART_COMPILER_DEBUG_DWARF_DEBUG_ABBREV_WRITER_H_ +#define ART_COMPILER_DEBUG_DWARF_DEBUG_ABBREV_WRITER_H_ #include #include @@ -23,8 +23,8 @@ #include "base/casts.h" #include "base/stl_util.h" -#include "dwarf/dwarf_constants.h" -#include "dwarf/writer.h" +#include "debug/dwarf/dwarf_constants.h" +#include "debug/dwarf/writer.h" #include "leb128.h" namespace art { @@ -95,4 +95,4 @@ class DebugAbbrevWriter FINAL : private Writer { } // namespace dwarf } // namespace art -#endif // ART_COMPILER_DWARF_DEBUG_ABBREV_WRITER_H_ +#endif // ART_COMPILER_DEBUG_DWARF_DEBUG_ABBREV_WRITER_H_ diff --git a/compiler/dwarf/debug_frame_opcode_writer.h b/compiler/debug/dwarf/debug_frame_opcode_writer.h similarity index 97% rename from compiler/dwarf/debug_frame_opcode_writer.h rename to compiler/debug/dwarf/debug_frame_opcode_writer.h index f74f37ce8..7c75c9bf3 100644 --- a/compiler/dwarf/debug_frame_opcode_writer.h +++ b/compiler/debug/dwarf/debug_frame_opcode_writer.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef ART_COMPILER_DWARF_DEBUG_FRAME_OPCODE_WRITER_H_ -#define ART_COMPILER_DWARF_DEBUG_FRAME_OPCODE_WRITER_H_ +#ifndef ART_COMPILER_DEBUG_DWARF_DEBUG_FRAME_OPCODE_WRITER_H_ +#define ART_COMPILER_DEBUG_DWARF_DEBUG_FRAME_OPCODE_WRITER_H_ #include "base/bit_utils.h" -#include "dwarf/dwarf_constants.h" -#include "dwarf/register.h" -#include "dwarf/writer.h" +#include "debug/dwarf/dwarf_constants.h" +#include "debug/dwarf/register.h" +#include "debug/dwarf/writer.h" namespace art { namespace dwarf { @@ -338,4 +338,4 @@ class DebugFrameOpCodeWriter : private Writer { } // namespace dwarf } // namespace art -#endif // ART_COMPILER_DWARF_DEBUG_FRAME_OPCODE_WRITER_H_ +#endif // ART_COMPILER_DEBUG_DWARF_DEBUG_FRAME_OPCODE_WRITER_H_ diff --git a/compiler/dwarf/debug_info_entry_writer.h b/compiler/debug/dwarf/debug_info_entry_writer.h similarity index 95% rename from compiler/dwarf/debug_info_entry_writer.h rename to compiler/debug/dwarf/debug_info_entry_writer.h index 1e298595a..85f021ec5 100644 --- a/compiler/dwarf/debug_info_entry_writer.h +++ b/compiler/debug/dwarf/debug_info_entry_writer.h @@ -14,17 +14,17 @@ * limitations under the License. */ -#ifndef ART_COMPILER_DWARF_DEBUG_INFO_ENTRY_WRITER_H_ -#define ART_COMPILER_DWARF_DEBUG_INFO_ENTRY_WRITER_H_ +#ifndef ART_COMPILER_DEBUG_DWARF_DEBUG_INFO_ENTRY_WRITER_H_ +#define ART_COMPILER_DEBUG_DWARF_DEBUG_INFO_ENTRY_WRITER_H_ #include #include #include "base/casts.h" -#include "dwarf/debug_abbrev_writer.h" -#include "dwarf/dwarf_constants.h" -#include "dwarf/expression.h" -#include "dwarf/writer.h" +#include "debug/dwarf/debug_abbrev_writer.h" +#include "debug/dwarf/dwarf_constants.h" +#include "debug/dwarf/expression.h" +#include "debug/dwarf/writer.h" #include "leb128.h" namespace art { @@ -225,4 +225,4 @@ class DebugInfoEntryWriter FINAL : private Writer { } // namespace dwarf } // namespace art -#endif // ART_COMPILER_DWARF_DEBUG_INFO_ENTRY_WRITER_H_ +#endif // ART_COMPILER_DEBUG_DWARF_DEBUG_INFO_ENTRY_WRITER_H_ diff --git a/compiler/dwarf/debug_line_opcode_writer.h b/compiler/debug/dwarf/debug_line_opcode_writer.h similarity index 96% rename from compiler/dwarf/debug_line_opcode_writer.h rename to compiler/debug/dwarf/debug_line_opcode_writer.h index 201f0b40b..58502a3f9 100644 --- a/compiler/dwarf/debug_line_opcode_writer.h +++ b/compiler/debug/dwarf/debug_line_opcode_writer.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef ART_COMPILER_DWARF_DEBUG_LINE_OPCODE_WRITER_H_ -#define ART_COMPILER_DWARF_DEBUG_LINE_OPCODE_WRITER_H_ +#ifndef ART_COMPILER_DEBUG_DWARF_DEBUG_LINE_OPCODE_WRITER_H_ +#define ART_COMPILER_DEBUG_DWARF_DEBUG_LINE_OPCODE_WRITER_H_ #include -#include "dwarf/dwarf_constants.h" -#include "dwarf/writer.h" +#include "debug/dwarf/dwarf_constants.h" +#include "debug/dwarf/writer.h" namespace art { namespace dwarf { @@ -252,4 +252,4 @@ class DebugLineOpCodeWriter FINAL : private Writer { } // namespace dwarf } // namespace art -#endif // ART_COMPILER_DWARF_DEBUG_LINE_OPCODE_WRITER_H_ +#endif // ART_COMPILER_DEBUG_DWARF_DEBUG_LINE_OPCODE_WRITER_H_ diff --git a/compiler/dwarf/dwarf_constants.h b/compiler/debug/dwarf/dwarf_constants.h similarity index 99% rename from compiler/dwarf/dwarf_constants.h rename to compiler/debug/dwarf/dwarf_constants.h index 0d7951b73..96f805e85 100644 --- a/compiler/dwarf/dwarf_constants.h +++ b/compiler/debug/dwarf/dwarf_constants.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_COMPILER_DWARF_DWARF_CONSTANTS_H_ -#define ART_COMPILER_DWARF_DWARF_CONSTANTS_H_ +#ifndef ART_COMPILER_DEBUG_DWARF_DWARF_CONSTANTS_H_ +#define ART_COMPILER_DEBUG_DWARF_DWARF_CONSTANTS_H_ namespace art { namespace dwarf { @@ -691,4 +691,4 @@ enum CFIFormat : uint8_t { } // namespace dwarf } // namespace art -#endif // ART_COMPILER_DWARF_DWARF_CONSTANTS_H_ +#endif // ART_COMPILER_DEBUG_DWARF_DWARF_CONSTANTS_H_ diff --git a/compiler/dwarf/dwarf_test.cc b/compiler/debug/dwarf/dwarf_test.cc similarity index 98% rename from compiler/dwarf/dwarf_test.cc rename to compiler/debug/dwarf/dwarf_test.cc index 32373119b..e455d0d61 100644 --- a/compiler/dwarf/dwarf_test.cc +++ b/compiler/debug/dwarf/dwarf_test.cc @@ -16,11 +16,11 @@ #include "dwarf_test.h" -#include "dwarf/dwarf_constants.h" -#include "dwarf/debug_frame_opcode_writer.h" -#include "dwarf/debug_info_entry_writer.h" -#include "dwarf/debug_line_opcode_writer.h" -#include "dwarf/headers.h" +#include "debug/dwarf/debug_frame_opcode_writer.h" +#include "debug/dwarf/debug_info_entry_writer.h" +#include "debug/dwarf/debug_line_opcode_writer.h" +#include "debug/dwarf/dwarf_constants.h" +#include "debug/dwarf/headers.h" #include "gtest/gtest.h" namespace art { diff --git a/compiler/dwarf/dwarf_test.h b/compiler/debug/dwarf/dwarf_test.h similarity index 97% rename from compiler/dwarf/dwarf_test.h rename to compiler/debug/dwarf/dwarf_test.h index c3a3ca942..41bfe79c2 100644 --- a/compiler/dwarf/dwarf_test.h +++ b/compiler/debug/dwarf/dwarf_test.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_COMPILER_DWARF_DWARF_TEST_H_ -#define ART_COMPILER_DWARF_DWARF_TEST_H_ +#ifndef ART_COMPILER_DEBUG_DWARF_DWARF_TEST_H_ +#define ART_COMPILER_DEBUG_DWARF_DWARF_TEST_H_ #include #include @@ -169,4 +169,4 @@ class DwarfTest : public CommonRuntimeTest { } // namespace dwarf } // namespace art -#endif // ART_COMPILER_DWARF_DWARF_TEST_H_ +#endif // ART_COMPILER_DEBUG_DWARF_DWARF_TEST_H_ diff --git a/compiler/dwarf/expression.h b/compiler/debug/dwarf/expression.h similarity index 94% rename from compiler/dwarf/expression.h rename to compiler/debug/dwarf/expression.h index 1503d03d4..fafc0462d 100644 --- a/compiler/dwarf/expression.h +++ b/compiler/debug/dwarf/expression.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef ART_COMPILER_DWARF_EXPRESSION_H_ -#define ART_COMPILER_DWARF_EXPRESSION_H_ +#ifndef ART_COMPILER_DEBUG_DWARF_EXPRESSION_H_ +#define ART_COMPILER_DEBUG_DWARF_EXPRESSION_H_ #include #include -#include "dwarf/dwarf_constants.h" -#include "dwarf/writer.h" +#include "debug/dwarf/dwarf_constants.h" +#include "debug/dwarf/writer.h" namespace art { namespace dwarf { @@ -118,4 +118,4 @@ class Expression : private Writer<> { } // namespace dwarf } // namespace art -#endif // ART_COMPILER_DWARF_EXPRESSION_H_ +#endif // ART_COMPILER_DEBUG_DWARF_EXPRESSION_H_ diff --git a/compiler/dwarf/headers.h b/compiler/debug/dwarf/headers.h similarity index 95% rename from compiler/dwarf/headers.h rename to compiler/debug/dwarf/headers.h index 137c5668f..146d9fddf 100644 --- a/compiler/dwarf/headers.h +++ b/compiler/debug/dwarf/headers.h @@ -14,17 +14,17 @@ * limitations under the License. */ -#ifndef ART_COMPILER_DWARF_HEADERS_H_ -#define ART_COMPILER_DWARF_HEADERS_H_ +#ifndef ART_COMPILER_DEBUG_DWARF_HEADERS_H_ +#define ART_COMPILER_DEBUG_DWARF_HEADERS_H_ #include -#include "dwarf/debug_frame_opcode_writer.h" -#include "dwarf/debug_info_entry_writer.h" -#include "dwarf/debug_line_opcode_writer.h" -#include "dwarf/dwarf_constants.h" -#include "dwarf/register.h" -#include "dwarf/writer.h" +#include "debug/dwarf/debug_frame_opcode_writer.h" +#include "debug/dwarf/debug_info_entry_writer.h" +#include "debug/dwarf/debug_line_opcode_writer.h" +#include "debug/dwarf/dwarf_constants.h" +#include "debug/dwarf/register.h" +#include "debug/dwarf/writer.h" #include "utils/array_ref.h" namespace art { @@ -204,4 +204,4 @@ void WriteDebugLineTable(const std::vector& include_directories, } // namespace dwarf } // namespace art -#endif // ART_COMPILER_DWARF_HEADERS_H_ +#endif // ART_COMPILER_DEBUG_DWARF_HEADERS_H_ diff --git a/compiler/dwarf/register.h b/compiler/debug/dwarf/register.h similarity index 94% rename from compiler/dwarf/register.h rename to compiler/debug/dwarf/register.h index aa3070a9c..24bacac29 100644 --- a/compiler/dwarf/register.h +++ b/compiler/debug/dwarf/register.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_COMPILER_DWARF_REGISTER_H_ -#define ART_COMPILER_DWARF_REGISTER_H_ +#ifndef ART_COMPILER_DEBUG_DWARF_REGISTER_H_ +#define ART_COMPILER_DEBUG_DWARF_REGISTER_H_ namespace art { namespace dwarf { @@ -59,4 +59,4 @@ class Reg { } // namespace dwarf } // namespace art -#endif // ART_COMPILER_DWARF_REGISTER_H_ +#endif // ART_COMPILER_DEBUG_DWARF_REGISTER_H_ diff --git a/compiler/dwarf/writer.h b/compiler/debug/dwarf/writer.h similarity index 97% rename from compiler/dwarf/writer.h rename to compiler/debug/dwarf/writer.h index 74acf07ab..95912ad6c 100644 --- a/compiler/dwarf/writer.h +++ b/compiler/debug/dwarf/writer.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_COMPILER_DWARF_WRITER_H_ -#define ART_COMPILER_DWARF_WRITER_H_ +#ifndef ART_COMPILER_DEBUG_DWARF_WRITER_H_ +#define ART_COMPILER_DEBUG_DWARF_WRITER_H_ #include #include @@ -179,4 +179,4 @@ class Writer { } // namespace dwarf } // namespace art -#endif // ART_COMPILER_DWARF_WRITER_H_ +#endif // ART_COMPILER_DEBUG_DWARF_WRITER_H_ diff --git a/compiler/elf_writer_debug.cc b/compiler/debug/elf_writer_debug.cc similarity index 99% rename from compiler/elf_writer_debug.cc rename to compiler/debug/elf_writer_debug.cc index e2481b061..07d16d22e 100644 --- a/compiler/elf_writer_debug.cc +++ b/compiler/debug/elf_writer_debug.cc @@ -23,15 +23,15 @@ #include "base/casts.h" #include "base/stl_util.h" -#include "linear_alloc.h" #include "compiled_method.h" +#include "debug/dwarf/expression.h" +#include "debug/dwarf/headers.h" +#include "debug/dwarf/register.h" +#include "debug/method_debug_info.h" #include "dex_file-inl.h" #include "driver/compiler_driver.h" -#include "dwarf/expression.h" -#include "dwarf/headers.h" -#include "dwarf/method_debug_info.h" -#include "dwarf/register.h" #include "elf_builder.h" +#include "linear_alloc.h" #include "linker/vector_output_stream.h" #include "mirror/array.h" #include "mirror/class-inl.h" diff --git a/compiler/elf_writer_debug.h b/compiler/debug/elf_writer_debug.h similarity index 90% rename from compiler/elf_writer_debug.h rename to compiler/debug/elf_writer_debug.h index e28919797..c5bf60921 100644 --- a/compiler/elf_writer_debug.h +++ b/compiler/debug/elf_writer_debug.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef ART_COMPILER_ELF_WRITER_DEBUG_H_ -#define ART_COMPILER_ELF_WRITER_DEBUG_H_ +#ifndef ART_COMPILER_DEBUG_ELF_WRITER_DEBUG_H_ +#define ART_COMPILER_DEBUG_ELF_WRITER_DEBUG_H_ #include "base/macros.h" #include "base/mutex.h" -#include "dwarf/dwarf_constants.h" +#include "debug/dwarf/dwarf_constants.h" #include "elf_builder.h" #include "utils/array_ref.h" @@ -50,4 +50,4 @@ ArrayRef WriteDebugElfFileForClasses(const InstructionSet isa, } // namespace dwarf } // namespace art -#endif // ART_COMPILER_ELF_WRITER_DEBUG_H_ +#endif // ART_COMPILER_DEBUG_ELF_WRITER_DEBUG_H_ diff --git a/compiler/dwarf/method_debug_info.h b/compiler/debug/method_debug_info.h similarity index 87% rename from compiler/dwarf/method_debug_info.h rename to compiler/debug/method_debug_info.h index e8ba9148e..7da8fb795 100644 --- a/compiler/dwarf/method_debug_info.h +++ b/compiler/debug/method_debug_info.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_COMPILER_DWARF_METHOD_DEBUG_INFO_H_ -#define ART_COMPILER_DWARF_METHOD_DEBUG_INFO_H_ +#ifndef ART_COMPILER_DEBUG_METHOD_DEBUG_INFO_H_ +#define ART_COMPILER_DEBUG_METHOD_DEBUG_INFO_H_ #include "dex_file.h" @@ -38,4 +38,4 @@ struct MethodDebugInfo { } // namespace dwarf } // namespace art -#endif // ART_COMPILER_DWARF_METHOD_DEBUG_INFO_H_ +#endif // ART_COMPILER_DEBUG_METHOD_DEBUG_INFO_H_ diff --git a/compiler/dex/quick/lazy_debug_frame_opcode_writer.h b/compiler/dex/quick/lazy_debug_frame_opcode_writer.h index c425fc852..85050f4f1 100644 --- a/compiler/dex/quick/lazy_debug_frame_opcode_writer.h +++ b/compiler/dex/quick/lazy_debug_frame_opcode_writer.h @@ -19,7 +19,7 @@ #include "base/arena_allocator.h" #include "base/arena_containers.h" -#include "dwarf/debug_frame_opcode_writer.h" +#include "debug/dwarf/debug_frame_opcode_writer.h" namespace art { struct LIR; diff --git a/compiler/elf_writer_quick.cc b/compiler/elf_writer_quick.cc index 864e1b1be..e5dfe68ea 100644 --- a/compiler/elf_writer_quick.cc +++ b/compiler/elf_writer_quick.cc @@ -23,12 +23,12 @@ #include "base/logging.h" #include "base/stl_util.h" #include "compiled_method.h" +#include "debug/elf_writer_debug.h" +#include "debug/method_debug_info.h" #include "driver/compiler_options.h" -#include "dwarf/method_debug_info.h" #include "elf.h" #include "elf_builder.h" #include "elf_utils.h" -#include "elf_writer_debug.h" #include "globals.h" #include "leb128.h" #include "linker/buffered_output_stream.h" diff --git a/compiler/image_test.cc b/compiler/image_test.cc index a5a779661..4920f9baa 100644 --- a/compiler/image_test.cc +++ b/compiler/image_test.cc @@ -23,7 +23,7 @@ #include "base/unix_file/fd_file.h" #include "class_linker-inl.h" #include "common_compiler_test.h" -#include "dwarf/method_debug_info.h" +#include "debug/method_debug_info.h" #include "elf_writer.h" #include "elf_writer_quick.h" #include "gc/space/image_space.h" diff --git a/compiler/jit/jit_compiler.cc b/compiler/jit/jit_compiler.cc index 67747586c..930587708 100644 --- a/compiler/jit/jit_compiler.cc +++ b/compiler/jit/jit_compiler.cc @@ -16,19 +16,19 @@ #include "jit_compiler.h" -#include "art_method-inl.h" #include "arch/instruction_set.h" #include "arch/instruction_set_features.h" +#include "art_method-inl.h" #include "base/stringpiece.h" #include "base/time_utils.h" #include "base/timing_logger.h" #include "base/unix_file/fd_file.h" #include "compiler_callbacks.h" +#include "debug/elf_writer_debug.h" #include "dex/pass_manager.h" #include "dex/quick_compiler_callbacks.h" #include "driver/compiler_driver.h" #include "driver/compiler_options.h" -#include "elf_writer_debug.h" #include "jit/debugger_interface.h" #include "jit/jit.h" #include "jit/jit_code_cache.h" diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index cff2f471b..894d29ee9 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -21,20 +21,20 @@ #include "common_compiler_test.h" #include "compiled_method.h" #include "compiler.h" +#include "debug/method_debug_info.h" #include "dex/pass_manager.h" #include "dex/quick/dex_file_to_method_inliner_map.h" #include "dex/quick_compiler_callbacks.h" #include "dex/verification_results.h" #include "driver/compiler_driver.h" #include "driver/compiler_options.h" -#include "dwarf/method_debug_info.h" #include "elf_writer.h" #include "elf_writer_quick.h" #include "entrypoints/quick/quick_entrypoints.h" #include "linker/vector_output_stream.h" #include "mirror/class-inl.h" -#include "mirror/object_array-inl.h" #include "mirror/object-inl.h" +#include "mirror/object_array-inl.h" #include "oat_file-inl.h" #include "oat_writer.h" #include "scoped_thread_state_change.h" diff --git a/compiler/oat_writer.cc b/compiler/oat_writer.cc index 90ac499ba..590c0f870 100644 --- a/compiler/oat_writer.cc +++ b/compiler/oat_writer.cc @@ -29,11 +29,11 @@ #include "class_linker.h" #include "compiled_class.h" #include "compiled_method.h" -#include "dex_file-inl.h" +#include "debug/method_debug_info.h" #include "dex/verification_results.h" +#include "dex_file-inl.h" #include "driver/compiler_driver.h" #include "driver/compiler_options.h" -#include "dwarf/method_debug_info.h" #include "gc/space/image_space.h" #include "gc/space/space.h" #include "handle_scope-inl.h" diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index bdc664b3e..c8bef8115 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -45,15 +45,14 @@ #include "compiler.h" #include "constant_folding.h" #include "dead_code_elimination.h" +#include "debug/elf_writer_debug.h" +#include "debug/method_debug_info.h" #include "dex/quick/dex_file_to_method_inliner_map.h" -#include "dex/verified_method.h" #include "dex/verification_results.h" -#include "driver/compiler_driver.h" +#include "dex/verified_method.h" #include "driver/compiler_driver-inl.h" #include "driver/compiler_options.h" #include "driver/dex_compilation_unit.h" -#include "dwarf/method_debug_info.h" -#include "elf_writer_debug.h" #include "elf_writer_quick.h" #include "graph_checker.h" #include "graph_visualizer.h" @@ -64,20 +63,20 @@ #include "intrinsics.h" #include "jit/debugger_interface.h" #include "jit/jit_code_cache.h" -#include "licm.h" #include "jni/quick/jni_compiler.h" +#include "licm.h" #include "load_store_elimination.h" #include "nodes.h" +#include "oat_quick_method_header.h" #include "prepare_for_register_allocation.h" #include "reference_type_propagation.h" #include "register_allocator.h" -#include "oat_quick_method_header.h" #include "select_generator.h" #include "sharpening.h" #include "side_effects_analysis.h" #include "ssa_builder.h" -#include "ssa_phi_elimination.h" #include "ssa_liveness_analysis.h" +#include "ssa_phi_elimination.h" #include "utils/assembler.h" #include "verifier/method_verifier.h" diff --git a/compiler/utils/arm/managed_register_arm.h b/compiler/utils/arm/managed_register_arm.h index 5fde9e885..5b84058f7 100644 --- a/compiler/utils/arm/managed_register_arm.h +++ b/compiler/utils/arm/managed_register_arm.h @@ -19,7 +19,7 @@ #include "base/logging.h" #include "constants_arm.h" -#include "dwarf/register.h" +#include "debug/dwarf/register.h" #include "utils/managed_register.h" namespace art { diff --git a/compiler/utils/arm64/managed_register_arm64.h b/compiler/utils/arm64/managed_register_arm64.h index dbcd8c56f..46be1c528 100644 --- a/compiler/utils/arm64/managed_register_arm64.h +++ b/compiler/utils/arm64/managed_register_arm64.h @@ -19,7 +19,7 @@ #include "base/logging.h" #include "constants_arm64.h" -#include "dwarf/register.h" +#include "debug/dwarf/register.h" #include "utils/managed_register.h" namespace art { diff --git a/compiler/utils/assembler.h b/compiler/utils/assembler.h index 1dbc14239..414ea7e66 100644 --- a/compiler/utils/assembler.h +++ b/compiler/utils/assembler.h @@ -21,9 +21,10 @@ #include "arch/instruction_set.h" #include "arch/instruction_set_features.h" +#include "arm/constants_arm.h" #include "base/logging.h" #include "base/macros.h" -#include "arm/constants_arm.h" +#include "debug/dwarf/debug_frame_opcode_writer.h" #include "label.h" #include "managed_register.h" #include "memory_region.h" @@ -31,7 +32,6 @@ #include "offsets.h" #include "x86/constants_x86.h" #include "x86_64/constants_x86_64.h" -#include "dwarf/debug_frame_opcode_writer.h" namespace art { diff --git a/compiler/utils/mips/managed_register_mips.h b/compiler/utils/mips/managed_register_mips.h index 40d39e338..5e7ed11f5 100644 --- a/compiler/utils/mips/managed_register_mips.h +++ b/compiler/utils/mips/managed_register_mips.h @@ -18,7 +18,7 @@ #define ART_COMPILER_UTILS_MIPS_MANAGED_REGISTER_MIPS_H_ #include "constants_mips.h" -#include "dwarf/register.h" +#include "debug/dwarf/register.h" #include "utils/managed_register.h" namespace art { diff --git a/compiler/utils/mips64/managed_register_mips64.h b/compiler/utils/mips64/managed_register_mips64.h index 4c4705bbf..1d36128a0 100644 --- a/compiler/utils/mips64/managed_register_mips64.h +++ b/compiler/utils/mips64/managed_register_mips64.h @@ -18,7 +18,7 @@ #define ART_COMPILER_UTILS_MIPS64_MANAGED_REGISTER_MIPS64_H_ #include "constants_mips64.h" -#include "dwarf/register.h" +#include "debug/dwarf/register.h" #include "utils/managed_register.h" namespace art { diff --git a/compiler/utils/x86/managed_register_x86.h b/compiler/utils/x86/managed_register_x86.h index 4e8c41e21..fc20d7e20 100644 --- a/compiler/utils/x86/managed_register_x86.h +++ b/compiler/utils/x86/managed_register_x86.h @@ -18,7 +18,7 @@ #define ART_COMPILER_UTILS_X86_MANAGED_REGISTER_X86_H_ #include "constants_x86.h" -#include "dwarf/register.h" +#include "debug/dwarf/register.h" #include "utils/managed_register.h" namespace art { diff --git a/compiler/utils/x86_64/managed_register_x86_64.h b/compiler/utils/x86_64/managed_register_x86_64.h index 47bbb44fc..c4228c113 100644 --- a/compiler/utils/x86_64/managed_register_x86_64.h +++ b/compiler/utils/x86_64/managed_register_x86_64.h @@ -18,7 +18,7 @@ #define ART_COMPILER_UTILS_X86_64_MANAGED_REGISTER_X86_64_H_ #include "constants_x86_64.h" -#include "dwarf/register.h" +#include "debug/dwarf/register.h" #include "utils/managed_register.h" namespace art { diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index b1f71cee3..541fb5a42 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -35,9 +35,9 @@ #define ATRACE_TAG ATRACE_TAG_DALVIK #include -#include "art_method-inl.h" #include "arch/instruction_set_features.h" #include "arch/mips/instruction_set_features_mips.h" +#include "art_method-inl.h" #include "base/dumpable.h" #include "base/macros.h" #include "base/stl_util.h" @@ -48,14 +48,14 @@ #include "class_linker.h" #include "compiler.h" #include "compiler_callbacks.h" -#include "dex_file-inl.h" +#include "debug/method_debug_info.h" #include "dex/pass_manager.h" -#include "dex/verification_results.h" -#include "dex/quick_compiler_callbacks.h" #include "dex/quick/dex_file_to_method_inliner_map.h" +#include "dex/quick_compiler_callbacks.h" +#include "dex/verification_results.h" +#include "dex_file-inl.h" #include "driver/compiler_driver.h" #include "driver/compiler_options.h" -#include "dwarf/method_debug_info.h" #include "elf_file.h" #include "elf_writer.h" #include "elf_writer_quick.h" -- 2.11.0