From 7940e44f4517de5e2634a7e07d58d0fb26160513 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Fri, 12 Jul 2013 13:46:57 -0700 Subject: Create separate Android.mk for main build targets The runtime, compiler, dex2oat, and oatdump now are in seperate trees to prevent dependency creep. They can now be individually built without rebuilding the rest of the art projects. dalvikvm and jdwpspy were already this way. Builds in the art directory should behave as before, building everything including tests. Change-Id: Ic6b1151e5ed0f823c3dd301afd2b13eb2d8feb81 --- compiler/llvm/ir_builder.h | 490 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 490 insertions(+) create mode 100644 compiler/llvm/ir_builder.h (limited to 'compiler/llvm/ir_builder.h') diff --git a/compiler/llvm/ir_builder.h b/compiler/llvm/ir_builder.h new file mode 100644 index 0000000000..734b22f791 --- /dev/null +++ b/compiler/llvm/ir_builder.h @@ -0,0 +1,490 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ART_SRC_COMPILER_LLVM_IR_BUILDER_H_ +#define ART_SRC_COMPILER_LLVM_IR_BUILDER_H_ + +#include "backend_types.h" +#include "dex/compiler_enums.h" +#include "intrinsic_helper.h" +#include "md_builder.h" +#include "runtime_support_builder.h" +#include "runtime_support_llvm_func.h" + +#include +#include +#include +#include +#include +#include + +#include + + +namespace art { +namespace llvm { + +class InserterWithDexOffset : public ::llvm::IRBuilderDefaultInserter { + public: + InserterWithDexOffset() : node_(NULL) {} + + void InsertHelper(::llvm::Instruction *I, const ::llvm::Twine &Name, + ::llvm::BasicBlock *BB, + ::llvm::BasicBlock::iterator InsertPt) const { + ::llvm::IRBuilderDefaultInserter::InsertHelper(I, Name, BB, InsertPt); + if (node_ != NULL) { + I->setMetadata("DexOff", node_); + } + } + + void SetDexOffset(::llvm::MDNode* node) { + node_ = node; + } + private: + ::llvm::MDNode* node_; +}; + +typedef ::llvm::IRBuilder LLVMIRBuilder; +// NOTE: Here we define our own LLVMIRBuilder type alias, so that we can +// switch "preserveNames" template parameter easily. + + +class IRBuilder : public LLVMIRBuilder { + public: + //-------------------------------------------------------------------------- + // General + //-------------------------------------------------------------------------- + + IRBuilder(::llvm::LLVMContext& context, ::llvm::Module& module, + IntrinsicHelper& intrinsic_helper); + + + //-------------------------------------------------------------------------- + // Extend load & store for TBAA + //-------------------------------------------------------------------------- + + ::llvm::LoadInst* CreateLoad(::llvm::Value* ptr, ::llvm::MDNode* tbaa_info) { + ::llvm::LoadInst* inst = LLVMIRBuilder::CreateLoad(ptr); + inst->setMetadata(::llvm::LLVMContext::MD_tbaa, tbaa_info); + return inst; + } + + ::llvm::StoreInst* CreateStore(::llvm::Value* val, ::llvm::Value* ptr, ::llvm::MDNode* tbaa_info) { + ::llvm::StoreInst* inst = LLVMIRBuilder::CreateStore(val, ptr); + inst->setMetadata(::llvm::LLVMContext::MD_tbaa, tbaa_info); + return inst; + } + + ::llvm::AtomicCmpXchgInst* + CreateAtomicCmpXchgInst(::llvm::Value* ptr, ::llvm::Value* cmp, ::llvm::Value* val, + ::llvm::MDNode* tbaa_info) { + ::llvm::AtomicCmpXchgInst* inst = + LLVMIRBuilder::CreateAtomicCmpXchg(ptr, cmp, val, ::llvm::Acquire); + inst->setMetadata(::llvm::LLVMContext::MD_tbaa, tbaa_info); + return inst; + } + + //-------------------------------------------------------------------------- + // Extend memory barrier + //-------------------------------------------------------------------------- + void CreateMemoryBarrier(MemBarrierKind barrier_kind) { +#if ANDROID_SMP + // TODO: select atomic ordering according to given barrier kind. + CreateFence(::llvm::SequentiallyConsistent); +#endif + } + + //-------------------------------------------------------------------------- + // TBAA + //-------------------------------------------------------------------------- + + // TODO: After we design the non-special TBAA info, re-design the TBAA interface. + ::llvm::LoadInst* CreateLoad(::llvm::Value* ptr, TBAASpecialType special_ty) { + return CreateLoad(ptr, mdb_.GetTBAASpecialType(special_ty)); + } + + ::llvm::StoreInst* CreateStore(::llvm::Value* val, ::llvm::Value* ptr, TBAASpecialType special_ty) { + DCHECK_NE(special_ty, kTBAAConstJObject) << "ConstJObject is read only!"; + return CreateStore(val, ptr, mdb_.GetTBAASpecialType(special_ty)); + } + + ::llvm::LoadInst* CreateLoad(::llvm::Value* ptr, TBAASpecialType special_ty, JType j_ty) { + return CreateLoad(ptr, mdb_.GetTBAAMemoryJType(special_ty, j_ty)); + } + + ::llvm::StoreInst* CreateStore(::llvm::Value* val, ::llvm::Value* ptr, + TBAASpecialType special_ty, JType j_ty) { + DCHECK_NE(special_ty, kTBAAConstJObject) << "ConstJObject is read only!"; + return CreateStore(val, ptr, mdb_.GetTBAAMemoryJType(special_ty, j_ty)); + } + + ::llvm::LoadInst* LoadFromObjectOffset(::llvm::Value* object_addr, + int64_t offset, + ::llvm::Type* type, + TBAASpecialType special_ty) { + return LoadFromObjectOffset(object_addr, offset, type, mdb_.GetTBAASpecialType(special_ty)); + } + + void StoreToObjectOffset(::llvm::Value* object_addr, + int64_t offset, + ::llvm::Value* new_value, + TBAASpecialType special_ty) { + DCHECK_NE(special_ty, kTBAAConstJObject) << "ConstJObject is read only!"; + StoreToObjectOffset(object_addr, offset, new_value, mdb_.GetTBAASpecialType(special_ty)); + } + + ::llvm::LoadInst* LoadFromObjectOffset(::llvm::Value* object_addr, + int64_t offset, + ::llvm::Type* type, + TBAASpecialType special_ty, JType j_ty) { + return LoadFromObjectOffset(object_addr, offset, type, mdb_.GetTBAAMemoryJType(special_ty, j_ty)); + } + + void StoreToObjectOffset(::llvm::Value* object_addr, + int64_t offset, + ::llvm::Value* new_value, + TBAASpecialType special_ty, JType j_ty) { + DCHECK_NE(special_ty, kTBAAConstJObject) << "ConstJObject is read only!"; + StoreToObjectOffset(object_addr, offset, new_value, mdb_.GetTBAAMemoryJType(special_ty, j_ty)); + } + + ::llvm::AtomicCmpXchgInst* + CompareExchangeObjectOffset(::llvm::Value* object_addr, + int64_t offset, + ::llvm::Value* cmp_value, + ::llvm::Value* new_value, + TBAASpecialType special_ty) { + DCHECK_NE(special_ty, kTBAAConstJObject) << "ConstJObject is read only!"; + return CompareExchangeObjectOffset(object_addr, offset, cmp_value, new_value, + mdb_.GetTBAASpecialType(special_ty)); + } + + void SetTBAA(::llvm::Instruction* inst, TBAASpecialType special_ty) { + inst->setMetadata(::llvm::LLVMContext::MD_tbaa, mdb_.GetTBAASpecialType(special_ty)); + } + + + //-------------------------------------------------------------------------- + // Static Branch Prediction + //-------------------------------------------------------------------------- + + // Import the orignal conditional branch + using LLVMIRBuilder::CreateCondBr; + ::llvm::BranchInst* CreateCondBr(::llvm::Value *cond, + ::llvm::BasicBlock* true_bb, + ::llvm::BasicBlock* false_bb, + ExpectCond expect) { + ::llvm::BranchInst* branch_inst = CreateCondBr(cond, true_bb, false_bb); + if (false) { + // TODO: http://b/8511695 Restore branch weight metadata + branch_inst->setMetadata(::llvm::LLVMContext::MD_prof, mdb_.GetBranchWeights(expect)); + } + return branch_inst; + } + + + //-------------------------------------------------------------------------- + // Pointer Arithmetic Helper Function + //-------------------------------------------------------------------------- + + ::llvm::IntegerType* getPtrEquivIntTy() { + return getInt32Ty(); + } + + size_t getSizeOfPtrEquivInt() { + return 4; + } + + ::llvm::ConstantInt* getSizeOfPtrEquivIntValue() { + return getPtrEquivInt(getSizeOfPtrEquivInt()); + } + + ::llvm::ConstantInt* getPtrEquivInt(int64_t i) { + return ::llvm::ConstantInt::get(getPtrEquivIntTy(), i); + } + + ::llvm::Value* CreatePtrDisp(::llvm::Value* base, + ::llvm::Value* offset, + ::llvm::PointerType* ret_ty) { + + ::llvm::Value* base_int = CreatePtrToInt(base, getPtrEquivIntTy()); + ::llvm::Value* result_int = CreateAdd(base_int, offset); + ::llvm::Value* result = CreateIntToPtr(result_int, ret_ty); + + return result; + } + + ::llvm::Value* CreatePtrDisp(::llvm::Value* base, + ::llvm::Value* bs, + ::llvm::Value* count, + ::llvm::Value* offset, + ::llvm::PointerType* ret_ty) { + + ::llvm::Value* block_offset = CreateMul(bs, count); + ::llvm::Value* total_offset = CreateAdd(block_offset, offset); + + return CreatePtrDisp(base, total_offset, ret_ty); + } + + ::llvm::LoadInst* LoadFromObjectOffset(::llvm::Value* object_addr, + int64_t offset, + ::llvm::Type* type, + ::llvm::MDNode* tbaa_info) { + // Convert offset to ::llvm::value + ::llvm::Value* llvm_offset = getPtrEquivInt(offset); + // Calculate the value's address + ::llvm::Value* value_addr = CreatePtrDisp(object_addr, llvm_offset, type->getPointerTo()); + // Load + return CreateLoad(value_addr, tbaa_info); + } + + void StoreToObjectOffset(::llvm::Value* object_addr, + int64_t offset, + ::llvm::Value* new_value, + ::llvm::MDNode* tbaa_info) { + // Convert offset to ::llvm::value + ::llvm::Value* llvm_offset = getPtrEquivInt(offset); + // Calculate the value's address + ::llvm::Value* value_addr = CreatePtrDisp(object_addr, + llvm_offset, + new_value->getType()->getPointerTo()); + // Store + CreateStore(new_value, value_addr, tbaa_info); + } + + ::llvm::AtomicCmpXchgInst* CompareExchangeObjectOffset(::llvm::Value* object_addr, + int64_t offset, + ::llvm::Value* cmp_value, + ::llvm::Value* new_value, + ::llvm::MDNode* tbaa_info) { + // Convert offset to ::llvm::value + ::llvm::Value* llvm_offset = getPtrEquivInt(offset); + // Calculate the value's address + ::llvm::Value* value_addr = CreatePtrDisp(object_addr, + llvm_offset, + new_value->getType()->getPointerTo()); + // Atomic compare and exchange + return CreateAtomicCmpXchgInst(value_addr, cmp_value, new_value, tbaa_info); + } + + + //-------------------------------------------------------------------------- + // Runtime Helper Function + //-------------------------------------------------------------------------- + + RuntimeSupportBuilder& Runtime() { + return *runtime_support_; + } + + // TODO: Deprecate + ::llvm::Function* GetRuntime(runtime_support::RuntimeId rt) { + return runtime_support_->GetRuntimeSupportFunction(rt); + } + + // TODO: Deprecate + void SetRuntimeSupport(RuntimeSupportBuilder* runtime_support) { + // Can only set once. We can't do this on constructor, because RuntimeSupportBuilder needs + // IRBuilder. + if (runtime_support_ == NULL && runtime_support != NULL) { + runtime_support_ = runtime_support; + } + } + + + //-------------------------------------------------------------------------- + // Type Helper Function + //-------------------------------------------------------------------------- + + ::llvm::Type* getJType(char shorty_jty) { + return getJType(GetJTypeFromShorty(shorty_jty)); + } + + ::llvm::Type* getJType(JType jty); + + ::llvm::Type* getJVoidTy() { + return getVoidTy(); + } + + ::llvm::IntegerType* getJBooleanTy() { + return getInt8Ty(); + } + + ::llvm::IntegerType* getJByteTy() { + return getInt8Ty(); + } + + ::llvm::IntegerType* getJCharTy() { + return getInt16Ty(); + } + + ::llvm::IntegerType* getJShortTy() { + return getInt16Ty(); + } + + ::llvm::IntegerType* getJIntTy() { + return getInt32Ty(); + } + + ::llvm::IntegerType* getJLongTy() { + return getInt64Ty(); + } + + ::llvm::Type* getJFloatTy() { + return getFloatTy(); + } + + ::llvm::Type* getJDoubleTy() { + return getDoubleTy(); + } + + ::llvm::PointerType* getJObjectTy() { + return java_object_type_; + } + + ::llvm::PointerType* getJMethodTy() { + return java_method_type_; + } + + ::llvm::PointerType* getJThreadTy() { + return java_thread_type_; + } + + ::llvm::Type* getArtFrameTy() { + return art_frame_type_; + } + + ::llvm::PointerType* getJEnvTy() { + return jenv_type_; + } + + ::llvm::Type* getJValueTy() { + // NOTE: JValue is an union type, which may contains boolean, byte, char, + // short, int, long, float, double, Object. However, LLVM itself does + // not support union type, so we have to return a type with biggest size, + // then bitcast it before we use it. + return getJLongTy(); + } + + ::llvm::StructType* getShadowFrameTy(uint32_t vreg_size); + + + //-------------------------------------------------------------------------- + // Constant Value Helper Function + //-------------------------------------------------------------------------- + + ::llvm::ConstantInt* getJBoolean(bool is_true) { + return (is_true) ? getTrue() : getFalse(); + } + + ::llvm::ConstantInt* getJByte(int8_t i) { + return ::llvm::ConstantInt::getSigned(getJByteTy(), i); + } + + ::llvm::ConstantInt* getJChar(int16_t i) { + return ::llvm::ConstantInt::getSigned(getJCharTy(), i); + } + + ::llvm::ConstantInt* getJShort(int16_t i) { + return ::llvm::ConstantInt::getSigned(getJShortTy(), i); + } + + ::llvm::ConstantInt* getJInt(int32_t i) { + return ::llvm::ConstantInt::getSigned(getJIntTy(), i); + } + + ::llvm::ConstantInt* getJLong(int64_t i) { + return ::llvm::ConstantInt::getSigned(getJLongTy(), i); + } + + ::llvm::Constant* getJFloat(float f) { + return ::llvm::ConstantFP::get(getJFloatTy(), f); + } + + ::llvm::Constant* getJDouble(double d) { + return ::llvm::ConstantFP::get(getJDoubleTy(), d); + } + + ::llvm::ConstantPointerNull* getJNull() { + return ::llvm::ConstantPointerNull::get(getJObjectTy()); + } + + ::llvm::Constant* getJZero(char shorty_jty) { + return getJZero(GetJTypeFromShorty(shorty_jty)); + } + + ::llvm::Constant* getJZero(JType jty) { + switch (jty) { + case kVoid: + LOG(FATAL) << "Zero is not a value of void type"; + return NULL; + + case kBoolean: + return getJBoolean(false); + + case kByte: + return getJByte(0); + + case kChar: + return getJChar(0); + + case kShort: + return getJShort(0); + + case kInt: + return getJInt(0); + + case kLong: + return getJLong(0); + + case kFloat: + return getJFloat(0.0f); + + case kDouble: + return getJDouble(0.0); + + case kObject: + return getJNull(); + + default: + LOG(FATAL) << "Unknown java type: " << jty; + return NULL; + } + } + + + private: + ::llvm::Module* module_; + + MDBuilder mdb_; + + ::llvm::PointerType* java_object_type_; + ::llvm::PointerType* java_method_type_; + ::llvm::PointerType* java_thread_type_; + + ::llvm::PointerType* jenv_type_; + + ::llvm::StructType* art_frame_type_; + + RuntimeSupportBuilder* runtime_support_; + + IntrinsicHelper& intrinsic_helper_; +}; + + +} // namespace llvm +} // namespace art + +#endif // ART_SRC_COMPILER_LLVM_IR_BUILDER_H_ -- cgit v1.2.3-59-g8ed1b From fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Wed, 17 Jul 2013 14:40:12 -0700 Subject: Fix multiple inclusion guards to match new pathnames Change-Id: Id7735be1d75bc315733b1773fba45c1deb8ace43 --- Android.mk | 20 +++++++++++++++----- compiler/dex/arena_allocator.h | 6 +++--- compiler/dex/arena_bit_vector.h | 6 +++--- compiler/dex/backend.h | 6 +++--- compiler/dex/compiler_enums.h | 6 +++--- compiler/dex/compiler_internals.h | 6 +++--- compiler/dex/compiler_ir.h | 6 +++--- compiler/dex/dataflow_iterator-inl.h | 6 +++--- compiler/dex/dataflow_iterator.h | 6 +++--- compiler/dex/frontend.h | 6 +++--- compiler/dex/growable_array.h | 6 +++--- compiler/dex/local_value_numbering.h | 6 +++--- compiler/dex/mir_graph.h | 6 +++--- compiler/dex/portable/mir_to_gbc.h | 6 +++--- compiler/dex/quick/arm/arm_lir.h | 6 +++--- compiler/dex/quick/arm/codegen_arm.h | 6 +++--- compiler/dex/quick/mips/codegen_mips.h | 6 +++--- compiler/dex/quick/mips/mips_lir.h | 6 +++--- compiler/dex/quick/mir_to_lir-inl.h | 6 +++--- compiler/dex/quick/mir_to_lir.h | 6 +++--- compiler/dex/quick/x86/codegen_x86.h | 6 +++--- compiler/dex/quick/x86/x86_lir.h | 6 +++--- compiler/driver/compiler_driver.h | 6 +++--- compiler/driver/dex_compilation_unit.h | 6 +++--- compiler/elf_fixup.h | 6 +++--- compiler/elf_stripper.h | 6 +++--- compiler/elf_writer.h | 6 +++--- compiler/elf_writer_mclinker.h | 6 +++--- compiler/elf_writer_quick.h | 6 +++--- compiler/image_writer.h | 6 +++--- compiler/jni/portable/jni_compiler.h | 6 +++--- compiler/jni/quick/arm/calling_convention_arm.h | 6 +++--- compiler/jni/quick/calling_convention.h | 6 +++--- compiler/jni/quick/mips/calling_convention_mips.h | 6 +++--- compiler/jni/quick/x86/calling_convention_x86.h | 6 +++--- compiler/llvm/backend_options.h | 6 +++--- compiler/llvm/backend_types.h | 6 +++--- compiler/llvm/compiler_llvm.h | 6 +++--- compiler/llvm/intrinsic_helper.h | 6 +++--- compiler/llvm/ir_builder.h | 6 +++--- compiler/llvm/llvm_compilation_unit.h | 6 +++--- compiler/llvm/md_builder.h | 6 +++--- compiler/llvm/runtime_support_builder.h | 6 +++--- compiler/llvm/runtime_support_builder_arm.h | 6 +++--- compiler/llvm/runtime_support_builder_thumb2.h | 6 +++--- compiler/llvm/runtime_support_builder_x86.h | 6 +++--- compiler/llvm/runtime_support_llvm_func.h | 6 +++--- compiler/llvm/utils_llvm.h | 6 +++--- compiler/oat_writer.h | 6 +++--- compiler/sea_ir/instruction_tools.h | 6 +++--- compiler/sea_ir/sea.h | 6 +++--- compiler/stubs/stubs.h | 6 +++--- jdwpspy/Common.h | 6 +++--- runtime/asm_support.h | 6 +++--- runtime/atomic.h | 6 +++--- runtime/atomic_integer.h | 6 +++--- runtime/barrier.h | 6 +++--- runtime/base/casts.h | 6 +++--- runtime/base/histogram-inl.h | 6 +++--- runtime/base/histogram.h | 6 +++--- runtime/base/logging.h | 6 +++--- runtime/base/macros.h | 6 +++--- runtime/base/mutex-inl.h | 6 +++--- runtime/base/mutex.h | 6 +++--- runtime/base/stl_util.h | 6 +++--- runtime/base/stringpiece.h | 6 +++--- runtime/base/stringprintf.h | 6 +++--- runtime/base/timing_logger.h | 6 +++--- runtime/base/unix_file/fd_file.h | 6 +++--- runtime/base/unix_file/mapped_file.h | 6 +++--- runtime/base/unix_file/null_file.h | 6 +++--- runtime/base/unix_file/random_access_file.h | 6 +++--- runtime/base/unix_file/random_access_file_test.h | 6 +++--- runtime/base/unix_file/random_access_file_utils.h | 6 +++--- runtime/base/unix_file/string_file.h | 6 +++--- runtime/class_linker-inl.h | 6 +++--- runtime/class_linker.h | 6 +++--- runtime/class_reference.h | 6 +++--- runtime/closure.h | 6 +++--- runtime/common_test.h | 5 +++++ runtime/common_throws.h | 6 +++--- runtime/compiled_class.h | 6 +++--- runtime/compiled_method.h | 6 +++--- runtime/constants_arm.h | 6 +++--- runtime/constants_mips.h | 6 +++--- runtime/constants_x86.h | 6 +++--- runtime/debugger.h | 6 +++--- runtime/dex_file-inl.h | 6 +++--- runtime/dex_file.h | 6 +++--- runtime/dex_file_verifier.h | 6 +++--- runtime/dex_instruction-inl.h | 6 +++--- runtime/dex_instruction.h | 6 +++--- runtime/dex_instruction_list.h | 6 ++++++ runtime/dex_instruction_visitor.h | 6 +++--- runtime/dex_method_iterator.h | 6 +++--- runtime/disassembler.h | 6 +++--- runtime/disassembler_arm.h | 6 +++--- runtime/disassembler_mips.h | 6 +++--- runtime/disassembler_x86.h | 6 +++--- runtime/elf_file.h | 6 +++--- runtime/file_output_stream.h | 6 +++--- runtime/gc/accounting/atomic_stack.h | 6 +++--- runtime/gc/accounting/card_table-inl.h | 6 +++--- runtime/gc/accounting/card_table.h | 6 +++--- runtime/gc/accounting/heap_bitmap-inl.h | 6 +++--- runtime/gc/accounting/heap_bitmap.h | 6 +++--- runtime/gc/accounting/mod_union_table-inl.h | 6 +++--- runtime/gc/accounting/mod_union_table.h | 6 +++--- runtime/gc/accounting/space_bitmap-inl.h | 6 +++--- runtime/gc/accounting/space_bitmap.h | 6 +++--- runtime/gc/allocator/dlmalloc.h | 6 +++--- runtime/gc/collector/garbage_collector.h | 6 +++--- runtime/gc/collector/gc_type.h | 6 +++--- runtime/gc/collector/mark_sweep-inl.h | 6 +++--- runtime/gc/collector/mark_sweep.h | 6 +++--- runtime/gc/collector/partial_mark_sweep.h | 6 +++--- runtime/gc/collector/sticky_mark_sweep.h | 6 +++--- runtime/gc/heap.h | 6 +++--- runtime/gc/space/dlmalloc_space.h | 6 +++--- runtime/gc/space/image_space.h | 6 +++--- runtime/gc/space/large_object_space.h | 6 +++--- runtime/gc/space/space-inl.h | 6 +++--- runtime/gc/space/space.h | 6 +++--- runtime/gc_map.h | 6 +++--- runtime/globals.h | 6 +++--- runtime/hprof/hprof.h | 6 +++--- runtime/image.h | 6 +++--- runtime/indenter.h | 6 +++--- runtime/indirect_reference_table.h | 6 +++--- runtime/instruction_set.h | 6 +++--- runtime/instrumentation.h | 6 +++--- runtime/intern_table.h | 6 +++--- runtime/interpreter/interpreter.h | 6 +++--- runtime/invoke_arg_array_builder.h | 6 +++--- runtime/invoke_type.h | 6 +++--- runtime/jdwp/jdwp.h | 6 +++--- runtime/jdwp/jdwp_bits.h | 6 +++--- runtime/jdwp/jdwp_constants.h | 6 +++--- runtime/jdwp/jdwp_event.h | 6 +++--- runtime/jdwp/jdwp_expand_buf.h | 6 +++--- runtime/jdwp/jdwp_priv.h | 6 +++--- runtime/jdwp/object_registry.h | 5 +++++ runtime/jni_internal.h | 6 +++--- runtime/jobject_comparator.h | 6 +++--- runtime/jvalue.h | 6 +++--- runtime/leb128.h | 6 +++--- runtime/locks.h | 6 +++--- runtime/log_severity.h | 6 +++--- runtime/mem_map.h | 6 +++--- runtime/memory_region.h | 6 +++--- runtime/method_reference.h | 6 +++--- runtime/mirror/abstract_method-inl.h | 6 +++--- runtime/mirror/abstract_method.h | 6 +++--- runtime/mirror/array-inl.h | 6 +++--- runtime/mirror/array.h | 6 +++--- runtime/mirror/class-inl.h | 6 +++--- runtime/mirror/class.h | 6 +++--- runtime/mirror/class_loader.h | 6 +++--- runtime/mirror/dex_cache-inl.h | 6 +++--- runtime/mirror/dex_cache.h | 6 +++--- runtime/mirror/field-inl.h | 6 +++--- runtime/mirror/field.h | 6 +++--- runtime/mirror/iftable-inl.h | 6 +++--- runtime/mirror/iftable.h | 6 +++--- runtime/mirror/object-inl.h | 6 +++--- runtime/mirror/object.h | 6 +++--- runtime/mirror/object_array-inl.h | 6 +++--- runtime/mirror/object_array.h | 6 +++--- runtime/mirror/proxy.h | 6 +++--- runtime/mirror/stack_trace_element.h | 6 +++--- runtime/mirror/string.h | 6 +++--- runtime/mirror/throwable.h | 6 +++--- runtime/modifiers.h | 6 +++--- runtime/monitor.h | 6 +++--- runtime/nth_caller_visitor.h | 6 +++--- runtime/oat.h | 6 +++--- runtime/oat/runtime/argument_visitor.h | 6 +++--- runtime/oat/runtime/arm/context_arm.h | 6 +++--- runtime/oat/runtime/callee_save_frame.h | 6 +++--- runtime/oat/runtime/context.h | 6 +++--- runtime/oat/runtime/mips/context_mips.h | 6 +++--- runtime/oat/runtime/oat_support_entrypoints.h | 6 +++--- runtime/oat/runtime/x86/context_x86.h | 6 +++--- runtime/oat/utils/arm/assembler_arm.h | 6 +++--- runtime/oat/utils/arm/managed_register_arm.h | 6 +++--- runtime/oat/utils/assembler.h | 6 +++--- runtime/oat/utils/managed_register.h | 6 +++--- runtime/oat/utils/mips/assembler_mips.h | 6 +++--- runtime/oat/utils/mips/managed_register_mips.h | 6 +++--- runtime/oat/utils/x86/assembler_x86.h | 6 +++--- runtime/oat/utils/x86/managed_register_x86.h | 6 +++--- runtime/oat_file.h | 6 +++--- runtime/object_utils.h | 6 +++--- runtime/offsets.h | 6 +++--- runtime/os.h | 6 +++--- runtime/output_stream.h | 6 +++--- runtime/primitive.h | 6 +++--- runtime/reference_table.h | 6 +++--- runtime/reflection.h | 6 +++--- runtime/root_visitor.h | 6 +++--- runtime/runtime.h | 6 +++--- runtime/runtime_stats.h | 6 +++--- runtime/runtime_support.h | 6 +++--- runtime/runtime_support_llvm.h | 6 +++--- runtime/runtime_support_llvm_func_list.h | 6 ++++++ runtime/safe_map.h | 6 +++--- runtime/scoped_thread_state_change.h | 6 +++--- runtime/signal_catcher.h | 6 +++--- runtime/signal_set.h | 6 +++--- runtime/sirt_ref.h | 6 +++--- runtime/stack.h | 6 +++--- runtime/stack_indirect_reference_table.h | 6 +++--- runtime/strutil.h | 6 +++--- runtime/thread-inl.h | 6 +++--- runtime/thread.h | 6 +++--- runtime/thread_list.h | 6 +++--- runtime/thread_pool.h | 6 +++--- runtime/thread_state.h | 6 +++--- runtime/throw_location.h | 6 +++--- runtime/trace.h | 6 +++--- runtime/utf.h | 6 +++--- runtime/utils.h | 6 +++--- runtime/vector_output_stream.h | 6 +++--- runtime/verifier/dex_gc_map.h | 6 +++--- runtime/verifier/instruction_flags.h | 6 +++--- runtime/verifier/method_verifier.h | 6 +++--- runtime/verifier/reg_type.h | 6 +++--- runtime/verifier/reg_type_cache-inl.h | 6 +++--- runtime/verifier/reg_type_cache.h | 6 +++--- runtime/verifier/register_line-inl.h | 6 +++--- runtime/verifier/register_line.h | 6 +++--- runtime/well_known_classes.h | 6 +++--- runtime/zip_archive.h | 6 +++--- tools/cpplint.py | 7 +++++-- 234 files changed, 726 insertions(+), 691 deletions(-) (limited to 'compiler/llvm/ir_builder.h') diff --git a/Android.mk b/Android.mk index 4ffa9ac0ab..5a28723e8e 100644 --- a/Android.mk +++ b/Android.mk @@ -78,8 +78,11 @@ clean-oat-target: adb shell rm system/app/*.odex adb shell rm data/run-test/test-*/dalvik-cache/*@classes.dex +######################################################################## +# darwin build + # we aren't building most of art on darwin right now, but we do need to build new dalvikvm -ifeq ($(HOST_OS)-$(HOST_ARCH),darwin-x86) +ifeq ($(HOST_OS),darwin) art_dont_bother := true include $(art_path)/dalvikvm/Android.mk endif @@ -325,14 +328,21 @@ dump-oat-Calculator: $(TARGET_OUT_APPS)/Calculator.odex $(TARGET_BOOT_IMG_OUT) $ endif ######################################################################## -# cpplint target +# cpplint targets to style check art source files -# "mm cpplint-art" to style check art source files +# "mm cpplint-art" to verify we aren't regressing .PHONY: cpplint-art cpplint-art: ./art/tools/cpplint.py \ - --filter=-whitespace/comments,-whitespace/line_length,-build/include,-build/header_guard,-readability/function,-readability/streams,-readability/todo,-runtime/references \ - $(ANDROID_BUILD_TOP)/art/src/*.h $(ANDROID_BUILD_TOP)/art/src/*.cc + --filter=-,+build/header_guard, \ + $(shell find art -name *.h -o -name *$(ART_CPP_EXTENSION)) + +# "mm cpplint-art-aspirational" to see warnings we would like to fix +.PHONY: cpplint-art-aspirational +cpplint-art-aspirational: + ./art/tools/cpplint.py \ + --filter=-whitespace/comments,-whitespace/line_length,-build/include,-readability/function,-readability/streams,-readability/todo,-runtime/references \ + $(shell find art -name *.h -o -name *$(ART_CPP_EXTENSION)) ######################################################################## # targets to switch back and forth from libdvm to libart diff --git a/compiler/dex/arena_allocator.h b/compiler/dex/arena_allocator.h index 78d4614f90..23d6b9f06b 100644 --- a/compiler/dex/arena_allocator.h +++ b/compiler/dex/arena_allocator.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_COMPILER_ARENA_ALLOCATOR_H_ -#define ART_SRC_COMPILER_DEX_COMPILER_ARENA_ALLOCATOR_H_ +#ifndef ART_COMPILER_DEX_ARENA_ALLOCATOR_H_ +#define ART_COMPILER_DEX_ARENA_ALLOCATOR_H_ #include #include @@ -93,4 +93,4 @@ struct MemStats { } // namespace art -#endif // ART_SRC_COMPILER_DEX_COMPILER_ARENA_ALLOCATOR_H_ +#endif // ART_COMPILER_DEX_ARENA_ALLOCATOR_H_ diff --git a/compiler/dex/arena_bit_vector.h b/compiler/dex/arena_bit_vector.h index a950e82498..0b7bbc5f16 100644 --- a/compiler/dex/arena_bit_vector.h +++ b/compiler/dex/arena_bit_vector.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_COMPILER_ARENA_BIT_VECTOR_H_ -#define ART_SRC_COMPILER_DEX_COMPILER_ARENA_BIT_VECTOR_H_ +#ifndef ART_COMPILER_DEX_ARENA_BIT_VECTOR_H_ +#define ART_COMPILER_DEX_ARENA_BIT_VECTOR_H_ #include #include @@ -124,4 +124,4 @@ class ArenaBitVector { } // namespace art -#endif // ART_SRC_COMPILER_DEX_COMPILER_ARENA_BIT_VECTOR_H_ +#endif // ART_COMPILER_DEX_ARENA_BIT_VECTOR_H_ diff --git a/compiler/dex/backend.h b/compiler/dex/backend.h index 45a1531b85..6f5ba388e1 100644 --- a/compiler/dex/backend.h +++ b/compiler/dex/backend.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_BACKEND_H_ -#define ART_SRC_COMPILER_DEX_BACKEND_H_ +#ifndef ART_COMPILER_DEX_BACKEND_H_ +#define ART_COMPILER_DEX_BACKEND_H_ #include "compiled_method.h" #include "arena_allocator.h" @@ -37,4 +37,4 @@ class Backend { } // namespace art -#endif // ART_SRC_COMPILER_DEX_BACKEND_H_ +#endif // ART_COMPILER_DEX_BACKEND_H_ diff --git a/compiler/dex/compiler_enums.h b/compiler/dex/compiler_enums.h index bc456b2e70..88240e8c40 100644 --- a/compiler/dex/compiler_enums.h +++ b/compiler/dex/compiler_enums.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_COMPILERENUMS_H_ -#define ART_SRC_COMPILER_DEX_COMPILERENUMS_H_ +#ifndef ART_COMPILER_DEX_COMPILER_ENUMS_H_ +#define ART_COMPILER_DEX_COMPILER_ENUMS_H_ #include "dex_instruction.h" @@ -414,4 +414,4 @@ std::ostream& operator<<(std::ostream& os, const OatBitMapKind& kind); } // namespace art -#endif // ART_SRC_COMPILER_DEX_COMPILERENUMS_H_ +#endif // ART_COMPILER_DEX_COMPILER_ENUMS_H_ diff --git a/compiler/dex/compiler_internals.h b/compiler/dex/compiler_internals.h index a3fa25e842..9dd0272e50 100644 --- a/compiler/dex/compiler_internals.h +++ b/compiler/dex/compiler_internals.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_COMPILER_INTERNAL_H_ -#define ART_SRC_COMPILER_DEX_COMPILER_INTERNAL_H_ +#ifndef ART_COMPILER_DEX_COMPILER_INTERNALS_H_ +#define ART_COMPILER_DEX_COMPILER_INTERNALS_H_ #include #include @@ -33,4 +33,4 @@ #include "thread.h" #include "utils.h" -#endif // ART_SRC_COMPILER_DEX_COMPILER_INTERNAL_H_ +#endif // ART_COMPILER_DEX_COMPILER_INTERNALS_H_ diff --git a/compiler/dex/compiler_ir.h b/compiler/dex/compiler_ir.h index c6f99f3a88..a9b5bf68fc 100644 --- a/compiler/dex/compiler_ir.h +++ b/compiler/dex/compiler_ir.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_COMPILER_IR_H_ -#define ART_SRC_COMPILER_DEX_COMPILER_IR_H_ +#ifndef ART_COMPILER_DEX_COMPILER_IR_H_ +#define ART_COMPILER_DEX_COMPILER_IR_H_ #include #include @@ -112,4 +112,4 @@ struct CompilationUnit { } // namespace art -#endif // ART_SRC_COMPILER_DEX_COMPILER_IR_H_ +#endif // ART_COMPILER_DEX_COMPILER_IR_H_ diff --git a/compiler/dex/dataflow_iterator-inl.h b/compiler/dex/dataflow_iterator-inl.h index b20004decc..06cc505a9a 100644 --- a/compiler/dex/dataflow_iterator-inl.h +++ b/compiler/dex/dataflow_iterator-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_ -#define ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_ +#ifndef ART_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_ +#define ART_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_ #include "dataflow_iterator.h" @@ -65,4 +65,4 @@ inline BasicBlock* AllNodesIterator::NextBody(bool had_change) { } // namespace art -#endif // ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_ +#endif // ART_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_ diff --git a/compiler/dex/dataflow_iterator.h b/compiler/dex/dataflow_iterator.h index 12cbf9cadf..4c112f9678 100644 --- a/compiler/dex/dataflow_iterator.h +++ b/compiler/dex/dataflow_iterator.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_H_ -#define ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_H_ +#ifndef ART_COMPILER_DEX_DATAFLOW_ITERATOR_H_ +#define ART_COMPILER_DEX_DATAFLOW_ITERATOR_H_ #include "compiler_ir.h" #include "mir_graph.h" @@ -155,4 +155,4 @@ namespace art { } // namespace art -#endif // ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_H_ +#endif // ART_COMPILER_DEX_DATAFLOW_ITERATOR_H_ diff --git a/compiler/dex/frontend.h b/compiler/dex/frontend.h index 69d7f7728c..a86338950c 100644 --- a/compiler/dex/frontend.h +++ b/compiler/dex/frontend.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_COMPILER_H_ -#define ART_SRC_COMPILER_DEX_COMPILER_H_ +#ifndef ART_COMPILER_DEX_FRONTEND_H_ +#define ART_COMPILER_DEX_FRONTEND_H_ #include "dex_file.h" #include "dex_instruction.h" @@ -123,4 +123,4 @@ extern "C" art::CompiledMethod* ArtCompileMethod(art::CompilerDriver& driver, -#endif // ART_SRC_COMPILER_DEX_COMPILER_H_ +#endif // ART_COMPILER_DEX_FRONTEND_H_ diff --git a/compiler/dex/growable_array.h b/compiler/dex/growable_array.h index c4684a71f6..6ab0f1630a 100644 --- a/compiler/dex/growable_array.h +++ b/compiler/dex/growable_array.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_GROWABLE_LIST_H_ -#define ART_SRC_COMPILER_DEX_GROWABLE_LIST_H_ +#ifndef ART_COMPILER_DEX_GROWABLE_ARRAY_H_ +#define ART_COMPILER_DEX_GROWABLE_ARRAY_H_ #include #include @@ -168,4 +168,4 @@ class GrowableArray { } // namespace art -#endif // ART_SRC_COMPILER_DEX_GROWABLE_LIST_H_ +#endif // ART_COMPILER_DEX_GROWABLE_ARRAY_H_ diff --git a/compiler/dex/local_value_numbering.h b/compiler/dex/local_value_numbering.h index beb4cea733..f2b2291e56 100644 --- a/compiler/dex/local_value_numbering.h +++ b/compiler/dex/local_value_numbering.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_ -#define ART_SRC_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_ +#ifndef ART_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_ +#define ART_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_ #include "compiler_internals.h" @@ -140,4 +140,4 @@ class LocalValueNumbering { } // namespace art -#endif // ART_SRC_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_ +#endif // ART_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_ diff --git a/compiler/dex/mir_graph.h b/compiler/dex/mir_graph.h index 2b1c21fd70..a40fa97ad5 100644 --- a/compiler/dex/mir_graph.h +++ b/compiler/dex/mir_graph.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_MIRGRAPH_H_ -#define ART_SRC_COMPILER_DEX_MIRGRAPH_H_ +#ifndef ART_COMPILER_DEX_MIR_GRAPH_H_ +#define ART_COMPILER_DEX_MIR_GRAPH_H_ #include "dex_file.h" #include "dex_instruction.h" @@ -667,4 +667,4 @@ class MIRGraph { } // namespace art -#endif // ART_SRC_COMPILER_DEX_MIRGRAPH_H_ +#endif // ART_COMPILER_DEX_MIR_GRAPH_H_ diff --git a/compiler/dex/portable/mir_to_gbc.h b/compiler/dex/portable/mir_to_gbc.h index 8aa0271761..278631466f 100644 --- a/compiler/dex/portable/mir_to_gbc.h +++ b/compiler/dex/portable/mir_to_gbc.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_PORTABLE_MIRTOGBC_H_ -#define ART_SRC_COMPILER_DEX_PORTABLE_MIRTOGBC_H_ +#ifndef ART_COMPILER_DEX_PORTABLE_MIR_TO_GBC_H_ +#define ART_COMPILER_DEX_PORTABLE_MIR_TO_GBC_H_ #include "invoke_type.h" #include "compiled_method.h" @@ -192,4 +192,4 @@ class MirConverter : public Backend { } // namespace art -#endif // ART_SRC_COMPILER_DEX_PORTABLE_MIRTOGBC_H_ +#endif // ART_COMPILER_DEX_PORTABLE_MIR_TO_GBC_H_ diff --git a/compiler/dex/quick/arm/arm_lir.h b/compiler/dex/quick/arm/arm_lir.h index 9dd7dafcd6..fca17a1640 100644 --- a/compiler/dex/quick/arm/arm_lir.h +++ b/compiler/dex/quick/arm/arm_lir.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_QUICK_ARM_ARMLIR_H_ -#define ART_SRC_COMPILER_DEX_QUICK_ARM_ARMLIR_H_ +#ifndef ART_COMPILER_DEX_QUICK_ARM_ARM_LIR_H_ +#define ART_COMPILER_DEX_QUICK_ARM_ARM_LIR_H_ #include "dex/compiler_internals.h" @@ -496,4 +496,4 @@ struct ArmEncodingMap { } // namespace art -#endif // ART_SRC_COMPILER_DEX_QUICK_ARM_ARMLIR_H_ +#endif // ART_COMPILER_DEX_QUICK_ARM_ARM_LIR_H_ diff --git a/compiler/dex/quick/arm/codegen_arm.h b/compiler/dex/quick/arm/codegen_arm.h index a9199dfa7c..1599941ef6 100644 --- a/compiler/dex/quick/arm/codegen_arm.h +++ b/compiler/dex/quick/arm/codegen_arm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_QUICK_ARM_CODEGENARM_H_ -#define ART_SRC_COMPILER_DEX_QUICK_ARM_CODEGENARM_H_ +#ifndef ART_COMPILER_DEX_QUICK_ARM_CODEGEN_ARM_H_ +#define ART_COMPILER_DEX_QUICK_ARM_CODEGEN_ARM_H_ #include "dex/compiler_internals.h" @@ -192,4 +192,4 @@ class ArmMir2Lir : public Mir2Lir { } // namespace art -#endif // ART_SRC_COMPILER_DEX_QUICK_ARM_CODEGENARM_H_ +#endif // ART_COMPILER_DEX_QUICK_ARM_CODEGEN_ARM_H_ diff --git a/compiler/dex/quick/mips/codegen_mips.h b/compiler/dex/quick/mips/codegen_mips.h index 9723b899a9..376ad7f10e 100644 --- a/compiler/dex/quick/mips/codegen_mips.h +++ b/compiler/dex/quick/mips/codegen_mips.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_QUICK_CODEGEN_MIPS_CODEGENMIPS_H_ -#define ART_SRC_DEX_QUICK_CODEGEN_MIPS_CODEGENMIPS_H_ +#ifndef ART_COMPILER_DEX_QUICK_MIPS_CODEGEN_MIPS_H_ +#define ART_COMPILER_DEX_QUICK_MIPS_CODEGEN_MIPS_H_ #include "dex/compiler_internals.h" #include "mips_lir.h" @@ -180,4 +180,4 @@ class MipsMir2Lir : public Mir2Lir { } // namespace art -#endif // ART_SRC_DEX_QUICK_CODEGEN_MIPS_CODEGENMIPS_H_ +#endif // ART_COMPILER_DEX_QUICK_MIPS_CODEGEN_MIPS_H_ diff --git a/compiler/dex/quick/mips/mips_lir.h b/compiler/dex/quick/mips/mips_lir.h index ceab9ab1e5..8a99e93f09 100644 --- a/compiler/dex/quick/mips/mips_lir.h +++ b/compiler/dex/quick/mips/mips_lir.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_QUICK_MIPS_MIPSLIR_H_ -#define ART_SRC_COMPILER_DEX_QUICK_MIPS_MIPSLIR_H_ +#ifndef ART_COMPILER_DEX_QUICK_MIPS_MIPS_LIR_H_ +#define ART_COMPILER_DEX_QUICK_MIPS_MIPS_LIR_H_ #include "dex/compiler_internals.h" @@ -429,4 +429,4 @@ extern MipsEncodingMap EncodingMap[kMipsLast]; } // namespace art -#endif // ART_SRC_COMPILER_DEX_QUICK_MIPS_MIPSLIR_H_ +#endif // ART_COMPILER_DEX_QUICK_MIPS_MIPS_LIR_H_ diff --git a/compiler/dex/quick/mir_to_lir-inl.h b/compiler/dex/quick/mir_to_lir-inl.h index 4eef264a0f..d9aef5d968 100644 --- a/compiler/dex/quick/mir_to_lir-inl.h +++ b/compiler/dex/quick/mir_to_lir-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_ -#define ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_ +#ifndef ART_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_ +#define ART_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_ #include "mir_to_lir.h" @@ -198,4 +198,4 @@ inline void Mir2Lir::SetupResourceMasks(LIR* lir) { } // namespace art -#endif // ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_ +#endif // ART_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_ diff --git a/compiler/dex/quick/mir_to_lir.h b/compiler/dex/quick/mir_to_lir.h index 47514f769f..bec86c181e 100644 --- a/compiler/dex/quick/mir_to_lir.h +++ b/compiler/dex/quick/mir_to_lir.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_H_ -#define ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_H_ +#ifndef ART_COMPILER_DEX_QUICK_MIR_TO_LIR_H_ +#define ART_COMPILER_DEX_QUICK_MIR_TO_LIR_H_ #include "invoke_type.h" #include "compiled_method.h" @@ -776,4 +776,4 @@ class Mir2Lir : public Backend { } // namespace art -#endif //ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_H_ +#endif // ART_COMPILER_DEX_QUICK_MIR_TO_LIR_H_ diff --git a/compiler/dex/quick/x86/codegen_x86.h b/compiler/dex/quick/x86/codegen_x86.h index 3e30141594..4fa9dfb4d9 100644 --- a/compiler/dex/quick/x86/codegen_x86.h +++ b/compiler/dex/quick/x86/codegen_x86.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_QUICK_X86_CODEGENX86_H_ -#define ART_SRC_COMPILER_DEX_QUICK_X86_CODEGENX86_H_ +#ifndef ART_COMPILER_DEX_QUICK_X86_CODEGEN_X86_H_ +#define ART_COMPILER_DEX_QUICK_X86_CODEGEN_X86_H_ #include "dex/compiler_internals.h" #include "x86_lir.h" @@ -202,4 +202,4 @@ class X86Mir2Lir : public Mir2Lir { } // namespace art -#endif // ART_SRC_COMPILER_DEX_QUICK_X86_CODEGENX86_H_ +#endif // ART_COMPILER_DEX_QUICK_X86_CODEGEN_X86_H_ diff --git a/compiler/dex/quick/x86/x86_lir.h b/compiler/dex/quick/x86/x86_lir.h index 600bd03026..a39231b75a 100644 --- a/compiler/dex/quick/x86/x86_lir.h +++ b/compiler/dex/quick/x86/x86_lir.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_QUICK_X86_X86LIR_H_ -#define ART_SRC_COMPILER_DEX_QUICK_X86_X86LIR_H_ +#ifndef ART_COMPILER_DEX_QUICK_X86_X86_LIR_H_ +#define ART_COMPILER_DEX_QUICK_X86_X86_LIR_H_ #include "dex/compiler_internals.h" @@ -439,4 +439,4 @@ extern X86ConditionCode X86ConditionEncoding(ConditionCode cond); } // namespace art -#endif // ART_SRC_COMPILER_DEX_QUICK_X86_X86LIR_H_ +#endif // ART_COMPILER_DEX_QUICK_X86_X86_LIR_H_ diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index 4d7f0cf7b6..80cc89b95f 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DRIVER_COMPILER_DRIVER_H_ -#define ART_SRC_COMPILER_DRIVER_COMPILER_DRIVER_H_ +#ifndef ART_COMPILER_DRIVER_COMPILER_DRIVER_H_ +#define ART_COMPILER_DRIVER_COMPILER_DRIVER_H_ #include #include @@ -410,4 +410,4 @@ class CompilerDriver { } // namespace art -#endif // ART_SRC_COMPILER_DRIVER_COMPILER_DRIVER_H_ +#endif // ART_COMPILER_DRIVER_COMPILER_DRIVER_H_ diff --git a/compiler/driver/dex_compilation_unit.h b/compiler/driver/dex_compilation_unit.h index 3c6129d642..53efd12ba7 100644 --- a/compiler/driver/dex_compilation_unit.h +++ b/compiler/driver/dex_compilation_unit.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_DEX_COMPILATION_UNIT_H_ -#define ART_SRC_COMPILER_DEX_DEX_COMPILATION_UNIT_H_ +#ifndef ART_COMPILER_DRIVER_DEX_COMPILATION_UNIT_H_ +#define ART_COMPILER_DRIVER_DEX_COMPILATION_UNIT_H_ #include @@ -113,4 +113,4 @@ class DexCompilationUnit { } // namespace art -#endif // ART_SRC_COMPILER_DEX_DEX_COMPILATION_UNIT_H_ +#endif // ART_COMPILER_DRIVER_DEX_COMPILATION_UNIT_H_ diff --git a/compiler/elf_fixup.h b/compiler/elf_fixup.h index 79c45c1874..1abf06b1c5 100644 --- a/compiler/elf_fixup.h +++ b/compiler/elf_fixup.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ELF_FIXUP_H_ -#define ART_SRC_ELF_FIXUP_H_ +#ifndef ART_COMPILER_ELF_FIXUP_H_ +#define ART_COMPILER_ELF_FIXUP_H_ #include @@ -53,4 +53,4 @@ class ElfFixup { } // namespace art -#endif // ART_SRC_ELF_FIXUP_H_ +#endif // ART_COMPILER_ELF_FIXUP_H_ diff --git a/compiler/elf_stripper.h b/compiler/elf_stripper.h index b202e6e1f0..6015b30cb2 100644 --- a/compiler/elf_stripper.h +++ b/compiler/elf_stripper.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ELF_STRIPPER_H_ -#define ART_SRC_ELF_STRIPPER_H_ +#ifndef ART_COMPILER_ELF_STRIPPER_H_ +#define ART_COMPILER_ELF_STRIPPER_H_ #include "base/macros.h" #include "os.h" @@ -34,4 +34,4 @@ class ElfStripper { } // namespace art -#endif // ART_SRC_ELF_STRIPPER_H_ +#endif // ART_COMPILER_ELF_STRIPPER_H_ diff --git a/compiler/elf_writer.h b/compiler/elf_writer.h index 7392e67d7f..ab436e4fb3 100644 --- a/compiler/elf_writer.h +++ b/compiler/elf_writer.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ELF_WRITER_H_ -#define ART_SRC_ELF_WRITER_H_ +#ifndef ART_COMPILER_ELF_WRITER_H_ +#define ART_COMPILER_ELF_WRITER_H_ #include @@ -62,4 +62,4 @@ class ElfWriter { } // namespace art -#endif // ART_SRC_ELF_WRITER_H_ +#endif // ART_COMPILER_ELF_WRITER_H_ diff --git a/compiler/elf_writer_mclinker.h b/compiler/elf_writer_mclinker.h index 21f23e113d..468fa9a84f 100644 --- a/compiler/elf_writer_mclinker.h +++ b/compiler/elf_writer_mclinker.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ELF_WRITER_MCLINKER_H_ -#define ART_SRC_ELF_WRITER_MCLINKER_H_ +#ifndef ART_COMPILER_ELF_WRITER_MCLINKER_H_ +#define ART_COMPILER_ELF_WRITER_MCLINKER_H_ #include "elf_writer.h" @@ -96,4 +96,4 @@ class ElfWriterMclinker : public ElfWriter { } // namespace art -#endif // ART_SRC_ELF_WRITER_MCLINKER_H_ +#endif // ART_COMPILER_ELF_WRITER_MCLINKER_H_ diff --git a/compiler/elf_writer_quick.h b/compiler/elf_writer_quick.h index a1a386b3d7..a15c239de9 100644 --- a/compiler/elf_writer_quick.h +++ b/compiler/elf_writer_quick.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ELF_WRITER_MCLINKER_H_ -#define ART_SRC_ELF_WRITER_MCLINKER_H_ +#ifndef ART_COMPILER_ELF_WRITER_QUICK_H_ +#define ART_COMPILER_ELF_WRITER_QUICK_H_ #include "elf_writer.h" @@ -48,4 +48,4 @@ class ElfWriterQuick : public ElfWriter { } // namespace art -#endif // ART_SRC_ELF_WRITER_MCLINKER_H_ +#endif // ART_COMPILER_ELF_WRITER_QUICK_H_ diff --git a/compiler/image_writer.h b/compiler/image_writer.h index 9b0d671604..e43ec6338f 100644 --- a/compiler/image_writer.h +++ b/compiler/image_writer.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_IMAGE_WRITER_H_ -#define ART_SRC_IMAGE_WRITER_H_ +#ifndef ART_COMPILER_IMAGE_WRITER_H_ +#define ART_COMPILER_IMAGE_WRITER_H_ #include @@ -207,4 +207,4 @@ class ImageWriter { } // namespace art -#endif // ART_SRC_IMAGE_WRITER_H_ +#endif // ART_COMPILER_IMAGE_WRITER_H_ diff --git a/compiler/jni/portable/jni_compiler.h b/compiler/jni/portable/jni_compiler.h index a04277c9e6..9bdf35ef10 100644 --- a/compiler/jni/portable/jni_compiler.h +++ b/compiler/jni/portable/jni_compiler.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_ -#define ART_SRC_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_ +#ifndef ART_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_ +#define ART_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_ #include @@ -84,4 +84,4 @@ class JniCompiler { } // namespace art -#endif // ART_SRC_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_ +#endif // ART_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_ diff --git a/compiler/jni/quick/arm/calling_convention_arm.h b/compiler/jni/quick/arm/calling_convention_arm.h index 3787d45c6f..f188700746 100644 --- a/compiler/jni/quick/arm/calling_convention_arm.h +++ b/compiler/jni/quick/arm/calling_convention_arm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_JNI_ARM_CALLING_CONVENTION_ARM_H_ -#define ART_SRC_OAT_JNI_ARM_CALLING_CONVENTION_ARM_H_ +#ifndef ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_ +#define ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_ #include "jni/quick/calling_convention.h" @@ -85,4 +85,4 @@ class ArmJniCallingConvention : public JniCallingConvention { } // namespace arm } // namespace art -#endif // ART_SRC_OAT_JNI_ARM_CALLING_CONVENTION_ARM_H_ +#endif // ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_ diff --git a/compiler/jni/quick/calling_convention.h b/compiler/jni/quick/calling_convention.h index 121d1f80ae..d492b42237 100644 --- a/compiler/jni/quick/calling_convention.h +++ b/compiler/jni/quick/calling_convention.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_JNI_CALLING_CONVENTION_H_ -#define ART_SRC_OAT_JNI_CALLING_CONVENTION_H_ +#ifndef ART_COMPILER_JNI_QUICK_CALLING_CONVENTION_H_ +#define ART_COMPILER_JNI_QUICK_CALLING_CONVENTION_H_ #include #include "oat/utils/managed_register.h" @@ -286,4 +286,4 @@ class JniCallingConvention : public CallingConvention { } // namespace art -#endif // ART_SRC_OAT_JNI_CALLING_CONVENTION_H_ +#endif // ART_COMPILER_JNI_QUICK_CALLING_CONVENTION_H_ diff --git a/compiler/jni/quick/mips/calling_convention_mips.h b/compiler/jni/quick/mips/calling_convention_mips.h index 90681362bc..8412898dd8 100644 --- a/compiler/jni/quick/mips/calling_convention_mips.h +++ b/compiler/jni/quick/mips/calling_convention_mips.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_JNI_MIPS_CALLING_CONVENTION_MIPS_H_ -#define ART_SRC_OAT_JNI_MIPS_CALLING_CONVENTION_MIPS_H_ +#ifndef ART_COMPILER_JNI_QUICK_MIPS_CALLING_CONVENTION_MIPS_H_ +#define ART_COMPILER_JNI_QUICK_MIPS_CALLING_CONVENTION_MIPS_H_ #include "jni/quick/calling_convention.h" @@ -83,4 +83,4 @@ class MipsJniCallingConvention : public JniCallingConvention { } // namespace mips } // namespace art -#endif // ART_SRC_OAT_JNI_MIPS_CALLING_CONVENTION_MIPS_H_ +#endif // ART_COMPILER_JNI_QUICK_MIPS_CALLING_CONVENTION_MIPS_H_ diff --git a/compiler/jni/quick/x86/calling_convention_x86.h b/compiler/jni/quick/x86/calling_convention_x86.h index ea8a26e7d5..082c1c8eb1 100644 --- a/compiler/jni/quick/x86/calling_convention_x86.h +++ b/compiler/jni/quick/x86/calling_convention_x86.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_JNI_X86_CALLING_CONVENTION_X86_H_ -#define ART_SRC_OAT_JNI_X86_CALLING_CONVENTION_X86_H_ +#ifndef ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_ +#define ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_ #include "jni/quick/calling_convention.h" @@ -80,4 +80,4 @@ class X86JniCallingConvention : public JniCallingConvention { } // namespace x86 } // namespace art -#endif // ART_SRC_OAT_JNI_X86_CALLING_CONVENTION_X86_H_ +#endif // ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_ diff --git a/compiler/llvm/backend_options.h b/compiler/llvm/backend_options.h index 924a34639c..2a08bda2f1 100644 --- a/compiler/llvm/backend_options.h +++ b/compiler/llvm/backend_options.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_BACKEND_OPTIONS_H_ -#define ART_SRC_COMPILER_LLVM_BACKEND_OPTIONS_H_ +#ifndef ART_COMPILER_LLVM_BACKEND_OPTIONS_H_ +#define ART_COMPILER_LLVM_BACKEND_OPTIONS_H_ #include @@ -47,4 +47,4 @@ inline void InitialBackendOptions() { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_BACKEND_OPTIONS_H_ +#endif // ART_COMPILER_LLVM_BACKEND_OPTIONS_H_ diff --git a/compiler/llvm/backend_types.h b/compiler/llvm/backend_types.h index c89504a859..095040e5eb 100644 --- a/compiler/llvm/backend_types.h +++ b/compiler/llvm/backend_types.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_BACKEND_TYPES_H_ -#define ART_SRC_COMPILER_LLVM_BACKEND_TYPES_H_ +#ifndef ART_COMPILER_LLVM_BACKEND_TYPES_H_ +#define ART_COMPILER_LLVM_BACKEND_TYPES_H_ #include "base/logging.h" @@ -101,4 +101,4 @@ inline JType GetJTypeFromShorty(char shorty_jty) { } // namespace art -#endif // ART_SRC_COMPILER_LLVM_BACKEND_TYPES_H_ +#endif // ART_COMPILER_LLVM_BACKEND_TYPES_H_ diff --git a/compiler/llvm/compiler_llvm.h b/compiler/llvm/compiler_llvm.h index b70ddc5e20..77841d8564 100644 --- a/compiler/llvm/compiler_llvm.h +++ b/compiler/llvm/compiler_llvm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_COMPILER_LLVM_H_ -#define ART_SRC_COMPILER_LLVM_COMPILER_LLVM_H_ +#ifndef ART_COMPILER_LLVM_COMPILER_LLVM_H_ +#define ART_COMPILER_LLVM_COMPILER_LLVM_H_ #include "base/macros.h" #include "dex_file.h" @@ -100,4 +100,4 @@ class CompilerLLVM { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_COMPILER_LLVM_H_ +#endif // ART_COMPILER_LLVM_COMPILER_LLVM_H_ diff --git a/compiler/llvm/intrinsic_helper.h b/compiler/llvm/intrinsic_helper.h index 49b8a95230..bb123fd575 100644 --- a/compiler/llvm/intrinsic_helper.h +++ b/compiler/llvm/intrinsic_helper.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GREENLAND_INTRINSIC_HELPER_H_ -#define ART_SRC_GREENLAND_INTRINSIC_HELPER_H_ +#ifndef ART_COMPILER_LLVM_INTRINSIC_HELPER_H_ +#define ART_COMPILER_LLVM_INTRINSIC_HELPER_H_ #include "base/logging.h" @@ -154,4 +154,4 @@ class IntrinsicHelper { } // namespace llvm } // namespace art -#endif // ART_SRC_GREENLAND_INTRINSIC_HELPER_H_ +#endif // ART_COMPILER_LLVM_INTRINSIC_HELPER_H_ diff --git a/compiler/llvm/ir_builder.h b/compiler/llvm/ir_builder.h index 734b22f791..65da005e9b 100644 --- a/compiler/llvm/ir_builder.h +++ b/compiler/llvm/ir_builder.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_IR_BUILDER_H_ -#define ART_SRC_COMPILER_LLVM_IR_BUILDER_H_ +#ifndef ART_COMPILER_LLVM_IR_BUILDER_H_ +#define ART_COMPILER_LLVM_IR_BUILDER_H_ #include "backend_types.h" #include "dex/compiler_enums.h" @@ -487,4 +487,4 @@ class IRBuilder : public LLVMIRBuilder { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_IR_BUILDER_H_ +#endif // ART_COMPILER_LLVM_IR_BUILDER_H_ diff --git a/compiler/llvm/llvm_compilation_unit.h b/compiler/llvm/llvm_compilation_unit.h index a4f0adbab8..9de132379b 100644 --- a/compiler/llvm/llvm_compilation_unit.h +++ b/compiler/llvm/llvm_compilation_unit.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ -#define ART_SRC_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ +#ifndef ART_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ +#define ART_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ #include "base/logging.h" #include "base/mutex.h" @@ -135,4 +135,4 @@ class LlvmCompilationUnit { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ +#endif // ART_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ diff --git a/compiler/llvm/md_builder.h b/compiler/llvm/md_builder.h index 79a7caa04c..cc169a3219 100644 --- a/compiler/llvm/md_builder.h +++ b/compiler/llvm/md_builder.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_MD_BUILDER_H_ -#define ART_SRC_COMPILER_LLVM_MD_BUILDER_H_ +#ifndef ART_COMPILER_LLVM_MD_BUILDER_H_ +#define ART_COMPILER_LLVM_MD_BUILDER_H_ #include "backend_types.h" @@ -68,4 +68,4 @@ class MDBuilder : public LLVMMDBuilder { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_MD_BUILDER_H_ +#endif // ART_COMPILER_LLVM_MD_BUILDER_H_ diff --git a/compiler/llvm/runtime_support_builder.h b/compiler/llvm/runtime_support_builder.h index 267b406232..c3c0856bd0 100644 --- a/compiler/llvm/runtime_support_builder.h +++ b/compiler/llvm/runtime_support_builder.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_ -#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_ +#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_ +#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_ #include "backend_types.h" #include "base/logging.h" @@ -95,4 +95,4 @@ class RuntimeSupportBuilder { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_ +#endif // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_ diff --git a/compiler/llvm/runtime_support_builder_arm.h b/compiler/llvm/runtime_support_builder_arm.h index 3c5972fc33..6aa23b2306 100644 --- a/compiler/llvm/runtime_support_builder_arm.h +++ b/compiler/llvm/runtime_support_builder_arm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_ -#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_ +#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_ +#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_ #include "runtime_support_builder.h" @@ -43,4 +43,4 @@ class RuntimeSupportBuilderARM : public RuntimeSupportBuilder { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_ +#endif // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_ diff --git a/compiler/llvm/runtime_support_builder_thumb2.h b/compiler/llvm/runtime_support_builder_thumb2.h index 4762a269f9..941bd6b2bb 100644 --- a/compiler/llvm/runtime_support_builder_thumb2.h +++ b/compiler/llvm/runtime_support_builder_thumb2.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_ -#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_ +#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_ +#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_ #include "runtime_support_builder_arm.h" @@ -34,4 +34,4 @@ class RuntimeSupportBuilderThumb2 : public RuntimeSupportBuilderARM { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_ +#endif // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_ diff --git a/compiler/llvm/runtime_support_builder_x86.h b/compiler/llvm/runtime_support_builder_x86.h index e5fdbc2e26..831d022ce5 100644 --- a/compiler/llvm/runtime_support_builder_x86.h +++ b/compiler/llvm/runtime_support_builder_x86.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_ -#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_ +#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_ +#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_ #include "runtime_support_builder.h" @@ -39,4 +39,4 @@ class RuntimeSupportBuilderX86 : public RuntimeSupportBuilder { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_ +#endif // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_ diff --git a/compiler/llvm/runtime_support_llvm_func.h b/compiler/llvm/runtime_support_llvm_func.h index ac6f3b869f..c0e76addc6 100644 --- a/compiler/llvm/runtime_support_llvm_func.h +++ b/compiler/llvm/runtime_support_llvm_func.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_FUNC_H_ -#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_FUNC_H_ +#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_FUNC_H_ +#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_FUNC_H_ namespace art { namespace llvm { @@ -35,4 +35,4 @@ namespace runtime_support { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_FUNC_H_ +#endif // ART_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_FUNC_H_ diff --git a/compiler/llvm/utils_llvm.h b/compiler/llvm/utils_llvm.h index 2e273f4fe9..a606b91958 100644 --- a/compiler/llvm/utils_llvm.h +++ b/compiler/llvm/utils_llvm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_UTILS_LLVM_H_ -#define ART_SRC_UTILS_LLVM_H_ +#ifndef ART_COMPILER_LLVM_UTILS_LLVM_H_ +#define ART_COMPILER_LLVM_UTILS_LLVM_H_ #include @@ -29,4 +29,4 @@ namespace art { } // namespace art -#endif // ART_SRC_UTILS_LLVM_H_ +#endif // ART_COMPILER_LLVM_UTILS_LLVM_H_ diff --git a/compiler/oat_writer.h b/compiler/oat_writer.h index 1f97bf853c..ea7156ea49 100644 --- a/compiler/oat_writer.h +++ b/compiler/oat_writer.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_WRITER_H_ -#define ART_SRC_OAT_WRITER_H_ +#ifndef ART_COMPILER_OAT_WRITER_H_ +#define ART_COMPILER_OAT_WRITER_H_ #include @@ -224,4 +224,4 @@ class OatWriter { } // namespace art -#endif // ART_SRC_OAT_WRITER_H_ +#endif // ART_COMPILER_OAT_WRITER_H_ diff --git a/compiler/sea_ir/instruction_tools.h b/compiler/sea_ir/instruction_tools.h index f68cdd0784..b0bbc272c8 100644 --- a/compiler/sea_ir/instruction_tools.h +++ b/compiler/sea_ir/instruction_tools.h @@ -17,8 +17,8 @@ #include "dex_instruction.h" -#ifndef INSTRUCTION_TOOLS_H_ -#define INSTRUCTION_TOOLS_H_ +#ifndef ART_COMPILER_SEA_IR_INSTRUCTION_TOOLS_H_ +#define ART_COMPILER_SEA_IR_INSTRUCTION_TOOLS_H_ // Note: This file has content cannibalized for SEA_IR from the MIR implementation, // to avoid having a dependence on MIR. @@ -121,4 +121,4 @@ class InstructionTools { static const int instruction_attributes_[]; }; } // end namespace sea_ir -#endif // INSTRUCTION_TOOLS_H_ +#endif // ART_COMPILER_SEA_IR_INSTRUCTION_TOOLS_H_ diff --git a/compiler/sea_ir/sea.h b/compiler/sea_ir/sea.h index f2c71469e5..ce4624d438 100644 --- a/compiler/sea_ir/sea.h +++ b/compiler/sea_ir/sea.h @@ -15,8 +15,8 @@ */ -#ifndef SEA_IR_H_ -#define SEA_IR_H_ +#ifndef ART_COMPILER_SEA_IR_SEA_H_ +#define ART_COMPILER_SEA_IR_SEA_H_ #include #include @@ -159,4 +159,4 @@ class SeaGraph { } // end namespace sea_ir -#endif +#endif // ART_COMPILER_SEA_IR_SEA_H_ diff --git a/compiler/stubs/stubs.h b/compiler/stubs/stubs.h index ebe761df35..d85eae8e1e 100644 --- a/compiler/stubs/stubs.h +++ b/compiler/stubs/stubs.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_STUBS_STUBS_H_ -#define ART_SRC_COMPILER_STUBS_STUBS_H_ +#ifndef ART_COMPILER_STUBS_STUBS_H_ +#define ART_COMPILER_STUBS_STUBS_H_ #include "runtime.h" @@ -56,4 +56,4 @@ const std::vector* CreateInterpreterToQuickEntry() } // namespace art -#endif // ART_SRC_COMPILER_STUBS_STUBS_H_ +#endif // ART_COMPILER_STUBS_STUBS_H_ diff --git a/jdwpspy/Common.h b/jdwpspy/Common.h index 0bd305643a..33f1a670ea 100644 --- a/jdwpspy/Common.h +++ b/jdwpspy/Common.h @@ -3,8 +3,8 @@ * * jdwpspy common stuff. */ -#ifndef _JDWPSPY_COMMON -#define _JDWPSPY_COMMON +#ifndef ART_JDWPSPY_COMMON_H_ +#define ART_JDWPSPY_COMMON_H_ #include #include @@ -99,4 +99,4 @@ void printHexDump2(const void* vaddr, size_t length, const char* prefix); void printHexDumpEx(FILE* fp, const void* vaddr, size_t length, HexDumpMode mode, const char* prefix); -#endif /*_JDWPSPY_COMMON*/ +#endif // ART_JDWPSPY_COMMON_H_ diff --git a/runtime/asm_support.h b/runtime/asm_support.h index 8ea4adfcf2..7b20c7aee0 100644 --- a/runtime/asm_support.h +++ b/runtime/asm_support.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ASM_SUPPORT_H_ -#define ART_SRC_ASM_SUPPORT_H_ +#ifndef ART_RUNTIME_ASM_SUPPORT_H_ +#define ART_RUNTIME_ASM_SUPPORT_H_ // Value loaded into rSUSPEND for quick. When this value is counted down to zero we do a suspend // check. @@ -55,4 +55,4 @@ #define THREAD_EXCEPTION_OFFSET 12 #endif -#endif // ART_SRC_ASM_SUPPORT_H_ +#endif // ART_RUNTIME_ASM_SUPPORT_H_ diff --git a/runtime/atomic.h b/runtime/atomic.h index d340dc5474..cb6f86b921 100644 --- a/runtime/atomic.h +++ b/runtime/atomic.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ATOMIC_H_ -#define ART_SRC_ATOMIC_H_ +#ifndef ART_RUNTIME_ATOMIC_H_ +#define ART_RUNTIME_ATOMIC_H_ #include @@ -54,4 +54,4 @@ class QuasiAtomic { } // namespace art -#endif // ART_SRC_ATOMIC_H_ +#endif // ART_RUNTIME_ATOMIC_H_ diff --git a/runtime/atomic_integer.h b/runtime/atomic_integer.h index c4a8de9817..57836d6e26 100644 --- a/runtime/atomic_integer.h +++ b/runtime/atomic_integer.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ATOMIC_INTEGER_H_ -#define ART_SRC_ATOMIC_INTEGER_H_ +#ifndef ART_RUNTIME_ATOMIC_INTEGER_H_ +#define ART_RUNTIME_ATOMIC_INTEGER_H_ #include "cutils/atomic.h" #include "cutils/atomic-inline.h" @@ -76,4 +76,4 @@ class AtomicInteger { } -#endif // ART_SRC_ATOMIC_INTEGER_H_ +#endif // ART_RUNTIME_ATOMIC_INTEGER_H_ diff --git a/runtime/barrier.h b/runtime/barrier.h index 2b0429a7c2..e0ad239eab 100644 --- a/runtime/barrier.h +++ b/runtime/barrier.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BARRIER_H_ -#define ART_SRC_BARRIER_H_ +#ifndef ART_RUNTIME_BARRIER_H_ +#define ART_RUNTIME_BARRIER_H_ #include "base/mutex.h" #include "locks.h" @@ -52,4 +52,4 @@ class Barrier { }; } // namespace art -#endif // ART_SRC_GC_BARRIER_H_ +#endif // ART_RUNTIME_BARRIER_H_ diff --git a/runtime/base/casts.h b/runtime/base/casts.h index 34c05af4e3..be94c2eb78 100644 --- a/runtime/base/casts.h +++ b/runtime/base/casts.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BASE_CASTS_H_ -#define ART_SRC_BASE_CASTS_H_ +#ifndef ART_RUNTIME_BASE_CASTS_H_ +#define ART_RUNTIME_BASE_CASTS_H_ #include #include @@ -90,4 +90,4 @@ inline Dest bit_cast(const Source& source) { } // namespace art -#endif // ART_SRC_BASE_CASTS_H_ +#endif // ART_RUNTIME_BASE_CASTS_H_ diff --git a/runtime/base/histogram-inl.h b/runtime/base/histogram-inl.h index 9514209c11..bbca60308a 100644 --- a/runtime/base/histogram-inl.h +++ b/runtime/base/histogram-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef SRC_BASE_HISTOGRAM_INL_H_ -#define SRC_BASE_HISTOGRAM_INL_H_ +#ifndef ART_RUNTIME_BASE_HISTOGRAM_INL_H_ +#define ART_RUNTIME_BASE_HISTOGRAM_INL_H_ #include "histogram.h" @@ -251,5 +251,5 @@ inline double Histogram::Percentile(double per) const { } } // namespace art -#endif // SRC_BASE_HISTOGRAM_INL_H_ +#endif // ART_RUNTIME_BASE_HISTOGRAM_INL_H_ diff --git a/runtime/base/histogram.h b/runtime/base/histogram.h index 6878e71ccc..8724d2c582 100644 --- a/runtime/base/histogram.h +++ b/runtime/base/histogram.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef ART_SRC_BASE_HISTOGRAM_H_ -#define ART_SRC_BASE_HISTOGRAM_H_ +#ifndef ART_RUNTIME_BASE_HISTOGRAM_H_ +#define ART_RUNTIME_BASE_HISTOGRAM_H_ #include #include @@ -117,4 +117,4 @@ template class Histogram { }; } -#endif // ART_SRC_BASE_HISTOGRAM_H_ +#endif // ART_RUNTIME_BASE_HISTOGRAM_H_ diff --git a/runtime/base/logging.h b/runtime/base/logging.h index 8d89e4d0cb..f02a39a1f9 100644 --- a/runtime/base/logging.h +++ b/runtime/base/logging.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BASE_LOGGING_H_ -#define ART_SRC_BASE_LOGGING_H_ +#ifndef ART_RUNTIME_BASE_LOGGING_H_ +#define ART_RUNTIME_BASE_LOGGING_H_ #include #include @@ -334,4 +334,4 @@ extern const char* ProgramInvocationShortName(); } // namespace art -#endif // ART_SRC_BASE_LOGGING_H_ +#endif // ART_RUNTIME_BASE_LOGGING_H_ diff --git a/runtime/base/macros.h b/runtime/base/macros.h index 847105d20c..4a196f28e7 100644 --- a/runtime/base/macros.h +++ b/runtime/base/macros.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BASE_MACROS_H_ -#define ART_SRC_BASE_MACROS_H_ +#ifndef ART_RUNTIME_BASE_MACROS_H_ +#define ART_RUNTIME_BASE_MACROS_H_ #include // for size_t @@ -198,4 +198,4 @@ template void UNUSED(const T&) {} #endif // defined(__SUPPORT_TS_ANNOTATION__) -#endif // ART_SRC_BASE_MACROS_H_ +#endif // ART_RUNTIME_BASE_MACROS_H_ diff --git a/runtime/base/mutex-inl.h b/runtime/base/mutex-inl.h index f911054b86..07157da7aa 100644 --- a/runtime/base/mutex-inl.h +++ b/runtime/base/mutex-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BASE_MUTEX_INL_H_ -#define ART_SRC_BASE_MUTEX_INL_H_ +#ifndef ART_RUNTIME_BASE_MUTEX_INL_H_ +#define ART_RUNTIME_BASE_MUTEX_INL_H_ #include "mutex.h" @@ -184,4 +184,4 @@ inline void ReaderWriterMutex::SharedUnlock(Thread* self) { } // namespace art -#endif // ART_SRC_BASE_MUTEX_INL_H_ +#endif // ART_RUNTIME_BASE_MUTEX_INL_H_ diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h index b62755917c..dea52a6615 100644 --- a/runtime/base/mutex.h +++ b/runtime/base/mutex.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BASE_MUTEX_H_ -#define ART_SRC_BASE_MUTEX_H_ +#ifndef ART_RUNTIME_BASE_MUTEX_H_ +#define ART_RUNTIME_BASE_MUTEX_H_ #include #include @@ -398,4 +398,4 @@ class SCOPED_LOCKABLE WriterMutexLock { } // namespace art -#endif // ART_SRC_BASE_MUTEX_H_ +#endif // ART_RUNTIME_BASE_MUTEX_H_ diff --git a/runtime/base/stl_util.h b/runtime/base/stl_util.h index eb8be42df3..ff9f40cbf8 100644 --- a/runtime/base/stl_util.h +++ b/runtime/base/stl_util.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BASE_STL_UTIL_H_ -#define ART_SRC_BASE_STL_UTIL_H_ +#ifndef ART_RUNTIME_BASE_STL_UTIL_H_ +#define ART_RUNTIME_BASE_STL_UTIL_H_ #include #include @@ -94,4 +94,4 @@ std::string ToString(const T& v) { } // namespace art -#endif // ART_SRC_BASE_STL_UTIL_H_ +#endif // ART_RUNTIME_BASE_STL_UTIL_H_ diff --git a/runtime/base/stringpiece.h b/runtime/base/stringpiece.h index 3664218860..62088cc183 100644 --- a/runtime/base/stringpiece.h +++ b/runtime/base/stringpiece.h @@ -25,8 +25,8 @@ // Systematic usage of StringPiece is encouraged as it will reduce unnecessary // conversions from "const char*" to "string" and back again. -#ifndef ART_SRC_BASE_STRINGPIECE_H_ -#define ART_SRC_BASE_STRINGPIECE_H_ +#ifndef ART_RUNTIME_BASE_STRINGPIECE_H_ +#define ART_RUNTIME_BASE_STRINGPIECE_H_ #include #include @@ -223,4 +223,4 @@ struct StringPieceHash { } // namespace art -#endif // ART_SRC_BASE_STRINGPIECE_H_ +#endif // ART_RUNTIME_BASE_STRINGPIECE_H_ diff --git a/runtime/base/stringprintf.h b/runtime/base/stringprintf.h index d707cc02d6..4767a750c3 100644 --- a/runtime/base/stringprintf.h +++ b/runtime/base/stringprintf.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BASE_STRINGPRINTF_H_ -#define ART_SRC_BASE_STRINGPRINTF_H_ +#ifndef ART_RUNTIME_BASE_STRINGPRINTF_H_ +#define ART_RUNTIME_BASE_STRINGPRINTF_H_ #include #include @@ -35,4 +35,4 @@ void StringAppendV(std::string* dst, const char* format, va_list ap); } // namespace art -#endif // ART_SRC_BASE_STRINGPRINTF_H_ +#endif // ART_RUNTIME_BASE_STRINGPRINTF_H_ diff --git a/runtime/base/timing_logger.h b/runtime/base/timing_logger.h index 65732b170d..816cbeadec 100644 --- a/runtime/base/timing_logger.h +++ b/runtime/base/timing_logger.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_TIMING_LOGGER_H_ -#define ART_SRC_TIMING_LOGGER_H_ +#ifndef ART_RUNTIME_BASE_TIMING_LOGGER_H_ +#define ART_RUNTIME_BASE_TIMING_LOGGER_H_ #include "base/histogram.h" #include "base/macros.h" @@ -139,4 +139,4 @@ class NewTimingLogger { } // namespace base } // namespace art -#endif // ART_SRC_TIMING_LOGGER_H_ +#endif // ART_RUNTIME_BASE_TIMING_LOGGER_H_ diff --git a/runtime/base/unix_file/fd_file.h b/runtime/base/unix_file/fd_file.h index 2b339613ba..79a0db9eda 100644 --- a/runtime/base/unix_file/fd_file.h +++ b/runtime/base/unix_file/fd_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UNIX_FILE_FD_FILE_H_ -#define BASE_UNIX_FILE_FD_FILE_H_ +#ifndef ART_RUNTIME_BASE_UNIX_FILE_FD_FILE_H_ +#define ART_RUNTIME_BASE_UNIX_FILE_FD_FILE_H_ #include #include @@ -72,4 +72,4 @@ class FdFile : public RandomAccessFile { } // namespace unix_file -#endif // BASE_UNIX_FILE_FD_FILE_H_ +#endif // ART_RUNTIME_BASE_UNIX_FILE_FD_FILE_H_ diff --git a/runtime/base/unix_file/mapped_file.h b/runtime/base/unix_file/mapped_file.h index 161100b0d5..28cc5514f7 100644 --- a/runtime/base/unix_file/mapped_file.h +++ b/runtime/base/unix_file/mapped_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UNIX_FILE_MAPPED_FILE_H_ -#define BASE_UNIX_FILE_MAPPED_FILE_H_ +#ifndef ART_RUNTIME_BASE_UNIX_FILE_MAPPED_FILE_H_ +#define ART_RUNTIME_BASE_UNIX_FILE_MAPPED_FILE_H_ #include #include @@ -94,4 +94,4 @@ class MappedFile : public FdFile { } // namespace unix_file -#endif // BASE_UNIX_FILE_MAPPED_FILE_H_ +#endif // ART_RUNTIME_BASE_UNIX_FILE_MAPPED_FILE_H_ diff --git a/runtime/base/unix_file/null_file.h b/runtime/base/unix_file/null_file.h index e716603687..33947311f0 100644 --- a/runtime/base/unix_file/null_file.h +++ b/runtime/base/unix_file/null_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UNIX_FILE_NULL_FILE_H_ -#define BASE_UNIX_FILE_NULL_FILE_H_ +#ifndef ART_RUNTIME_BASE_UNIX_FILE_NULL_FILE_H_ +#define ART_RUNTIME_BASE_UNIX_FILE_NULL_FILE_H_ #include "base/unix_file/random_access_file.h" #include "base/macros.h" @@ -47,4 +47,4 @@ class NullFile : public RandomAccessFile { } // namespace unix_file -#endif // BASE_UNIX_FILE_NULL_FILE_H_ +#endif // ART_RUNTIME_BASE_UNIX_FILE_NULL_FILE_H_ diff --git a/runtime/base/unix_file/random_access_file.h b/runtime/base/unix_file/random_access_file.h index 22da37f03e..31a6dbe1fc 100644 --- a/runtime/base/unix_file/random_access_file.h +++ b/runtime/base/unix_file/random_access_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_ -#define BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_ +#ifndef ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_ +#define ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_ #include @@ -65,4 +65,4 @@ class RandomAccessFile { } // namespace unix_file -#endif // BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_ +#endif // ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_ diff --git a/runtime/base/unix_file/random_access_file_test.h b/runtime/base/unix_file/random_access_file_test.h index 3baaeae8ac..9d8550d6f6 100644 --- a/runtime/base/unix_file/random_access_file_test.h +++ b/runtime/base/unix_file/random_access_file_test.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_ -#define BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_ +#ifndef ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_ +#define ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_ #include @@ -169,4 +169,4 @@ class RandomAccessFileTest : public testing::Test { } // namespace unix_file -#endif // BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_ +#endif // ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_ diff --git a/runtime/base/unix_file/random_access_file_utils.h b/runtime/base/unix_file/random_access_file_utils.h index 0535ead8c5..30c81c09aa 100644 --- a/runtime/base/unix_file/random_access_file_utils.h +++ b/runtime/base/unix_file/random_access_file_utils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_ -#define BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_ +#ifndef ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_ +#define ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_ namespace unix_file { @@ -27,4 +27,4 @@ bool CopyFile(const RandomAccessFile& src, RandomAccessFile* dst); } // namespace unix_file -#endif // BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_ +#endif // ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_ diff --git a/runtime/base/unix_file/string_file.h b/runtime/base/unix_file/string_file.h index 8944373344..26904f89a6 100644 --- a/runtime/base/unix_file/string_file.h +++ b/runtime/base/unix_file/string_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UNIX_FILE_STRING_FILE_H_ -#define BASE_UNIX_FILE_STRING_FILE_H_ +#ifndef ART_RUNTIME_BASE_UNIX_FILE_STRING_FILE_H_ +#define ART_RUNTIME_BASE_UNIX_FILE_STRING_FILE_H_ #include @@ -56,4 +56,4 @@ class StringFile : public RandomAccessFile { } // namespace unix_file -#endif // BASE_UNIX_FILE_STRING_FILE_H_ +#endif // ART_RUNTIME_BASE_UNIX_FILE_STRING_FILE_H_ diff --git a/runtime/class_linker-inl.h b/runtime/class_linker-inl.h index 6cf49912a2..4d01b66f0a 100644 --- a/runtime/class_linker-inl.h +++ b/runtime/class_linker-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CLASS_LINKER_INL_H_ -#define ART_SRC_CLASS_LINKER_INL_H_ +#ifndef ART_RUNTIME_CLASS_LINKER_INL_H_ +#define ART_RUNTIME_CLASS_LINKER_INL_H_ #include "class_linker.h" @@ -143,4 +143,4 @@ inline mirror::Class* ClassLinker::GetClassRoot(ClassRoot class_root) } // namespace art -#endif // ART_SRC_CLASS_LINKER_INL_H_ +#endif // ART_RUNTIME_CLASS_LINKER_INL_H_ diff --git a/runtime/class_linker.h b/runtime/class_linker.h index df1ecc6207..3993cb214b 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CLASS_LINKER_H_ -#define ART_SRC_CLASS_LINKER_H_ +#ifndef ART_RUNTIME_CLASS_LINKER_H_ +#define ART_RUNTIME_CLASS_LINKER_H_ #include #include @@ -627,4 +627,4 @@ class ClassLinker { } // namespace art -#endif // ART_SRC_CLASS_LINKER_H_ +#endif // ART_RUNTIME_CLASS_LINKER_H_ diff --git a/runtime/class_reference.h b/runtime/class_reference.h index c3be720ea5..77c296facd 100644 --- a/runtime/class_reference.h +++ b/runtime/class_reference.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CLASS_REFERENCE_H_ -#define ART_SRC_CLASS_REFERENCE_H_ +#ifndef ART_RUNTIME_CLASS_REFERENCE_H_ +#define ART_RUNTIME_CLASS_REFERENCE_H_ #include @@ -38,4 +38,4 @@ inline bool operator<(const ClassReference& lhs, const ClassReference& rhs) { } // namespace art -#endif // ART_SRC_CLASS_REFERENCE_H_ +#endif // ART_RUNTIME_CLASS_REFERENCE_H_ diff --git a/runtime/closure.h b/runtime/closure.h index 17f2b84d82..9bea28fa58 100644 --- a/runtime/closure.h +++ b/runtime/closure.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CLOSURE_H_ -#define ART_SRC_CLOSURE_H_ +#ifndef ART_RUNTIME_CLOSURE_H_ +#define ART_RUNTIME_CLOSURE_H_ namespace art { @@ -29,4 +29,4 @@ class Closure { } // namespace art -#endif // ART_SRC_CLOSURE_H_ +#endif // ART_RUNTIME_CLOSURE_H_ diff --git a/runtime/common_test.h b/runtime/common_test.h index f03b1f9cdb..73c47b5a8c 100644 --- a/runtime/common_test.h +++ b/runtime/common_test.h @@ -14,6 +14,9 @@ * limitations under the License. */ +#ifndef ART_RUNTIME_COMMON_TEST_H_ +#define ART_RUNTIME_COMMON_TEST_H_ + #include #include #include @@ -586,3 +589,5 @@ std::ostream& operator<<(std::ostream& os, const std::vector& rhs) { } } // namespace std + +#endif // ART_RUNTIME_COMMON_TEST_H_ diff --git a/runtime/common_throws.h b/runtime/common_throws.h index 4bf12c0d01..b7f2754df1 100644 --- a/runtime/common_throws.h +++ b/runtime/common_throws.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMMON_THROWS__H_ -#define ART_SRC_COMMON_THROWS_H_ +#ifndef ART_RUNTIME_COMMON_THROWS_H_ +#define ART_RUNTIME_COMMON_THROWS_H_ #include "base/mutex.h" #include "invoke_type.h" @@ -183,4 +183,4 @@ void ThrowVerifyError(const mirror::Class* referrer, const char* fmt, ...) } // namespace art -#endif // ART_SRC_COMMON_THROWS_H_ +#endif // ART_RUNTIME_COMMON_THROWS_H_ diff --git a/runtime/compiled_class.h b/runtime/compiled_class.h index f050ee6a7e..c53d500502 100644 --- a/runtime/compiled_class.h +++ b/runtime/compiled_class.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILED_CLASS_H_ -#define ART_SRC_COMPILED_CLASS_H_ +#ifndef ART_RUNTIME_COMPILED_CLASS_H_ +#define ART_RUNTIME_COMPILED_CLASS_H_ #include "mirror/class.h" @@ -34,4 +34,4 @@ class CompiledClass { } // namespace art -#endif // ART_SRC_COMPILED_CLASS_H_ +#endif // ART_RUNTIME_COMPILED_CLASS_H_ diff --git a/runtime/compiled_method.h b/runtime/compiled_method.h index fb0172cc19..800dde2208 100644 --- a/runtime/compiled_method.h +++ b/runtime/compiled_method.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILED_METHOD_H_ -#define ART_SRC_COMPILED_METHOD_H_ +#ifndef ART_RUNTIME_COMPILED_METHOD_H_ +#define ART_RUNTIME_COMPILED_METHOD_H_ #include #include @@ -177,4 +177,4 @@ class CompiledMethod : public CompiledCode { } // namespace art -#endif // ART_SRC_COMPILED_METHOD_H_ +#endif // ART_RUNTIME_COMPILED_METHOD_H_ diff --git a/runtime/constants_arm.h b/runtime/constants_arm.h index 601c57247e..bbb9242def 100644 --- a/runtime/constants_arm.h +++ b/runtime/constants_arm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CONSTANTS_ARM_H_ -#define ART_SRC_CONSTANTS_ARM_H_ +#ifndef ART_RUNTIME_CONSTANTS_ARM_H_ +#define ART_RUNTIME_CONSTANTS_ARM_H_ #include @@ -516,4 +516,4 @@ class Instr { } // namespace arm } // namespace art -#endif // ART_SRC_CONSTANTS_ARM_H_ +#endif // ART_RUNTIME_CONSTANTS_ARM_H_ diff --git a/runtime/constants_mips.h b/runtime/constants_mips.h index 87a13554fb..fb56493a14 100644 --- a/runtime/constants_mips.h +++ b/runtime/constants_mips.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CONSTANTS_MIPS_H_ -#define ART_SRC_CONSTANTS_MIPS_H_ +#ifndef ART_RUNTIME_CONSTANTS_MIPS_H_ +#define ART_RUNTIME_CONSTANTS_MIPS_H_ #include @@ -183,4 +183,4 @@ class Instr { } // namespace mips } // namespace art -#endif // ART_SRC_CONSTANTS_MIPS_H_ +#endif // ART_RUNTIME_CONSTANTS_MIPS_H_ diff --git a/runtime/constants_x86.h b/runtime/constants_x86.h index e48b281599..bb18b6b23b 100644 --- a/runtime/constants_x86.h +++ b/runtime/constants_x86.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CONSTANTS_X86_H_ -#define ART_SRC_CONSTANTS_X86_H_ +#ifndef ART_RUNTIME_CONSTANTS_X86_H_ +#define ART_RUNTIME_CONSTANTS_X86_H_ #include @@ -137,4 +137,4 @@ class Instr { } // namespace x86 } // namespace art -#endif // ART_SRC_CONSTANTS_X86_H_ +#endif // ART_RUNTIME_CONSTANTS_X86_H_ diff --git a/runtime/debugger.h b/runtime/debugger.h index eb17695249..94f3cbed76 100644 --- a/runtime/debugger.h +++ b/runtime/debugger.h @@ -18,8 +18,8 @@ * Dalvik-specific side of debugger support. (The JDWP code is intended to * be relatively generic.) */ -#ifndef ART_DEBUGGER_H_ -#define ART_DEBUGGER_H_ +#ifndef ART_RUNTIME_DEBUGGER_H_ +#define ART_RUNTIME_DEBUGGER_H_ #include @@ -429,4 +429,4 @@ class Dbg { } // namespace art -#endif // ART_DEBUGGER_H_ +#endif // ART_RUNTIME_DEBUGGER_H_ diff --git a/runtime/dex_file-inl.h b/runtime/dex_file-inl.h index 5d8216eda5..dee80269d6 100644 --- a/runtime/dex_file-inl.h +++ b/runtime/dex_file-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_FILE_INL_H_ -#define ART_SRC_DEX_FILE_INL_H_ +#ifndef ART_RUNTIME_DEX_FILE_INL_H_ +#define ART_RUNTIME_DEX_FILE_INL_H_ #include "base/logging.h" #include "dex_file.h" @@ -44,4 +44,4 @@ inline const DexFile::TryItem* DexFile::GetTryItems(const CodeItem& code_item, u } // namespace art -#endif // ART_SRC_DEX_FILE_INL_H_ +#endif // ART_RUNTIME_DEX_FILE_INL_H_ diff --git a/runtime/dex_file.h b/runtime/dex_file.h index e09270e018..28e06cc5b9 100644 --- a/runtime/dex_file.h +++ b/runtime/dex_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_FILE_H_ -#define ART_SRC_DEX_FILE_H_ +#ifndef ART_RUNTIME_DEX_FILE_H_ +#define ART_RUNTIME_DEX_FILE_H_ #include #include @@ -1220,4 +1220,4 @@ class CatchHandlerIterator { } // namespace art -#endif // ART_SRC_DEX_FILE_H_ +#endif // ART_RUNTIME_DEX_FILE_H_ diff --git a/runtime/dex_file_verifier.h b/runtime/dex_file_verifier.h index 5538d4aa75..3797dc77e5 100644 --- a/runtime/dex_file_verifier.h +++ b/runtime/dex_file_verifier.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_FILE_VERIFIER_H_ -#define ART_SRC_DEX_FILE_VERIFIER_H_ +#ifndef ART_RUNTIME_DEX_FILE_VERIFIER_H_ +#define ART_RUNTIME_DEX_FILE_VERIFIER_H_ #include "dex_file.h" #include "safe_map.h" @@ -94,4 +94,4 @@ class DexFileVerifier { } // namespace art -#endif // ART_SRC_DEX_FILE_VERIFIER_H_ +#endif // ART_RUNTIME_DEX_FILE_VERIFIER_H_ diff --git a/runtime/dex_instruction-inl.h b/runtime/dex_instruction-inl.h index b426e66a1c..2cb5235417 100644 --- a/runtime/dex_instruction-inl.h +++ b/runtime/dex_instruction-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_INSTRUCTION_INL_H_ -#define ART_SRC_DEX_INSTRUCTION_INL_H_ +#ifndef ART_RUNTIME_DEX_INSTRUCTION_INL_H_ +#define ART_RUNTIME_DEX_INSTRUCTION_INL_H_ #include "dex_instruction.h" @@ -319,4 +319,4 @@ inline void Instruction::GetArgs(uint32_t arg[5]) const { } // namespace art -#endif // ART_SRC_DEX_INSTRUCTION_INL_H_ +#endif // ART_RUNTIME_DEX_INSTRUCTION_INL_H_ diff --git a/runtime/dex_instruction.h b/runtime/dex_instruction.h index 0407c57935..d2ad989395 100644 --- a/runtime/dex_instruction.h +++ b/runtime/dex_instruction.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_INSTRUCTION_H_ -#define ART_SRC_DEX_INSTRUCTION_H_ +#ifndef ART_RUNTIME_DEX_INSTRUCTION_H_ +#define ART_RUNTIME_DEX_INSTRUCTION_H_ #include "base/logging.h" #include "base/macros.h" @@ -443,4 +443,4 @@ struct DecodedInstruction { } // namespace art -#endif // ART_SRC_DEX_INSTRUCTION_H_ +#endif // ART_RUNTIME_DEX_INSTRUCTION_H_ diff --git a/runtime/dex_instruction_list.h b/runtime/dex_instruction_list.h index 8257c783e7..31d51c9b41 100644 --- a/runtime/dex_instruction_list.h +++ b/runtime/dex_instruction_list.h @@ -14,6 +14,9 @@ * limitations under the License. */ +#ifndef ART_RUNTIME_DEX_INSTRUCTION_LIST_H_ +#define ART_RUNTIME_DEX_INSTRUCTION_LIST_H_ + #define DEX_INSTRUCTION_LIST(V) \ V(0x00, NOP, "nop", k10x, false, kNone, kContinue, kVerifyNone) \ V(0x01, MOVE, "move", k12x, true, kNone, kContinue, kVerifyRegA | kVerifyRegB) \ @@ -297,3 +300,6 @@ V(k35c) \ V(k3rc) \ V(k51l) + +#endif // ART_RUNTIME_DEX_INSTRUCTION_LIST_H_ +#undef ART_RUNTIME_DEX_INSTRUCTION_LIST_H_ // the guard in this file is just for cpplint diff --git a/runtime/dex_instruction_visitor.h b/runtime/dex_instruction_visitor.h index ff4620f8f0..795b95bf76 100644 --- a/runtime/dex_instruction_visitor.h +++ b/runtime/dex_instruction_visitor.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_INSTRUCTION_VISITOR_H_ -#define ART_SRC_DEX_INSTRUCTION_VISITOR_H_ +#ifndef ART_RUNTIME_DEX_INSTRUCTION_VISITOR_H_ +#define ART_RUNTIME_DEX_INSTRUCTION_VISITOR_H_ #include "base/macros.h" #include "dex_instruction.h" @@ -69,4 +69,4 @@ class DexInstructionVisitor { } // namespace art -#endif // ART_SRC_DEX_INSTRUCTION_VISITOR_H_ +#endif // ART_RUNTIME_DEX_INSTRUCTION_VISITOR_H_ diff --git a/runtime/dex_method_iterator.h b/runtime/dex_method_iterator.h index dc2e712681..cb71cb5b11 100644 --- a/runtime/dex_method_iterator.h +++ b/runtime/dex_method_iterator.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_METHOD_ITERATOR_H_ -#define ART_SRC_DEX_METHOD_ITERATOR_H_ +#ifndef ART_RUNTIME_DEX_METHOD_ITERATOR_H_ +#define ART_RUNTIME_DEX_METHOD_ITERATOR_H_ #include @@ -147,4 +147,4 @@ class DexMethodIterator { } // namespace art -#endif // ART_SRC_DEX_METHOD_ITERATOR_H_ +#endif // ART_RUNTIME_DEX_METHOD_ITERATOR_H_ diff --git a/runtime/disassembler.h b/runtime/disassembler.h index 1f50bfc9c0..805ff4d079 100644 --- a/runtime/disassembler.h +++ b/runtime/disassembler.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DISASSEMBLER_H_ -#define ART_SRC_DISASSEMBLER_H_ +#ifndef ART_RUNTIME_DISASSEMBLER_H_ +#define ART_RUNTIME_DISASSEMBLER_H_ #include @@ -45,4 +45,4 @@ class Disassembler { } // namespace art -#endif // ART_SRC_DISASSEMBLER_H_ +#endif // ART_RUNTIME_DISASSEMBLER_H_ diff --git a/runtime/disassembler_arm.h b/runtime/disassembler_arm.h index 103876f33b..cab9150108 100644 --- a/runtime/disassembler_arm.h +++ b/runtime/disassembler_arm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DISASSEMBLER_ARM_H_ -#define ART_SRC_DISASSEMBLER_ARM_H_ +#ifndef ART_RUNTIME_DISASSEMBLER_ARM_H_ +#define ART_RUNTIME_DISASSEMBLER_ARM_H_ #include @@ -48,4 +48,4 @@ class DisassemblerArm : public Disassembler { } // namespace arm } // namespace art -#endif // ART_SRC_DISASSEMBLER_ARM_H_ +#endif // ART_RUNTIME_DISASSEMBLER_ARM_H_ diff --git a/runtime/disassembler_mips.h b/runtime/disassembler_mips.h index ed45113db7..e248503963 100644 --- a/runtime/disassembler_mips.h +++ b/runtime/disassembler_mips.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DISASSEMBLER_MIPS_H_ -#define ART_SRC_DISASSEMBLER_MIPS_H_ +#ifndef ART_RUNTIME_DISASSEMBLER_MIPS_H_ +#define ART_RUNTIME_DISASSEMBLER_MIPS_H_ #include @@ -37,4 +37,4 @@ class DisassemblerMips : public Disassembler { } // namespace mips } // namespace art -#endif // ART_SRC_DISASSEMBLER_MIPS_H_ +#endif // ART_RUNTIME_DISASSEMBLER_MIPS_H_ diff --git a/runtime/disassembler_x86.h b/runtime/disassembler_x86.h index 13f8503720..ff4322c8b8 100644 --- a/runtime/disassembler_x86.h +++ b/runtime/disassembler_x86.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DISASSEMBLER_X86_H_ -#define ART_SRC_DISASSEMBLER_X86_H_ +#ifndef ART_RUNTIME_DISASSEMBLER_X86_H_ +#define ART_RUNTIME_DISASSEMBLER_X86_H_ #include "disassembler.h" @@ -35,4 +35,4 @@ class DisassemblerX86 : public Disassembler { } // namespace x86 } // namespace art -#endif // ART_SRC_DISASSEMBLER_X86_H_ +#endif // ART_RUNTIME_DISASSEMBLER_X86_H_ diff --git a/runtime/elf_file.h b/runtime/elf_file.h index cb95cb0df0..33b5fc3f9b 100644 --- a/runtime/elf_file.h +++ b/runtime/elf_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ELF_FILE_H_ -#define ART_SRC_ELF_FILE_H_ +#ifndef ART_RUNTIME_ELF_FILE_H_ +#define ART_RUNTIME_ELF_FILE_H_ #include #include @@ -172,4 +172,4 @@ class ElfFile { } // namespace art -#endif // ART_SRC_ELF_FILE_H_ +#endif // ART_RUNTIME_ELF_FILE_H_ diff --git a/runtime/file_output_stream.h b/runtime/file_output_stream.h index b5eb4f8194..10405eff1f 100644 --- a/runtime/file_output_stream.h +++ b/runtime/file_output_stream.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_FILE_OUTPUT_STREAM_H_ -#define ART_SRC_FILE_OUTPUT_STREAM_H_ +#ifndef ART_RUNTIME_FILE_OUTPUT_STREAM_H_ +#define ART_RUNTIME_FILE_OUTPUT_STREAM_H_ #include "output_stream.h" @@ -41,4 +41,4 @@ class FileOutputStream : public OutputStream { } // namespace art -#endif // ART_SRC_FILE_OUTPUT_STREAM_H_ +#endif // ART_RUNTIME_FILE_OUTPUT_STREAM_H_ diff --git a/runtime/gc/accounting/atomic_stack.h b/runtime/gc/accounting/atomic_stack.h index 4e1c253bdf..5310c18ec6 100644 --- a/runtime/gc/accounting/atomic_stack.h +++ b/runtime/gc/accounting/atomic_stack.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_ACCOUNTING_ATOMIC_STACK_H_ -#define ART_SRC_GC_ACCOUNTING_ATOMIC_STACK_H_ +#ifndef ART_RUNTIME_GC_ACCOUNTING_ATOMIC_STACK_H_ +#define ART_RUNTIME_GC_ACCOUNTING_ATOMIC_STACK_H_ #include @@ -189,4 +189,4 @@ typedef AtomicStack ObjectStack; } // namespace gc } // namespace art -#endif // ART_SRC_GC_ACCOUNTING_ATOMIC_STACK_H_ +#endif // ART_RUNTIME_GC_ACCOUNTING_ATOMIC_STACK_H_ diff --git a/runtime/gc/accounting/card_table-inl.h b/runtime/gc/accounting/card_table-inl.h index 1e7529084a..f8f2773582 100644 --- a/runtime/gc/accounting/card_table-inl.h +++ b/runtime/gc/accounting/card_table-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_CARDTABLE_INL_H_ -#define ART_SRC_GC_CARDTABLE_INL_H_ +#ifndef ART_RUNTIME_GC_ACCOUNTING_CARD_TABLE_INL_H_ +#define ART_RUNTIME_GC_ACCOUNTING_CARD_TABLE_INL_H_ #include "base/logging.h" #include "card_table.h" @@ -210,4 +210,4 @@ inline void CardTable::CheckCardValid(byte* card) const { } // namespace gc } // namespace art -#endif // ART_SRC_GC_CARDTABLE_INL_H_ +#endif // ART_RUNTIME_GC_ACCOUNTING_CARD_TABLE_INL_H_ diff --git a/runtime/gc/accounting/card_table.h b/runtime/gc/accounting/card_table.h index cf85d15448..1acaf5bdfc 100644 --- a/runtime/gc/accounting/card_table.h +++ b/runtime/gc/accounting/card_table.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_CARDTABLE_H_ -#define ART_SRC_GC_CARDTABLE_H_ +#ifndef ART_RUNTIME_GC_ACCOUNTING_CARD_TABLE_H_ +#define ART_RUNTIME_GC_ACCOUNTING_CARD_TABLE_H_ #include "globals.h" #include "locks.h" @@ -153,4 +153,4 @@ class CardTable { } // namespace gc } // namespace art -#endif // ART_SRC_GC_CARDTABLE_H_ +#endif // ART_RUNTIME_GC_ACCOUNTING_CARD_TABLE_H_ diff --git a/runtime/gc/accounting/heap_bitmap-inl.h b/runtime/gc/accounting/heap_bitmap-inl.h index 8e3123b974..76226041d1 100644 --- a/runtime/gc/accounting/heap_bitmap-inl.h +++ b/runtime/gc/accounting/heap_bitmap-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_ACCOUNTING_HEAP_BITMAP_INL_H_ -#define ART_SRC_GC_ACCOUNTING_HEAP_BITMAP_INL_H_ +#ifndef ART_RUNTIME_GC_ACCOUNTING_HEAP_BITMAP_INL_H_ +#define ART_RUNTIME_GC_ACCOUNTING_HEAP_BITMAP_INL_H_ #include "heap_bitmap.h" @@ -47,4 +47,4 @@ inline void HeapBitmap::Visit(const Visitor& visitor) { } // namespace gc } // namespace art -#endif // ART_SRC_GC_ACCOUNTING_HEAP_BITMAP_INL_H_ +#endif // ART_RUNTIME_GC_ACCOUNTING_HEAP_BITMAP_INL_H_ diff --git a/runtime/gc/accounting/heap_bitmap.h b/runtime/gc/accounting/heap_bitmap.h index 5ff40c6426..a12809ea55 100644 --- a/runtime/gc/accounting/heap_bitmap.h +++ b/runtime/gc/accounting/heap_bitmap.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_ACCOUNTING_HEAP_BITMAP_H_ -#define ART_SRC_GC_ACCOUNTING_HEAP_BITMAP_H_ +#ifndef ART_RUNTIME_GC_ACCOUNTING_HEAP_BITMAP_H_ +#define ART_RUNTIME_GC_ACCOUNTING_HEAP_BITMAP_H_ #include "base/logging.h" #include "locks.h" @@ -126,4 +126,4 @@ class HeapBitmap { } // namespace gc } // namespace art -#endif // ART_SRC_GC_ACCOUNTING_HEAP_BITMAP_H_ +#endif // ART_RUNTIME_GC_ACCOUNTING_HEAP_BITMAP_H_ diff --git a/runtime/gc/accounting/mod_union_table-inl.h b/runtime/gc/accounting/mod_union_table-inl.h index 656af94853..32ac95f9f8 100644 --- a/runtime/gc/accounting/mod_union_table-inl.h +++ b/runtime/gc/accounting/mod_union_table-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_MOD_UNION_TABLE_INL_H_ -#define ART_SRC_GC_MOD_UNION_TABLE_INL_H_ +#ifndef ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_INL_H_ +#define ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_INL_H_ #include "mod_union_table.h" @@ -72,4 +72,4 @@ class ModUnionTableToAllocspace : public ModUnionTableReferenceCache { } // namespace gc } // namespace art -#endif // ART_SRC_GC_MOD_UNION_TABLE_INL_H_ +#endif // ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_INL_H_ diff --git a/runtime/gc/accounting/mod_union_table.h b/runtime/gc/accounting/mod_union_table.h index 5d25e05658..543562563b 100644 --- a/runtime/gc/accounting/mod_union_table.h +++ b/runtime/gc/accounting/mod_union_table.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_ACCOUNTING_MOD_UNION_TABLE_H_ -#define ART_SRC_GC_ACCOUNTING_MOD_UNION_TABLE_H_ +#ifndef ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_H_ +#define ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_H_ #include "globals.h" #include "safe_map.h" @@ -150,4 +150,4 @@ class ModUnionTableCardCache : public ModUnionTable { } // namespace gc } // namespace art -#endif // ART_SRC_GC_ACCOUNTING_MOD_UNION_TABLE_H_ +#endif // ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_H_ diff --git a/runtime/gc/accounting/space_bitmap-inl.h b/runtime/gc/accounting/space_bitmap-inl.h index a4fd330c8f..d074a0f578 100644 --- a/runtime/gc/accounting/space_bitmap-inl.h +++ b/runtime/gc/accounting/space_bitmap-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_ACCOUNTING_SPACE_BITMAP_INL_H_ -#define ART_SRC_GC_ACCOUNTING_SPACE_BITMAP_INL_H_ +#ifndef ART_RUNTIME_GC_ACCOUNTING_SPACE_BITMAP_INL_H_ +#define ART_RUNTIME_GC_ACCOUNTING_SPACE_BITMAP_INL_H_ #include "base/logging.h" #include "cutils/atomic-inline.h" @@ -144,4 +144,4 @@ inline bool SpaceBitmap::Modify(const mirror::Object* obj, bool do_set) { } // namespace gc } // namespace art -#endif // ART_SRC_GC_ACCOUNTING_SPACE_BITMAP_INL_H_ +#endif // ART_RUNTIME_GC_ACCOUNTING_SPACE_BITMAP_INL_H_ diff --git a/runtime/gc/accounting/space_bitmap.h b/runtime/gc/accounting/space_bitmap.h index bb487d88d0..32ab440f31 100644 --- a/runtime/gc/accounting/space_bitmap.h +++ b/runtime/gc/accounting/space_bitmap.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_ACCOUNTING_SPACE_BITMAP_H_ -#define ART_SRC_GC_ACCOUNTING_SPACE_BITMAP_H_ +#ifndef ART_RUNTIME_GC_ACCOUNTING_SPACE_BITMAP_H_ +#define ART_RUNTIME_GC_ACCOUNTING_SPACE_BITMAP_H_ #include "locks.h" #include "globals.h" @@ -262,4 +262,4 @@ std::ostream& operator << (std::ostream& stream, const SpaceBitmap& bitmap); } // namespace gc } // namespace art -#endif // ART_SRC_GC_ACCOUNTING_SPACE_BITMAP_H_ +#endif // ART_RUNTIME_GC_ACCOUNTING_SPACE_BITMAP_H_ diff --git a/runtime/gc/allocator/dlmalloc.h b/runtime/gc/allocator/dlmalloc.h index 6b02a44ffe..07ebd1c0e3 100644 --- a/runtime/gc/allocator/dlmalloc.h +++ b/runtime/gc/allocator/dlmalloc.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_ALLOCATOR_DLMALLOC_H_ -#define ART_SRC_GC_ALLOCATOR_DLMALLOC_H_ +#ifndef ART_RUNTIME_GC_ALLOCATOR_DLMALLOC_H_ +#define ART_RUNTIME_GC_ALLOCATOR_DLMALLOC_H_ // Configure dlmalloc for mspaces. #define HAVE_MMAP 0 @@ -37,4 +37,4 @@ extern "C" int dlmalloc_trim(size_t); // pages back to the kernel. extern "C" void DlmallocMadviseCallback(void* start, void* end, size_t used_bytes, void* /*arg*/); -#endif // ART_SRC_GC_ALLOCATOR_DLMALLOC_H_ +#endif // ART_RUNTIME_GC_ALLOCATOR_DLMALLOC_H_ diff --git a/runtime/gc/collector/garbage_collector.h b/runtime/gc/collector/garbage_collector.h index 1ab395775b..a22faac43b 100644 --- a/runtime/gc/collector/garbage_collector.h +++ b/runtime/gc/collector/garbage_collector.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_GARBAGE_COLLECTOR_H_ -#define ART_SRC_GC_GARBAGE_COLLECTOR_H_ +#ifndef ART_RUNTIME_GC_COLLECTOR_GARBAGE_COLLECTOR_H_ +#define ART_RUNTIME_GC_COLLECTOR_GARBAGE_COLLECTOR_H_ #include "gc_type.h" #include "locks.h" @@ -119,4 +119,4 @@ class GarbageCollector { } // namespace gc } // namespace art -#endif // ART_SRC_GC_GARBAGE_COLLECTOR_H_ +#endif // ART_RUNTIME_GC_COLLECTOR_GARBAGE_COLLECTOR_H_ diff --git a/runtime/gc/collector/gc_type.h b/runtime/gc/collector/gc_type.h index bb25bb93f9..f18e40fa74 100644 --- a/runtime/gc/collector/gc_type.h +++ b/runtime/gc/collector/gc_type.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_COLLECTOR_GC_TYPE_H_ -#define ART_SRC_GC_COLLECTOR_GC_TYPE_H_ +#ifndef ART_RUNTIME_GC_COLLECTOR_GC_TYPE_H_ +#define ART_RUNTIME_GC_COLLECTOR_GC_TYPE_H_ #include @@ -43,4 +43,4 @@ std::ostream& operator<<(std::ostream& os, const GcType& policy); } // namespace gc } // namespace art -#endif // ART_SRC_GC_COLLECTOR_GC_TYPE_H_ +#endif // ART_RUNTIME_GC_COLLECTOR_GC_TYPE_H_ diff --git a/runtime/gc/collector/mark_sweep-inl.h b/runtime/gc/collector/mark_sweep-inl.h index ea9fced84a..6b1b617eb4 100644 --- a/runtime/gc/collector/mark_sweep-inl.h +++ b/runtime/gc/collector/mark_sweep-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_MARK_SWEEP_INL_H_ -#define ART_SRC_GC_MARK_SWEEP_INL_H_ +#ifndef ART_RUNTIME_GC_COLLECTOR_MARK_SWEEP_INL_H_ +#define ART_RUNTIME_GC_COLLECTOR_MARK_SWEEP_INL_H_ #include "gc/collector/mark_sweep.h" @@ -162,4 +162,4 @@ inline void MarkSweep::VisitObjectArrayReferences(const mirror::ObjectArray #include @@ -609,4 +609,4 @@ class Heap { } // namespace gc } // namespace art -#endif // ART_SRC_GC_HEAP_H_ +#endif // ART_RUNTIME_GC_HEAP_H_ diff --git a/runtime/gc/space/dlmalloc_space.h b/runtime/gc/space/dlmalloc_space.h index 00df0e6d42..8a4314c716 100644 --- a/runtime/gc/space/dlmalloc_space.h +++ b/runtime/gc/space/dlmalloc_space.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_SPACE_DLMALLOC_SPACE_H_ -#define ART_SRC_GC_SPACE_DLMALLOC_SPACE_H_ +#ifndef ART_RUNTIME_GC_SPACE_DLMALLOC_SPACE_H_ +#define ART_RUNTIME_GC_SPACE_DLMALLOC_SPACE_H_ #include "gc/allocator/dlmalloc.h" #include "space.h" @@ -182,4 +182,4 @@ class DlMallocSpace : public MemMapSpace, public AllocSpace { } // namespace gc } // namespace art -#endif // ART_SRC_GC_SPACE_DLMALLOC_SPACE_H_ +#endif // ART_RUNTIME_GC_SPACE_DLMALLOC_SPACE_H_ diff --git a/runtime/gc/space/image_space.h b/runtime/gc/space/image_space.h index 833fb8d73a..fde2b419ac 100644 --- a/runtime/gc/space/image_space.h +++ b/runtime/gc/space/image_space.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_SPACE_IMAGE_SPACE_H_ -#define ART_SRC_GC_SPACE_IMAGE_SPACE_H_ +#ifndef ART_RUNTIME_GC_SPACE_IMAGE_SPACE_H_ +#define ART_RUNTIME_GC_SPACE_IMAGE_SPACE_H_ #include "space.h" @@ -115,4 +115,4 @@ class ImageSpace : public MemMapSpace { } // namespace gc } // namespace art -#endif // ART_SRC_GC_SPACE_IMAGE_SPACE_H_ +#endif // ART_RUNTIME_GC_SPACE_IMAGE_SPACE_H_ diff --git a/runtime/gc/space/large_object_space.h b/runtime/gc/space/large_object_space.h index 197fad3854..74d9cca6db 100644 --- a/runtime/gc/space/large_object_space.h +++ b/runtime/gc/space/large_object_space.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_SPACE_LARGE_OBJECT_SPACE_H_ -#define ART_SRC_GC_SPACE_LARGE_OBJECT_SPACE_H_ +#ifndef ART_RUNTIME_GC_SPACE_LARGE_OBJECT_SPACE_H_ +#define ART_RUNTIME_GC_SPACE_LARGE_OBJECT_SPACE_H_ #include "dlmalloc_space.h" @@ -190,4 +190,4 @@ class FreeListSpace : public LargeObjectSpace { } // namespace gc } // namespace art -#endif // ART_SRC_GC_SPACE_LARGE_OBJECT_SPACE_H_ +#endif // ART_RUNTIME_GC_SPACE_LARGE_OBJECT_SPACE_H_ diff --git a/runtime/gc/space/space-inl.h b/runtime/gc/space/space-inl.h index 54bf604822..2c3b93c60d 100644 --- a/runtime/gc/space/space-inl.h +++ b/runtime/gc/space/space-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_SPACE_SPACE_INL_H_ -#define ART_SRC_GC_SPACE_SPACE_INL_H_ +#ifndef ART_RUNTIME_GC_SPACE_SPACE_INL_H_ +#define ART_RUNTIME_GC_SPACE_SPACE_INL_H_ #include "space.h" @@ -45,4 +45,4 @@ inline LargeObjectSpace* Space::AsLargeObjectSpace() { } // namespace gc } // namespace art -#endif // ART_SRC_GC_SPACE_SPACE_INL_H_ +#endif // ART_RUNTIME_GC_SPACE_SPACE_INL_H_ diff --git a/runtime/gc/space/space.h b/runtime/gc/space/space.h index ca01c55497..48f0579d83 100644 --- a/runtime/gc/space/space.h +++ b/runtime/gc/space/space.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_SPACE_SPACE_H_ -#define ART_SRC_GC_SPACE_SPACE_H_ +#ifndef ART_RUNTIME_GC_SPACE_SPACE_H_ +#define ART_RUNTIME_GC_SPACE_SPACE_H_ #include @@ -292,4 +292,4 @@ class MemMapSpace : public ContinuousSpace { } // namespace gc } // namespace art -#endif // ART_SRC_GC_SPACE_SPACE_H_ +#endif // ART_RUNTIME_GC_SPACE_SPACE_H_ diff --git a/runtime/gc_map.h b/runtime/gc_map.h index 473b39a629..33d09f29f6 100644 --- a/runtime/gc_map.h +++ b/runtime/gc_map.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_MAP_H_ -#define ART_SRC_GC_MAP_H_ +#ifndef ART_RUNTIME_GC_MAP_H_ +#define ART_RUNTIME_GC_MAP_H_ #include @@ -108,4 +108,4 @@ class NativePcOffsetToReferenceMap { } // namespace art -#endif // ART_SRC_GC_MAP_H_ +#endif // ART_RUNTIME_GC_MAP_H_ diff --git a/runtime/globals.h b/runtime/globals.h index dc9341ae0f..c3974943cd 100644 --- a/runtime/globals.h +++ b/runtime/globals.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GLOBALS_H_ -#define ART_SRC_GLOBALS_H_ +#ifndef ART_RUNTIME_GLOBALS_H_ +#define ART_RUNTIME_GLOBALS_H_ #include #include @@ -75,4 +75,4 @@ const bool kIsTargetBuild = false; } // namespace art -#endif // ART_SRC_GLOBALS_H_ +#endif // ART_RUNTIME_GLOBALS_H_ diff --git a/runtime/hprof/hprof.h b/runtime/hprof/hprof.h index c6222dcb90..91684648a5 100644 --- a/runtime/hprof/hprof.h +++ b/runtime/hprof/hprof.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef HPROF_HPROF_H_ -#define HPROF_HPROF_H_ +#ifndef ART_RUNTIME_HPROF_HPROF_H_ +#define ART_RUNTIME_HPROF_HPROF_H_ namespace art { @@ -27,4 +27,4 @@ void DumpHeap(const char* filename, int fd, bool direct_to_ddms); } // namespace art -#endif // HPROF_HPROF_H_ +#endif // ART_RUNTIME_HPROF_HPROF_H_ diff --git a/runtime/image.h b/runtime/image.h index f14d7d190a..35e4c5cabd 100644 --- a/runtime/image.h +++ b/runtime/image.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_IMAGE_H_ -#define ART_SRC_IMAGE_H_ +#ifndef ART_RUNTIME_IMAGE_H_ +#define ART_RUNTIME_IMAGE_H_ #include @@ -131,4 +131,4 @@ class PACKED(4) ImageHeader { } // namespace art -#endif // ART_SRC_IMAGE_H_ +#endif // ART_RUNTIME_IMAGE_H_ diff --git a/runtime/indenter.h b/runtime/indenter.h index 4ac0c01163..c432e1ba8d 100644 --- a/runtime/indenter.h +++ b/runtime/indenter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INDENTER_H_ -#define ART_SRC_INDENTER_H_ +#ifndef ART_RUNTIME_INDENTER_H_ +#define ART_RUNTIME_INDENTER_H_ #include "base/macros.h" #include @@ -60,4 +60,4 @@ class Indenter : public std::streambuf { DISALLOW_COPY_AND_ASSIGN(Indenter); }; -#endif // ART_SRC_INDENTER_H_ +#endif // ART_RUNTIME_INDENTER_H_ diff --git a/runtime/indirect_reference_table.h b/runtime/indirect_reference_table.h index e09043dba7..34b0f3abe2 100644 --- a/runtime/indirect_reference_table.h +++ b/runtime/indirect_reference_table.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INDIRECT_REFERENCE_TABLE_H_ -#define ART_SRC_INDIRECT_REFERENCE_TABLE_H_ +#ifndef ART_RUNTIME_INDIRECT_REFERENCE_TABLE_H_ +#define ART_RUNTIME_INDIRECT_REFERENCE_TABLE_H_ #include @@ -378,4 +378,4 @@ class IndirectReferenceTable { } // namespace art -#endif // ART_SRC_INDIRECT_REFERENCE_TABLE_H_ +#endif // ART_RUNTIME_INDIRECT_REFERENCE_TABLE_H_ diff --git a/runtime/instruction_set.h b/runtime/instruction_set.h index c4dae4dcb6..2217f7f76e 100644 --- a/runtime/instruction_set.h +++ b/runtime/instruction_set.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INSTRUCTION_SET_H_ -#define ART_SRC_INSTRUCTION_SET_H_ +#ifndef ART_RUNTIME_INSTRUCTION_SET_H_ +#define ART_RUNTIME_INSTRUCTION_SET_H_ #include @@ -33,4 +33,4 @@ std::ostream& operator<<(std::ostream& os, const InstructionSet& rhs); } // namespace art -#endif // ART_SRC_INSTRUCTION_SET_H_ +#endif // ART_RUNTIME_INSTRUCTION_SET_H_ diff --git a/runtime/instrumentation.h b/runtime/instrumentation.h index 5fea34f388..e0f1fa978b 100644 --- a/runtime/instrumentation.h +++ b/runtime/instrumentation.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INSTRUMENTATION_H_ -#define ART_SRC_INSTRUMENTATION_H_ +#ifndef ART_RUNTIME_INSTRUMENTATION_H_ +#define ART_RUNTIME_INSTRUMENTATION_H_ #include "base/macros.h" #include "locks.h" @@ -290,4 +290,4 @@ struct InstrumentationStackFrame { } // namespace instrumentation } // namespace art -#endif // ART_SRC_INSTRUMENTATION_H_ +#endif // ART_RUNTIME_INSTRUMENTATION_H_ diff --git a/runtime/intern_table.h b/runtime/intern_table.h index 1ff4f6d3c6..5031ce3c5a 100644 --- a/runtime/intern_table.h +++ b/runtime/intern_table.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INTERN_TABLE_H_ -#define ART_SRC_INTERN_TABLE_H_ +#ifndef ART_RUNTIME_INTERN_TABLE_H_ +#define ART_RUNTIME_INTERN_TABLE_H_ #include "base/mutex.h" #include "root_visitor.h" @@ -95,4 +95,4 @@ class InternTable { } // namespace art -#endif // ART_SRC_CLASS_LINKER_H_ +#endif // ART_RUNTIME_INTERN_TABLE_H_ diff --git a/runtime/interpreter/interpreter.h b/runtime/interpreter/interpreter.h index 20166ac545..17884b9a63 100644 --- a/runtime/interpreter/interpreter.h +++ b/runtime/interpreter/interpreter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INTERPRETER_INTERPRETER_H_ -#define ART_SRC_INTERPRETER_INTERPRETER_H_ +#ifndef ART_RUNTIME_INTERPRETER_INTERPRETER_H_ +#define ART_RUNTIME_INTERPRETER_INTERPRETER_H_ #include "dex_file.h" #include "locks.h" @@ -55,4 +55,4 @@ extern "C" void artInterpreterToInterpreterEntry(Thread* self, MethodHelper& mh, } // namespace interpreter } // namespace art -#endif // ART_SRC_INTERPRETER_INTERPRETER_H_ +#endif // ART_RUNTIME_INTERPRETER_INTERPRETER_H_ diff --git a/runtime/invoke_arg_array_builder.h b/runtime/invoke_arg_array_builder.h index b57d60a70f..c1d8249fd3 100644 --- a/runtime/invoke_arg_array_builder.h +++ b/runtime/invoke_arg_array_builder.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INVOKE_ARG_ARRAY_BUILDER_H_ -#define ART_SRC_INVOKE_ARG_ARRAY_BUILDER_H_ +#ifndef ART_RUNTIME_INVOKE_ARG_ARRAY_BUILDER_H_ +#define ART_RUNTIME_INVOKE_ARG_ARRAY_BUILDER_H_ #include "mirror/object.h" #include "scoped_thread_state_change.h" @@ -180,4 +180,4 @@ class ArgArray { } // namespace art -#endif // ART_SRC_INVOKE_ARG_ARRAY_BUILDER_H_ +#endif // ART_RUNTIME_INVOKE_ARG_ARRAY_BUILDER_H_ diff --git a/runtime/invoke_type.h b/runtime/invoke_type.h index d724fdb9c1..cdf9be87d9 100644 --- a/runtime/invoke_type.h +++ b/runtime/invoke_type.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INVOKE_TYPE_H_ -#define ART_SRC_INVOKE_TYPE_H_ +#ifndef ART_RUNTIME_INVOKE_TYPE_H_ +#define ART_RUNTIME_INVOKE_TYPE_H_ #include @@ -34,4 +34,4 @@ std::ostream& operator<<(std::ostream& os, const InvokeType& rhs); } // namespace art -#endif // ART_SRC_INVOKE_TYPE_H_ +#endif // ART_RUNTIME_INVOKE_TYPE_H_ diff --git a/runtime/jdwp/jdwp.h b/runtime/jdwp/jdwp.h index 436525c3d0..6a5d0d19fb 100644 --- a/runtime/jdwp/jdwp.h +++ b/runtime/jdwp/jdwp.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_JDWP_JDWP_H_ -#define ART_JDWP_JDWP_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_H_ +#define ART_RUNTIME_JDWP_JDWP_H_ #include "base/mutex.h" #include "jdwp/jdwp_bits.h" @@ -429,4 +429,4 @@ class Request { } // namespace art -#endif // ART_JDWP_JDWP_H_ +#endif // ART_RUNTIME_JDWP_JDWP_H_ diff --git a/runtime/jdwp/jdwp_bits.h b/runtime/jdwp/jdwp_bits.h index 2a3c775164..9f80cbe307 100644 --- a/runtime/jdwp/jdwp_bits.h +++ b/runtime/jdwp/jdwp_bits.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_JDWP_BITS_H_ -#define ART_JDWP_BITS_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_BITS_H_ +#define ART_RUNTIME_JDWP_JDWP_BITS_H_ #include #include @@ -121,4 +121,4 @@ static inline void Write8BE(uint8_t** dst, uint64_t value) { } // namespace art -#endif // ART_JDWP_BITS_H_ +#endif // ART_RUNTIME_JDWP_JDWP_BITS_H_ diff --git a/runtime/jdwp/jdwp_constants.h b/runtime/jdwp/jdwp_constants.h index ebc575b6b6..a8db325c66 100644 --- a/runtime/jdwp/jdwp_constants.h +++ b/runtime/jdwp/jdwp_constants.h @@ -16,8 +16,8 @@ /* * These come out of the JDWP documentation. */ -#ifndef ART_JDWP_JDWPCONSTANTS_H_ -#define ART_JDWP_JDWPCONSTANTS_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_CONSTANTS_H_ +#define ART_RUNTIME_JDWP_JDWP_CONSTANTS_H_ #include @@ -246,4 +246,4 @@ std::ostream& operator<<(std::ostream& os, const JdwpTag& value); } // namespace art -#endif // ART_JDWP_JDWPCONSTANTS_H_ +#endif // ART_RUNTIME_JDWP_JDWP_CONSTANTS_H_ diff --git a/runtime/jdwp/jdwp_event.h b/runtime/jdwp/jdwp_event.h index a6eabb1371..d269761999 100644 --- a/runtime/jdwp/jdwp_event.h +++ b/runtime/jdwp/jdwp_event.h @@ -16,8 +16,8 @@ /* * Handle registration of events, and debugger event notification. */ -#ifndef ART_JDWP_JDWPEVENT_H_ -#define ART_JDWP_JDWPEVENT_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_EVENT_H_ +#define ART_RUNTIME_JDWP_JDWP_EVENT_H_ #include "jdwp/jdwp.h" #include "jdwp/jdwp_constants.h" @@ -110,4 +110,4 @@ void EventFree(JdwpEvent* pEvent); } // namespace art -#endif // ART_JDWP_JDWPEVENT_H_ +#endif // ART_RUNTIME_JDWP_JDWP_EVENT_H_ diff --git a/runtime/jdwp/jdwp_expand_buf.h b/runtime/jdwp/jdwp_expand_buf.h index 820f62d6a0..81e01e2100 100644 --- a/runtime/jdwp/jdwp_expand_buf.h +++ b/runtime/jdwp/jdwp_expand_buf.h @@ -16,8 +16,8 @@ /* * Expanding byte buffer, with primitives for appending basic data types. */ -#ifndef ART_JDWP_EXPANDBUF_H_ -#define ART_JDWP_EXPANDBUF_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_EXPAND_BUF_H_ +#define ART_RUNTIME_JDWP_JDWP_EXPAND_BUF_H_ #include @@ -67,4 +67,4 @@ void expandBufAddLocation(ExpandBuf* pReply, const JdwpLocation& location); } // namespace art -#endif // ART_JDWP_EXPANDBUF_H_ +#endif // ART_RUNTIME_JDWP_JDWP_EXPAND_BUF_H_ diff --git a/runtime/jdwp/jdwp_priv.h b/runtime/jdwp/jdwp_priv.h index c8a7b2686d..ab89339347 100644 --- a/runtime/jdwp/jdwp_priv.h +++ b/runtime/jdwp/jdwp_priv.h @@ -16,8 +16,8 @@ /* * JDWP internal interfaces. */ -#ifndef ART_JDWP_JDWPPRIV_H_ -#define ART_JDWP_JDWPPRIV_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_PRIV_H_ +#define ART_RUNTIME_JDWP_JDWP_PRIV_H_ #include "debugger.h" #include "jdwp/jdwp.h" @@ -101,4 +101,4 @@ class JdwpNetStateBase { } // namespace art -#endif // ART_JDWP_JDWPPRIV_H_ +#endif // ART_RUNTIME_JDWP_JDWP_PRIV_H_ diff --git a/runtime/jdwp/object_registry.h b/runtime/jdwp/object_registry.h index d0ea59da71..345f0ad73a 100644 --- a/runtime/jdwp/object_registry.h +++ b/runtime/jdwp/object_registry.h @@ -14,6 +14,9 @@ * limitations under the License. */ +#ifndef ART_RUNTIME_JDWP_OBJECT_REGISTRY_H_ +#define ART_RUNTIME_JDWP_OBJECT_REGISTRY_H_ + #include #include @@ -98,3 +101,5 @@ class ObjectRegistry { }; } // namespace art + +#endif // ART_RUNTIME_JDWP_OBJECT_REGISTRY_H_ diff --git a/runtime/jni_internal.h b/runtime/jni_internal.h index 7b43f95cb3..ad66ada329 100644 --- a/runtime/jni_internal.h +++ b/runtime/jni_internal.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_JNI_INTERNAL_H_ -#define ART_SRC_JNI_INTERNAL_H_ +#ifndef ART_RUNTIME_JNI_INTERNAL_H_ +#define ART_RUNTIME_JNI_INTERNAL_H_ #include "jni.h" @@ -198,4 +198,4 @@ class ScopedJniEnvLocalRefState { std::ostream& operator<<(std::ostream& os, const jobjectRefType& rhs); -#endif // ART_SRC_JNI_INTERNAL_H_ +#endif // ART_RUNTIME_JNI_INTERNAL_H_ diff --git a/runtime/jobject_comparator.h b/runtime/jobject_comparator.h index 17098aaebb..698d6678d6 100644 --- a/runtime/jobject_comparator.h +++ b/runtime/jobject_comparator.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_JOBJECT_COMPARATOR_H_ -#define ART_SRC_JOBJECT_COMPARATOR_H_ +#ifndef ART_RUNTIME_JOBJECT_COMPARATOR_H_ +#define ART_RUNTIME_JOBJECT_COMPARATOR_H_ #include @@ -27,4 +27,4 @@ struct JobjectComparator { } // namespace art -#endif // ART_SRC_JOBJECT_COMPARATOR_H_ +#endif // ART_RUNTIME_JOBJECT_COMPARATOR_H_ diff --git a/runtime/jvalue.h b/runtime/jvalue.h index 66cd93e2c0..0c1aadb462 100644 --- a/runtime/jvalue.h +++ b/runtime/jvalue.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_JVALUE_H_ -#define ART_SRC_JVALUE_H_ +#ifndef ART_RUNTIME_JVALUE_H_ +#define ART_RUNTIME_JVALUE_H_ #include "base/macros.h" @@ -75,4 +75,4 @@ union PACKED(4) JValue { } // namespace art -#endif // ART_SRC_JVALUE_H_ +#endif // ART_RUNTIME_JVALUE_H_ diff --git a/runtime/leb128.h b/runtime/leb128.h index a5a6683aee..ca955b0921 100644 --- a/runtime/leb128.h +++ b/runtime/leb128.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_LEB128_H_ -#define ART_SRC_LEB128_H_ +#ifndef ART_RUNTIME_LEB128_H_ +#define ART_RUNTIME_LEB128_H_ #include "globals.h" @@ -121,4 +121,4 @@ static inline uint8_t* WriteUnsignedLeb128(uint8_t* ptr, uint32_t data) { } // namespace art -#endif // ART_SRC_LEB128_H_ +#endif // ART_RUNTIME_LEB128_H_ diff --git a/runtime/locks.h b/runtime/locks.h index 91437e1830..6b0e96f8b9 100644 --- a/runtime/locks.h +++ b/runtime/locks.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_LOCKS_H_ -#define ART_SRC_LOCKS_H_ +#ifndef ART_RUNTIME_LOCKS_H_ +#define ART_RUNTIME_LOCKS_H_ #include @@ -165,4 +165,4 @@ class Locks { } // namespace art -#endif // ART_SRC_LOCKS_H_ +#endif // ART_RUNTIME_LOCKS_H_ diff --git a/runtime/log_severity.h b/runtime/log_severity.h index 126019bdb6..bb7679d218 100644 --- a/runtime/log_severity.h +++ b/runtime/log_severity.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef BASE_LOG_SEVERITY_H_ -#define BASE_LOG_SEVERITY_H_ +#ifndef ART_RUNTIME_LOG_SEVERITY_H_ +#define ART_RUNTIME_LOG_SEVERITY_H_ typedef int LogSeverity; const int VERBOSE = 0, DEBUG = 1, INFO = 2, WARNING = 3, ERROR = 4, FATAL = 5; const int INTERNAL_FATAL = 6; // For Runtime::Abort. -#endif // BASE_LOG_SEVERITY_H_ +#endif // ART_RUNTIME_LOG_SEVERITY_H_ diff --git a/runtime/mem_map.h b/runtime/mem_map.h index 2eb7772705..7d418a5c6a 100644 --- a/runtime/mem_map.h +++ b/runtime/mem_map.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MEM_MAP_H_ -#define ART_SRC_MEM_MAP_H_ +#ifndef ART_RUNTIME_MEM_MAP_H_ +#define ART_RUNTIME_MEM_MAP_H_ #include @@ -101,4 +101,4 @@ class MemMap { } // namespace art -#endif // ART_SRC_MEM_MAP_H_ +#endif // ART_RUNTIME_MEM_MAP_H_ diff --git a/runtime/memory_region.h b/runtime/memory_region.h index cfbe42dddf..849ab1c420 100644 --- a/runtime/memory_region.h +++ b/runtime/memory_region.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MEMORY_REGION_H_ -#define ART_SRC_MEMORY_REGION_H_ +#ifndef ART_RUNTIME_MEMORY_REGION_H_ +#define ART_RUNTIME_MEMORY_REGION_H_ #include @@ -96,4 +96,4 @@ class MemoryRegion { } // namespace art -#endif // ART_MEMORY_REGION_H_ +#endif // ART_RUNTIME_MEMORY_REGION_H_ diff --git a/runtime/method_reference.h b/runtime/method_reference.h index ff8bf313f0..1ff4ea0942 100644 --- a/runtime/method_reference.h +++ b/runtime/method_reference.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_METHOD_REFERENCE_H_ -#define ART_SRC_METHOD_REFERENCE_H_ +#ifndef ART_RUNTIME_METHOD_REFERENCE_H_ +#define ART_RUNTIME_METHOD_REFERENCE_H_ namespace art { @@ -44,4 +44,4 @@ struct MethodReferenceComparator { } // namespace art -#endif // ART_SRC_METHOD_REFERENCE_H_ +#endif // ART_RUNTIME_METHOD_REFERENCE_H_ diff --git a/runtime/mirror/abstract_method-inl.h b/runtime/mirror/abstract_method-inl.h index a8238867aa..6fcd705e55 100644 --- a/runtime/mirror/abstract_method-inl.h +++ b/runtime/mirror/abstract_method-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_METHOD_INL_H_ -#define ART_SRC_MIRROR_METHOD_INL_H_ +#ifndef ART_RUNTIME_MIRROR_ABSTRACT_METHOD_INL_H_ +#define ART_RUNTIME_MIRROR_ABSTRACT_METHOD_INL_H_ #include "abstract_method.h" @@ -196,4 +196,4 @@ inline bool AbstractMethod::IsResolutionMethod() const { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_METHOD_INL_H_ +#endif // ART_RUNTIME_MIRROR_ABSTRACT_METHOD_INL_H_ diff --git a/runtime/mirror/abstract_method.h b/runtime/mirror/abstract_method.h index 339471dd5d..d909058e0d 100644 --- a/runtime/mirror/abstract_method.h +++ b/runtime/mirror/abstract_method.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_METHOD_H_ -#define ART_SRC_MIRROR_METHOD_H_ +#ifndef ART_RUNTIME_MIRROR_ABSTRACT_METHOD_H_ +#define ART_RUNTIME_MIRROR_ABSTRACT_METHOD_H_ #include "class.h" #include "dex_file.h" @@ -515,4 +515,4 @@ class MANAGED AbstractMethodClass : public Class { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_METHOD_H_ +#endif // ART_RUNTIME_MIRROR_ABSTRACT_METHOD_H_ diff --git a/runtime/mirror/array-inl.h b/runtime/mirror/array-inl.h index b7f212f50f..eb73c7dd38 100644 --- a/runtime/mirror/array-inl.h +++ b/runtime/mirror/array-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_ARRAY_INL_H_ -#define ART_SRC_MIRROR_ARRAY_INL_H_ +#ifndef ART_RUNTIME_MIRROR_ARRAY_INL_H_ +#define ART_RUNTIME_MIRROR_ARRAY_INL_H_ #include "array.h" @@ -36,4 +36,4 @@ inline size_t Array::SizeOf() const { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_ARRAY_INL_H_ +#endif // ART_RUNTIME_MIRROR_ARRAY_INL_H_ diff --git a/runtime/mirror/array.h b/runtime/mirror/array.h index 98b8ea0008..b195a87fc0 100644 --- a/runtime/mirror/array.h +++ b/runtime/mirror/array.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_ARRAY_H_ -#define ART_SRC_MIRROR_ARRAY_H_ +#ifndef ART_RUNTIME_MIRROR_ARRAY_H_ +#define ART_RUNTIME_MIRROR_ARRAY_H_ #include "object.h" @@ -145,4 +145,4 @@ class MANAGED PrimitiveArray : public Array { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_ARRAY_H_ +#endif // ART_RUNTIME_MIRROR_ARRAY_H_ diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h index 6819fb2954..d323c3333b 100644 --- a/runtime/mirror/class-inl.h +++ b/runtime/mirror/class-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_CLASS_INL_H_ -#define ART_SRC_MIRROR_CLASS_INL_H_ +#ifndef ART_RUNTIME_MIRROR_CLASS_INL_H_ +#define ART_RUNTIME_MIRROR_CLASS_INL_H_ #include "class.h" @@ -346,4 +346,4 @@ inline void Class::SetName(String* name) { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_CLASS_INL_H_ +#endif // ART_RUNTIME_MIRROR_CLASS_INL_H_ diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h index 084aa24c7c..9a506c29af 100644 --- a/runtime/mirror/class.h +++ b/runtime/mirror/class.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_CLASS_H_ -#define ART_SRC_MIRROR_CLASS_H_ +#ifndef ART_RUNTIME_MIRROR_CLASS_H_ +#define ART_RUNTIME_MIRROR_CLASS_H_ #include "modifiers.h" #include "object.h" @@ -882,4 +882,4 @@ class MANAGED ClassClass : public Class { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_CLASS_H_ +#endif // ART_RUNTIME_MIRROR_CLASS_H_ diff --git a/runtime/mirror/class_loader.h b/runtime/mirror/class_loader.h index 0d635f1d21..415cb67c6c 100644 --- a/runtime/mirror/class_loader.h +++ b/runtime/mirror/class_loader.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CLASS_LOADER_H_ -#define ART_SRC_CLASS_LOADER_H_ +#ifndef ART_RUNTIME_MIRROR_CLASS_LOADER_H_ +#define ART_RUNTIME_MIRROR_CLASS_LOADER_H_ #include @@ -43,4 +43,4 @@ class MANAGED ClassLoader : public Object { } // namespace mirror } // namespace art -#endif // ART_SRC_CLASS_LOADER_H_ +#endif // ART_RUNTIME_MIRROR_CLASS_LOADER_H_ diff --git a/runtime/mirror/dex_cache-inl.h b/runtime/mirror/dex_cache-inl.h index 3b17c428a5..369dc49ed0 100644 --- a/runtime/mirror/dex_cache-inl.h +++ b/runtime/mirror/dex_cache-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_DEX_CACHE_INL_H_ -#define ART_SRC_MIRROR_DEX_CACHE_INL_H_ +#ifndef ART_RUNTIME_MIRROR_DEX_CACHE_INL_H_ +#define ART_RUNTIME_MIRROR_DEX_CACHE_INL_H_ #include "dex_cache.h" @@ -37,4 +37,4 @@ inline AbstractMethod* DexCache::GetResolvedMethod(uint32_t method_idx) const } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_DEX_CACHE_INL_H_ +#endif // ART_RUNTIME_MIRROR_DEX_CACHE_INL_H_ diff --git a/runtime/mirror/dex_cache.h b/runtime/mirror/dex_cache.h index 307588b581..fd3f5f44b8 100644 --- a/runtime/mirror/dex_cache.h +++ b/runtime/mirror/dex_cache.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_DEX_CACHE_H_ -#define ART_SRC_MIRROR_DEX_CACHE_H_ +#ifndef ART_RUNTIME_MIRROR_DEX_CACHE_H_ +#define ART_RUNTIME_MIRROR_DEX_CACHE_H_ #include "abstract_method.h" #include "class.h" @@ -179,4 +179,4 @@ class MANAGED DexCache : public Object { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_DEX_CACHE_H_ +#endif // ART_RUNTIME_MIRROR_DEX_CACHE_H_ diff --git a/runtime/mirror/field-inl.h b/runtime/mirror/field-inl.h index be5dcab03d..3e3d6db4a6 100644 --- a/runtime/mirror/field-inl.h +++ b/runtime/mirror/field-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_FIELD_INL_H_ -#define ART_SRC_MIRROR_FIELD_INL_H_ +#ifndef ART_RUNTIME_MIRROR_FIELD_INL_H_ +#define ART_RUNTIME_MIRROR_FIELD_INL_H_ #include "field.h" @@ -218,4 +218,4 @@ inline void Field::SetObject(Object* object, const Object* l) const { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_FIELD_INL_H_ +#endif // ART_RUNTIME_MIRROR_FIELD_INL_H_ diff --git a/runtime/mirror/field.h b/runtime/mirror/field.h index 4e7abe8550..6e508a362f 100644 --- a/runtime/mirror/field.h +++ b/runtime/mirror/field.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_FIELD_H_ -#define ART_SRC_MIRROR_FIELD_H_ +#ifndef ART_RUNTIME_MIRROR_FIELD_H_ +#define ART_RUNTIME_MIRROR_FIELD_H_ #include "class.h" #include "modifiers.h" @@ -165,4 +165,4 @@ class MANAGED FieldClass : public Class { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_FIELD_H_ +#endif // ART_RUNTIME_MIRROR_FIELD_H_ diff --git a/runtime/mirror/iftable-inl.h b/runtime/mirror/iftable-inl.h index 72803b8002..9d5fa7475a 100644 --- a/runtime/mirror/iftable-inl.h +++ b/runtime/mirror/iftable-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_IFTABLE_INL_H_ -#define ART_SRC_MIRROR_IFTABLE_INL_H_ +#ifndef ART_RUNTIME_MIRROR_IFTABLE_INL_H_ +#define ART_RUNTIME_MIRROR_IFTABLE_INL_H_ #include "iftable.h" @@ -32,4 +32,4 @@ inline void IfTable::SetInterface(int32_t i, Class* interface) { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_IFTABLE_INL_H_ +#endif // ART_RUNTIME_MIRROR_IFTABLE_INL_H_ diff --git a/runtime/mirror/iftable.h b/runtime/mirror/iftable.h index ffb2e51582..aea8fddafe 100644 --- a/runtime/mirror/iftable.h +++ b/runtime/mirror/iftable.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_IFTABLE_H_ -#define ART_SRC_MIRROR_IFTABLE_H_ +#ifndef ART_RUNTIME_MIRROR_IFTABLE_H_ +#define ART_RUNTIME_MIRROR_IFTABLE_H_ #include "object_array.h" @@ -76,4 +76,4 @@ class MANAGED IfTable : public ObjectArray { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_IFTABLE_H_ +#endif // ART_RUNTIME_MIRROR_IFTABLE_H_ diff --git a/runtime/mirror/object-inl.h b/runtime/mirror/object-inl.h index 1a91dd3e6f..5818a800bf 100644 --- a/runtime/mirror/object-inl.h +++ b/runtime/mirror/object-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_OBJECT_INL_H_ -#define ART_SRC_MIRROR_OBJECT_INL_H_ +#ifndef ART_RUNTIME_MIRROR_OBJECT_INL_H_ +#define ART_RUNTIME_MIRROR_OBJECT_INL_H_ #include "object.h" @@ -272,4 +272,4 @@ inline void Object::VerifyObject(const Object* obj) { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_OBJECT_INL_H_ +#endif // ART_RUNTIME_MIRROR_OBJECT_INL_H_ diff --git a/runtime/mirror/object.h b/runtime/mirror/object.h index 71b628db52..a40c906eb0 100644 --- a/runtime/mirror/object.h +++ b/runtime/mirror/object.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_OBJECT_H_ -#define ART_SRC_MIRROR_OBJECT_H_ +#ifndef ART_RUNTIME_MIRROR_OBJECT_H_ +#define ART_RUNTIME_MIRROR_OBJECT_H_ #include "base/casts.h" #include "base/logging.h" @@ -260,4 +260,4 @@ class MANAGED Object { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_OBJECT_H_ +#endif // ART_RUNTIME_MIRROR_OBJECT_H_ diff --git a/runtime/mirror/object_array-inl.h b/runtime/mirror/object_array-inl.h index b130dac514..8675c31b37 100644 --- a/runtime/mirror/object_array-inl.h +++ b/runtime/mirror/object_array-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_OBJECT_ARRAY_INL_H_ -#define ART_SRC_MIRROR_OBJECT_ARRAY_INL_H_ +#ifndef ART_RUNTIME_MIRROR_OBJECT_ARRAY_INL_H_ +#define ART_RUNTIME_MIRROR_OBJECT_ARRAY_INL_H_ #include "object_array.h" @@ -142,4 +142,4 @@ inline ObjectArray* ObjectArray::CopyOf(Thread* self, int32_t new_length) } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_OBJET_ARRAY_INL_H_ +#endif // ART_RUNTIME_MIRROR_OBJECT_ARRAY_INL_H_ diff --git a/runtime/mirror/object_array.h b/runtime/mirror/object_array.h index 08a8d62567..09ff5193ae 100644 --- a/runtime/mirror/object_array.h +++ b/runtime/mirror/object_array.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_OBJECT_ARRAY_H_ -#define ART_SRC_MIRROR_OBJECT_ARRAY_H_ +#ifndef ART_RUNTIME_MIRROR_OBJECT_ARRAY_H_ +#define ART_RUNTIME_MIRROR_OBJECT_ARRAY_H_ #include "array.h" @@ -61,4 +61,4 @@ class MANAGED ObjectArray : public Array { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_OBJECT_ARRAY_H_ +#endif // ART_RUNTIME_MIRROR_OBJECT_ARRAY_H_ diff --git a/runtime/mirror/proxy.h b/runtime/mirror/proxy.h index cac028a731..7c5bc39429 100644 --- a/runtime/mirror/proxy.h +++ b/runtime/mirror/proxy.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_PROXY_H_ -#define ART_SRC_MIRROR_PROXY_H_ +#ifndef ART_RUNTIME_MIRROR_PROXY_H_ +#define ART_RUNTIME_MIRROR_PROXY_H_ #include "mirror/object.h" @@ -52,4 +52,4 @@ class MANAGED Proxy : public Object { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_PROXY_H_ +#endif // ART_RUNTIME_MIRROR_PROXY_H_ diff --git a/runtime/mirror/stack_trace_element.h b/runtime/mirror/stack_trace_element.h index d53c8602dc..a9751f9988 100644 --- a/runtime/mirror/stack_trace_element.h +++ b/runtime/mirror/stack_trace_element.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_STACK_TRACE_ELEMENT_H_ -#define ART_SRC_MIRROR_STACK_TRACE_ELEMENT_H_ +#ifndef ART_RUNTIME_MIRROR_STACK_TRACE_ELEMENT_H_ +#define ART_RUNTIME_MIRROR_STACK_TRACE_ELEMENT_H_ #include "object.h" @@ -80,4 +80,4 @@ class MANAGED StackTraceElement : public Object { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_STACK_TRACE_ELEMENT_H_ +#endif // ART_RUNTIME_MIRROR_STACK_TRACE_ELEMENT_H_ diff --git a/runtime/mirror/string.h b/runtime/mirror/string.h index 8109dcb9a9..bf545eaefb 100644 --- a/runtime/mirror/string.h +++ b/runtime/mirror/string.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_STRING_H_ -#define ART_SRC_MIRROR_STRING_H_ +#ifndef ART_RUNTIME_MIRROR_STRING_H_ +#define ART_RUNTIME_MIRROR_STRING_H_ #include "class.h" #include "gtest/gtest.h" @@ -164,4 +164,4 @@ class MANAGED StringClass : public Class { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_STRING_H_ +#endif // ART_RUNTIME_MIRROR_STRING_H_ diff --git a/runtime/mirror/throwable.h b/runtime/mirror/throwable.h index aafcc07d86..909228e4d9 100644 --- a/runtime/mirror/throwable.h +++ b/runtime/mirror/throwable.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MIRROR_THROWABLE_H_ -#define ART_SRC_MIRROR_THROWABLE_H_ +#ifndef ART_RUNTIME_MIRROR_THROWABLE_H_ +#define ART_RUNTIME_MIRROR_THROWABLE_H_ #include "object.h" #include "string.h" @@ -72,4 +72,4 @@ class MANAGED Throwable : public Object { } // namespace mirror } // namespace art -#endif // ART_SRC_MIRROR_THROWABLE_H_ +#endif // ART_RUNTIME_MIRROR_THROWABLE_H_ diff --git a/runtime/modifiers.h b/runtime/modifiers.h index 85bc06da65..9b61ee0cf0 100644 --- a/runtime/modifiers.h +++ b/runtime/modifiers.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MODIFIERS_H_ -#define ART_SRC_MODIFIERS_H_ +#ifndef ART_RUNTIME_MODIFIERS_H_ +#define ART_RUNTIME_MODIFIERS_H_ #include @@ -63,5 +63,5 @@ static const uint32_t kAccReferenceFlagsMask = (kAccClassIsReference | kAccClassIsFinalizerReference | kAccClassIsPhantomReference); -#endif // ART_SRC_MODIFIERS_H_ +#endif // ART_RUNTIME_MODIFIERS_H_ diff --git a/runtime/monitor.h b/runtime/monitor.h index 9194c08ab4..9206131a5b 100644 --- a/runtime/monitor.h +++ b/runtime/monitor.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MONITOR_H_ -#define ART_SRC_MONITOR_H_ +#ifndef ART_RUNTIME_MONITOR_H_ +#define ART_RUNTIME_MONITOR_H_ #include #include @@ -208,4 +208,4 @@ class MonitorInfo { } // namespace art -#endif // ART_SRC_MONITOR_H_ +#endif // ART_RUNTIME_MONITOR_H_ diff --git a/runtime/nth_caller_visitor.h b/runtime/nth_caller_visitor.h index c32a46aa02..e3593d805d 100644 --- a/runtime/nth_caller_visitor.h +++ b/runtime/nth_caller_visitor.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_NTH_CALLER_VISITOR_H_ -#define ART_SRC_NTH_CALLER_VISITOR_H_ +#ifndef ART_RUNTIME_NTH_CALLER_VISITOR_H_ +#define ART_RUNTIME_NTH_CALLER_VISITOR_H_ #include "mirror/abstract_method.h" #include "locks.h" @@ -58,4 +58,4 @@ struct NthCallerVisitor : public StackVisitor { } // namespace art -#endif // ART_SRC_NTH_CALLER_VISITOR_H_ +#endif // ART_RUNTIME_NTH_CALLER_VISITOR_H_ diff --git a/runtime/oat.h b/runtime/oat.h index c67a1a6630..fb28962762 100644 --- a/runtime/oat.h +++ b/runtime/oat.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_H_ -#define ART_SRC_OAT_H_ +#ifndef ART_RUNTIME_OAT_H_ +#define ART_RUNTIME_OAT_H_ #include @@ -113,4 +113,4 @@ class PACKED(4) OatMethodOffsets { } // namespace art -#endif // ART_SRC_OAT_H_ +#endif // ART_RUNTIME_OAT_H_ diff --git a/runtime/oat/runtime/argument_visitor.h b/runtime/oat/runtime/argument_visitor.h index 4ab05b9e4d..d92ff19d13 100644 --- a/runtime/oat/runtime/argument_visitor.h +++ b/runtime/oat/runtime/argument_visitor.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_RUNTIME_ARGUMENT_VISITOR_H_ -#define ART_SRC_OAT_RUNTIME_ARGUMENT_VISITOR_H_ +#ifndef ART_RUNTIME_OAT_RUNTIME_ARGUMENT_VISITOR_H_ +#define ART_RUNTIME_OAT_RUNTIME_ARGUMENT_VISITOR_H_ #include "object_utils.h" @@ -246,4 +246,4 @@ class QuickArgumentVisitor { } -#endif // ART_SRC_OAT_RUNTIME_ARGUMENT_VISITOR_H_ +#endif // ART_RUNTIME_OAT_RUNTIME_ARGUMENT_VISITOR_H_ diff --git a/runtime/oat/runtime/arm/context_arm.h b/runtime/oat/runtime/arm/context_arm.h index ec1d4cb7f6..0be85e3577 100644 --- a/runtime/oat/runtime/arm/context_arm.h +++ b/runtime/oat/runtime/arm/context_arm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_RUNTIME_ARM_CONTEXT_ARM_H_ -#define ART_SRC_OAT_RUNTIME_ARM_CONTEXT_ARM_H_ +#ifndef ART_RUNTIME_OAT_RUNTIME_ARM_CONTEXT_ARM_H_ +#define ART_RUNTIME_OAT_RUNTIME_ARM_CONTEXT_ARM_H_ #include "locks.h" #include "constants_arm.h" @@ -64,4 +64,4 @@ class ArmContext : public Context { } // namespace arm } // namespace art -#endif // ART_SRC_OAT_RUNTIME_ARM_CONTEXT_ARM_H_ +#endif // ART_RUNTIME_OAT_RUNTIME_ARM_CONTEXT_ARM_H_ diff --git a/runtime/oat/runtime/callee_save_frame.h b/runtime/oat/runtime/callee_save_frame.h index dd2f3fa69e..59f46acbac 100644 --- a/runtime/oat/runtime/callee_save_frame.h +++ b/runtime/oat/runtime/callee_save_frame.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_RUNTIME_CALLEE_SAVE_FRAME_H_ -#define ART_SRC_OAT_RUNTIME_CALLEE_SAVE_FRAME_H_ +#ifndef ART_RUNTIME_OAT_RUNTIME_CALLEE_SAVE_FRAME_H_ +#define ART_RUNTIME_OAT_RUNTIME_CALLEE_SAVE_FRAME_H_ #include "base/mutex.h" #include "thread-inl.h" @@ -38,4 +38,4 @@ static void FinishCalleeSaveFrameSetup(Thread* self, mirror::AbstractMethod** sp } // namespace art -#endif // ART_SRC_OAT_RUNTIME_CALLEE_SAVE_FRAME_H_ +#endif // ART_RUNTIME_OAT_RUNTIME_CALLEE_SAVE_FRAME_H_ diff --git a/runtime/oat/runtime/context.h b/runtime/oat/runtime/context.h index 895abf99ed..ac43e9a7e9 100644 --- a/runtime/oat/runtime/context.h +++ b/runtime/oat/runtime/context.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_RUNTIME_CONTEXT_H_ -#define ART_SRC_OAT_RUNTIME_CONTEXT_H_ +#ifndef ART_RUNTIME_OAT_RUNTIME_CONTEXT_H_ +#define ART_RUNTIME_OAT_RUNTIME_CONTEXT_H_ #include #include @@ -67,4 +67,4 @@ class Context { } // namespace art -#endif // ART_SRC_OAT_RUNTIME_CONTEXT_H_ +#endif // ART_RUNTIME_OAT_RUNTIME_CONTEXT_H_ diff --git a/runtime/oat/runtime/mips/context_mips.h b/runtime/oat/runtime/mips/context_mips.h index fc8ef9655f..f27124c79b 100644 --- a/runtime/oat/runtime/mips/context_mips.h +++ b/runtime/oat/runtime/mips/context_mips.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_RUNTIME_MIPS_CONTEXT_MIPS_H_ -#define ART_SRC_OAT_RUNTIME_MIPS_CONTEXT_MIPS_H_ +#ifndef ART_RUNTIME_OAT_RUNTIME_MIPS_CONTEXT_MIPS_H_ +#define ART_RUNTIME_OAT_RUNTIME_MIPS_CONTEXT_MIPS_H_ #include "constants_mips.h" #include "oat/runtime/context.h" @@ -61,4 +61,4 @@ class MipsContext : public Context { } // namespace mips } // namespace art -#endif // ART_SRC_OAT_RUNTIME_MIPS_CONTEXT_MIPS_H_ +#endif // ART_RUNTIME_OAT_RUNTIME_MIPS_CONTEXT_MIPS_H_ diff --git a/runtime/oat/runtime/oat_support_entrypoints.h b/runtime/oat/runtime/oat_support_entrypoints.h index c1a2587c45..546ee01c6f 100644 --- a/runtime/oat/runtime/oat_support_entrypoints.h +++ b/runtime/oat/runtime/oat_support_entrypoints.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_RUNTIME_OAT_SUPPORT_ENTRYPOINTS_H_ -#define ART_SRC_OAT_RUNTIME_OAT_SUPPORT_ENTRYPOINTS_H_ +#ifndef ART_RUNTIME_OAT_RUNTIME_OAT_SUPPORT_ENTRYPOINTS_H_ +#define ART_RUNTIME_OAT_RUNTIME_OAT_SUPPORT_ENTRYPOINTS_H_ #include "dex_file-inl.h" #include "runtime.h" @@ -174,4 +174,4 @@ void ChangeDebuggerEntryPoint(EntryPoints* points, bool enabled); } // namespace art -#endif // ART_SRC_OAT_RUNTIME_OAT_SUPPORT_ENTRYPOINTS_H_ +#endif // ART_RUNTIME_OAT_RUNTIME_OAT_SUPPORT_ENTRYPOINTS_H_ diff --git a/runtime/oat/runtime/x86/context_x86.h b/runtime/oat/runtime/x86/context_x86.h index 7928fd860f..4ecfc51b04 100644 --- a/runtime/oat/runtime/x86/context_x86.h +++ b/runtime/oat/runtime/x86/context_x86.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_RUNTIME_X86_CONTEXT_X86_H_ -#define ART_SRC_OAT_RUNTIME_X86_CONTEXT_X86_H_ +#ifndef ART_RUNTIME_OAT_RUNTIME_X86_CONTEXT_X86_H_ +#define ART_RUNTIME_OAT_RUNTIME_X86_CONTEXT_X86_H_ #include "constants_x86.h" #include "oat/runtime/context.h" @@ -64,4 +64,4 @@ class X86Context : public Context { } // namespace x86 } // namespace art -#endif // ART_SRC_OAT_RUNTIME_X86_CONTEXT_X86_H_ +#endif // ART_RUNTIME_OAT_RUNTIME_X86_CONTEXT_X86_H_ diff --git a/runtime/oat/utils/arm/assembler_arm.h b/runtime/oat/utils/arm/assembler_arm.h index 06e0a55f63..b8c79d21b9 100644 --- a/runtime/oat/utils/arm/assembler_arm.h +++ b/runtime/oat/utils/arm/assembler_arm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_UTILS_ARM_ASSEMBLER_ARM_H_ -#define ART_SRC_OAT_UTILS_ARM_ASSEMBLER_ARM_H_ +#ifndef ART_RUNTIME_OAT_UTILS_ARM_ASSEMBLER_ARM_H_ +#define ART_RUNTIME_OAT_UTILS_ARM_ASSEMBLER_ARM_H_ #include @@ -656,4 +656,4 @@ class ArmExceptionSlowPath : public SlowPath { } // namespace arm } // namespace art -#endif // ART_SRC_OAT_UTILS_ARM_ASSEMBLER_ARM_H_ +#endif // ART_RUNTIME_OAT_UTILS_ARM_ASSEMBLER_ARM_H_ diff --git a/runtime/oat/utils/arm/managed_register_arm.h b/runtime/oat/utils/arm/managed_register_arm.h index b069f6dedd..01596bb6b1 100644 --- a/runtime/oat/utils/arm/managed_register_arm.h +++ b/runtime/oat/utils/arm/managed_register_arm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_ -#define ART_SRC_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_ +#ifndef ART_RUNTIME_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_ +#define ART_RUNTIME_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_ #include "base/logging.h" #include "constants_arm.h" @@ -271,4 +271,4 @@ inline arm::ArmManagedRegister ManagedRegister::AsArm() const { } // namespace art -#endif // ART_SRC_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_ +#endif // ART_RUNTIME_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_ diff --git a/runtime/oat/utils/assembler.h b/runtime/oat/utils/assembler.h index cbf145b949..05e2732c5f 100644 --- a/runtime/oat/utils/assembler.h +++ b/runtime/oat/utils/assembler.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_UTILS_ASSEMBLER_H_ -#define ART_SRC_OAT_UTILS_ASSEMBLER_H_ +#ifndef ART_RUNTIME_OAT_UTILS_ASSEMBLER_H_ +#define ART_RUNTIME_OAT_UTILS_ASSEMBLER_H_ #include @@ -456,4 +456,4 @@ class Assembler { } // namespace art -#endif // ART_SRC_OAT_UTILS_ASSEMBLER_H_ +#endif // ART_RUNTIME_OAT_UTILS_ASSEMBLER_H_ diff --git a/runtime/oat/utils/managed_register.h b/runtime/oat/utils/managed_register.h index a3d5795665..4dd2acd8fe 100644 --- a/runtime/oat/utils/managed_register.h +++ b/runtime/oat/utils/managed_register.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_UTILS_MANAGED_REGISTER_H_ -#define ART_SRC_OAT_UTILS_MANAGED_REGISTER_H_ +#ifndef ART_RUNTIME_OAT_UTILS_MANAGED_REGISTER_H_ +#define ART_RUNTIME_OAT_UTILS_MANAGED_REGISTER_H_ namespace art { @@ -69,4 +69,4 @@ class ManagedRegister { } // namespace art -#endif // ART_SRC_OAT_UTILS_MANAGED_REGISTER_H_ +#endif // ART_RUNTIME_OAT_UTILS_MANAGED_REGISTER_H_ diff --git a/runtime/oat/utils/mips/assembler_mips.h b/runtime/oat/utils/mips/assembler_mips.h index 02759e4efb..eeb4a57db2 100644 --- a/runtime/oat/utils/mips/assembler_mips.h +++ b/runtime/oat/utils/mips/assembler_mips.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_UTILS_MIPS_ASSEMBLER_MIPS_H_ -#define ART_SRC_OAT_UTILS_MIPS_ASSEMBLER_MIPS_H_ +#ifndef ART_RUNTIME_OAT_UTILS_MIPS_ASSEMBLER_MIPS_H_ +#define ART_RUNTIME_OAT_UTILS_MIPS_ASSEMBLER_MIPS_H_ #include @@ -510,4 +510,4 @@ class MipsExceptionSlowPath : public SlowPath { } // namespace mips } // namespace art -#endif // ART_SRC_OAT_UTILS_MIPS_ASSEMBLER_MIPS_H_ +#endif // ART_RUNTIME_OAT_UTILS_MIPS_ASSEMBLER_MIPS_H_ diff --git a/runtime/oat/utils/mips/managed_register_mips.h b/runtime/oat/utils/mips/managed_register_mips.h index aaaabfcc0c..b335ff9649 100644 --- a/runtime/oat/utils/mips/managed_register_mips.h +++ b/runtime/oat/utils/mips/managed_register_mips.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_UTILS_MIPS_MANAGED_REGISTER_MIPS_H_ -#define ART_SRC_OAT_UTILS_MIPS_MANAGED_REGISTER_MIPS_H_ +#ifndef ART_RUNTIME_OAT_UTILS_MIPS_MANAGED_REGISTER_MIPS_H_ +#define ART_RUNTIME_OAT_UTILS_MIPS_MANAGED_REGISTER_MIPS_H_ #include "constants_mips.h" #include "oat/utils/managed_register.h" @@ -225,4 +225,4 @@ inline mips::MipsManagedRegister ManagedRegister::AsMips() const { } // namespace art -#endif // ART_SRC_OAT_UTILS_MIPS_MANAGED_REGISTER_MIPS_H_ +#endif // ART_RUNTIME_OAT_UTILS_MIPS_MANAGED_REGISTER_MIPS_H_ diff --git a/runtime/oat/utils/x86/assembler_x86.h b/runtime/oat/utils/x86/assembler_x86.h index dddb9b1885..390f7aa898 100644 --- a/runtime/oat/utils/x86/assembler_x86.h +++ b/runtime/oat/utils/x86/assembler_x86.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_UTILS_X86_ASSEMBLER_X86_H_ -#define ART_SRC_OAT_UTILS_X86_ASSEMBLER_X86_H_ +#ifndef ART_RUNTIME_OAT_UTILS_X86_ASSEMBLER_X86_H_ +#define ART_RUNTIME_OAT_UTILS_X86_ASSEMBLER_X86_H_ #include #include "base/macros.h" @@ -652,4 +652,4 @@ class X86ExceptionSlowPath : public SlowPath { } // namespace x86 } // namespace art -#endif // ART_SRC_OAT_UTILS_X86_ASSEMBLER_X86_H_ +#endif // ART_RUNTIME_OAT_UTILS_X86_ASSEMBLER_X86_H_ diff --git a/runtime/oat/utils/x86/managed_register_x86.h b/runtime/oat/utils/x86/managed_register_x86.h index 4481456315..b564a8396f 100644 --- a/runtime/oat/utils/x86/managed_register_x86.h +++ b/runtime/oat/utils/x86/managed_register_x86.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_UTILS_X86_MANAGED_REGISTER_X86_H_ -#define ART_SRC_OAT_UTILS_X86_MANAGED_REGISTER_X86_H_ +#ifndef ART_RUNTIME_OAT_UTILS_X86_MANAGED_REGISTER_X86_H_ +#define ART_RUNTIME_OAT_UTILS_X86_MANAGED_REGISTER_X86_H_ #include "constants_x86.h" #include "oat/utils/managed_register.h" @@ -215,4 +215,4 @@ inline x86::X86ManagedRegister ManagedRegister::AsX86() const { } // namespace art -#endif // ART_SRC_OAT_UTILS_X86_MANAGED_REGISTER_X86_H_ +#endif // ART_RUNTIME_OAT_UTILS_X86_MANAGED_REGISTER_X86_H_ diff --git a/runtime/oat_file.h b/runtime/oat_file.h index ecc8d0c965..fff6c8a1a6 100644 --- a/runtime/oat_file.h +++ b/runtime/oat_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_FILE_H_ -#define ART_SRC_OAT_FILE_H_ +#ifndef ART_RUNTIME_OAT_FILE_H_ +#define ART_RUNTIME_OAT_FILE_H_ #include #include @@ -265,4 +265,4 @@ class OatFile { } // namespace art -#endif // ART_SRC_OAT_WRITER_H_ +#endif // ART_RUNTIME_OAT_FILE_H_ diff --git a/runtime/object_utils.h b/runtime/object_utils.h index 4af5d4c30b..fa7763e11f 100644 --- a/runtime/object_utils.h +++ b/runtime/object_utils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OBJECT_UTILS_H_ -#define ART_SRC_OBJECT_UTILS_H_ +#ifndef ART_RUNTIME_OBJECT_UTILS_H_ +#define ART_RUNTIME_OBJECT_UTILS_H_ #include "class_linker-inl.h" #include "dex_file.h" @@ -684,4 +684,4 @@ class MethodHelper { } // namespace art -#endif // ART_SRC_OBJECT_UTILS_H_ +#endif // ART_RUNTIME_OBJECT_UTILS_H_ diff --git a/runtime/offsets.h b/runtime/offsets.h index f37dbd4413..94ae805e4a 100644 --- a/runtime/offsets.h +++ b/runtime/offsets.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OFFSETS_H_ -#define ART_SRC_OFFSETS_H_ +#ifndef ART_RUNTIME_OFFSETS_H_ +#define ART_RUNTIME_OFFSETS_H_ #include // NOLINT #include "globals.h" @@ -59,4 +59,4 @@ class MemberOffset : public Offset { } // namespace art -#endif // ART_SRC_OFFSETS_H_ +#endif // ART_RUNTIME_OFFSETS_H_ diff --git a/runtime/os.h b/runtime/os.h index 3428b6afb3..6767566673 100644 --- a/runtime/os.h +++ b/runtime/os.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OS_H_ -#define ART_SRC_OS_H_ +#ifndef ART_RUNTIME_OS_H_ +#define ART_RUNTIME_OS_H_ namespace unix_file { class FdFile; @@ -41,4 +41,4 @@ class OS { } // namespace art -#endif // ART_SRC_OS_H_ +#endif // ART_RUNTIME_OS_H_ diff --git a/runtime/output_stream.h b/runtime/output_stream.h index b03092ddf7..d2a77d898e 100644 --- a/runtime/output_stream.h +++ b/runtime/output_stream.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OUTPUT_STREAM_H_ -#define ART_SRC_OUTPUT_STREAM_H_ +#ifndef ART_RUNTIME_OUTPUT_STREAM_H_ +#define ART_RUNTIME_OUTPUT_STREAM_H_ #include @@ -53,4 +53,4 @@ class OutputStream { } // namespace art -#endif // ART_SRC_OUTPUT_STREAM_H_ +#endif // ART_RUNTIME_OUTPUT_STREAM_H_ diff --git a/runtime/primitive.h b/runtime/primitive.h index eaa04cd054..5e07311073 100644 --- a/runtime/primitive.h +++ b/runtime/primitive.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_PRIMITIVE_H_ -#define ART_SRC_PRIMITIVE_H_ +#ifndef ART_RUNTIME_PRIMITIVE_H_ +#define ART_RUNTIME_PRIMITIVE_H_ #include @@ -123,4 +123,4 @@ std::ostream& operator<<(std::ostream& os, const Primitive::Type& state); } // namespace art -#endif // ART_SRC_PRIMITIVE_H_ +#endif // ART_RUNTIME_PRIMITIVE_H_ diff --git a/runtime/reference_table.h b/runtime/reference_table.h index 5abb5c7b46..4b6b50e183 100644 --- a/runtime/reference_table.h +++ b/runtime/reference_table.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_REFERENCE_TABLE_H_ -#define ART_SRC_REFERENCE_TABLE_H_ +#ifndef ART_RUNTIME_REFERENCE_TABLE_H_ +#define ART_RUNTIME_REFERENCE_TABLE_H_ #include #include @@ -62,4 +62,4 @@ class ReferenceTable { } // namespace art -#endif // ART_SRC_REFERENCE_TABLE_H_ +#endif // ART_RUNTIME_REFERENCE_TABLE_H_ diff --git a/runtime/reflection.h b/runtime/reflection.h index e9f4e0893e..56ab4712db 100644 --- a/runtime/reflection.h +++ b/runtime/reflection.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_REFLECTION_H_ -#define ART_SRC_REFLECTION_H_ +#ifndef ART_RUNTIME_REFLECTION_H_ +#define ART_RUNTIME_REFLECTION_H_ #include "jni.h" #include "primitive.h" @@ -56,4 +56,4 @@ bool VerifyObjectInClass(mirror::Object* o, mirror::Class* c) } // namespace art -#endif // ART_SRC_REFLECTION_H_ +#endif // ART_RUNTIME_REFLECTION_H_ diff --git a/runtime/root_visitor.h b/runtime/root_visitor.h index d53acd3621..3aa9b4bac0 100644 --- a/runtime/root_visitor.h +++ b/runtime/root_visitor.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ROOT_VISITOR_H_ -#define ART_SRC_ROOT_VISITOR_H_ +#ifndef ART_RUNTIME_ROOT_VISITOR_H_ +#define ART_RUNTIME_ROOT_VISITOR_H_ namespace art { namespace mirror { @@ -30,4 +30,4 @@ typedef bool (IsMarkedTester)(const mirror::Object* object, void* arg); } // namespace art -#endif // ART_SRC_ROOT_VISITOR_H_ +#endif // ART_RUNTIME_ROOT_VISITOR_H_ diff --git a/runtime/runtime.h b/runtime/runtime.h index 97b7c2518b..58f985fae7 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_RUNTIME_H_ -#define ART_SRC_RUNTIME_H_ +#ifndef ART_RUNTIME_RUNTIME_H_ +#define ART_RUNTIME_RUNTIME_H_ #include #include @@ -476,4 +476,4 @@ class Runtime { } // namespace art -#endif // ART_SRC_RUNTIME_H_ +#endif // ART_RUNTIME_RUNTIME_H_ diff --git a/runtime/runtime_stats.h b/runtime/runtime_stats.h index 55e57ecc1d..05d3fbb60f 100644 --- a/runtime/runtime_stats.h +++ b/runtime/runtime_stats.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_RUNTIME_STATS_H_ -#define ART_SRC_RUNTIME_STATS_H_ +#ifndef ART_RUNTIME_RUNTIME_STATS_H_ +#define ART_RUNTIME_RUNTIME_STATS_H_ #include @@ -111,4 +111,4 @@ struct PACKED(4) RuntimeStats { } // namespace art -#endif // ART_SRC_HEAP_H_ +#endif // ART_RUNTIME_RUNTIME_STATS_H_ diff --git a/runtime/runtime_support.h b/runtime/runtime_support.h index 0cb82a5466..051981f99e 100644 --- a/runtime/runtime_support.h +++ b/runtime/runtime_support.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_RUNTIME_SUPPORT_H_ -#define ART_SRC_RUNTIME_SUPPORT_H_ +#ifndef ART_RUNTIME_RUNTIME_SUPPORT_H_ +#define ART_RUNTIME_RUNTIME_SUPPORT_H_ #include "class_linker.h" #include "common_throws.h" @@ -412,4 +412,4 @@ static inline void* GetJniDlsymLookupStub() { } // namespace art -#endif // ART_SRC_RUNTIME_SUPPORT_H_ +#endif // ART_RUNTIME_RUNTIME_SUPPORT_H_ diff --git a/runtime/runtime_support_llvm.h b/runtime/runtime_support_llvm.h index af99842089..566f7bcb16 100644 --- a/runtime/runtime_support_llvm.h +++ b/runtime/runtime_support_llvm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_H_ -#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_H_ +#ifndef ART_RUNTIME_RUNTIME_SUPPORT_LLVM_H_ +#define ART_RUNTIME_RUNTIME_SUPPORT_LLVM_H_ extern "C" { @@ -27,4 +27,4 @@ void* art_portable_find_runtime_support_func(void* context, const char* name); } // extern "C" -#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_H_ +#endif // ART_RUNTIME_RUNTIME_SUPPORT_LLVM_H_ diff --git a/runtime/runtime_support_llvm_func_list.h b/runtime/runtime_support_llvm_func_list.h index a58b061e16..d371421a16 100644 --- a/runtime/runtime_support_llvm_func_list.h +++ b/runtime/runtime_support_llvm_func_list.h @@ -14,6 +14,9 @@ * limitations under the License. */ +#ifndef ART_RUNTIME_RUNTIME_SUPPORT_LLVM_FUNC_LIST_H_ +#define ART_RUNTIME_RUNTIME_SUPPORT_LLVM_FUNC_LIST_H_ + #define RUNTIME_SUPPORT_FUNC_LIST(V) \ V(LockObject, art_portable_lock_object_from_code) \ V(UnlockObject, art_portable_unlock_object_from_code) \ @@ -74,3 +77,6 @@ V(JniMethodEndSynchronized, art_portable_jni_method_end_synchronized) \ V(JniMethodEndWithReference, art_portable_jni_method_end_with_reference) \ V(JniMethodEndWithReferenceSynchronized, art_portable_jni_method_end_with_reference_synchronized) + +#endif // ART_RUNTIME_RUNTIME_SUPPORT_LLVM_FUNC_LIST_H_ +#undef ART_RUNTIME_RUNTIME_SUPPORT_LLVM_FUNC_LIST_H_ // the guard in this file is just for cpplint diff --git a/runtime/safe_map.h b/runtime/safe_map.h index b9a6ecf5e7..dcc172de01 100644 --- a/runtime/safe_map.h +++ b/runtime/safe_map.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_SAFE_MAP_H_ -#define ART_SRC_SAFE_MAP_H_ +#ifndef ART_RUNTIME_SAFE_MAP_H_ +#define ART_RUNTIME_SAFE_MAP_H_ #include @@ -102,4 +102,4 @@ bool operator!=(const SafeMap& lhs, const SafeMap @@ -59,4 +59,4 @@ class SignalSet { } // namespace art -#endif // ART_SRC_SIGNAL_SET_H_ +#endif // ART_RUNTIME_SIGNAL_SET_H_ diff --git a/runtime/sirt_ref.h b/runtime/sirt_ref.h index 12f8326347..81f0dff217 100644 --- a/runtime/sirt_ref.h +++ b/runtime/sirt_ref.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_SIRT_REF_H_ -#define ART_SRC_SIRT_REF_H_ +#ifndef ART_RUNTIME_SIRT_REF_H_ +#define ART_RUNTIME_SIRT_REF_H_ #include "base/logging.h" #include "base/macros.h" @@ -52,4 +52,4 @@ class SirtRef { } // namespace art -#endif // ART_SRC_SIRT_REF_H_ +#endif // ART_RUNTIME_SIRT_REF_H_ diff --git a/runtime/stack.h b/runtime/stack.h index fbfacb1733..0e2c4c5b86 100644 --- a/runtime/stack.h +++ b/runtime/stack.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_STACK_H_ -#define ART_SRC_STACK_H_ +#ifndef ART_RUNTIME_STACK_H_ +#define ART_RUNTIME_STACK_H_ #include "dex_file.h" #include "instrumentation.h" @@ -644,4 +644,4 @@ class VmapTable { } // namespace art -#endif // ART_SRC_STACK_H_ +#endif // ART_RUNTIME_STACK_H_ diff --git a/runtime/stack_indirect_reference_table.h b/runtime/stack_indirect_reference_table.h index dd106344de..4c9b038423 100644 --- a/runtime/stack_indirect_reference_table.h +++ b/runtime/stack_indirect_reference_table.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_STACK_INDIRECT_REFERENCE_TABLE_H_ -#define ART_SRC_STACK_INDIRECT_REFERENCE_TABLE_H_ +#ifndef ART_RUNTIME_STACK_INDIRECT_REFERENCE_TABLE_H_ +#define ART_RUNTIME_STACK_INDIRECT_REFERENCE_TABLE_H_ #include "base/logging.h" #include "base/macros.h" @@ -96,4 +96,4 @@ class StackIndirectReferenceTable { } // namespace art -#endif // ART_SRC_STACK_INDIRECT_REFERENCE_TABLE_H_ +#endif // ART_RUNTIME_STACK_INDIRECT_REFERENCE_TABLE_H_ diff --git a/runtime/strutil.h b/runtime/strutil.h index b8769183da..c8d39e2311 100644 --- a/runtime/strutil.h +++ b/runtime/strutil.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_STRUTIL_H_ -#define ART_SRC_STRUTIL_H_ +#ifndef ART_RUNTIME_STRUTIL_H_ +#define ART_RUNTIME_STRUTIL_H_ #include @@ -37,4 +37,4 @@ struct CStringEq { } // namespace art -#endif // ART_SRC_STRUTIL_H_ +#endif // ART_RUNTIME_STRUTIL_H_ diff --git a/runtime/thread-inl.h b/runtime/thread-inl.h index 2fc5987306..c22f2cd921 100644 --- a/runtime/thread-inl.h +++ b/runtime/thread-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_THREAD_INL_H_ -#define ART_SRC_THREAD_INL_H_ +#ifndef ART_RUNTIME_THREAD_INL_H_ +#define ART_RUNTIME_THREAD_INL_H_ #include "thread.h" @@ -133,4 +133,4 @@ inline void Thread::VerifyStack() { } // namespace art -#endif // ART_SRC_THREAD_INL_H_ +#endif // ART_RUNTIME_THREAD_INL_H_ diff --git a/runtime/thread.h b/runtime/thread.h index 0daf763359..64ff7c22fa 100644 --- a/runtime/thread.h +++ b/runtime/thread.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_THREAD_H_ -#define ART_SRC_THREAD_H_ +#ifndef ART_RUNTIME_THREAD_H_ +#define ART_RUNTIME_THREAD_H_ #include @@ -788,4 +788,4 @@ std::ostream& operator<<(std::ostream& os, const ThreadState& state); } // namespace art -#endif // ART_SRC_THREAD_H_ +#endif // ART_RUNTIME_THREAD_H_ diff --git a/runtime/thread_list.h b/runtime/thread_list.h index 0470cfc3b9..87abbda479 100644 --- a/runtime/thread_list.h +++ b/runtime/thread_list.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_THREAD_LIST_H_ -#define ART_SRC_THREAD_LIST_H_ +#ifndef ART_RUNTIME_THREAD_LIST_H_ +#define ART_RUNTIME_THREAD_LIST_H_ #include "base/mutex.h" #include "root_visitor.h" @@ -144,4 +144,4 @@ class ThreadList { } // namespace art -#endif // ART_SRC_THREAD_LIST_H_ +#endif // ART_RUNTIME_THREAD_LIST_H_ diff --git a/runtime/thread_pool.h b/runtime/thread_pool.h index 814e654ad7..3462d5efbb 100644 --- a/runtime/thread_pool.h +++ b/runtime/thread_pool.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_THREAD_POOL_H_ -#define ART_SRC_THREAD_POOL_H_ +#ifndef ART_RUNTIME_THREAD_POOL_H_ +#define ART_RUNTIME_THREAD_POOL_H_ #include #include @@ -177,4 +177,4 @@ class WorkStealingThreadPool : public ThreadPool { } // namespace art -#endif // ART_SRC_THREAD_POOL_H_ +#endif // ART_RUNTIME_THREAD_POOL_H_ diff --git a/runtime/thread_state.h b/runtime/thread_state.h index 52f092efa0..fc4812a427 100644 --- a/runtime/thread_state.h +++ b/runtime/thread_state.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_THREAD_STATE_H_ -#define ART_SRC_THREAD_STATE_H_ +#ifndef ART_RUNTIME_THREAD_STATE_H_ +#define ART_RUNTIME_THREAD_STATE_H_ namespace art { @@ -44,4 +44,4 @@ enum ThreadState { } // namespace art -#endif // ART_SRC_THREAD_STATE_H_ +#endif // ART_RUNTIME_THREAD_STATE_H_ diff --git a/runtime/throw_location.h b/runtime/throw_location.h index 8c1b9410af..b2cd4d5803 100644 --- a/runtime/throw_location.h +++ b/runtime/throw_location.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_THROW_LOCATION_H_ -#define ART_SRC_THROW_LOCATION_H_ +#ifndef ART_RUNTIME_THROW_LOCATION_H_ +#define ART_RUNTIME_THROW_LOCATION_H_ #include "base/macros.h" #include "root_visitor.h" @@ -75,4 +75,4 @@ class PACKED(4) ThrowLocation { } // namespace art -#endif // ART_SRC_THROW_LOCATION_H_ +#endif // ART_RUNTIME_THROW_LOCATION_H_ diff --git a/runtime/trace.h b/runtime/trace.h index 9432e718ff..5bd6a8d5ca 100644 --- a/runtime/trace.h +++ b/runtime/trace.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_TRACE_H_ -#define ART_SRC_TRACE_H_ +#ifndef ART_RUNTIME_TRACE_H_ +#define ART_RUNTIME_TRACE_H_ #include #include @@ -129,4 +129,4 @@ class Trace : public instrumentation::InstrumentationListener { } // namespace art -#endif // ART_SRC_TRACE_H_ +#endif // ART_RUNTIME_TRACE_H_ diff --git a/runtime/utf.h b/runtime/utf.h index 57c811f21d..4c9a1d959e 100644 --- a/runtime/utf.h +++ b/runtime/utf.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_UTF_H_ -#define ART_SRC_UTF_H_ +#ifndef ART_RUNTIME_UTF_H_ +#define ART_RUNTIME_UTF_H_ #include "base/macros.h" @@ -94,4 +94,4 @@ uint16_t GetUtf16FromUtf8(const char** utf8_data_in); } // namespace art -#endif // ART_SRC_UTF_H_ +#endif // ART_RUNTIME_UTF_H_ diff --git a/runtime/utils.h b/runtime/utils.h index e5028bae86..a08e46524b 100644 --- a/runtime/utils.h +++ b/runtime/utils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_UTILS_H_ -#define ART_SRC_UTILS_H_ +#ifndef ART_RUNTIME_UTILS_H_ +#define ART_RUNTIME_UTILS_H_ #include @@ -372,4 +372,4 @@ class VoidFunctor { } // namespace art -#endif // ART_SRC_UTILS_H_ +#endif // ART_RUNTIME_UTILS_H_ diff --git a/runtime/vector_output_stream.h b/runtime/vector_output_stream.h index 3546c8d577..7daa39ffa5 100644 --- a/runtime/vector_output_stream.h +++ b/runtime/vector_output_stream.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VECTOR_OUTPUT_STREAM_H_ -#define ART_SRC_VECTOR_OUTPUT_STREAM_H_ +#ifndef ART_RUNTIME_VECTOR_OUTPUT_STREAM_H_ +#define ART_RUNTIME_VECTOR_OUTPUT_STREAM_H_ #include "output_stream.h" @@ -62,4 +62,4 @@ class VectorOutputStream : public OutputStream { } // namespace art -#endif // ART_SRC_VECTOR_OUTPUT_STREAM_H_ +#endif // ART_RUNTIME_VECTOR_OUTPUT_STREAM_H_ diff --git a/runtime/verifier/dex_gc_map.h b/runtime/verifier/dex_gc_map.h index 673112b213..be7415e1d6 100644 --- a/runtime/verifier/dex_gc_map.h +++ b/runtime/verifier/dex_gc_map.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_DEX_GC_MAP_H_ -#define ART_SRC_VERIFIER_DEX_GC_MAP_H_ +#ifndef ART_RUNTIME_VERIFIER_DEX_GC_MAP_H_ +#define ART_RUNTIME_VERIFIER_DEX_GC_MAP_H_ #include @@ -119,4 +119,4 @@ class DexPcToReferenceMap { } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_DEX_GC_MAP_H_ +#endif // ART_RUNTIME_VERIFIER_DEX_GC_MAP_H_ diff --git a/runtime/verifier/instruction_flags.h b/runtime/verifier/instruction_flags.h index 9dc3ea7a7c..df89beecfb 100644 --- a/runtime/verifier/instruction_flags.h +++ b/runtime/verifier/instruction_flags.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_METHOD_INSTRUCTION_FLAGS_H_ -#define ART_SRC_VERIFIER_METHOD_INSTRUCTION_FLAGS_H_ +#ifndef ART_RUNTIME_VERIFIER_INSTRUCTION_FLAGS_H_ +#define ART_RUNTIME_VERIFIER_INSTRUCTION_FLAGS_H_ #include "base/logging.h" @@ -113,4 +113,4 @@ class InstructionFlags { } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_METHOD_INSTRUCTION_FLAGS_H_ +#endif // ART_RUNTIME_VERIFIER_INSTRUCTION_FLAGS_H_ diff --git a/runtime/verifier/method_verifier.h b/runtime/verifier/method_verifier.h index ac0de9e1f7..57d630de5a 100644 --- a/runtime/verifier/method_verifier.h +++ b/runtime/verifier/method_verifier.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_METHOD_VERIFIER_H_ -#define ART_SRC_VERIFIER_METHOD_VERIFIER_H_ +#ifndef ART_RUNTIME_VERIFIER_METHOD_VERIFIER_H_ +#define ART_RUNTIME_VERIFIER_METHOD_VERIFIER_H_ #include #include @@ -723,4 +723,4 @@ std::ostream& operator<<(std::ostream& os, const MethodVerifier::FailureKind& rh } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_METHOD_VERIFIER_H_ +#endif // ART_RUNTIME_VERIFIER_METHOD_VERIFIER_H_ diff --git a/runtime/verifier/reg_type.h b/runtime/verifier/reg_type.h index 9ac0ecac8a..1553f1e554 100644 --- a/runtime/verifier/reg_type.h +++ b/runtime/verifier/reg_type.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_REG_TYPE_H_ -#define ART_SRC_VERIFIER_REG_TYPE_H_ +#ifndef ART_RUNTIME_VERIFIER_REG_TYPE_H_ +#define ART_RUNTIME_VERIFIER_REG_TYPE_H_ #include "base/macros.h" #include "globals.h" @@ -922,4 +922,4 @@ std::ostream& operator<<(std::ostream& os, const RegType& rhs) } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_REG_TYPE_H_ +#endif // ART_RUNTIME_VERIFIER_REG_TYPE_H_ diff --git a/runtime/verifier/reg_type_cache-inl.h b/runtime/verifier/reg_type_cache-inl.h index 42474d1849..295e27198d 100644 --- a/runtime/verifier/reg_type_cache-inl.h +++ b/runtime/verifier/reg_type_cache-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_REG_TYPE_CACHE_INL_H_ -#define ART_SRC_VERIFIER_REG_TYPE_CACHE_INL_H_ +#ifndef ART_RUNTIME_VERIFIER_REG_TYPE_CACHE_INL_H_ +#define ART_RUNTIME_VERIFIER_REG_TYPE_CACHE_INL_H_ #include "reg_type.h" #include "reg_type_cache.h" @@ -43,4 +43,4 @@ inline const art::verifier::RegType& RegTypeCache::GetFromId(uint16_t id) const } } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_REG_TYPE_CACHE_INL_H_ +#endif // ART_RUNTIME_VERIFIER_REG_TYPE_CACHE_INL_H_ diff --git a/runtime/verifier/reg_type_cache.h b/runtime/verifier/reg_type_cache.h index d70123c2de..814dff79f6 100644 --- a/runtime/verifier/reg_type_cache.h +++ b/runtime/verifier/reg_type_cache.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_REG_TYPE_CACHE_H_ -#define ART_SRC_VERIFIER_REG_TYPE_CACHE_H_ +#ifndef ART_RUNTIME_VERIFIER_REG_TYPE_CACHE_H_ +#define ART_RUNTIME_VERIFIER_REG_TYPE_CACHE_H_ #include "base/casts.h" #include "base/macros.h" @@ -163,4 +163,4 @@ class RegTypeCache { } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_REG_TYPE_CACHE_H_ +#endif // ART_RUNTIME_VERIFIER_REG_TYPE_CACHE_H_ diff --git a/runtime/verifier/register_line-inl.h b/runtime/verifier/register_line-inl.h index 157e136cc1..b3a28470db 100644 --- a/runtime/verifier/register_line-inl.h +++ b/runtime/verifier/register_line-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_REGISTER_LINE_INL_H_ -#define ART_SRC_VERIFIER_REGISTER_LINE_INL_H_ +#ifndef ART_RUNTIME_VERIFIER_REGISTER_LINE_INL_H_ +#define ART_RUNTIME_VERIFIER_REGISTER_LINE_INL_H_ #include "register_line.h" #include "method_verifier.h" @@ -32,4 +32,4 @@ inline const RegType& RegisterLine::GetRegisterType(uint32_t vsrc) const { } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_REGISTER_LINE_INL_H_ +#endif // ART_RUNTIME_VERIFIER_REGISTER_LINE_INL_H_ diff --git a/runtime/verifier/register_line.h b/runtime/verifier/register_line.h index 5f17049e8e..cde7b9b0be 100644 --- a/runtime/verifier/register_line.h +++ b/runtime/verifier/register_line.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_REGISTER_LINE_H_ -#define ART_SRC_VERIFIER_REGISTER_LINE_H_ +#ifndef ART_RUNTIME_VERIFIER_REGISTER_LINE_H_ +#define ART_RUNTIME_VERIFIER_REGISTER_LINE_H_ #include #include @@ -355,4 +355,4 @@ std::ostream& operator<<(std::ostream& os, const RegisterLine& rhs); } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_REGISTER_LINE_H_ +#endif // ART_RUNTIME_VERIFIER_REGISTER_LINE_H_ diff --git a/runtime/well_known_classes.h b/runtime/well_known_classes.h index 8170520d45..a8069bc9cb 100644 --- a/runtime/well_known_classes.h +++ b/runtime/well_known_classes.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_WELL_KNOWN_CLASSES_H_ -#define ART_SRC_WELL_KNOWN_CLASSES_H_ +#ifndef ART_RUNTIME_WELL_KNOWN_CLASSES_H_ +#define ART_RUNTIME_WELL_KNOWN_CLASSES_H_ #include "base/mutex.h" #include "jni.h" @@ -104,4 +104,4 @@ struct WellKnownClasses { } // namespace art -#endif // ART_SRC_WELL_KNOWN_CLASSES_H_ +#endif // ART_RUNTIME_WELL_KNOWN_CLASSES_H_ diff --git a/runtime/zip_archive.h b/runtime/zip_archive.h index ef3148696e..d648517aae 100644 --- a/runtime/zip_archive.h +++ b/runtime/zip_archive.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ZIP_ARCHIVE_H_ -#define ART_SRC_ZIP_ARCHIVE_H_ +#ifndef ART_RUNTIME_ZIP_ARCHIVE_H_ +#define ART_RUNTIME_ZIP_ARCHIVE_H_ #include #include @@ -129,4 +129,4 @@ class ZipArchive { } // namespace art -#endif // ART_SRC_ZIP_ARCHIVE_H_ +#endif // ART_RUNTIME_ZIP_ARCHIVE_H_ diff --git a/tools/cpplint.py b/tools/cpplint.py index ff92d70f06..30c712856e 100755 --- a/tools/cpplint.py +++ b/tools/cpplint.py @@ -726,7 +726,11 @@ class FileInfo: os.path.exists(os.path.join(root_dir, ".hg")) or os.path.exists(os.path.join(root_dir, ".svn"))): prefix = os.path.commonprefix([root_dir, project_dir]) - return fullname[len(prefix) + 1:] + # BEGIN android-changed + # return fullname[len(prefix) + 1:] + return "art/" + fullname[len(prefix) + 1:] + # END android-changed + # Don't know what to do; header guard warnings may be wrong... return fullname @@ -1032,7 +1036,6 @@ def GetHeaderGuardCPPVariable(filename): # Restores original filename in case that cpplint is invoked from Emacs's # flymake. filename = re.sub(r'_flymake\.h$', '.h', filename) - fileinfo = FileInfo(filename) return re.sub(r'[-./\s]', '_', fileinfo.RepositoryName()).upper() + '_' -- cgit v1.2.3-59-g8ed1b From 0cd7ec2dcd8d7ba30bf3ca420b40dac52849876c Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Wed, 17 Jul 2013 23:40:20 -0700 Subject: Fix cpplint whitespace/blank_line issues Change-Id: Ice937e95e23dd622c17054551d4ae4cebd0ef8a2 --- Android.mk | 6 +- compiler/dex/arena_allocator.h | 3 - compiler/dex/arena_bit_vector.h | 1 - compiler/dex/backend.h | 2 - compiler/dex/dataflow_iterator.h | 3 - compiler/dex/growable_array.h | 1 - compiler/dex/local_value_numbering.cc | 1 - compiler/dex/local_value_numbering.h | 1 - compiler/dex/mir_graph.cc | 1 - compiler/dex/mir_graph.h | 1 - compiler/dex/portable/mir_to_gbc.cc | 6 +- compiler/dex/portable/mir_to_gbc.h | 1 - compiler/dex/quick/arm/assemble_arm.cc | 1 - compiler/dex/quick/codegen_util.cc | 3 - compiler/dex/quick/gen_invoke.cc | 1 - compiler/dex/quick/local_optimizations.cc | 45 +++++++---- compiler/dex/quick/mips/codegen_mips.h | 2 - compiler/dex/quick/mir_to_lir.h | 1 - compiler/dex/quick/x86/codegen_x86.h | 1 - compiler/dex/ssa_transformation.cc | 97 ++++++++++++++++-------- compiler/driver/compiler_driver.cc | 2 +- compiler/elf_writer_mclinker.cc | 1 - compiler/elf_writer_mclinker.h | 1 - compiler/elf_writer_test.cc | 1 - compiler/jni/portable/jni_compiler.cc | 9 +-- compiler/jni/quick/x86/calling_convention_x86.cc | 1 - compiler/llvm/gbc_expander.cc | 5 -- compiler/llvm/ir_builder.h | 2 - compiler/llvm/llvm_compilation_unit.cc | 1 - compiler/oat_writer.cc | 1 - dex2oat/dex2oat.cc | 1 - runtime/atomic_integer.h | 3 +- runtime/barrier.cc | 2 +- runtime/barrier_test.cc | 9 +-- runtime/base/histogram-inl.h | 1 - runtime/base/histogram.h | 1 - runtime/base/timing_logger.h | 3 - runtime/debugger.cc | 2 - runtime/dex_method_iterator.h | 1 - runtime/gc/accounting/heap_bitmap-inl.h | 1 - runtime/gc/accounting/heap_bitmap.h | 1 - runtime/gc/accounting/space_bitmap.cc | 4 +- runtime/gc/accounting/space_bitmap.h | 1 + runtime/gc/collector/garbage_collector.h | 1 - runtime/gc/space/image_space.h | 1 - runtime/gc/space/large_object_space.cc | 8 +- runtime/gc/space/large_object_space.h | 2 +- runtime/image_test.cc | 1 - runtime/interpreter/interpreter.cc | 1 - runtime/jdwp/jdwp_handler.cc | 1 - runtime/mirror/abstract_method.h | 8 +- runtime/mirror/class.cc | 4 +- runtime/oat/runtime/argument_visitor.h | 3 +- runtime/oat_file.cc | 1 - runtime/runtime_support_llvm.cc | 2 - runtime/runtime_support_llvm.h | 3 - runtime/stack.h | 3 +- runtime/thread.cc | 4 +- runtime/thread_pool.cc | 13 +--- runtime/thread_pool.h | 4 +- runtime/thread_pool_test.cc | 4 +- runtime/trace.h | 1 + runtime/verifier/method_verifier.cc | 1 - runtime/verifier/reg_type.h | 4 + runtime/verifier/reg_type_test.cc | 4 +- runtime/verifier/register_line.cc | 1 - test/ReferenceMap/stack_walk_refmap_jni.cc | 2 +- test/StackWalk/stack_walk_jni.cc | 2 +- 68 files changed, 134 insertions(+), 177 deletions(-) (limited to 'compiler/llvm/ir_builder.h') diff --git a/Android.mk b/Android.mk index 27bd894f13..971eb2f202 100644 --- a/Android.mk +++ b/Android.mk @@ -334,15 +334,15 @@ endif .PHONY: cpplint-art cpplint-art: ./art/tools/cpplint.py \ - --filter=-,+build/header_guard,+whitespace/braces,+whitespace/comma,+runtime/explicit,+whitespace/newline \ - $(shell find art -name *.h -o -name *$(ART_CPP_EXTENSION)) + --filter=-,+build/header_guard,+whitespace/braces,+whitespace/comma,+runtime/explicit,+whitespace/newline,+whitespace/parens \ + $(shell find art -name *.h -o -name *$(ART_CPP_EXTENSION) | grep -v art/compiler/llvm/generated/) # "mm cpplint-art-aspirational" to see warnings we would like to fix .PHONY: cpplint-art-aspirational cpplint-art-aspirational: ./art/tools/cpplint.py \ --filter=-whitespace/comments,-whitespace/line_length,-build/include,-readability/function,-readability/streams,-readability/todo,-runtime/references \ - $(shell find art -name *.h -o -name *$(ART_CPP_EXTENSION)) + $(shell find art -name *.h -o -name *$(ART_CPP_EXTENSION) | grep -v art/compiler/llvm/generated/) ######################################################################## # targets to switch back and forth from libdvm to libart diff --git a/compiler/dex/arena_allocator.h b/compiler/dex/arena_allocator.h index 0ad859ea9a..cd2141a3c3 100644 --- a/compiler/dex/arena_allocator.h +++ b/compiler/dex/arena_allocator.h @@ -28,7 +28,6 @@ namespace art { class ArenaAllocator { public: - // Type of allocation for memory tuning. enum ArenaAllocKind { kAllocMisc, @@ -57,7 +56,6 @@ class ArenaAllocator { void DumpMemStats(std::ostream& os) const; private: - // Variable-length allocation block. struct ArenaMemBlock { size_t block_size; @@ -77,7 +75,6 @@ class ArenaAllocator { uint32_t alloc_stats_[kNumAllocKinds]; // Bytes used by various allocation kinds. uint32_t lost_bytes_; // Lost memory at end of too-small region uint32_t num_allocations_; - }; // ArenaAllocator diff --git a/compiler/dex/arena_bit_vector.h b/compiler/dex/arena_bit_vector.h index 7e5c436f4c..de30859bfd 100644 --- a/compiler/dex/arena_bit_vector.h +++ b/compiler/dex/arena_bit_vector.h @@ -30,7 +30,6 @@ namespace art { */ class ArenaBitVector { public: - class Iterator { public: explicit Iterator(ArenaBitVector* bit_vector) diff --git a/compiler/dex/backend.h b/compiler/dex/backend.h index 7fa8e9992a..acfec42352 100644 --- a/compiler/dex/backend.h +++ b/compiler/dex/backend.h @@ -23,7 +23,6 @@ namespace art { class Backend { - public: virtual ~Backend() {}; virtual void Materialize() = 0; @@ -32,7 +31,6 @@ class Backend { protected: explicit Backend(ArenaAllocator* arena) : arena_(arena) {}; ArenaAllocator* const arena_; - }; // Class Backend } // namespace art diff --git a/compiler/dex/dataflow_iterator.h b/compiler/dex/dataflow_iterator.h index 19468698f9..e427862956 100644 --- a/compiler/dex/dataflow_iterator.h +++ b/compiler/dex/dataflow_iterator.h @@ -41,7 +41,6 @@ namespace art { */ class DataflowIterator { public: - virtual ~DataflowIterator() {} // Return the next BasicBlock* to visit. @@ -81,7 +80,6 @@ namespace art { GrowableArray* block_id_list_; int idx_; bool changed_; - }; // DataflowIterator class ReachableNodesIterator : public DataflowIterator { @@ -106,7 +104,6 @@ namespace art { class PostOrderDfsIterator : public DataflowIterator { public: - PostOrderDfsIterator(MIRGraph* mir_graph, bool is_iterative) : DataflowIterator(mir_graph, is_iterative, 0, mir_graph->GetNumReachableBlocks(), false) { diff --git a/compiler/dex/growable_array.h b/compiler/dex/growable_array.h index 6d26bc216d..3bfbcd4edf 100644 --- a/compiler/dex/growable_array.h +++ b/compiler/dex/growable_array.h @@ -46,7 +46,6 @@ enum OatListKind { template class GrowableArray { public: - class Iterator { public: explicit Iterator(GrowableArray* g_list) diff --git a/compiler/dex/local_value_numbering.cc b/compiler/dex/local_value_numbering.cc index b783f3ed52..35d29235f2 100644 --- a/compiler/dex/local_value_numbering.cc +++ b/compiler/dex/local_value_numbering.cc @@ -509,7 +509,6 @@ uint16_t LocalValueNumbering::GetValueNumber(MIR* mir) { AdvanceMemoryVersion(NO_VALUE, field_ref); } break; - } return res; } diff --git a/compiler/dex/local_value_numbering.h b/compiler/dex/local_value_numbering.h index 09ed7aec8d..d29600a479 100644 --- a/compiler/dex/local_value_numbering.h +++ b/compiler/dex/local_value_numbering.h @@ -135,7 +135,6 @@ class LocalValueNumbering { ValueMap value_map_; MemoryVersionMap memory_version_map_; std::set null_checked_; - }; } // namespace art diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc index a9af477d2a..0b3fa46faa 100644 --- a/compiler/dex/mir_graph.cc +++ b/compiler/dex/mir_graph.cc @@ -804,7 +804,6 @@ void MIRGraph::DumpCFG(const char* dir_prefix, bool all_blocks) { if (bb->successor_block_list.block_list_type == kPackedSwitch || bb->successor_block_list.block_list_type == kSparseSwitch) { - GrowableArray::Iterator iter(bb->successor_block_list.blocks); succ_id = 0; diff --git a/compiler/dex/mir_graph.h b/compiler/dex/mir_graph.h index f86e13016d..f6011e06e6 100644 --- a/compiler/dex/mir_graph.h +++ b/compiler/dex/mir_graph.h @@ -553,7 +553,6 @@ class MIRGraph { static const char* extended_mir_op_names_[kMirOpLast - kMirOpFirst]; private: - int FindCommonParent(int block1, int block2); void ComputeSuccLineIn(ArenaBitVector* dest, const ArenaBitVector* src1, const ArenaBitVector* src2); diff --git a/compiler/dex/portable/mir_to_gbc.cc b/compiler/dex/portable/mir_to_gbc.cc index 4317d1e354..cfd3dafbee 100644 --- a/compiler/dex/portable/mir_to_gbc.cc +++ b/compiler/dex/portable/mir_to_gbc.cc @@ -74,7 +74,6 @@ void MirConverter::DefineValueOnly(::llvm::Value* val, int s_reg) { ::llvm::Instruction* inst = ::llvm::dyn_cast< ::llvm::Instruction>(placeholder); DCHECK(inst != NULL); inst->eraseFromParent(); - } void MirConverter::DefineValue(::llvm::Value* val, int s_reg) { @@ -1580,8 +1579,7 @@ void MirConverter::HandlePhiNodes(BasicBlock* bb, ::llvm::BasicBlock* llvm_bb) { /* Extended MIR instructions like PHI */ void MirConverter::ConvertExtendedMIR(BasicBlock* bb, MIR* mir, - ::llvm::BasicBlock* llvm_bb) { - + ::llvm::BasicBlock* llvm_bb) { switch (static_cast(mir->dalvikInsn.opcode)) { case kMirOpPhi: { // The llvm Phi node already emitted - just DefineValue() here. @@ -1706,7 +1704,6 @@ bool MirConverter::BlockBitcodeConversion(BasicBlock* bb) { HandlePhiNodes(bb, llvm_bb); for (MIR* mir = bb->first_mir_insn; mir != NULL; mir = mir->next) { - SetDexOffset(mir->offset); int opcode = mir->dalvikInsn.opcode; @@ -1795,7 +1792,6 @@ char RemapShorty(char shorty_type) { } ::llvm::FunctionType* MirConverter::GetFunctionType() { - // Get return type ::llvm::Type* ret_type = irb_->getJType(RemapShorty(cu_->shorty[0])); diff --git a/compiler/dex/portable/mir_to_gbc.h b/compiler/dex/portable/mir_to_gbc.h index 278631466f..2b681f6097 100644 --- a/compiler/dex/portable/mir_to_gbc.h +++ b/compiler/dex/portable/mir_to_gbc.h @@ -41,7 +41,6 @@ Backend* PortableCodeGenerator(CompilationUnit* const cu, MIRGraph* const mir_gr llvm::LlvmCompilationUnit* const llvm_compilation_unit); class MirConverter : public Backend { - public: // TODO: flesh out and integrate into new world order. MirConverter(CompilationUnit* cu, MIRGraph* mir_graph, ArenaAllocator* arena, diff --git a/compiler/dex/quick/arm/assemble_arm.cc b/compiler/dex/quick/arm/assemble_arm.cc index f4aa1f3212..0649c9f319 100644 --- a/compiler/dex/quick/arm/assemble_arm.cc +++ b/compiler/dex/quick/arm/assemble_arm.cc @@ -1007,7 +1007,6 @@ AssemblerStatus ArmMir2Lir::AssembleInstructions(uintptr_t start_addr) { AssemblerStatus res = kSuccess; // Assume success for (lir = first_lir_insn_; lir != NULL; lir = NEXT_LIR(lir)) { - if (lir->opcode < 0) { /* 1 means padding is needed */ if ((lir->opcode == kPseudoPseudoAlign4) && (lir->operands[0] == 1)) { diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index e169dc8f54..8698b1f9ed 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -969,7 +969,6 @@ void Mir2Lir::Materialize() { /* Method is not empty */ if (first_lir_insn_) { - // mark the targets of switch statement case labels ProcessSwitchTables(); @@ -979,9 +978,7 @@ void Mir2Lir::Materialize() { if (cu_->verbose) { CodegenDump(); } - } - } CompiledMethod* Mir2Lir::GetCompiledMethod() { diff --git a/compiler/dex/quick/gen_invoke.cc b/compiler/dex/quick/gen_invoke.cc index 14e395cdac..fd8f86b5fc 100644 --- a/compiler/dex/quick/gen_invoke.cc +++ b/compiler/dex/quick/gen_invoke.cc @@ -736,7 +736,6 @@ int Mir2Lir::GenDalvikArgsRange(CallInfo* info, int call_state, const MethodReference& target_method, uint32_t vtable_idx, uintptr_t direct_code, uintptr_t direct_method, InvokeType type, bool skip_this) { - // If we can treat it as non-range (Jumbo ops will use range form) if (info->num_arg_words <= 5) return GenDalvikArgsNoRange(info, call_state, pcrLabel, diff --git a/compiler/dex/quick/local_optimizations.cc b/compiler/dex/quick/local_optimizations.cc index eb27bf8b5d..2e9c845d05 100644 --- a/compiler/dex/quick/local_optimizations.cc +++ b/compiler/dex/quick/local_optimizations.cc @@ -73,11 +73,14 @@ void Mir2Lir::ConvertMemOpIntoMove(LIR* orig_lir, int dest, int src) { void Mir2Lir::ApplyLoadStoreElimination(LIR* head_lir, LIR* tail_lir) { LIR* this_lir; - if (head_lir == tail_lir) return; + if (head_lir == tail_lir) { + return; + } for (this_lir = PREV_LIR(tail_lir); this_lir != head_lir; this_lir = PREV_LIR(this_lir)) { - - if (is_pseudo_opcode(this_lir->opcode)) continue; + if (is_pseudo_opcode(this_lir->opcode)) { + continue; + } int sink_distance = 0; @@ -110,7 +113,9 @@ void Mir2Lir::ApplyLoadStoreElimination(LIR* head_lir, LIR* tail_lir) { * Currently only eliminate redundant ld/st for constant and Dalvik * register accesses. */ - if (!(this_mem_mask & (ENCODE_LITERAL | ENCODE_DALVIK_REG))) continue; + if (!(this_mem_mask & (ENCODE_LITERAL | ENCODE_DALVIK_REG))) { + continue; + } uint64_t stop_def_reg_mask = this_lir->def_mask & ~ENCODE_MEM; uint64_t stop_use_reg_mask; @@ -127,12 +132,13 @@ void Mir2Lir::ApplyLoadStoreElimination(LIR* head_lir, LIR* tail_lir) { } for (check_lir = NEXT_LIR(this_lir); check_lir != tail_lir; check_lir = NEXT_LIR(check_lir)) { - /* * Skip already dead instructions (whose dataflow information is * outdated and misleading). */ - if (check_lir->flags.is_nop || is_pseudo_opcode(check_lir->opcode)) continue; + if (check_lir->flags.is_nop || is_pseudo_opcode(check_lir->opcode)) { + continue; + } uint64_t check_mem_mask = (check_lir->use_mask | check_lir->def_mask) & ENCODE_MEM; uint64_t alias_condition = this_mem_mask & check_mem_mask; @@ -274,12 +280,15 @@ void Mir2Lir::ApplyLoadHoisting(LIR* head_lir, LIR* tail_lir) { LIR* prev_inst_list[MAX_HOIST_DISTANCE]; /* Empty block */ - if (head_lir == tail_lir) return; + if (head_lir == tail_lir) { + return; + } /* Start from the second instruction */ for (this_lir = NEXT_LIR(head_lir); this_lir != tail_lir; this_lir = NEXT_LIR(this_lir)) { - - if (is_pseudo_opcode(this_lir->opcode)) continue; + if (is_pseudo_opcode(this_lir->opcode)) { + continue; + } uint64_t target_flags = GetTargetInstFlags(this_lir->opcode); /* Skip non-interesting instructions */ @@ -312,12 +321,13 @@ void Mir2Lir::ApplyLoadHoisting(LIR* head_lir, LIR* tail_lir) { /* Try to hoist the load to a good spot */ for (check_lir = PREV_LIR(this_lir); check_lir != head_lir; check_lir = PREV_LIR(check_lir)) { - /* * Skip already dead instructions (whose dataflow information is * outdated and misleading). */ - if (check_lir->flags.is_nop) continue; + if (check_lir->flags.is_nop) { + continue; + } uint64_t check_mem_mask = check_lir->def_mask & ENCODE_MEM; uint64_t alias_condition = stop_use_all_mask & check_mem_mask; @@ -355,7 +365,9 @@ void Mir2Lir::ApplyLoadHoisting(LIR* head_lir, LIR* tail_lir) { */ if (stop_here || !is_pseudo_opcode(check_lir->opcode)) { prev_inst_list[next_slot++] = check_lir; - if (next_slot == MAX_HOIST_DISTANCE) break; + if (next_slot == MAX_HOIST_DISTANCE) { + break; + } } /* Found a new place to put the load - move it here */ @@ -400,12 +412,16 @@ void Mir2Lir::ApplyLoadHoisting(LIR* head_lir, LIR* tail_lir) { * If the first instruction is a load, don't hoist anything * above it since it is unlikely to be beneficial. */ - if (GetTargetInstFlags(cur_lir->opcode) & IS_LOAD) continue; + if (GetTargetInstFlags(cur_lir->opcode) & IS_LOAD) { + continue; + } /* * If the remaining number of slots is less than LD_LATENCY, * insert the hoisted load here. */ - if (slot < LD_LATENCY) break; + if (slot < LD_LATENCY) { + break; + } } // Don't look across a barrier label @@ -461,7 +477,6 @@ void Mir2Lir::RemoveRedundantBranches() { LIR* this_lir; for (this_lir = first_lir_insn_; this_lir != last_lir_insn_; this_lir = NEXT_LIR(this_lir)) { - /* Branch to the next instruction */ if (IsUnconditionalBranch(this_lir)) { LIR* next_lir = this_lir; diff --git a/compiler/dex/quick/mips/codegen_mips.h b/compiler/dex/quick/mips/codegen_mips.h index 376ad7f10e..802ff625c9 100644 --- a/compiler/dex/quick/mips/codegen_mips.h +++ b/compiler/dex/quick/mips/codegen_mips.h @@ -24,7 +24,6 @@ namespace art { class MipsMir2Lir : public Mir2Lir { public: - MipsMir2Lir(CompilationUnit* cu, MIRGraph* mir_graph, ArenaAllocator* arena); // Required for target - codegen utilities. @@ -175,7 +174,6 @@ class MipsMir2Lir : public Mir2Lir { private: void ConvertShortToLongBranch(LIR* lir); - }; } // namespace art diff --git a/compiler/dex/quick/mir_to_lir.h b/compiler/dex/quick/mir_to_lir.h index abb687cb84..41e5a2d988 100644 --- a/compiler/dex/quick/mir_to_lir.h +++ b/compiler/dex/quick/mir_to_lir.h @@ -166,7 +166,6 @@ Mir2Lir* X86CodeGenerator(CompilationUnit* const cu, MIRGraph* const mir_graph, #define is_pseudo_opcode(opcode) (static_cast(opcode) < 0) class Mir2Lir : public Backend { - public: struct SwitchTable { int offset; diff --git a/compiler/dex/quick/x86/codegen_x86.h b/compiler/dex/quick/x86/codegen_x86.h index 4fa9dfb4d9..edb5ae57c2 100644 --- a/compiler/dex/quick/x86/codegen_x86.h +++ b/compiler/dex/quick/x86/codegen_x86.h @@ -24,7 +24,6 @@ namespace art { class X86Mir2Lir : public Mir2Lir { public: - X86Mir2Lir(CompilationUnit* cu, MIRGraph* mir_graph, ArenaAllocator* arena); // Required for target - codegen helpers. diff --git a/compiler/dex/ssa_transformation.cc b/compiler/dex/ssa_transformation.cc index ccd2454a49..3a0cbcc67c 100644 --- a/compiler/dex/ssa_transformation.cc +++ b/compiler/dex/ssa_transformation.cc @@ -46,9 +46,13 @@ BasicBlock* MIRGraph::NextUnvisitedSuccessor(BasicBlock* bb) { GrowableArray::Iterator iterator(bb->successor_block_list.blocks); while (true) { SuccessorBlockInfo *sbi = iterator.Next(); - if (sbi == NULL) break; + if (sbi == NULL) { + break; + } res = NeedsVisit(sbi->block); - if (res != NULL) break; + if (res != NULL) { + break; + } } } } @@ -112,12 +116,16 @@ void MIRGraph::ComputeDFSOrders() { * register idx is defined in BasicBlock bb. */ bool MIRGraph::FillDefBlockMatrix(BasicBlock* bb) { - if (bb->data_flow_info == NULL) return false; + if (bb->data_flow_info == NULL) { + return false; + } ArenaBitVector::Iterator iterator(bb->data_flow_info->def_v); while (true) { int idx = iterator.Next(); - if (idx == -1) break; + if (idx == -1) { + break; + } /* Block bb defines register idx */ def_block_matrix_[idx]->SetBit(bb->id); } @@ -222,7 +230,9 @@ bool MIRGraph::ComputeDominanceFrontier(BasicBlock* bb) { GrowableArray::Iterator iterator(bb->successor_block_list.blocks); while (true) { SuccessorBlockInfo *successor_block_info = iterator.Next(); - if (successor_block_info == NULL) break; + if (successor_block_info == NULL) { + break; + } BasicBlock* succ_bb = successor_block_info->block; CheckForDominanceFrontier(bb, succ_bb); } @@ -233,13 +243,17 @@ bool MIRGraph::ComputeDominanceFrontier(BasicBlock* bb) { while (true) { //TUNING: hot call to BitVectorIteratorNext int dominated_idx = bv_iterator.Next(); - if (dominated_idx == -1) break; + if (dominated_idx == -1) { + break; + } BasicBlock* dominated_bb = GetBasicBlock(dominated_idx); ArenaBitVector::Iterator df_iterator(dominated_bb->dom_frontier); while (true) { //TUNING: hot call to BitVectorIteratorNext int df_up_idx = df_iterator.Next(); - if (df_up_idx == -1) break; + if (df_up_idx == -1) { + break; + } BasicBlock* df_up_block = GetBasicBlock(df_up_idx); CheckForDominanceFrontier(bb, df_up_block); } @@ -313,7 +327,9 @@ bool MIRGraph::ComputeblockIDom(BasicBlock* bb) { /* Scan the rest of the predecessors */ while (true) { BasicBlock* pred_bb = iter.Next(); - if (!pred_bb) break; + if (!pred_bb) { + break; + } if (i_dom_list_[pred_bb->dfs_id] == NOTVISITED) { continue; } else { @@ -443,7 +459,9 @@ void MIRGraph::ComputeSuccLineIn(ArenaBitVector* dest, const ArenaBitVector* src bool MIRGraph::ComputeBlockLiveIns(BasicBlock* bb) { ArenaBitVector* temp_dalvik_register_v = temp_dalvik_register_v_; - if (bb->data_flow_info == NULL) return false; + if (bb->data_flow_info == NULL) { + return false; + } temp_dalvik_register_v->Copy(bb->data_flow_info->live_in_v); if (bb->taken && bb->taken->data_flow_info) ComputeSuccLineIn(temp_dalvik_register_v, bb->taken->data_flow_info->live_in_v, @@ -455,7 +473,9 @@ bool MIRGraph::ComputeBlockLiveIns(BasicBlock* bb) { GrowableArray::Iterator iterator(bb->successor_block_list.blocks); while (true) { SuccessorBlockInfo *successor_block_info = iterator.Next(); - if (successor_block_info == NULL) break; + if (successor_block_info == NULL) { + break; + } BasicBlock* succ_bb = successor_block_info->block; if (succ_bb->data_flow_info) { ComputeSuccLineIn(temp_dalvik_register_v, succ_bb->data_flow_info->live_in_v, @@ -504,25 +524,27 @@ void MIRGraph::InsertPhiNodes() { while (true) { int idx = iterator.Next(); - if (idx == -1) break; - BasicBlock* def_bb = GetBasicBlock(idx); + if (idx == -1) { + break; + } + BasicBlock* def_bb = GetBasicBlock(idx); - /* Merge the dominance frontier to tmp_blocks */ - //TUNING: hot call to Union(). - if (def_bb->dom_frontier != NULL) { - tmp_blocks->Union(def_bb->dom_frontier); - } + /* Merge the dominance frontier to tmp_blocks */ + //TUNING: hot call to Union(). + if (def_bb->dom_frontier != NULL) { + tmp_blocks->Union(def_bb->dom_frontier); } - if (!phi_blocks->Equal(tmp_blocks)) { - change = true; - phi_blocks->Copy(tmp_blocks); - - /* - * Iterate through the original blocks plus the new ones in - * the dominance frontier. - */ - input_blocks->Copy(phi_blocks); - input_blocks->Union(def_block_matrix_[dalvik_reg]); + } + if (!phi_blocks->Equal(tmp_blocks)) { + change = true; + phi_blocks->Copy(tmp_blocks); + + /* + * Iterate through the original blocks plus the new ones in + * the dominance frontier. + */ + input_blocks->Copy(phi_blocks); + input_blocks->Union(def_block_matrix_[dalvik_reg]); } } while (change); @@ -533,10 +555,14 @@ void MIRGraph::InsertPhiNodes() { ArenaBitVector::Iterator iterator(phi_blocks); while (true) { int idx = iterator.Next(); - if (idx == -1) break; + if (idx == -1) { + break; + } BasicBlock* phi_bb = GetBasicBlock(idx); /* Variable will be clobbered before being used - no need for phi */ - if (!phi_bb->data_flow_info->live_in_v->IsBitSet(dalvik_reg)) continue; + if (!phi_bb->data_flow_info->live_in_v->IsBitSet(dalvik_reg)) { + continue; + } MIR *phi = static_cast(arena_->NewMem(sizeof(MIR), true, ArenaAllocator::kAllocDFInfo)); phi->dalvikInsn.opcode = static_cast(kMirOpPhi); @@ -572,7 +598,9 @@ bool MIRGraph::InsertPhiNodeOperands(BasicBlock* bb) { GrowableArray::Iterator iter(bb->predecessors); while (true) { BasicBlock* pred_bb = iter.Next(); - if (!pred_bb) break; + if (!pred_bb) { + break; + } int ssa_reg = pred_bb->data_flow_info->vreg_to_ssa_map[v_reg]; uses.push_back(ssa_reg); incoming_arc.push_back(pred_bb->id); @@ -605,8 +633,9 @@ bool MIRGraph::InsertPhiNodeOperands(BasicBlock* bb) { } void MIRGraph::DoDFSPreOrderSSARename(BasicBlock* block) { - - if (block->visited || block->hidden) return; + if (block->visited || block->hidden) { + return; + } block->visited = true; /* Process this block */ @@ -632,7 +661,9 @@ void MIRGraph::DoDFSPreOrderSSARename(BasicBlock* block) { GrowableArray::Iterator iterator(block->successor_block_list.blocks); while (true) { SuccessorBlockInfo *successor_block_info = iterator.Next(); - if (successor_block_info == NULL) break; + if (successor_block_info == NULL) { + break; + } BasicBlock* succ_bb = successor_block_info->block; DoDFSPreOrderSSARename(succ_bb); /* Restore SSA map snapshot */ diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index d1d21b1d03..f1082db9bc 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1402,7 +1402,6 @@ class ParallelCompilationManager { } private: - class ForAllClosure : public Task { public: ForAllClosure(ParallelCompilationManager* manager, size_t begin, size_t end, Callback* callback, @@ -1423,6 +1422,7 @@ class ParallelCompilationManager { virtual void Finalize() { delete this; } + private: const ParallelCompilationManager* const manager_; const size_t begin_; diff --git a/compiler/elf_writer_mclinker.cc b/compiler/elf_writer_mclinker.cc index 472a606cc6..05f3b025e7 100644 --- a/compiler/elf_writer_mclinker.cc +++ b/compiler/elf_writer_mclinker.cc @@ -307,7 +307,6 @@ void ElfWriterMclinker::AddRuntimeInputs(const std::string& android_root, bool i // TODO: ownership of libm_lib_input? mcld::Input* libm_lib_input_input = ir_builder_->ReadInput(libm_lib, libm_lib); CHECK(libm_lib_input_input != NULL); - } #endif diff --git a/compiler/elf_writer_mclinker.h b/compiler/elf_writer_mclinker.h index 468fa9a84f..3b33bc4986 100644 --- a/compiler/elf_writer_mclinker.h +++ b/compiler/elf_writer_mclinker.h @@ -38,7 +38,6 @@ class CompiledCode; class ElfWriterMclinker : public ElfWriter { public: - // Write an ELF file. Returns true on success, false on failure. static bool Create(File* file, std::vector& oat_contents, diff --git a/compiler/elf_writer_test.cc b/compiler/elf_writer_test.cc index 4a02b61242..e48806ecc4 100644 --- a/compiler/elf_writer_test.cc +++ b/compiler/elf_writer_test.cc @@ -22,7 +22,6 @@ namespace art { class ElfWriterTest : public CommonTest { - protected: virtual void SetUp() { ReserveImageSpace(); diff --git a/compiler/jni/portable/jni_compiler.cc b/compiler/jni/portable/jni_compiler.cc index 44d0c2d215..57b8a315a1 100644 --- a/compiler/jni/portable/jni_compiler.cc +++ b/compiler/jni/portable/jni_compiler.cc @@ -46,11 +46,10 @@ using namespace runtime_support; JniCompiler::JniCompiler(LlvmCompilationUnit* cunit, const CompilerDriver& driver, const DexCompilationUnit* dex_compilation_unit) -: cunit_(cunit), driver_(&driver), module_(cunit_->GetModule()), - context_(cunit_->GetLLVMContext()), irb_(*cunit_->GetIRBuilder()), - dex_compilation_unit_(dex_compilation_unit), - func_(NULL), elf_func_idx_(0) { - + : cunit_(cunit), driver_(&driver), module_(cunit_->GetModule()), + context_(cunit_->GetLLVMContext()), irb_(*cunit_->GetIRBuilder()), + dex_compilation_unit_(dex_compilation_unit), + func_(NULL), elf_func_idx_(0) { // Check: Ensure that JNI compiler will only get "native" method CHECK(dex_compilation_unit->IsNative()); } diff --git a/compiler/jni/quick/x86/calling_convention_x86.cc b/compiler/jni/quick/x86/calling_convention_x86.cc index b671bd190c..45dd42960c 100644 --- a/compiler/jni/quick/x86/calling_convention_x86.cc +++ b/compiler/jni/quick/x86/calling_convention_x86.cc @@ -159,7 +159,6 @@ size_t X86JniCallingConvention::NumberOfOutgoingStackArgs() { // count JNIEnv* and return pc (pushed after Method*) size_t total_args = static_args + param_args + 2; return total_args; - } } // namespace x86 diff --git a/compiler/llvm/gbc_expander.cc b/compiler/llvm/gbc_expander.cc index b139e322f1..94cc9731aa 100644 --- a/compiler/llvm/gbc_expander.cc +++ b/compiler/llvm/gbc_expander.cc @@ -361,7 +361,6 @@ class GBCExpanderPass : public llvm::FunctionPass { llvm::Value* ExpandIntrinsic(IntrinsicHelper::IntrinsicId intr_id, llvm::CallInst& call_inst); - }; char GBCExpanderPass::ID = 0; @@ -710,7 +709,6 @@ llvm::Value* GBCExpanderPass::EmitLoadArrayLength(llvm::Value* array) { art::mirror::Array::LengthOffset().Int32Value(), irb_.getJIntTy(), kTBAAConstJObject); - } llvm::Value* @@ -751,7 +749,6 @@ EmitLoadVirtualCalleeMethodObjectAddr(int vtable_idx, llvm::Value* this_addr) { llvm::Value* GBCExpanderPass::EmitArrayGEP(llvm::Value* array_addr, llvm::Value* index_value, JType elem_jty) { - int data_offset; if (elem_jty == kLong || elem_jty == kDouble || (elem_jty == kObject && sizeof(uint64_t) == sizeof(art::mirror::Object*))) { @@ -1426,7 +1423,6 @@ llvm::Value* GBCExpanderPass::Expand_LongCompare(llvm::Value* src1_value, llvm:: llvm::Value* GBCExpanderPass::EmitCompareResultSelection(llvm::Value* cmp_eq, llvm::Value* cmp_lt) { - llvm::Constant* zero = irb_.getJInt(0); llvm::Constant* pos1 = irb_.getJInt(1); llvm::Constant* neg1 = irb_.getJInt(-1); @@ -2437,7 +2433,6 @@ EmitCallRuntimeForCalleeMethodObjectAddr(uint32_t callee_method_idx, llvm::Value* this_addr, uint32_t dex_pc, bool is_fast_path) { - llvm::Function* runtime_func = NULL; switch (invoke_type) { diff --git a/compiler/llvm/ir_builder.h b/compiler/llvm/ir_builder.h index 65da005e9b..c81ba278a8 100644 --- a/compiler/llvm/ir_builder.h +++ b/compiler/llvm/ir_builder.h @@ -219,7 +219,6 @@ class IRBuilder : public LLVMIRBuilder { ::llvm::Value* CreatePtrDisp(::llvm::Value* base, ::llvm::Value* offset, ::llvm::PointerType* ret_ty) { - ::llvm::Value* base_int = CreatePtrToInt(base, getPtrEquivIntTy()); ::llvm::Value* result_int = CreateAdd(base_int, offset); ::llvm::Value* result = CreateIntToPtr(result_int, ret_ty); @@ -232,7 +231,6 @@ class IRBuilder : public LLVMIRBuilder { ::llvm::Value* count, ::llvm::Value* offset, ::llvm::PointerType* ret_ty) { - ::llvm::Value* block_offset = CreateMul(bs, count); ::llvm::Value* total_offset = CreateAdd(block_offset, offset); diff --git a/compiler/llvm/llvm_compilation_unit.cc b/compiler/llvm/llvm_compilation_unit.cc index dfb572477e..1f2b977921 100644 --- a/compiler/llvm/llvm_compilation_unit.cc +++ b/compiler/llvm/llvm_compilation_unit.cc @@ -166,7 +166,6 @@ void LlvmCompilationUnit::DumpBitcodeToString(std::string& str_buffer) { } bool LlvmCompilationUnit::Materialize() { - const bool kDumpBitcode = false; if (kDumpBitcode) { // Dump the bitcode for debugging diff --git a/compiler/oat_writer.cc b/compiler/oat_writer.cc index 0bfa4ec328..4c32506d43 100644 --- a/compiler/oat_writer.cc +++ b/compiler/oat_writer.cc @@ -83,7 +83,6 @@ OatWriter::OatWriter(const std::vector& dex_files, size_oat_dex_file_methods_offsets_(0), size_oat_class_status_(0), size_oat_class_method_offsets_(0) { - size_t offset = InitOatHeader(); offset = InitOatDexFiles(offset); offset = InitDexFiles(offset); diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index 541c916936..9e23d3e7d3 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -440,7 +440,6 @@ static size_t OpenDexFiles(const std::vector& dex_filenames, // during development when fatal aborts lead to a cascade of failures // that result in a deadlock. class WatchDog { - // WatchDog defines its own CHECK_PTHREAD_CALL to avoid using Log which uses locks #undef CHECK_PTHREAD_CALL #define CHECK_WATCH_DOG_PTHREAD_CALL(call, args, what) \ diff --git a/runtime/atomic_integer.h b/runtime/atomic_integer.h index 117e837bdb..6711722672 100644 --- a/runtime/atomic_integer.h +++ b/runtime/atomic_integer.h @@ -70,10 +70,11 @@ class AtomicInteger { bool success = android_atomic_cas(expected_value, new_value, &value_) == 0; return success; } + private: volatile int32_t value_; }; -} +} // namespace art #endif // ART_RUNTIME_ATOMIC_INTEGER_H_ diff --git a/runtime/barrier.cc b/runtime/barrier.cc index 250d468adb..a64499848e 100644 --- a/runtime/barrier.cc +++ b/runtime/barrier.cc @@ -60,4 +60,4 @@ Barrier::~Barrier() { CHECK(!count_) << "Attempted to destroy barrier with non zero count"; } -} +} // namespace art diff --git a/runtime/barrier_test.cc b/runtime/barrier_test.cc index d26ae9e20f..298ae569fb 100644 --- a/runtime/barrier_test.cc +++ b/runtime/barrier_test.cc @@ -32,9 +32,7 @@ class CheckWaitTask : public Task { : barrier_(barrier), count1_(count1), count2_(count2), - count3_(count3) { - - } + count3_(count3) {} void Run(Thread* self) { LOG(INFO) << "Before barrier 1 " << *self; @@ -50,6 +48,7 @@ class CheckWaitTask : public Task { virtual void Finalize() { delete this; } + private: Barrier* const barrier_; AtomicInteger* const count1_; @@ -100,9 +99,7 @@ class CheckPassTask : public Task { CheckPassTask(Barrier* barrier, AtomicInteger* count, size_t subtasks) : barrier_(barrier), count_(count), - subtasks_(subtasks) { - - } + subtasks_(subtasks) {} void Run(Thread* self) { for (size_t i = 0; i < subtasks_; ++i) { diff --git a/runtime/base/histogram-inl.h b/runtime/base/histogram-inl.h index bbca60308a..d572cf9cba 100644 --- a/runtime/base/histogram-inl.h +++ b/runtime/base/histogram-inl.h @@ -212,7 +212,6 @@ inline double Histogram::Percentile(double per) const { DCHECK_GT(cumulative_perc_.size(), 0ull); size_t idx, upper_idx = 0, lower_idx = 0; for (idx = 0; idx < cumulative_perc_.size(); idx++) { - if (per <= cumulative_perc_[idx]) { upper_idx = idx; break; diff --git a/runtime/base/histogram.h b/runtime/base/histogram.h index dfb556bd79..33a1e6518b 100644 --- a/runtime/base/histogram.h +++ b/runtime/base/histogram.h @@ -30,7 +30,6 @@ namespace art { // Designed to be simple and used with timing logger in art. template class Histogram { - const double kAdjust; const Value kBucketWidth; const size_t kInitialBucketCount; diff --git a/runtime/base/timing_logger.h b/runtime/base/timing_logger.h index 816cbeadec..0f00a046e5 100644 --- a/runtime/base/timing_logger.h +++ b/runtime/base/timing_logger.h @@ -50,9 +50,7 @@ namespace base { } // namespace base class CumulativeLogger { - public: - explicit CumulativeLogger(const std::string& name); void prepare_stats(); ~CumulativeLogger(); @@ -68,7 +66,6 @@ class CumulativeLogger { void AddNewLogger(const base::NewTimingLogger& logger) LOCKS_EXCLUDED(lock_); private: - void AddPair(const std::string &label, uint64_t delta_time) EXCLUSIVE_LOCKS_REQUIRED(lock_); void DumpHistogram(std::ostream &os) EXCLUSIVE_LOCKS_REQUIRED(lock_); diff --git a/runtime/debugger.cc b/runtime/debugger.cc index 5a31c87935..b502c9ab58 100644 --- a/runtime/debugger.cc +++ b/runtime/debugger.cc @@ -155,7 +155,6 @@ class DebugInstrumentationListener : public instrumentation::InstrumentationList SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { Dbg::PostException(thread, throw_location, catch_method, catch_dex_pc, exception_object); } - } gDebugInstrumentationListener; // JDWP is allowed unless the Zygote forbids it. @@ -761,7 +760,6 @@ JDWP::JdwpError Dbg::GetContendedMonitor(JDWP::ObjectId thread_id, JDWP::ObjectI JDWP::JdwpError Dbg::GetInstanceCounts(const std::vector& class_ids, std::vector& counts) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - std::vector classes; counts.clear(); for (size_t i = 0; i < class_ids.size(); ++i) { diff --git a/runtime/dex_method_iterator.h b/runtime/dex_method_iterator.h index e915d77e6d..1975e48330 100644 --- a/runtime/dex_method_iterator.h +++ b/runtime/dex_method_iterator.h @@ -120,7 +120,6 @@ class DexMethodIterator { } private: - ClassDataItemIterator& GetIterator() const { CHECK(it_.get() != NULL); return *it_.get(); diff --git a/runtime/gc/accounting/heap_bitmap-inl.h b/runtime/gc/accounting/heap_bitmap-inl.h index 76226041d1..5edea95dc3 100644 --- a/runtime/gc/accounting/heap_bitmap-inl.h +++ b/runtime/gc/accounting/heap_bitmap-inl.h @@ -40,7 +40,6 @@ inline void HeapBitmap::Visit(const Visitor& visitor) { SpaceSetMap* set = *it; set->Visit(visitor); } - } } // namespace accounting diff --git a/runtime/gc/accounting/heap_bitmap.h b/runtime/gc/accounting/heap_bitmap.h index f4b725c4e9..1710579619 100644 --- a/runtime/gc/accounting/heap_bitmap.h +++ b/runtime/gc/accounting/heap_bitmap.h @@ -106,7 +106,6 @@ class HeapBitmap { explicit HeapBitmap(Heap* heap) : heap_(heap) {} private: - const Heap* const heap_; void AddContinuousSpaceBitmap(SpaceBitmap* bitmap); diff --git a/runtime/gc/accounting/space_bitmap.cc b/runtime/gc/accounting/space_bitmap.cc index 19f1128963..6edc067cc7 100644 --- a/runtime/gc/accounting/space_bitmap.cc +++ b/runtime/gc/accounting/space_bitmap.cc @@ -64,9 +64,7 @@ SpaceBitmap* SpaceBitmap::Create(const std::string& name, byte* heap_begin, size } // Clean up any resources associated with the bitmap. -SpaceBitmap::~SpaceBitmap() { - -} +SpaceBitmap::~SpaceBitmap() {} void SpaceBitmap::SetHeapLimit(uintptr_t new_end) { DCHECK(IsAligned(new_end)); diff --git a/runtime/gc/accounting/space_bitmap.h b/runtime/gc/accounting/space_bitmap.h index 5a1bfe3250..bf4c1ed9af 100644 --- a/runtime/gc/accounting/space_bitmap.h +++ b/runtime/gc/accounting/space_bitmap.h @@ -174,6 +174,7 @@ class SpaceBitmap { const size_t index = OffsetToIndex(offset); return &bitmap_begin_[index]; } + private: // TODO: heap_end_ is initialized so that the heap bitmap is empty, this doesn't require the -1, // however, we document that this is expected on heap_end_ diff --git a/runtime/gc/collector/garbage_collector.h b/runtime/gc/collector/garbage_collector.h index a22faac43b..1684664eff 100644 --- a/runtime/gc/collector/garbage_collector.h +++ b/runtime/gc/collector/garbage_collector.h @@ -79,7 +79,6 @@ class GarbageCollector { void SwapBitmaps() EXCLUSIVE_LOCKS_REQUIRED(Locks::heap_bitmap_lock_); protected: - // The initial phase. Done without mutators paused. virtual void InitializePhase() = 0; diff --git a/runtime/gc/space/image_space.h b/runtime/gc/space/image_space.h index fde2b419ac..bdda9fa4b1 100644 --- a/runtime/gc/space/image_space.h +++ b/runtime/gc/space/image_space.h @@ -78,7 +78,6 @@ class ImageSpace : public MemMapSpace { void Dump(std::ostream& os) const; private: - // Tries to initialize an ImageSpace from the given image path, // returning NULL on error. // diff --git a/runtime/gc/space/large_object_space.cc b/runtime/gc/space/large_object_space.cc index f7d776fbfb..6aedd9cf2b 100644 --- a/runtime/gc/space/large_object_space.cc +++ b/runtime/gc/space/large_object_space.cc @@ -49,9 +49,7 @@ void LargeObjectSpace::CopyLiveToMarked() { LargeObjectMapSpace::LargeObjectMapSpace(const std::string& name) : LargeObjectSpace(name), - lock_("large object map space lock", kAllocSpaceLock) { - -} + lock_("large object map space lock", kAllocSpaceLock) {} LargeObjectMapSpace* LargeObjectMapSpace::Create(const std::string& name) { return new LargeObjectMapSpace(name); @@ -147,9 +145,7 @@ FreeListSpace::FreeListSpace(const std::string& name, MemMap* mem_map, byte* beg AddFreeChunk(begin_, end_ - begin_, NULL); } -FreeListSpace::~FreeListSpace() { - -} +FreeListSpace::~FreeListSpace() {} void FreeListSpace::AddFreeChunk(void* address, size_t size, Chunk* previous) { Chunk* chunk = ChunkFromAddr(address); diff --git a/runtime/gc/space/large_object_space.h b/runtime/gc/space/large_object_space.h index db845db4e6..20a48673b6 100644 --- a/runtime/gc/space/large_object_space.h +++ b/runtime/gc/space/large_object_space.h @@ -60,7 +60,6 @@ class LargeObjectSpace : public DiscontinuousSpace, public AllocSpace { size_t FreeList(Thread* self, size_t num_ptrs, mirror::Object** ptrs); protected: - explicit LargeObjectSpace(const std::string& name); // Approximate number of bytes which have been allocated into the space. @@ -165,6 +164,7 @@ class FreeListSpace : public LargeObjectSpace { DCHECK(m_previous == NULL || (m_previous != NULL && m_previous + m_previous->GetSize() / kAlignment == this)); } + private: size_t m_size; Chunk* m_previous; diff --git a/runtime/image_test.cc b/runtime/image_test.cc index 9ab1d7475b..ee50118b06 100644 --- a/runtime/image_test.cc +++ b/runtime/image_test.cc @@ -31,7 +31,6 @@ namespace art { class ImageTest : public CommonTest { - protected: virtual void SetUp() { ReserveImageSpace(); diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index 2fb272cef4..45314c231b 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -366,7 +366,6 @@ static void InterpreterJni(Thread* self, AbstractMethod* method, StringPiece sho { ScopedThreadStateChange tsc(self, kNative); jresult = fn(soa.Env(), rcvr.get(), arg0.get()); - } result->SetL(soa.Decode(jresult)); ScopedThreadStateChange tsc(self, kNative); diff --git a/runtime/jdwp/jdwp_handler.cc b/runtime/jdwp/jdwp_handler.cc index 8ef146c096..e141496c3b 100644 --- a/runtime/jdwp/jdwp_handler.cc +++ b/runtime/jdwp/jdwp_handler.cc @@ -361,7 +361,6 @@ static JdwpError VM_Capabilities(JdwpState*, Request&, ExpandBuf* reply) static JdwpError VM_CapabilitiesNew(JdwpState*, Request& request, ExpandBuf* reply) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - // The first few capabilities are the same as those reported by the older call. VM_Capabilities(NULL, request, reply); diff --git a/runtime/mirror/abstract_method.h b/runtime/mirror/abstract_method.h index d909058e0d..bbebecebb4 100644 --- a/runtime/mirror/abstract_method.h +++ b/runtime/mirror/abstract_method.h @@ -497,13 +497,9 @@ class MANAGED AbstractMethod : public Object { DISALLOW_IMPLICIT_CONSTRUCTORS(AbstractMethod); }; -class MANAGED Method : public AbstractMethod { +class MANAGED Method : public AbstractMethod {}; -}; - -class MANAGED Constructor : public AbstractMethod { - -}; +class MANAGED Constructor : public AbstractMethod {}; class MANAGED AbstractMethodClass : public Class { private: diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc index 2d2130c39e..e490d97f80 100644 --- a/runtime/mirror/class.cc +++ b/runtime/mirror/class.cc @@ -320,13 +320,11 @@ bool Class::IsFieldClass() const { Class* java_lang_Class = GetClass(); Class* java_lang_reflect_Field = java_lang_Class->GetInstanceField(0)->GetClass(); return this == java_lang_reflect_Field; - } bool Class::IsMethodClass() const { return (this == AbstractMethod::GetMethodClass()) || - (this == AbstractMethod::GetConstructorClass()); - + (this == AbstractMethod::GetConstructorClass()); } void Class::SetClassLoader(ClassLoader* new_class_loader) { diff --git a/runtime/oat/runtime/argument_visitor.h b/runtime/oat/runtime/argument_visitor.h index d92ff19d13..aaf93f7db7 100644 --- a/runtime/oat/runtime/argument_visitor.h +++ b/runtime/oat/runtime/argument_visitor.h @@ -199,7 +199,6 @@ class QuickArgumentVisitor { uint64_t low_half = *reinterpret_cast(GetParamAddress()); uint64_t high_half = *reinterpret_cast(stack_args_); return (low_half & 0xffffffffULL) | (high_half << 32); - } void VisitArguments() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { @@ -244,6 +243,6 @@ class QuickArgumentVisitor { bool is_split_long_or_double_; }; -} +} // namespace art #endif // ART_RUNTIME_OAT_RUNTIME_ARGUMENT_VISITOR_H_ diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc index bb8341ee9f..6562633bc3 100644 --- a/runtime/oat_file.cc +++ b/runtime/oat_file.cc @@ -122,7 +122,6 @@ OatFile::~OatFile() { } bool OatFile::Dlopen(const std::string& elf_filename, byte* requested_base) { - char* absolute_path = realpath(elf_filename.c_str(), NULL); if (absolute_path == NULL) { return false; diff --git a/runtime/runtime_support_llvm.cc b/runtime/runtime_support_llvm.cc index cbdefe8a03..d703db29d5 100644 --- a/runtime/runtime_support_llvm.cc +++ b/runtime/runtime_support_llvm.cc @@ -50,7 +50,6 @@ using namespace art; extern "C" { - class ShadowFrameCopyVisitor : public StackVisitor { public: explicit ShadowFrameCopyVisitor(Thread* self) : StackVisitor(self, NULL), prev_frame_(NULL), @@ -844,5 +843,4 @@ void art_portable_proxy_invoke_handler_from_code(mirror::AbstractMethod* proxy_m void art_portable_constructor_barrier() { LOG(FATAL) << "Implemented by IRBuilder."; } - } // extern "C" diff --git a/runtime/runtime_support_llvm.h b/runtime/runtime_support_llvm.h index 566f7bcb16..43ea953a96 100644 --- a/runtime/runtime_support_llvm.h +++ b/runtime/runtime_support_llvm.h @@ -18,13 +18,10 @@ #define ART_RUNTIME_RUNTIME_SUPPORT_LLVM_H_ extern "C" { - //---------------------------------------------------------------------------- // Runtime Support Function Lookup Callback //---------------------------------------------------------------------------- - void* art_portable_find_runtime_support_func(void* context, const char* name); - } // extern "C" #endif // ART_RUNTIME_RUNTIME_SUPPORT_LLVM_H_ diff --git a/runtime/stack.h b/runtime/stack.h index 0e2c4c5b86..99ba898362 100644 --- a/runtime/stack.h +++ b/runtime/stack.h @@ -554,7 +554,6 @@ class StackVisitor { static void DescribeStack(Thread* thread) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); private: - instrumentation::InstrumentationStackFrame GetInstrumentationStackFrame(uint32_t depth) const; void SanityCheckFrame() const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); @@ -567,6 +566,7 @@ class StackVisitor { size_t num_frames_; // Depth of the frame we're currently at. size_t cur_depth_; + protected: Context* const context_; }; @@ -638,6 +638,7 @@ class VmapTable { spill_shifts--; // wind back one as we want the last match return spill_shifts; } + private: const uint16_t* table_; }; diff --git a/runtime/thread.cc b/runtime/thread.cc index dd55195c15..a1fb862a17 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -2104,9 +2104,7 @@ class ReferenceMapVisitor : public StackVisitor { class RootCallbackVisitor { public: - RootCallbackVisitor(RootVisitor* visitor, void* arg) : visitor_(visitor), arg_(arg) { - - } + RootCallbackVisitor(RootVisitor* visitor, void* arg) : visitor_(visitor), arg_(arg) {} void operator()(const mirror::Object* obj, size_t, const StackVisitor*) const { visitor_(obj, arg_); diff --git a/runtime/thread_pool.cc b/runtime/thread_pool.cc index 784a7caadf..067ef2d5d8 100644 --- a/runtime/thread_pool.cc +++ b/runtime/thread_pool.cc @@ -180,10 +180,7 @@ size_t ThreadPool::GetTaskCount(Thread* self) { WorkStealingWorker::WorkStealingWorker(ThreadPool* thread_pool, const std::string& name, size_t stack_size) - : ThreadPoolWorker(thread_pool, name, stack_size), - task_(NULL) { - -} + : ThreadPoolWorker(thread_pool, name, stack_size), task_(NULL) {} void WorkStealingWorker::Run() { Thread* self = Thread::Current(); @@ -254,9 +251,7 @@ void WorkStealingWorker::Run() { } } -WorkStealingWorker::~WorkStealingWorker() { - -} +WorkStealingWorker::~WorkStealingWorker() {} WorkStealingThreadPool::WorkStealingThreadPool(size_t num_threads) : ThreadPool(0), @@ -288,8 +283,6 @@ WorkStealingTask* WorkStealingThreadPool::FindTaskToStealFrom(Thread* self) { return NULL; } -WorkStealingThreadPool::~WorkStealingThreadPool() { - -} +WorkStealingThreadPool::~WorkStealingThreadPool() {} } // namespace art diff --git a/runtime/thread_pool.h b/runtime/thread_pool.h index b9f185d5f9..7b626fbbe1 100644 --- a/runtime/thread_pool.h +++ b/runtime/thread_pool.h @@ -124,9 +124,7 @@ class ThreadPool { class WorkStealingTask : public Task { public: - WorkStealingTask() : ref_count_(0) { - - } + WorkStealingTask() : ref_count_(0) {} size_t GetRefCount() const { return ref_count_; diff --git a/runtime/thread_pool_test.cc b/runtime/thread_pool_test.cc index 9b66318d8d..98178bc40c 100644 --- a/runtime/thread_pool_test.cc +++ b/runtime/thread_pool_test.cc @@ -105,9 +105,7 @@ class TreeTask : public Task { TreeTask(ThreadPool* const thread_pool, AtomicInteger* count, int depth) : thread_pool_(thread_pool), count_(count), - depth_(depth) { - - } + depth_(depth) {} void Run(Thread* self) { if (depth_ > 1) { diff --git a/runtime/trace.h b/runtime/trace.h index 5bd6a8d5ca..bd9c140d26 100644 --- a/runtime/trace.h +++ b/runtime/trace.h @@ -78,6 +78,7 @@ class Trace : public instrumentation::InstrumentationListener { mirror::AbstractMethod* catch_method, uint32_t catch_dex_pc, mirror::Throwable* exception_object) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + private: explicit Trace(File* trace_file, int buffer_size, int flags); diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc index 5a70f2a696..ff7f594501 100644 --- a/runtime/verifier/method_verifier.cc +++ b/runtime/verifier/method_verifier.cc @@ -3749,7 +3749,6 @@ MethodVerifier::MethodSafeCastSet* MethodVerifier::GenerateSafeCastSet() { } MethodVerifier::PcToConcreteMethodMap* MethodVerifier::GenerateDevirtMap() { - // It is risky to rely on reg_types for sharpening in cases of soft // verification, we might end up sharpening to a wrong implementation. Just abort. if (!failure_messages_.empty()) { diff --git a/runtime/verifier/reg_type.h b/runtime/verifier/reg_type.h index c66e7cb514..5b806c47e5 100644 --- a/runtime/verifier/reg_type.h +++ b/runtime/verifier/reg_type.h @@ -309,6 +309,7 @@ class ConflictType : public RegType { // Destroy the singleton instance. static void Destroy(); + private: ConflictType(mirror::Class* klass, const std::string& descriptor, uint16_t cache_id) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) @@ -338,6 +339,7 @@ class UndefinedType : public RegType { // Destroy the singleton instance. static void Destroy(); + private: UndefinedType(mirror::Class* klass, const std::string& descriptor, uint16_t cache_id) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) @@ -875,6 +877,7 @@ class UnresolvedSuperClass : public UnresolvedType { } std::string Dump() const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + private: void CheckInvariants() const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); @@ -909,6 +912,7 @@ class UnresolvedMergedType : public UnresolvedType { } std::string Dump() const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + private: void CheckInvariants() const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); diff --git a/runtime/verifier/reg_type_test.cc b/runtime/verifier/reg_type_test.cc index f37edff6ac..d2c9dd6ba7 100644 --- a/runtime/verifier/reg_type_test.cc +++ b/runtime/verifier/reg_type_test.cc @@ -414,7 +414,6 @@ TEST_F(RegTypeReferenceTest, Dump) { EXPECT_EQ(expected, unresolved_merged.Dump()); } - TEST_F(RegTypeReferenceTest, JavalangString) { // Add a class to the cache then look for the same class and make sure it is a // Hit the second time. Then check for the same effect when using @@ -433,8 +432,8 @@ TEST_F(RegTypeReferenceTest, JavalangString) { const RegType& ref_type_unintialized = cache.Uninitialized(ref_type, 0110ull); EXPECT_TRUE(ref_type_unintialized.IsUninitializedReference()); EXPECT_FALSE(ref_type_unintialized.IsUnresolvedAndUninitializedReference()); - } + TEST_F(RegTypeReferenceTest, JavalangObject) { // Add a class to the cache then look for the same class and make sure it is a // Hit the second time. Then I am checking for the same effect when using @@ -474,7 +473,6 @@ TEST_F(RegTypeReferenceTest, Merging) { TEST_F(RegTypeTest, ConstPrecision) { - // Tests creating primitive types types. ScopedObjectAccess soa(Thread::Current()); RegTypeCache cache_new(true); diff --git a/runtime/verifier/register_line.cc b/runtime/verifier/register_line.cc index 3a2145b9bb..d2abaac6f7 100644 --- a/runtime/verifier/register_line.cc +++ b/runtime/verifier/register_line.cc @@ -254,7 +254,6 @@ void RegisterLine::CopyResultRegister2(uint32_t vdst) { SetRegisterTypeWide(vdst, type_l, type_h); // also sets the high result_[0] = verifier_->GetRegTypeCache()->Undefined().GetId(); result_[1] = verifier_->GetRegTypeCache()->Undefined().GetId(); - } } diff --git a/test/ReferenceMap/stack_walk_refmap_jni.cc b/test/ReferenceMap/stack_walk_refmap_jni.cc index 9ef4a59dc1..492916ed90 100644 --- a/test/ReferenceMap/stack_walk_refmap_jni.cc +++ b/test/ReferenceMap/stack_walk_refmap_jni.cc @@ -280,4 +280,4 @@ extern "C" JNIEXPORT jint JNICALL Java_ReferenceMap_refmap(JNIEnv*, jobject, jin return count + 1; } -} +} // namespace art diff --git a/test/StackWalk/stack_walk_jni.cc b/test/StackWalk/stack_walk_jni.cc index 4b472daa5e..fc156b15d1 100644 --- a/test/StackWalk/stack_walk_jni.cc +++ b/test/StackWalk/stack_walk_jni.cc @@ -127,4 +127,4 @@ extern "C" JNIEXPORT jint JNICALL Java_StackWalk2_refmap2(JNIEnv*, jobject, jint return count + 1; } -} +} // namespace art -- cgit v1.2.3-59-g8ed1b From 7934ac288acfb2552bb0b06ec1f61e5820d924a4 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Fri, 26 Jul 2013 10:54:15 -0700 Subject: Fix cpplint whitespace/comments issues Change-Id: Iae286862c85fb8fd8901eae1204cd6d271d69496 --- build/Android.cpplint.mk | 2 +- compiler/dex/arena_allocator.h | 2 +- compiler/dex/compiler_enums.h | 20 +- compiler/dex/dataflow_iterator.h | 2 +- compiler/dex/dex_to_dex_compiler.cc | 4 +- compiler/dex/frontend.cc | 56 +- compiler/dex/frontend.h | 2 +- compiler/dex/local_value_numbering.h | 2 +- compiler/dex/mir_graph.cc | 12 +- compiler/dex/mir_graph.h | 6 +- compiler/dex/mir_optimization.cc | 2 +- compiler/dex/portable/mir_to_gbc.cc | 6 +- compiler/dex/quick/arm/arm_lir.h | 28 +- compiler/dex/quick/arm/call_arm.cc | 6 +- compiler/dex/quick/arm/fp_arm.cc | 2 +- compiler/dex/quick/arm/int_arm.cc | 16 +- compiler/dex/quick/arm/target_arm.cc | 2 +- compiler/dex/quick/arm/utility_arm.cc | 6 +- compiler/dex/quick/codegen_util.cc | 2 +- compiler/dex/quick/gen_common.cc | 10 +- compiler/dex/quick/gen_invoke.cc | 14 +- compiler/dex/quick/mips/call_mips.cc | 2 +- compiler/dex/quick/mips/fp_mips.cc | 4 +- compiler/dex/quick/mips/int_mips.cc | 6 +- compiler/dex/quick/mips/mips_lir.h | 58 +- compiler/dex/quick/mips/target_mips.cc | 4 +- compiler/dex/quick/mips/utility_mips.cc | 2 +- compiler/dex/quick/mir_to_lir.h | 4 +- compiler/dex/quick/ralloc_util.cc | 10 +- compiler/dex/quick/x86/assemble_x86.cc | 4 +- compiler/dex/quick/x86/call_x86.cc | 2 +- compiler/dex/quick/x86/fp_x86.cc | 2 +- compiler/dex/quick/x86/target_x86.cc | 4 +- compiler/dex/quick/x86/utility_x86.cc | 10 +- compiler/dex/quick/x86/x86_lir.h | 36 +- compiler/dex/ssa_transformation.cc | 8 +- compiler/dex/vreg_analysis.cc | 2 +- compiler/driver/compiler_driver.cc | 808 ++++++++++----------- compiler/driver/dex_compilation_unit.cc | 2 +- compiler/driver/dex_compilation_unit.h | 2 +- compiler/elf_fixup.cc | 32 +- compiler/elf_writer_mclinker.h | 2 +- compiler/elf_writer_quick.cc | 4 +- compiler/image_writer.cc | 6 +- compiler/jni/portable/jni_compiler.cc | 14 +- compiler/llvm/backend_types.h | 4 +- compiler/llvm/compiler_llvm.cc | 8 +- compiler/llvm/compiler_llvm.h | 4 +- compiler/llvm/gbc_expander.cc | 46 +- compiler/llvm/generated/art_module.cc | 132 ++-- compiler/llvm/intrinsic_helper.cc | 4 +- compiler/llvm/intrinsic_helper.h | 4 +- compiler/llvm/ir_builder.cc | 4 +- compiler/llvm/ir_builder.h | 4 +- compiler/llvm/llvm_compilation_unit.cc | 12 +- compiler/llvm/llvm_compilation_unit.h | 6 +- compiler/llvm/md_builder.cc | 4 +- compiler/llvm/md_builder.h | 4 +- compiler/llvm/runtime_support_builder.cc | 4 +- compiler/llvm/runtime_support_builder.h | 4 +- compiler/llvm/runtime_support_builder_arm.cc | 6 +- compiler/llvm/runtime_support_builder_arm.h | 4 +- compiler/llvm/runtime_support_builder_thumb2.cc | 6 +- compiler/llvm/runtime_support_builder_thumb2.h | 4 +- compiler/llvm/runtime_support_builder_x86.cc | 4 +- compiler/llvm/runtime_support_builder_x86.h | 4 +- compiler/llvm/runtime_support_llvm_func.h | 6 +- compiler/sea_ir/code_gen.cc | 4 +- compiler/sea_ir/code_gen.h | 8 +- compiler/sea_ir/frontend.cc | 4 +- compiler/sea_ir/instruction_nodes.h | 6 +- compiler/sea_ir/instruction_tools.cc | 2 +- compiler/sea_ir/instruction_tools.h | 2 +- compiler/sea_ir/sea.cc | 28 +- compiler/sea_ir/sea.h | 4 +- compiler/sea_ir/sea_node.h | 2 +- compiler/sea_ir/visitor.h | 4 +- compiler/stubs/portable/stubs.cc | 14 +- compiler/stubs/quick/stubs.cc | 12 +- compiler/utils/scoped_hashtable.h | 2 +- compiler/utils/scoped_hashtable_test.cc | 2 +- dalvikvm/dalvikvm.cc | 2 +- dex2oat/dex2oat.cc | 6 +- jdwpspy/Net.cpp | 2 +- oatdump/oatdump.cc | 2 +- runtime/base/histogram_test.cc | 28 +- runtime/base/logging.cc | 2 +- runtime/base/logging.h | 4 +- runtime/base/macros.h | 2 +- runtime/base/mutex-inl.h | 2 +- runtime/base/mutex.cc | 10 +- runtime/base/unix_file/mapped_file_test.cc | 2 +- runtime/check_jni.cc | 56 +- runtime/class_linker.cc | 6 +- runtime/class_linker.h | 4 +- runtime/common_test.h | 8 +- runtime/compiled_method.cc | 2 +- runtime/debugger.cc | 44 +- runtime/debugger.h | 2 +- runtime/dex_file.cc | 2 +- runtime/dex_file.h | 2 +- runtime/dex_file_verifier.cc | 2 +- runtime/dex_instruction-inl.h | 8 +- runtime/dex_instruction.cc | 8 +- runtime/dex_instruction.h | 4 +- runtime/dex_instruction_list.h | 2 +- runtime/disassembler_arm.cc | 52 +- runtime/disassembler_mips.cc | 42 +- runtime/disassembler_x86.cc | 2 +- runtime/exception_test.cc | 2 +- runtime/gc/accounting/card_table.cc | 2 +- runtime/gc/accounting/space_bitmap-inl.h | 2 +- runtime/gc/collector/mark_sweep.cc | 4 +- runtime/gc/collector/mark_sweep.h | 2 +- runtime/gc/heap.cc | 2 +- runtime/gc/space/dlmalloc_space.cc | 4 +- runtime/gc/space/space.h | 2 +- runtime/hprof/hprof.cc | 18 +- runtime/indirect_reference_table.cc | 2 +- runtime/indirect_reference_table.h | 8 +- runtime/instrumentation.cc | 14 +- runtime/intern_table.cc | 8 +- runtime/intern_table_test.cc | 2 +- runtime/interpreter/interpreter.cc | 6 +- runtime/invoke_type.h | 10 +- runtime/jdwp/jdwp.h | 8 +- runtime/jdwp/jdwp_constants.h | 8 +- runtime/jdwp/jdwp_event.cc | 6 +- runtime/jdwp/jdwp_handler.cc | 6 +- runtime/jdwp/jdwp_priv.h | 4 +- runtime/jdwp/jdwp_request.cc | 2 +- runtime/jdwp/object_registry.cc | 6 +- runtime/jni_internal.cc | 26 +- runtime/jvalue.h | 4 +- runtime/locks.h | 2 +- runtime/log_severity.h | 2 +- runtime/mem_map.cc | 6 +- runtime/mirror/dex_cache.h | 2 +- runtime/mirror/field.cc | 2 +- runtime/mirror/throwable.h | 2 +- runtime/monitor.cc | 6 +- runtime/native/dalvik_system_VMDebug.cc | 4 +- runtime/native/dalvik_system_Zygote.cc | 2 +- runtime/native/java_lang_Thread.cc | 2 +- runtime/oat/runtime/arm/context_arm.cc | 2 +- runtime/oat/runtime/mips/context_mips.cc | 2 +- runtime/oat/runtime/support_interpreter.cc | 2 +- runtime/oat/runtime/support_jni.cc | 2 +- runtime/oat/runtime/support_stubs.cc | 4 +- .../oat/runtime/x86/oat_support_entrypoints_x86.cc | 12 +- runtime/oat_test.cc | 2 +- runtime/reference_table.cc | 2 +- runtime/reference_table.h | 2 +- runtime/reflection.cc | 2 +- runtime/runtime.cc | 32 +- runtime/runtime_linux.cc | 2 +- runtime/runtime_support.cc | 8 +- runtime/runtime_support_llvm_func_list.h | 2 +- runtime/safe_map.h | 2 +- runtime/scoped_thread_state_change.h | 2 +- runtime/signal_catcher.cc | 2 +- runtime/stack.cc | 8 +- runtime/stack.h | 6 +- runtime/thread.cc | 20 +- runtime/thread.h | 6 +- runtime/thread_linux.cc | 2 +- runtime/thread_list.cc | 6 +- runtime/thread_list.h | 4 +- runtime/thread_state.h | 40 +- runtime/trace.cc | 14 +- runtime/utils.cc | 34 +- runtime/verifier/dex_gc_map.h | 6 +- runtime/verifier/method_verifier.cc | 16 +- runtime/verifier/method_verifier.h | 22 +- runtime/verifier/reg_type_cache.cc | 2 +- runtime/verifier/reg_type_test.cc | 2 +- runtime/zip_archive.cc | 2 +- test/ReferenceMap/stack_walk_refmap_jni.cc | 44 +- test/StackWalk/stack_walk_jni.cc | 2 +- 179 files changed, 1208 insertions(+), 1208 deletions(-) (limited to 'compiler/llvm/ir_builder.h') diff --git a/build/Android.cpplint.mk b/build/Android.cpplint.mk index eabaf31cca..adb87cb4e9 100644 --- a/build/Android.cpplint.mk +++ b/build/Android.cpplint.mk @@ -15,7 +15,7 @@ # ART_CPPLINT := art/tools/cpplint.py -ART_CPPLINT_FILTER := --filter=-whitespace/comments,-whitespace/line_length,-build/include,-readability/function,-readability/streams,-readability/todo,-runtime/references,-runtime/sizeof,-runtime/threadsafe_fn,-runtime/printf +ART_CPPLINT_FILTER := --filter=-whitespace/line_length,-build/include,-readability/function,-readability/streams,-readability/todo,-runtime/references,-runtime/sizeof,-runtime/threadsafe_fn,-runtime/printf ART_CPPLINT_SRC := $(shell find art -name *.h -o -name *$(ART_CPP_EXTENSION) | grep -v art/compiler/llvm/generated/) # "mm cpplint-art" to verify we aren't regressing diff --git a/compiler/dex/arena_allocator.h b/compiler/dex/arena_allocator.h index 3bd733e753..e8e2c027d0 100644 --- a/compiler/dex/arena_allocator.h +++ b/compiler/dex/arena_allocator.h @@ -86,7 +86,7 @@ struct MemStats { explicit MemStats(const ArenaAllocator &arena) : arena_(arena) {} private: const ArenaAllocator &arena_; -}; // MemStats +}; // MemStats } // namespace art diff --git a/compiler/dex/compiler_enums.h b/compiler/dex/compiler_enums.h index 88240e8c40..97a682f2aa 100644 --- a/compiler/dex/compiler_enums.h +++ b/compiler/dex/compiler_enums.h @@ -48,7 +48,7 @@ enum SpecialTargetRegister { }; enum RegLocationType { - kLocDalvikFrame = 0, // Normal Dalvik register + kLocDalvikFrame = 0, // Normal Dalvik register kLocPhysReg, kLocCompilerTemp, kLocInvalid @@ -249,20 +249,20 @@ enum X86ConditionCode { kX86CondC = kX86CondB, // carry kX86CondNb = 0x3, // not-below - kX86CondAe = kX86CondNb, // above-equal - kX86CondNc = kX86CondNb, // not-carry + kX86CondAe = kX86CondNb, // above-equal + kX86CondNc = kX86CondNb, // not-carry kX86CondZ = 0x4, // zero kX86CondEq = kX86CondZ, // equal kX86CondNz = 0x5, // not-zero - kX86CondNe = kX86CondNz, // not-equal + kX86CondNe = kX86CondNz, // not-equal kX86CondBe = 0x6, // below-equal - kX86CondNa = kX86CondBe, // not-above + kX86CondNa = kX86CondBe, // not-above kX86CondNbe = 0x7, // not-below-equal - kX86CondA = kX86CondNbe,// above + kX86CondA = kX86CondNbe, // above kX86CondS = 0x8, // sign kX86CondNs = 0x9, // not-sign @@ -277,13 +277,13 @@ enum X86ConditionCode { kX86CondNge = kX86CondL, // not-greater-equal kX86CondNl = 0xd, // not-less-than - kX86CondGe = kX86CondNl, // not-greater-equal + kX86CondGe = kX86CondNl, // not-greater-equal kX86CondLe = 0xe, // less-than-equal - kX86CondNg = kX86CondLe, // not-greater + kX86CondNg = kX86CondLe, // not-greater kX86CondNle = 0xf, // not-less-than - kX86CondG = kX86CondNle,// greater + kX86CondG = kX86CondNle, // greater }; std::ostream& operator<<(std::ostream& os, const X86ConditionCode& kind); @@ -349,7 +349,7 @@ enum OpFeatureFlags { kIsIT, kMemLoad, kMemStore, - kPCRelFixup, // x86 FIXME: add NEEDS_FIXUP to instruction attributes. + kPCRelFixup, // x86 FIXME: add NEEDS_FIXUP to instruction attributes. kRegDef0, kRegDef1, kRegDefA, diff --git a/compiler/dex/dataflow_iterator.h b/compiler/dex/dataflow_iterator.h index 847a614727..da44ffd99c 100644 --- a/compiler/dex/dataflow_iterator.h +++ b/compiler/dex/dataflow_iterator.h @@ -80,7 +80,7 @@ namespace art { GrowableArray* block_id_list_; int idx_; bool changed_; - }; // DataflowIterator + }; // DataflowIterator class ReachableNodesIterator : public DataflowIterator { public: diff --git a/compiler/dex/dex_to_dex_compiler.cc b/compiler/dex/dex_to_dex_compiler.cc index 28c325726e..3c491ce20f 100644 --- a/compiler/dex/dex_to_dex_compiler.cc +++ b/compiler/dex/dex_to_dex_compiler.cc @@ -240,12 +240,12 @@ Instruction* DexCompiler::CompileCheckCast(Instruction* inst, uint32_t dex_pc) { // We are modifying 4 consecutive bytes. ScopedDexWriteAccess sdwa(GetModifiableDexFile(), inst, 4u); inst->SetOpcode(Instruction::NOP); - inst->SetVRegA_10x(0u); // keep compliant with verifier. + inst->SetVRegA_10x(0u); // keep compliant with verifier. // Get to next instruction which is the second half of check-cast and replace // it by a NOP. inst = const_cast(inst->Next()); inst->SetOpcode(Instruction::NOP); - inst->SetVRegA_10x(0u); // keep compliant with verifier. + inst->SetVRegA_10x(0u); // keep compliant with verifier. return inst; } diff --git a/compiler/dex/frontend.cc b/compiler/dex/frontend.cc index 113a80a96c..9cc4d18d37 100644 --- a/compiler/dex/frontend.cc +++ b/compiler/dex/frontend.cc @@ -72,37 +72,37 @@ extern "C" void ArtUnInitQuickCompilerContext(art::CompilerDriver& compiler) { } /* Default optimizer/debug setting for the compiler. */ -static uint32_t kCompilerOptimizerDisableFlags = 0 | // Disable specific optimizations +static uint32_t kCompilerOptimizerDisableFlags = 0 | // Disable specific optimizations (1 << kLoadStoreElimination) | - //(1 << kLoadHoisting) | - //(1 << kSuppressLoads) | - //(1 << kNullCheckElimination) | - //(1 << kPromoteRegs) | - //(1 << kTrackLiveTemps) | - //(1 << kSafeOptimizations) | - //(1 << kBBOpt) | - //(1 << kMatch) | - //(1 << kPromoteCompilerTemps) | + // (1 << kLoadHoisting) | + // (1 << kSuppressLoads) | + // (1 << kNullCheckElimination) | + // (1 << kPromoteRegs) | + // (1 << kTrackLiveTemps) | + // (1 << kSafeOptimizations) | + // (1 << kBBOpt) | + // (1 << kMatch) | + // (1 << kPromoteCompilerTemps) | 0; static uint32_t kCompilerDebugFlags = 0 | // Enable debug/testing modes - //(1 << kDebugDisplayMissingTargets) | - //(1 << kDebugVerbose) | - //(1 << kDebugDumpCFG) | - //(1 << kDebugSlowFieldPath) | - //(1 << kDebugSlowInvokePath) | - //(1 << kDebugSlowStringPath) | - //(1 << kDebugSlowestFieldPath) | - //(1 << kDebugSlowestStringPath) | - //(1 << kDebugExerciseResolveMethod) | - //(1 << kDebugVerifyDataflow) | - //(1 << kDebugShowMemoryUsage) | - //(1 << kDebugShowNops) | - //(1 << kDebugCountOpcodes) | - //(1 << kDebugDumpCheckStats) | - //(1 << kDebugDumpBitcodeFile) | - //(1 << kDebugVerifyBitcode) | - //(1 << kDebugShowSummaryMemoryUsage) | + // (1 << kDebugDisplayMissingTargets) | + // (1 << kDebugVerbose) | + // (1 << kDebugDumpCFG) | + // (1 << kDebugSlowFieldPath) | + // (1 << kDebugSlowInvokePath) | + // (1 << kDebugSlowStringPath) | + // (1 << kDebugSlowestFieldPath) | + // (1 << kDebugSlowestStringPath) | + // (1 << kDebugExerciseResolveMethod) | + // (1 << kDebugVerifyDataflow) | + // (1 << kDebugShowMemoryUsage) | + // (1 << kDebugShowNops) | + // (1 << kDebugCountOpcodes) | + // (1 << kDebugDumpCheckStats) | + // (1 << kDebugDumpBitcodeFile) | + // (1 << kDebugVerifyBitcode) | + // (1 << kDebugShowSummaryMemoryUsage) | 0; static CompiledMethod* CompileMethod(CompilerDriver& compiler, @@ -277,7 +277,7 @@ CompiledMethod* CompileOneMethod(CompilerDriver& compiler, #if defined(ART_USE_PORTABLE_COMPILER) , llvm_compilation_unit #endif - ); // NOLINT(whitespace/parens) + ); // NOLINT(whitespace/parens) } } // namespace art diff --git a/compiler/dex/frontend.h b/compiler/dex/frontend.h index a86338950c..5c68ab4244 100644 --- a/compiler/dex/frontend.h +++ b/compiler/dex/frontend.h @@ -102,7 +102,7 @@ class LLVMInfo { private: UniquePtr< ::llvm::LLVMContext> llvm_context_; - ::llvm::Module* llvm_module_; // Managed by context_. + ::llvm::Module* llvm_module_; // Managed by context_. UniquePtr intrinsic_helper_; UniquePtr ir_builder_; }; diff --git a/compiler/dex/local_value_numbering.h b/compiler/dex/local_value_numbering.h index e3fd7ad2da..33ca8f1ad8 100644 --- a/compiler/dex/local_value_numbering.h +++ b/compiler/dex/local_value_numbering.h @@ -137,6 +137,6 @@ class LocalValueNumbering { std::set null_checked_; }; -} // namespace art +} // namespace art #endif // ART_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_ diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc index 264604c355..6b010ed9b3 100644 --- a/compiler/dex/mir_graph.cc +++ b/compiler/dex/mir_graph.cc @@ -972,23 +972,23 @@ char* MIRGraph::GetDalvikDisassembly(const MIR* mir) { } } switch (dalvik_format) { - case Instruction::k11n: // Add one immediate from vB + case Instruction::k11n: // Add one immediate from vB case Instruction::k21s: case Instruction::k31i: case Instruction::k21h: str.append(StringPrintf(", #%d", insn.vB)); break; - case Instruction::k51l: // Add one wide immediate + case Instruction::k51l: // Add one wide immediate str.append(StringPrintf(", #%lld", insn.vB_wide)); break; - case Instruction::k21c: // One register, one string/type/method index + case Instruction::k21c: // One register, one string/type/method index case Instruction::k31c: str.append(StringPrintf(", index #%d", insn.vB)); break; - case Instruction::k22c: // Two registers, one string/type/method index + case Instruction::k22c: // Two registers, one string/type/method index str.append(StringPrintf(", index #%d", insn.vC)); break; - case Instruction::k22s: // Add one immediate from vC + case Instruction::k22s: // Add one immediate from vC case Instruction::k22b: str.append(StringPrintf(", #%d", insn.vC)); break; @@ -1154,4 +1154,4 @@ BasicBlock* MIRGraph::NewMemBB(BBType block_type, int block_id) { return bb; } -} // namespace art +} // namespace art diff --git a/compiler/dex/mir_graph.h b/compiler/dex/mir_graph.h index 342d2a296a..e9ec949f23 100644 --- a/compiler/dex/mir_graph.h +++ b/compiler/dex/mir_graph.h @@ -273,7 +273,7 @@ struct RegLocation { unsigned fp:1; // Floating point? unsigned core:1; // Non-floating point? unsigned ref:1; // Something GC cares about. - unsigned high_word:1; // High word of pair? + unsigned high_word:1; // High word of pair? unsigned home:1; // Does this represent the home location? uint8_t low_reg; // First physical register. uint8_t high_reg; // 2nd physical register (if wide). @@ -650,7 +650,7 @@ class MIRGraph { BasicBlock* cur_block_; int num_blocks_; const DexFile::CodeItem* current_code_item_; - SafeMap block_map_; // FindBlock lookup cache. + SafeMap block_map_; // FindBlock lookup cache. std::vector m_units_; // List of methods included in this graph typedef std::pair MIRLocation; // Insert point, (m_unit_ index, offset) std::vector method_stack_; // Include stack @@ -659,7 +659,7 @@ class MIRGraph { int def_count_; // Used to estimate size of ssa name storage. int* opcode_count_; // Dex opcode coverage stats. int num_ssa_regs_; // Number of names following SSA transformation. - std::vector extended_basic_blocks_; // Heads of block "traces". + std::vector extended_basic_blocks_; // Heads of block "traces". int method_sreg_; unsigned int attributes_; Checkstats* checkstats_; diff --git a/compiler/dex/mir_optimization.cc b/compiler/dex/mir_optimization.cc index d79b26e4b9..a6314f4cab 100644 --- a/compiler/dex/mir_optimization.cc +++ b/compiler/dex/mir_optimization.cc @@ -845,7 +845,7 @@ bool MIRGraph::BuildExtendedBBList(struct BasicBlock* bb) { bb = NextDominatedBlock(bb); } } - return false; // Not iterative - return value will be ignored + return false; // Not iterative - return value will be ignored } diff --git a/compiler/dex/portable/mir_to_gbc.cc b/compiler/dex/portable/mir_to_gbc.cc index 6fc01bdff2..7831cf6f7a 100644 --- a/compiler/dex/portable/mir_to_gbc.cc +++ b/compiler/dex/portable/mir_to_gbc.cc @@ -1648,7 +1648,7 @@ bool MirConverter::BlockBitcodeConversion(BasicBlock* bb) { if (bb->block_type == kEntryBlock) { SetMethodInfo(); - { // Allocate shadowframe. + { // Allocate shadowframe. art::llvm::IntrinsicHelper::IntrinsicId id = art::llvm::IntrinsicHelper::AllocaShadowFrame; ::llvm::Function* func = intrinsic_helper_->GetIntrinsicFunction(id); @@ -1656,7 +1656,7 @@ bool MirConverter::BlockBitcodeConversion(BasicBlock* bb) { irb_->CreateCall(func, entries); } - { // Store arguments to vregs. + { // Store arguments to vregs. uint16_t arg_reg = cu_->num_regs; ::llvm::Function::arg_iterator arg_iter(func_->arg_begin()); @@ -1666,7 +1666,7 @@ bool MirConverter::BlockBitcodeConversion(BasicBlock* bb) { uint32_t shorty_size = strlen(shorty); CHECK_GE(shorty_size, 1u); - ++arg_iter; // skip method object + ++arg_iter; // skip method object if ((cu_->access_flags & kAccStatic) == 0) { SetVregOnValue(arg_iter, arg_reg); diff --git a/compiler/dex/quick/arm/arm_lir.h b/compiler/dex/quick/arm/arm_lir.h index 93fee05e4e..2f54190ae7 100644 --- a/compiler/dex/quick/arm/arm_lir.h +++ b/compiler/dex/quick/arm/arm_lir.h @@ -239,7 +239,7 @@ enum ArmShiftEncodings { */ enum ArmOpcode { kArmFirst = 0, - kArm16BitData = kArmFirst, // DATA [0] rd[15..0]. + kArm16BitData = kArmFirst, // DATA [0] rd[15..0]. kThumbAdcRR, // adc [0100000101] rm[5..3] rd[2..0]. kThumbAddRRI3, // add(1) [0001110] imm_3[8..6] rn[5..3] rd[2..0]*/ kThumbAddRI8, // add(2) [00110] rd[10..8] imm_8[7..0]. @@ -332,12 +332,12 @@ enum ArmOpcode { kThumb2VcvtDF, // vcvt.F32.F64 vd, vm [1110111010110111] vd[15..12] [10111100] vm[3..0]. kThumb2Vsqrts, // vsqrt.f32 vd, vm [1110111010110001] vd[15..12] [10101100] vm[3..0]. kThumb2Vsqrtd, // vsqrt.f64 vd, vm [1110111010110001] vd[15..12] [10111100] vm[3..0]. - kThumb2MovImmShift,// mov(T2) rd, # [11110] i [00001001111] imm3 rd[11..8] imm8. + kThumb2MovImmShift, // mov(T2) rd, # [11110] i [00001001111] imm3 rd[11..8] imm8. kThumb2MovImm16, // mov(T3) rd, # [11110] i [0010100] imm4 [0] imm3 rd[11..8] imm8. kThumb2StrRRI12, // str(Imm,T3) rd,[rn,#imm12] [111110001100] rn[19..16] rt[15..12] imm12[11..0]. kThumb2LdrRRI12, // str(Imm,T3) rd,[rn,#imm12] [111110001100] rn[19..16] rt[15..12] imm12[11..0]. - kThumb2StrRRI8Predec, // str(Imm,T4) rd,[rn,#-imm8] [111110000100] rn[19..16] rt[15..12] [1100] imm[7..0]*/ - kThumb2LdrRRI8Predec, // ldr(Imm,T4) rd,[rn,#-imm8] [111110000101] rn[19..16] rt[15..12] [1100] imm[7..0]*/ + kThumb2StrRRI8Predec, // str(Imm,T4) rd,[rn,#-imm8] [111110000100] rn[19..16] rt[15..12] [1100] imm[7..0]*/ + kThumb2LdrRRI8Predec, // ldr(Imm,T4) rd,[rn,#-imm8] [111110000101] rn[19..16] rt[15..12] [1100] imm[7..0]*/ kThumb2Cbnz, // cbnz rd,