From 641ce0371c2f0dc95d26be02d8366124c8b66653 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Thu, 31 Jan 2013 15:21:37 -0800 Subject: Rename compiler_llvm CompilationUnit to LlvmCompilationUnit Also fixed stray ART_TEST_CFLAGS to LOCAL_CFLAGS Also fixed relative includes Tried to change CompilationUnit to reference LlvmCompilationUnit, but that causes issues because of the split libart-compiler libart-compiler-llvm. Change-Id: I7a490f339add6355a20c1cedae858ccf6967a6aa --- src/compiler/codegen/arm/arm_lir.h | 2 +- src/compiler/codegen/arm/assemble_arm.cc | 2 +- src/compiler/codegen/arm/call_arm.cc | 8 ++++---- src/compiler/codegen/arm/codegen_arm.h | 2 +- src/compiler/codegen/arm/fp_arm.cc | 4 ++-- src/compiler/codegen/arm/int_arm.cc | 8 ++++---- src/compiler/codegen/arm/target_arm.cc | 10 +++++----- src/compiler/codegen/arm/utility_arm.cc | 4 ++-- src/compiler/codegen/codegen.h | 2 +- src/compiler/codegen/codegen_util.cc | 2 +- src/compiler/codegen/codegen_util.h | 7 +++++++ src/compiler/codegen/gen_common.cc | 4 ++-- src/compiler/codegen/gen_invoke.cc | 4 ++-- src/compiler/codegen/gen_loadstore.cc | 4 ++-- src/compiler/codegen/local_optimizations.cc | 2 +- src/compiler/codegen/mips/assemble_mips.cc | 4 ++-- src/compiler/codegen/mips/call_mips.cc | 8 ++++---- src/compiler/codegen/mips/codegen_mips.h | 3 ++- src/compiler/codegen/mips/fp_mips.cc | 8 ++++---- src/compiler/codegen/mips/int_mips.cc | 8 ++++---- src/compiler/codegen/mips/mips_lir.h | 2 +- src/compiler/codegen/mips/target_mips.cc | 8 ++++---- src/compiler/codegen/mips/utility_mips.cc | 6 +++--- src/compiler/codegen/mir_to_gbc.cc | 4 ++-- src/compiler/codegen/mir_to_lir.cc | 2 +- src/compiler/codegen/ralloc_util.cc | 8 ++++---- src/compiler/codegen/ralloc_util.h | 6 +++--- src/compiler/codegen/x86/assemble_x86.cc | 4 ++-- src/compiler/codegen/x86/call_x86.cc | 6 +++--- src/compiler/codegen/x86/codegen_x86.h | 2 +- src/compiler/codegen/x86/fp_x86.cc | 6 +++--- src/compiler/codegen/x86/int_x86.cc | 6 +++--- src/compiler/codegen/x86/target_x86.cc | 8 ++++---- src/compiler/codegen/x86/utility_x86.cc | 6 +++--- src/compiler/codegen/x86/x86_lir.h | 2 +- 35 files changed, 90 insertions(+), 82 deletions(-) (limited to 'src/compiler/codegen') diff --git a/src/compiler/codegen/arm/arm_lir.h b/src/compiler/codegen/arm/arm_lir.h index 09b45b83f3..3fc87924cf 100644 --- a/src/compiler/codegen/arm/arm_lir.h +++ b/src/compiler/codegen/arm/arm_lir.h @@ -17,7 +17,7 @@ #ifndef ART_SRC_COMPILER_CODEGEN_ARM_ARMLIR_H_ #define ART_SRC_COMPILER_CODEGEN_ARM_ARMLIR_H_ -#include "../../compiler_internals.h" +#include "compiler/compiler_internals.h" namespace art { diff --git a/src/compiler/codegen/arm/assemble_arm.cc b/src/compiler/codegen/arm/assemble_arm.cc index 27544d82ec..91f25d68e6 100644 --- a/src/compiler/codegen/arm/assemble_arm.cc +++ b/src/compiler/codegen/arm/assemble_arm.cc @@ -16,7 +16,7 @@ #include "arm_lir.h" #include "codegen_arm.h" -#include "../codegen_util.h" +#include "compiler/codegen/codegen_util.h" namespace art { diff --git a/src/compiler/codegen/arm/call_arm.cc b/src/compiler/codegen/arm/call_arm.cc index 47306f402c..225c3349b5 100644 --- a/src/compiler/codegen/arm/call_arm.cc +++ b/src/compiler/codegen/arm/call_arm.cc @@ -16,12 +16,12 @@ /* This file contains codegen for the Thumb2 ISA. */ -#include "oat_compilation_unit.h" -#include "oat/runtime/oat_support_entrypoints.h" #include "arm_lir.h" #include "codegen_arm.h" -#include "../codegen_util.h" -#include "../ralloc_util.h" +#include "compiler/codegen/codegen_util.h" +#include "compiler/codegen/ralloc_util.h" +#include "oat/runtime/oat_support_entrypoints.h" +#include "oat_compilation_unit.h" namespace art { diff --git a/src/compiler/codegen/arm/codegen_arm.h b/src/compiler/codegen/arm/codegen_arm.h index 8d99049c6b..ea34ff2b26 100644 --- a/src/compiler/codegen/arm/codegen_arm.h +++ b/src/compiler/codegen/arm/codegen_arm.h @@ -17,7 +17,7 @@ #ifndef ART_SRC_COMPILER_CODEGEN_ARM_CODEGENARM_H_ #define ART_SRC_COMPILER_CODEGEN_ARM_CODEGENARM_H_ -#include "../../compiler_internals.h" +#include "compiler/compiler_internals.h" namespace art { diff --git a/src/compiler/codegen/arm/fp_arm.cc b/src/compiler/codegen/arm/fp_arm.cc index 57c55cc436..577e0ab150 100644 --- a/src/compiler/codegen/arm/fp_arm.cc +++ b/src/compiler/codegen/arm/fp_arm.cc @@ -16,8 +16,8 @@ #include "arm_lir.h" #include "codegen_arm.h" -#include "../codegen_util.h" -#include "../ralloc_util.h" +#include "compiler/codegen/codegen_util.h" +#include "compiler/codegen/ralloc_util.h" namespace art { diff --git a/src/compiler/codegen/arm/int_arm.cc b/src/compiler/codegen/arm/int_arm.cc index 6a1178e340..fcf74f1471 100644 --- a/src/compiler/codegen/arm/int_arm.cc +++ b/src/compiler/codegen/arm/int_arm.cc @@ -16,12 +16,12 @@ /* This file contains codegen for the Thumb2 ISA. */ -#include "oat_compilation_unit.h" -#include "oat/runtime/oat_support_entrypoints.h" #include "arm_lir.h" #include "codegen_arm.h" -#include "../codegen_util.h" -#include "../ralloc_util.h" +#include "compiler/codegen/codegen_util.h" +#include "compiler/codegen/ralloc_util.h" +#include "oat/runtime/oat_support_entrypoints.h" +#include "oat_compilation_unit.h" namespace art { diff --git a/src/compiler/codegen/arm/target_arm.cc b/src/compiler/codegen/arm/target_arm.cc index 493b4a9aca..f871f3da7a 100644 --- a/src/compiler/codegen/arm/target_arm.cc +++ b/src/compiler/codegen/arm/target_arm.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "../../compiler_internals.h" +#include + #include "arm_lir.h" #include "codegen_arm.h" -#include "../ralloc_util.h" -#include "../codegen_util.h" - -#include +#include "compiler/codegen/codegen_util.h" +#include "compiler/compiler_internals.h" +#include "compiler/codegen/ralloc_util.h" namespace art { diff --git a/src/compiler/codegen/arm/utility_arm.cc b/src/compiler/codegen/arm/utility_arm.cc index 5c25eee87a..433111c528 100644 --- a/src/compiler/codegen/arm/utility_arm.cc +++ b/src/compiler/codegen/arm/utility_arm.cc @@ -16,8 +16,8 @@ #include "arm_lir.h" #include "codegen_arm.h" -#include "../codegen_util.h" -#include "../ralloc_util.h" +#include "compiler/codegen/codegen_util.h" +#include "compiler/codegen/ralloc_util.h" namespace art { diff --git a/src/compiler/codegen/codegen.h b/src/compiler/codegen/codegen.h index 595a1dbb61..03ecb43171 100644 --- a/src/compiler/codegen/codegen.h +++ b/src/compiler/codegen/codegen.h @@ -17,7 +17,7 @@ #ifndef ART_SRC_COMPILER_CODEGEN_CODEGEN_H_ #define ART_SRC_COMPILER_CODEGEN_CODEGEN_H_ -#include "../compiler_ir.h" +#include "compiler/compiler_ir.h" namespace art { diff --git a/src/compiler/codegen/codegen_util.cc b/src/compiler/codegen/codegen_util.cc index 389a41380f..ad05b93c8d 100644 --- a/src/compiler/codegen/codegen_util.cc +++ b/src/compiler/codegen/codegen_util.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "../compiler_internals.h" +#include "compiler/compiler_internals.h" #include "gc_map.h" #include "verifier/dex_gc_map.h" #include "verifier/method_verifier.h" diff --git a/src/compiler/codegen/codegen_util.h b/src/compiler/codegen/codegen_util.h index 3bb4291767..4f146560b2 100644 --- a/src/compiler/codegen/codegen_util.h +++ b/src/compiler/codegen/codegen_util.h @@ -17,8 +17,15 @@ #ifndef ART_SRC_COMPILER_CODEGEN_CODEGENUTIL_H_ #define ART_SRC_COMPILER_CODEGEN_CODEGENUTIL_H_ +#include + +#include "compiler/compiler_enums.h" + namespace art { +class CompilationUnit; +struct LIR; + void MarkSafepointPC(CompilationUnit* cu, LIR* inst); bool FastInstance(CompilationUnit* cu, uint32_t field_idx, int& field_offset, bool& is_volatile, bool is_put); diff --git a/src/compiler/codegen/gen_common.cc b/src/compiler/codegen/gen_common.cc index acaad5b26b..1d64a71848 100644 --- a/src/compiler/codegen/gen_common.cc +++ b/src/compiler/codegen/gen_common.cc @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "codegen_util.h" +#include "compiler/compiler_ir.h" #include "oat/runtime/oat_support_entrypoints.h" -#include "../compiler_ir.h" #include "ralloc_util.h" -#include "codegen_util.h" namespace art { diff --git a/src/compiler/codegen/gen_invoke.cc b/src/compiler/codegen/gen_invoke.cc index 78425c40bd..816927f75d 100644 --- a/src/compiler/codegen/gen_invoke.cc +++ b/src/compiler/codegen/gen_invoke.cc @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "codegen_util.h" +#include "compiler/compiler_ir.h" #include "oat/runtime/oat_support_entrypoints.h" -#include "../compiler_ir.h" #include "ralloc_util.h" -#include "codegen_util.h" #include "x86/codegen_x86.h" namespace art { diff --git a/src/compiler/codegen/gen_loadstore.cc b/src/compiler/codegen/gen_loadstore.cc index 6c16d40849..b183f9e245 100644 --- a/src/compiler/codegen/gen_loadstore.cc +++ b/src/compiler/codegen/gen_loadstore.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "../compiler_ir.h" -#include "ralloc_util.h" #include "codegen_util.h" +#include "compiler/compiler_ir.h" +#include "ralloc_util.h" namespace art { diff --git a/src/compiler/codegen/local_optimizations.cc b/src/compiler/codegen/local_optimizations.cc index 69b5d8ef36..b6981cac03 100644 --- a/src/compiler/codegen/local_optimizations.cc +++ b/src/compiler/codegen/local_optimizations.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "../compiler_internals.h" +#include "compiler/compiler_internals.h" namespace art { diff --git a/src/compiler/codegen/mips/assemble_mips.cc b/src/compiler/codegen/mips/assemble_mips.cc index c0ed3b68ba..34a91b08e2 100644 --- a/src/compiler/codegen/mips/assemble_mips.cc +++ b/src/compiler/codegen/mips/assemble_mips.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "mips_lir.h" #include "codegen_mips.h" -#include "../codegen_util.h" +#include "compiler/codegen/codegen_util.h" +#include "mips_lir.h" namespace art { diff --git a/src/compiler/codegen/mips/call_mips.cc b/src/compiler/codegen/mips/call_mips.cc index 76c9fbd393..39fdc0335a 100644 --- a/src/compiler/codegen/mips/call_mips.cc +++ b/src/compiler/codegen/mips/call_mips.cc @@ -16,11 +16,11 @@ /* This file contains codegen for the Mips ISA */ -#include "oat/runtime/oat_support_entrypoints.h" -#include "mips_lir.h" #include "codegen_mips.h" -#include "../codegen_util.h" -#include "../ralloc_util.h" +#include "compiler/codegen/codegen_util.h" +#include "compiler/codegen/ralloc_util.h" +#include "mips_lir.h" +#include "oat/runtime/oat_support_entrypoints.h" namespace art { diff --git a/src/compiler/codegen/mips/codegen_mips.h b/src/compiler/codegen/mips/codegen_mips.h index fcd5669422..705ecfa393 100644 --- a/src/compiler/codegen/mips/codegen_mips.h +++ b/src/compiler/codegen/mips/codegen_mips.h @@ -17,7 +17,8 @@ #ifndef ART_SRC_COMPILER_CODEGEN_MIPS_CODEGENMIPS_H_ #define ART_SRC_COMPILER_CODEGEN_MIPS_CODEGENMIPS_H_ -#include "../../compiler_internals.h" +#include "compiler/compiler_internals.h" +#include "mips_lir.h" namespace art { diff --git a/src/compiler/codegen/mips/fp_mips.cc b/src/compiler/codegen/mips/fp_mips.cc index 6ffc5e0e3e..e7b106e87a 100644 --- a/src/compiler/codegen/mips/fp_mips.cc +++ b/src/compiler/codegen/mips/fp_mips.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "oat/runtime/oat_support_entrypoints.h" -#include "mips_lir.h" #include "codegen_mips.h" -#include "../codegen_util.h" -#include "../ralloc_util.h" +#include "compiler/codegen/codegen_util.h" +#include "compiler/codegen/ralloc_util.h" +#include "mips_lir.h" +#include "oat/runtime/oat_support_entrypoints.h" namespace art { diff --git a/src/compiler/codegen/mips/int_mips.cc b/src/compiler/codegen/mips/int_mips.cc index 86f0527bf1..7da4cf684b 100644 --- a/src/compiler/codegen/mips/int_mips.cc +++ b/src/compiler/codegen/mips/int_mips.cc @@ -16,11 +16,11 @@ /* This file contains codegen for the Mips ISA */ -#include "oat/runtime/oat_support_entrypoints.h" -#include "mips_lir.h" #include "codegen_mips.h" -#include "../codegen_util.h" -#include "../ralloc_util.h" +#include "compiler/codegen/codegen_util.h" +#include "compiler/codegen/ralloc_util.h" +#include "mips_lir.h" +#include "oat/runtime/oat_support_entrypoints.h" namespace art { diff --git a/src/compiler/codegen/mips/mips_lir.h b/src/compiler/codegen/mips/mips_lir.h index cecd4ab3ff..41e598fa39 100644 --- a/src/compiler/codegen/mips/mips_lir.h +++ b/src/compiler/codegen/mips/mips_lir.h @@ -17,7 +17,7 @@ #ifndef ART_COMPILER_COMPILER_CODEGEN_MIPS_MIPSLIR_H_ #define ART_COMPILER_COMPILER_CODEGEN_MIPS_MIPSLIR_H_ -#include "../../compiler_internals.h" +#include "compiler/compiler_internals.h" namespace art { diff --git a/src/compiler/codegen/mips/target_mips.cc b/src/compiler/codegen/mips/target_mips.cc index 3bb46896a5..de19ac08a9 100644 --- a/src/compiler/codegen/mips/target_mips.cc +++ b/src/compiler/codegen/mips/target_mips.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "../../compiler_internals.h" -#include "mips_lir.h" #include "codegen_mips.h" -#include "../ralloc_util.h" -#include "../codegen_util.h" +#include "compiler/codegen/codegen_util.h" +#include "compiler/compiler_internals.h" +#include "compiler/codegen/ralloc_util.h" +#include "mips_lir.h" #include diff --git a/src/compiler/codegen/mips/utility_mips.cc b/src/compiler/codegen/mips/utility_mips.cc index 4d4be7600b..1e217fbe75 100644 --- a/src/compiler/codegen/mips/utility_mips.cc +++ b/src/compiler/codegen/mips/utility_mips.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "mips_lir.h" #include "codegen_mips.h" -#include "../codegen_util.h" -#include "../ralloc_util.h" +#include "compiler/codegen/codegen_util.h" +#include "compiler/codegen/ralloc_util.h" +#include "mips_lir.h" namespace art { diff --git a/src/compiler/codegen/mir_to_gbc.cc b/src/compiler/codegen/mir_to_gbc.cc index 2657b791ac..f67f760d40 100644 --- a/src/compiler/codegen/mir_to_gbc.cc +++ b/src/compiler/codegen/mir_to_gbc.cc @@ -27,9 +27,9 @@ #include #include -#include "../compiler_internals.h" -#include "local_optimizations.h" #include "codegen_util.h" +#include "compiler/compiler_internals.h" +#include "local_optimizations.h" #include "ralloc_util.h" static const char* kLabelFormat = "%c0x%x_%d"; diff --git a/src/compiler/codegen/mir_to_lir.cc b/src/compiler/codegen/mir_to_lir.cc index 77d581fd6e..bd26f2d64e 100644 --- a/src/compiler/codegen/mir_to_lir.cc +++ b/src/compiler/codegen/mir_to_lir.cc @@ -16,7 +16,7 @@ #include "object_utils.h" -#include "../compiler_internals.h" +#include "compiler/compiler_internals.h" #include "local_optimizations.h" #include "codegen_util.h" #include "ralloc_util.h" diff --git a/src/compiler/codegen/ralloc_util.cc b/src/compiler/codegen/ralloc_util.cc index accf676fd7..afd49768d0 100644 --- a/src/compiler/codegen/ralloc_util.cc +++ b/src/compiler/codegen/ralloc_util.cc @@ -16,11 +16,11 @@ /* This file contains register alloction support. */ -#include "../compiler_utility.h" -#include "../compiler_ir.h" -#include "../dataflow.h" -#include "ralloc_util.h" #include "codegen_util.h" +#include "compiler/compiler_ir.h" +#include "compiler/compiler_utility.h" +#include "compiler/dataflow.h" +#include "ralloc_util.h" namespace art { diff --git a/src/compiler/codegen/ralloc_util.h b/src/compiler/codegen/ralloc_util.h index 3526f4cd20..a5ed9999da 100644 --- a/src/compiler/codegen/ralloc_util.h +++ b/src/compiler/codegen/ralloc_util.h @@ -21,9 +21,9 @@ * This file contains target independent register alloction support. */ -#include "../compiler_ir.h" -#include "../dataflow.h" -#include "../compiler_utility.h" +#include "compiler/compiler_ir.h" +#include "compiler/compiler_utility.h" +#include "compiler/dataflow.h" namespace art { diff --git a/src/compiler/codegen/x86/assemble_x86.cc b/src/compiler/codegen/x86/assemble_x86.cc index 2b33090d05..1fa2352d78 100644 --- a/src/compiler/codegen/x86/assemble_x86.cc +++ b/src/compiler/codegen/x86/assemble_x86.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "x86_lir.h" #include "codegen_x86.h" -#include "../codegen_util.h" +#include "compiler/codegen/codegen_util.h" +#include "x86_lir.h" namespace art { diff --git a/src/compiler/codegen/x86/call_x86.cc b/src/compiler/codegen/x86/call_x86.cc index f9b25c844c..4209375b9d 100644 --- a/src/compiler/codegen/x86/call_x86.cc +++ b/src/compiler/codegen/x86/call_x86.cc @@ -16,10 +16,10 @@ /* This file contains codegen for the X86 ISA */ -#include "x86_lir.h" #include "codegen_x86.h" -#include "../codegen_util.h" -#include "../ralloc_util.h" +#include "compiler/codegen/codegen_util.h" +#include "compiler/codegen/ralloc_util.h" +#include "x86_lir.h" namespace art { diff --git a/src/compiler/codegen/x86/codegen_x86.h b/src/compiler/codegen/x86/codegen_x86.h index 25f4461237..141638cf1a 100644 --- a/src/compiler/codegen/x86/codegen_x86.h +++ b/src/compiler/codegen/x86/codegen_x86.h @@ -17,7 +17,7 @@ #ifndef ART_SRC_COMPILER_CODEGEN_X86_CODEGENX86_H_ #define ART_SRC_COMPILER_CODEGEN_X86_CODEGENX86_H_ -#include "../../compiler_internals.h" +#include "compiler/compiler_internals.h" #include "x86_lir.h" namespace art { diff --git a/src/compiler/codegen/x86/fp_x86.cc b/src/compiler/codegen/x86/fp_x86.cc index 6bfe9a2e6f..00c2f536d5 100644 --- a/src/compiler/codegen/x86/fp_x86.cc +++ b/src/compiler/codegen/x86/fp_x86.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "x86_lir.h" #include "codegen_x86.h" -#include "../codegen_util.h" -#include "../ralloc_util.h" +#include "compiler/codegen/codegen_util.h" +#include "compiler/codegen/ralloc_util.h" +#include "x86_lir.h" namespace art { diff --git a/src/compiler/codegen/x86/int_x86.cc b/src/compiler/codegen/x86/int_x86.cc index f2d023cbad..0ae51e0e23 100644 --- a/src/compiler/codegen/x86/int_x86.cc +++ b/src/compiler/codegen/x86/int_x86.cc @@ -16,10 +16,10 @@ /* This file contains codegen for the X86 ISA */ -#include "x86_lir.h" #include "codegen_x86.h" -#include "../codegen_util.h" -#include "../ralloc_util.h" +#include "compiler/codegen/codegen_util.h" +#include "compiler/codegen/ralloc_util.h" +#include "x86_lir.h" namespace art { diff --git a/src/compiler/codegen/x86/target_x86.cc b/src/compiler/codegen/x86/target_x86.cc index e396e54717..6cb420ce79 100644 --- a/src/compiler/codegen/x86/target_x86.cc +++ b/src/compiler/codegen/x86/target_x86.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "../../compiler_internals.h" -#include "x86_lir.h" #include "codegen_x86.h" -#include "../ralloc_util.h" -#include "../codegen_util.h" +#include "compiler/codegen/codegen_util.h" +#include "compiler/compiler_internals.h" +#include "compiler/codegen/ralloc_util.h" +#include "x86_lir.h" #include diff --git a/src/compiler/codegen/x86/utility_x86.cc b/src/compiler/codegen/x86/utility_x86.cc index ce55b4bf22..4f9e28b444 100644 --- a/src/compiler/codegen/x86/utility_x86.cc +++ b/src/compiler/codegen/x86/utility_x86.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "x86_lir.h" #include "codegen_x86.h" -#include "../codegen_util.h" -#include "../ralloc_util.h" +#include "compiler/codegen/codegen_util.h" +#include "compiler/codegen/ralloc_util.h" +#include "x86_lir.h" namespace art { diff --git a/src/compiler/codegen/x86/x86_lir.h b/src/compiler/codegen/x86/x86_lir.h index edfcd4d10e..c2722869c3 100644 --- a/src/compiler/codegen/x86/x86_lir.h +++ b/src/compiler/codegen/x86/x86_lir.h @@ -17,7 +17,7 @@ #ifndef ART_COMPILER_COMPILER_CODEGEN_X86_X86LIR_H_ #define ART_COMPILER_COMPILER_CODEGEN_X86_X86LIR_H_ -#include "../../compiler_internals.h" +#include "compiler/compiler_internals.h" namespace art { -- cgit v1.2.3-59-g8ed1b