diff options
Diffstat (limited to 'compiler')
80 files changed, 800 insertions, 800 deletions
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<int>* 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<Instruction*>(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<art::llvm::IntrinsicHelper> intrinsic_helper_; UniquePtr<art::llvm::IRBuilder> 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<uint16_t> 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<unsigned int, BasicBlock*> block_map_; // FindBlock lookup cache. + SafeMap<unsigned int, BasicBlock*> block_map_; // FindBlock lookup cache. std::vector<DexCompilationUnit*> m_units_; // List of methods included in this graph typedef std::pair<int, int> MIRLocation; // Insert point, (m_unit_ index, offset) std::vector<MIRLocation> 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<BasicBlock*> extended_basic_blocks_; // Heads of block "traces". + std::vector<BasicBlock*> 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, #<const> [11110] i [00001001111] imm3 rd[11..8] imm8. + kThumb2MovImmShift, // mov(T2) rd, #<const> [11110] i [00001001111] imm3 rd[11..8] imm8. kThumb2MovImm16, // mov(T3) rd, #<const> [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,<label> [101110] i [1] imm5[7..3] rn[2..0]. kThumb2Cbz, // cbn rd,<label> [101100] i [1] imm5[7..3] rn[2..0]. kThumb2AddRRI12, // add rd, rn, #imm12 [11110] i [100000] rn[19..16] [0] imm3[14..12] rd[11..8] imm8[7..0]. @@ -364,9 +364,9 @@ enum ArmOpcode { kThumb2StrhRRR, // str rt,[rn,rm,LSL #imm] [111110000010] rn[19-16] rt[15-12] [000000] imm[5-4] rm[3-0]. kThumb2StrbRRR, // str rt,[rn,rm,LSL #imm] [111110000000] rn[19-16] rt[15-12] [000000] imm[5-4] rm[3-0]. kThumb2LdrhRRI12, // ldrh rt,[rn,#imm12] [111110001011] rt[15..12] rn[19..16] imm12[11..0]. - kThumb2LdrshRRI12, // ldrsh rt,[rn,#imm12] [111110011011] rt[15..12] rn[19..16] imm12[11..0]. + kThumb2LdrshRRI12, // ldrsh rt,[rn,#imm12] [111110011011] rt[15..12] rn[19..16] imm12[11..0]. kThumb2LdrbRRI12, // ldrb rt,[rn,#imm12] [111110001001] rt[15..12] rn[19..16] imm12[11..0]. - kThumb2LdrsbRRI12, // ldrsb rt,[rn,#imm12] [111110011001] rt[15..12] rn[19..16] imm12[11..0]. + kThumb2LdrsbRRI12, // ldrsb rt,[rn,#imm12] [111110011001] rt[15..12] rn[19..16] imm12[11..0]. kThumb2StrhRRI12, // strh rt,[rn,#imm12] [111110001010] rt[15..12] rn[19..16] imm12[11..0]. kThumb2StrbRRI12, // strb rt,[rn,#imm12] [111110001000] rt[15..12] rn[19..16] imm12[11..0]. kThumb2Pop, // pop [1110100010111101] list[15-0]*/ @@ -403,7 +403,7 @@ enum ArmOpcode { kThumb2Fmstat, // fmstat [11101110111100011111101000010000]. kThumb2Vcmpd, // vcmp [111011101] D [11011] rd[15-12] [1011] E [1] M [0] rm[3-0]. kThumb2Vcmps, // vcmp [111011101] D [11010] rd[15-12] [1011] E [1] M [0] rm[3-0]. - kThumb2LdrPcRel12, // ldr rd,[pc,#imm12] [1111100011011111] rt[15-12] imm12[11-0]. + kThumb2LdrPcRel12, // ldr rd,[pc,#imm12] [1111100011011111] rt[15-12] imm12[11-0]. kThumb2BCond, // b<c> [1110] S cond[25-22] imm6[21-16] [10] J1 [0] J2 imm11[10..0]. kThumb2Vmovd_RR, // vmov [111011101] D [110000] vd[15-12 [101101] M [0] vm[3-0]. kThumb2Vmovs_RR, // vmov [111011101] D [110000] vd[15-12 [101001] M [0] vm[3-0]. @@ -415,8 +415,8 @@ enum ArmOpcode { kThumb2Vabss, // vabs.f32 [111011101] D [110000] rd[15-12] [1010110] M [0] vm[3-0]. kThumb2Vnegd, // vneg.f64 [111011101] D [110000] rd[15-12] [1011110] M [0] vm[3-0]. kThumb2Vnegs, // vneg.f32 [111011101] D [110000] rd[15-12] [1010110] M [0] vm[3-0]. - kThumb2Vmovs_IMM8, // vmov.f32 [111011101] D [11] imm4h[19-16] vd[15-12] [10100000] imm4l[3-0]. - kThumb2Vmovd_IMM8, // vmov.f64 [111011101] D [11] imm4h[19-16] vd[15-12] [10110000] imm4l[3-0]. + kThumb2Vmovs_IMM8, // vmov.f32 [111011101] D [11] imm4h[19-16] vd[15-12] [10100000] imm4l[3-0]. + kThumb2Vmovd_IMM8, // vmov.f64 [111011101] D [11] imm4h[19-16] vd[15-12] [10110000] imm4l[3-0]. kThumb2Mla, // mla [111110110000] rn[19-16] ra[15-12] rd[7-4] [0000] rm[3-0]. kThumb2Umull, // umull [111110111010] rn[19-16], rdlo[15-12] rdhi[11-8] [0000] rm[3-0]. kThumb2Ldrex, // ldrex [111010000101] rn[19-16] rt[11-8] [1111] imm8[7-0]. @@ -425,7 +425,7 @@ enum ArmOpcode { kThumb2Bfi, // bfi [111100110110] rn[19-16] [0] imm3[14-12] rd[11-8] imm2[7-6] [0] msb[4-0]. kThumb2Bfc, // bfc [11110011011011110] [0] imm3[14-12] rd[11-8] imm2[7-6] [0] msb[4-0]. kThumb2Dmb, // dmb [1111001110111111100011110101] option[3-0]. - kThumb2LdrPcReln12,// ldr rd,[pc,-#imm12] [1111100011011111] rt[15-12] imm12[11-0]. + kThumb2LdrPcReln12, // ldr rd,[pc,-#imm12] [1111100011011111] rt[15-12] imm12[11-0]. kThumb2Stm, // stm <list> [111010010000] rn[19-16] 000 rl[12-0]. kThumbUndefined, // undefined [11011110xxxxxxxx]. kThumb2VPopCS, // vpop <list of callee save fp singles (s16+). @@ -436,8 +436,8 @@ enum ArmOpcode { kThumb2MovImm16H, // similar to kThumb2MovImm16, but target high hw. kThumb2AddPCR, // Thumb2 2-operand add with hard-coded PC target. kThumb2Adr, // Special purpose encoding of ADR for switch tables. - kThumb2MovImm16LST,// Special purpose version for switch table use. - kThumb2MovImm16HST,// Special purpose version for switch table use. + kThumb2MovImm16LST, // Special purpose version for switch table use. + kThumb2MovImm16HST, // Special purpose version for switch table use. kThumb2LdmiaWB, // ldmia [111010011001[ rn[19..16] mask[15..0]. kThumb2SubsRRI12, // setflags encoding. kThumb2OrrRRRs, // orrx [111010100101] rn[19..16] [0000] rd[11..8] [0000] rm[3..0]. @@ -445,7 +445,7 @@ enum ArmOpcode { kThumb2Pop1, // t3 encoding of pop. kThumb2RsubRRR, // rsb [111010111101] rn[19..16] [0000] rd[11..8] [0000] rm[3..0]. kThumb2Smull, // smull [111110111000] rn[19-16], rdlo[15-12] rdhi[11-8] [0000] rm[3-0]. - kThumb2LdrdPcRel8, // ldrd rt, rt2, pc +-/1024. + kThumb2LdrdPcRel8, // ldrd rt, rt2, pc +-/1024. kThumb2LdrdI8, // ldrd rt, rt2, [rn +-/1024]. kThumb2StrdI8, // strd rt, rt2, [rn +-/1024]. kArmLast, @@ -485,7 +485,7 @@ struct ArmEncodingMap { struct { ArmEncodingKind kind; int end; // end for kFmtBitBlt, 1-bit slice end for FP regs. - int start; // start for kFmtBitBlt, 4-bit slice end for FP regs. + int start; // start for kFmtBitBlt, 4-bit slice end for FP regs. } field_loc[4]; ArmOpcode opcode; uint64_t flags; diff --git a/compiler/dex/quick/arm/call_arm.cc b/compiler/dex/quick/arm/call_arm.cc index 1416c6115b..64ebb6abbd 100644 --- a/compiler/dex/quick/arm/call_arm.cc +++ b/compiler/dex/quick/arm/call_arm.cc @@ -117,7 +117,7 @@ MIR* ArmMir2Lir::GetNextMir(BasicBlock** p_bb, MIR* mir) { } /* Used for the "verbose" listing */ -//TODO: move to common code +// TODO: move to common code void ArmMir2Lir::GenPrintLabel(MIR* mir) { /* Mark the beginning of a Dalvik instruction for line tracking */ char* inst_str = cu_->verbose ? @@ -475,7 +475,7 @@ void ArmMir2Lir::GenMonitorEnter(int opt_flags, RegLocation rl_src) { GenNullCheck(rl_src.s_reg_low, r0, opt_flags); LoadWordDisp(rARM_SELF, Thread::ThinLockIdOffset().Int32Value(), r2); NewLIR3(kThumb2Ldrex, r1, r0, - mirror::Object::MonitorOffset().Int32Value() >> 2); // Get object->lock + mirror::Object::MonitorOffset().Int32Value() >> 2); // Get object->lock // Align owner OpRegImm(kOpLsl, r2, LW_LOCK_OWNER_SHIFT); // Is lock unheld on lock or held by us (==thread_id) on unlock? @@ -507,7 +507,7 @@ void ArmMir2Lir::GenMonitorExit(int opt_flags, RegLocation rl_src) { LoadValueDirectFixed(rl_src, r0); // Get obj LockCallTemps(); // Prepare for explicit register usage GenNullCheck(rl_src.s_reg_low, r0, opt_flags); - LoadWordDisp(r0, mirror::Object::MonitorOffset().Int32Value(), r1); // Get lock + LoadWordDisp(r0, mirror::Object::MonitorOffset().Int32Value(), r1); // Get lock LoadWordDisp(rARM_SELF, Thread::ThinLockIdOffset().Int32Value(), r2); // Is lock unheld on lock or held by us (==thread_id) on unlock? OpRegRegImm(kOpAnd, r3, r1, diff --git a/compiler/dex/quick/arm/fp_arm.cc b/compiler/dex/quick/arm/fp_arm.cc index 8f73f0c2f5..1bb08c45e3 100644 --- a/compiler/dex/quick/arm/fp_arm.cc +++ b/compiler/dex/quick/arm/fp_arm.cc @@ -273,7 +273,7 @@ void ArmMir2Lir::GenCmpFP(Instruction::Code opcode, RegLocation rl_dest, OpIT((default_result == -1) ? kCondGt : kCondMi, ""); NewLIR2(kThumb2MovImmShift, rl_result.low_reg, - ModifiedImmediate(-default_result)); // Must not alter ccodes + ModifiedImmediate(-default_result)); // Must not alter ccodes GenBarrier(); OpIT(kCondEq, ""); diff --git a/compiler/dex/quick/arm/int_arm.cc b/compiler/dex/quick/arm/int_arm.cc index 15d361edcc..e1a77daba9 100644 --- a/compiler/dex/quick/arm/int_arm.cc +++ b/compiler/dex/quick/arm/int_arm.cc @@ -49,7 +49,7 @@ LIR* ArmMir2Lir::OpIT(ConditionCode ccode, const char* guide) { int cond_bit = code & 1; int alt_bit = cond_bit ^ 1; - //Note: case fallthroughs intentional + // Note: case fallthroughs intentional switch (strlen(guide)) { case 3: mask1 = (guide[2] == 'T') ? cond_bit : alt_bit; @@ -107,7 +107,7 @@ void ArmMir2Lir::GenCmpLong(RegLocation rl_dest, RegLocation rl_src1, target1 = NewLIR0(kPseudoTargetLabel); - RegLocation rl_temp = LocCReturn(); // Just using as template, will change + RegLocation rl_temp = LocCReturn(); // Just using as template, will change rl_temp.low_reg = t_reg; StoreValue(rl_dest, rl_temp); FreeTemp(t_reg); @@ -207,13 +207,13 @@ void ArmMir2Lir::GenSelect(BasicBlock* bb, MIR* mir) { OpRegRegImm(kOpRsub, rl_result.low_reg, rl_src.low_reg, 1); OpIT(kCondCc, ""); LoadConstant(rl_result.low_reg, 0); - GenBarrier(); // Add a scheduling barrier to keep the IT shadow intact + GenBarrier(); // Add a scheduling barrier to keep the IT shadow intact } else if (InexpensiveConstantInt(true_val) && InexpensiveConstantInt(false_val)) { OpRegImm(kOpCmp, rl_src.low_reg, 0); OpIT(kCondEq, "E"); LoadConstant(rl_result.low_reg, true_val); LoadConstant(rl_result.low_reg, false_val); - GenBarrier(); // Add a scheduling barrier to keep the IT shadow intact + GenBarrier(); // Add a scheduling barrier to keep the IT shadow intact } else { // Unlikely case - could be tuned. int t_reg1 = AllocTemp(); @@ -224,7 +224,7 @@ void ArmMir2Lir::GenSelect(BasicBlock* bb, MIR* mir) { OpIT(kCondEq, "E"); OpRegCopy(rl_result.low_reg, t_reg1); OpRegCopy(rl_result.low_reg, t_reg2); - GenBarrier(); // Add a scheduling barrier to keep the IT shadow intact + GenBarrier(); // Add a scheduling barrier to keep the IT shadow intact } } else { // MOVE case @@ -239,7 +239,7 @@ void ArmMir2Lir::GenSelect(BasicBlock* bb, MIR* mir) { l1->flags.is_nop = false; // Make sure this instruction isn't optimized away LIR* l2 = OpRegCopy(rl_result.low_reg, rl_false.low_reg); l2->flags.is_nop = false; // Make sure this instruction isn't optimized away - GenBarrier(); // Add a scheduling barrier to keep the IT shadow intact + GenBarrier(); // Add a scheduling barrier to keep the IT shadow intact } StoreValue(rl_dest, rl_result); } @@ -716,7 +716,7 @@ void ArmMir2Lir::GenMulLong(RegLocation rl_dest, RegLocation rl_src1, } } FreeTemp(tmp1); - rl_result = GetReturnWide(false); // Just using as a template. + rl_result = GetReturnWide(false); // Just using as a template. rl_result.low_reg = res_lo; rl_result.high_reg = res_hi; StoreValueWide(rl_dest, rl_result); @@ -883,7 +883,7 @@ void ArmMir2Lir::GenArrayPut(int opt_flags, OpSize size, RegLocation rl_array, int reg_len = INVALID_REG; if (needs_range_check) { reg_len = AllocTemp(); - //NOTE: max live temps(4) here. + // NOTE: max live temps(4) here. /* Get len */ LoadWordDisp(rl_array.low_reg, len_offset, reg_len); } diff --git a/compiler/dex/quick/arm/target_arm.cc b/compiler/dex/quick/arm/target_arm.cc index 5296f30d5e..6f3779879c 100644 --- a/compiler/dex/quick/arm/target_arm.cc +++ b/compiler/dex/quick/arm/target_arm.cc @@ -553,7 +553,7 @@ void ArmMir2Lir::CompilerInitializeRegAlloc() { // Keep special registers from being allocated for (int i = 0; i < num_reserved; i++) { if (NO_SUSPEND && (ReservedRegs[i] == rARM_SUSPEND)) { - //To measure cost of suspend check + // To measure cost of suspend check continue; } MarkInUse(ReservedRegs[i]); diff --git a/compiler/dex/quick/arm/utility_arm.cc b/compiler/dex/quick/arm/utility_arm.cc index 1ea0a648f2..afc8a66d8a 100644 --- a/compiler/dex/quick/arm/utility_arm.cc +++ b/compiler/dex/quick/arm/utility_arm.cc @@ -507,7 +507,7 @@ LIR* ArmMir2Lir::OpRegRegImm(OpKind op, int r_dest, int r_src1, int value) { alt_opcode = kThumb2EorRRR; break; case kOpMul: - //TUNING: power of 2, shift & add + // TUNING: power of 2, shift & add mod_imm = -1; alt_opcode = kThumb2MulRRR; break; @@ -662,7 +662,7 @@ LIR* ArmMir2Lir::LoadBaseIndexed(int rBase, int r_index, int r_dest, } switch (size) { - case kDouble: // fall-through + case kDouble: // fall-through case kSingle: reg_ptr = AllocTemp(); if (scale) { @@ -726,7 +726,7 @@ LIR* ArmMir2Lir::StoreBaseIndexed(int rBase, int r_index, int r_src, } switch (size) { - case kDouble: // fall-through + case kDouble: // fall-through case kSingle: reg_ptr = AllocTemp(); if (scale) { diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index 9e9b39e3ef..c9780fa537 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -1063,4 +1063,4 @@ void Mir2Lir::InsertLIRAfter(LIR* current_lir, LIR* new_lir) { } -} // namespace art +} // namespace art diff --git a/compiler/dex/quick/gen_common.cc b/compiler/dex/quick/gen_common.cc index bc49b7051a..40db2c69d9 100644 --- a/compiler/dex/quick/gen_common.cc +++ b/compiler/dex/quick/gen_common.cc @@ -547,7 +547,7 @@ void Mir2Lir::HandleThrowLaunchPads() { case kThrowNullPointer: func_offset = ENTRYPOINT_OFFSET(pThrowNullPointerFromCode); break; - case kThrowConstantArrayBounds: // v1 is length reg (for Arm/Mips), v2 constant index + case kThrowConstantArrayBounds: // v1 is length reg (for Arm/Mips), v2 constant index // v1 holds the constant array index. Mips/Arm uses v2 for length, x86 reloads. if (target_x86) { OpRegMem(kOpMov, TargetReg(kArg1), v1, mirror::Array::LengthOffset().Int32Value()); @@ -792,7 +792,7 @@ void Mir2Lir::GenConstString(uint32_t string_idx, RegLocation rl_dest) { *cu_->dex_file, string_idx) || SLOW_STRING_PATH) { // slow path, resolve string if not in dex cache FlushAllRegs(); - LockCallTemps(); // Using explicit registers + LockCallTemps(); // Using explicit registers LoadCurrMethodDirect(TargetReg(kArg2)); LoadWordDisp(TargetReg(kArg2), mirror::AbstractMethod::DexCacheStringsOffset().Int32Value(), TargetReg(kArg0)); @@ -951,7 +951,7 @@ void Mir2Lir::GenInstanceofCallingHelper(bool needs_access_check, bool type_know // Not resolved // Call out to helper, which will return resolved type in kRet0 CallRuntimeHelperImm(ENTRYPOINT_OFFSET(pInitializeTypeFromCode), type_idx, true); - OpRegCopy(TargetReg(kArg2), TargetReg(kRet0)); // Align usage with fast path + OpRegCopy(TargetReg(kArg2), TargetReg(kRet0)); // Align usage with fast path LoadValueDirectFixed(rl_src, TargetReg(kArg0)); /* reload Ref */ // Rejoin code paths LIR* hop_target = NewLIR0(kPseudoTargetLabel); @@ -1090,7 +1090,7 @@ void Mir2Lir::GenCheckCast(uint32_t insn_idx, uint32_t type_idx, RegLocation rl_ // InitializeTypeFromCode(idx, method) CallRuntimeHelperImmReg(ENTRYPOINT_OFFSET(pInitializeTypeFromCode), type_idx, TargetReg(kArg1), true); - OpRegCopy(class_reg, TargetReg(kRet0)); // Align usage with fast path + OpRegCopy(class_reg, TargetReg(kRet0)); // Align usage with fast path // Rejoin code paths LIR* hop_target = NewLIR0(kPseudoTargetLabel); hop_branch->target = hop_target; @@ -1167,7 +1167,7 @@ void Mir2Lir::GenLong3Addr(OpKind first_op, OpKind second_op, RegLocation rl_des void Mir2Lir::GenShiftOpLong(Instruction::Code opcode, RegLocation rl_dest, RegLocation rl_src1, RegLocation rl_shift) { - int func_offset = -1; // Make gcc happy + int func_offset = -1; // Make gcc happy switch (opcode) { case Instruction::SHL_LONG: diff --git a/compiler/dex/quick/gen_invoke.cc b/compiler/dex/quick/gen_invoke.cc index 13a59bf69a..cae13190ec 100644 --- a/compiler/dex/quick/gen_invoke.cc +++ b/compiler/dex/quick/gen_invoke.cc @@ -428,22 +428,22 @@ static int NextVCallInsn(CompilationUnit* cu, CallInfo* info, cg->LoadValueDirectFixed(rl_arg, cg->TargetReg(kArg1)); break; } - case 1: // Is "this" null? [use kArg1] + case 1: // Is "this" null? [use kArg1] cg->GenNullCheck(info->args[0].s_reg_low, cg->TargetReg(kArg1), info->opt_flags); // get this->klass_ [use kArg1, set kInvokeTgt] cg->LoadWordDisp(cg->TargetReg(kArg1), mirror::Object::ClassOffset().Int32Value(), cg->TargetReg(kInvokeTgt)); break; - case 2: // Get this->klass_->vtable [usr kInvokeTgt, set kInvokeTgt] + case 2: // Get this->klass_->vtable [usr kInvokeTgt, set kInvokeTgt] cg->LoadWordDisp(cg->TargetReg(kInvokeTgt), mirror::Class::VTableOffset().Int32Value(), cg->TargetReg(kInvokeTgt)); break; - case 3: // Get target method [use kInvokeTgt, set kArg0] + case 3: // Get target method [use kInvokeTgt, set kArg0] cg->LoadWordDisp(cg->TargetReg(kInvokeTgt), (method_idx * 4) + mirror::Array::DataOffset(sizeof(mirror::Object*)).Int32Value(), cg->TargetReg(kArg0)); break; - case 4: // Get the compiled code address [uses kArg0, sets kInvokeTgt] + case 4: // Get the compiled code address [uses kArg0, sets kInvokeTgt] if (cu->instruction_set != kX86) { cg->LoadWordDisp(cg->TargetReg(kArg0), mirror::AbstractMethod::GetEntryPointFromCompiledCodeOffset().Int32Value(), @@ -649,7 +649,7 @@ int Mir2Lir::GenDalvikArgsNoRange(CallInfo* info, DCHECK_LE(info->num_arg_words, 5); if (info->num_arg_words > 3) { int32_t next_use = 3; - //Detect special case of wide arg spanning arg3/arg4 + // Detect special case of wide arg spanning arg3/arg4 RegLocation rl_use0 = info->args[0]; RegLocation rl_use1 = info->args[1]; RegLocation rl_use2 = info->args[2]; @@ -789,7 +789,7 @@ int Mir2Lir::GenDalvikArgsRange(CallInfo* info, int call_state, direct_code, direct_method, type); OpRegRegImm(kOpAdd, TargetReg(kArg3), TargetReg(kSp), start_offset); LIR* ld = OpVldm(TargetReg(kArg3), regs_left); - //TUNING: loosen barrier + // TUNING: loosen barrier ld->def_mask = ENCODE_ALL; SetMemRefType(ld, true /* is_load */, kDalvikReg); call_state = next_call_insn(cu_, info, call_state, target_method, vtable_idx, @@ -1086,7 +1086,7 @@ bool Mir2Lir::GenInlinedStringCompareTo(CallInfo* info) { int r_tgt = (cu_->instruction_set != kX86) ? LoadHelper(ENTRYPOINT_OFFSET(pStringCompareTo)) : 0; GenNullCheck(rl_this.s_reg_low, reg_this, info->opt_flags); - //TUNING: check if rl_cmp.s_reg_low is already null checked + // TUNING: check if rl_cmp.s_reg_low is already null checked LIR* launch_pad = RawLIR(0, kPseudoIntrinsicRetry, reinterpret_cast<uintptr_t>(info)); intrinsic_launchpads_.Insert(launch_pad); OpCmpImmBranch(kCondEq, reg_cmp, 0, launch_pad); diff --git a/compiler/dex/quick/mips/call_mips.cc b/compiler/dex/quick/mips/call_mips.cc index db5764336a..8b375ea2f0 100644 --- a/compiler/dex/quick/mips/call_mips.cc +++ b/compiler/dex/quick/mips/call_mips.cc @@ -259,7 +259,7 @@ void MipsMir2Lir::GenFillArrayData(uint32_t table_offset, RegLocation rl_src) { // And go... ClobberCalleeSave(); - LIR* call_inst = OpReg(kOpBlx, r_tgt); // ( array*, fill_data* ) + LIR* call_inst = OpReg(kOpBlx, r_tgt); // ( array*, fill_data* ) MarkSafepointPC(call_inst); } diff --git a/compiler/dex/quick/mips/fp_mips.cc b/compiler/dex/quick/mips/fp_mips.cc index 2e744a2afc..6cd9acc099 100644 --- a/compiler/dex/quick/mips/fp_mips.cc +++ b/compiler/dex/quick/mips/fp_mips.cc @@ -174,7 +174,7 @@ void MipsMir2Lir::GenConversion(Instruction::Code opcode, RegLocation rl_dest, void MipsMir2Lir::GenCmpFP(Instruction::Code opcode, RegLocation rl_dest, RegLocation rl_src1, RegLocation rl_src2) { bool wide = true; - int offset = -1; // Make gcc happy. + int offset = -1; // Make gcc happy. switch (opcode) { case Instruction::CMPL_FLOAT: @@ -237,4 +237,4 @@ bool MipsMir2Lir::GenInlinedMinMaxInt(CallInfo* info, bool is_min) { return false; } -} // namespace art +} // namespace art diff --git a/compiler/dex/quick/mips/int_mips.cc b/compiler/dex/quick/mips/int_mips.cc index 03a58cc958..ea7da6030e 100644 --- a/compiler/dex/quick/mips/int_mips.cc +++ b/compiler/dex/quick/mips/int_mips.cc @@ -145,7 +145,7 @@ LIR* MipsMir2Lir::OpCmpImmBranch(ConditionCode cond, int reg, case kCondGe: opc = kMipsBgez; break; case kCondGt: opc = kMipsBgtz; break; case kCondLe: opc = kMipsBlez; break; - //case KCondMi: + // case KCondMi: case kCondLt: opc = kMipsBltz; break; case kCondNe: opc = kMipsBnez; break; default: @@ -513,7 +513,7 @@ void MipsMir2Lir::GenArrayPut(int opt_flags, OpSize size, RegLocation rl_array, int reg_len = INVALID_REG; if (needs_range_check) { reg_len = AllocTemp(); - //NOTE: max live temps(4) here. + // NOTE: max live temps(4) here. /* Get len */ LoadWordDisp(rl_array.low_reg, len_offset, reg_len); } @@ -521,7 +521,7 @@ void MipsMir2Lir::GenArrayPut(int opt_flags, OpSize size, RegLocation rl_array, OpRegImm(kOpAdd, reg_ptr, data_offset); /* at this point, reg_ptr points to array, 2 live temps */ if ((size == kLong) || (size == kDouble)) { - //TUNING: specific wide routine that can handle fp regs + // TUNING: specific wide routine that can handle fp regs if (scale) { int r_new_index = AllocTemp(); OpRegRegImm(kOpLsl, r_new_index, rl_index.low_reg, scale); diff --git a/compiler/dex/quick/mips/mips_lir.h b/compiler/dex/quick/mips/mips_lir.h index c3709b7204..278fcefcbf 100644 --- a/compiler/dex/quick/mips/mips_lir.h +++ b/compiler/dex/quick/mips/mips_lir.h @@ -155,7 +155,7 @@ enum MipsResourceEncodingPos { kMipsGPReg0 = 0, kMipsRegSP = 29, kMipsRegLR = 31, - kMipsFPReg0 = 32, // only 16 fp regs supported currently. + kMipsFPReg0 = 32, // only 16 fp regs supported currently. kMipsFPRegEnd = 48, kMipsRegHI = kMipsFPRegEnd, kMipsRegLO, @@ -248,7 +248,7 @@ enum MipsNativeRegisterPool { r_DF5 = r_F10 + MIPS_FP_DOUBLE, r_DF6 = r_F12 + MIPS_FP_DOUBLE, r_DF7 = r_F14 + MIPS_FP_DOUBLE, -#if 0 // TODO: expand resource mask to enable use of all MIPS fp registers. +#if 0 // TODO: expand resource mask to enable use of all MIPS fp registers. r_DF8 = r_F16 + MIPS_FP_DOUBLE, r_DF9 = r_F18 + MIPS_FP_DOUBLE, r_DF10 = r_F20 + MIPS_FP_DOUBLE, @@ -305,8 +305,8 @@ enum MipsShiftEncodings { */ enum MipsOpCode { kMipsFirst = 0, - kMips32BitData = kMipsFirst, // data [31..0]. - kMipsAddiu, // addiu t,s,imm16 [001001] s[25..21] t[20..16] imm16[15..0]. + kMips32BitData = kMipsFirst, // data [31..0]. + kMipsAddiu, // addiu t,s,imm16 [001001] s[25..21] t[20..16] imm16[15..0]. kMipsAddu, // add d,s,t [000000] s[25..21] t[20..16] d[15..11] [00000100001]. kMipsAnd, // and d,s,t [000000] s[25..21] t[20..16] d[15..11] [00000100100]. kMipsAndi, // andi t,s,imm16 [001100] s[25..21] t[20..16] imm16[15..0]. @@ -366,31 +366,31 @@ enum MipsOpCode { kMipsSw, // sw t,o(b) [101011] b[25..21] t[20..16] o[15..0]. kMipsXor, // xor d,s,t [000000] s[25..21] t[20..16] d[15..11] [00000100110]. kMipsXori, // xori t,s,imm16 [001110] s[25..21] t[20..16] imm16[15..0]. - kMipsFadds, // add.s d,s,t [01000110000] t[20..16] s[15..11] d[10..6] [000000]. - kMipsFsubs, // sub.s d,s,t [01000110000] t[20..16] s[15..11] d[10..6] [000001]. - kMipsFmuls, // mul.s d,s,t [01000110000] t[20..16] s[15..11] d[10..6] [000010]. - kMipsFdivs, // div.s d,s,t [01000110000] t[20..16] s[15..11] d[10..6] [000011]. - kMipsFaddd, // add.d d,s,t [01000110001] t[20..16] s[15..11] d[10..6] [000000]. - kMipsFsubd, // sub.d d,s,t [01000110001] t[20..16] s[15..11] d[10..6] [000001]. - kMipsFmuld, // mul.d d,s,t [01000110001] t[20..16] s[15..11] d[10..6] [000010]. - kMipsFdivd, // div.d d,s,t [01000110001] t[20..16] s[15..11] d[10..6] [000011]. - kMipsFcvtsd,// cvt.s.d d,s [01000110001] [00000] s[15..11] d[10..6] [100000]. - kMipsFcvtsw,// cvt.s.w d,s [01000110100] [00000] s[15..11] d[10..6] [100000]. - kMipsFcvtds,// cvt.d.s d,s [01000110000] [00000] s[15..11] d[10..6] [100001]. - kMipsFcvtdw,// cvt.d.w d,s [01000110100] [00000] s[15..11] d[10..6] [100001]. - kMipsFcvtws,// cvt.w.d d,s [01000110000] [00000] s[15..11] d[10..6] [100100]. - kMipsFcvtwd,// cvt.w.d d,s [01000110001] [00000] s[15..11] d[10..6] [100100]. - kMipsFmovs, // mov.s d,s [01000110000] [00000] s[15..11] d[10..6] [000110]. - kMipsFmovd, // mov.d d,s [01000110001] [00000] s[15..11] d[10..6] [000110]. - kMipsFlwc1, // lwc1 t,o(b) [110001] b[25..21] t[20..16] o[15..0]. - kMipsFldc1, // ldc1 t,o(b) [110101] b[25..21] t[20..16] o[15..0]. - kMipsFswc1, // swc1 t,o(b) [111001] b[25..21] t[20..16] o[15..0]. - kMipsFsdc1, // sdc1 t,o(b) [111101] b[25..21] t[20..16] o[15..0]. + kMipsFadds, // add.s d,s,t [01000110000] t[20..16] s[15..11] d[10..6] [000000]. + kMipsFsubs, // sub.s d,s,t [01000110000] t[20..16] s[15..11] d[10..6] [000001]. + kMipsFmuls, // mul.s d,s,t [01000110000] t[20..16] s[15..11] d[10..6] [000010]. + kMipsFdivs, // div.s d,s,t [01000110000] t[20..16] s[15..11] d[10..6] [000011]. + kMipsFaddd, // add.d d,s,t [01000110001] t[20..16] s[15..11] d[10..6] [000000]. + kMipsFsubd, // sub.d d,s,t [01000110001] t[20..16] s[15..11] d[10..6] [000001]. + kMipsFmuld, // mul.d d,s,t [01000110001] t[20..16] s[15..11] d[10..6] [000010]. + kMipsFdivd, // div.d d,s,t [01000110001] t[20..16] s[15..11] d[10..6] [000011]. + kMipsFcvtsd, // cvt.s.d d,s [01000110001] [00000] s[15..11] d[10..6] [100000]. + kMipsFcvtsw, // cvt.s.w d,s [01000110100] [00000] s[15..11] d[10..6] [100000]. + kMipsFcvtds, // cvt.d.s d,s [01000110000] [00000] s[15..11] d[10..6] [100001]. + kMipsFcvtdw, // cvt.d.w d,s [01000110100] [00000] s[15..11] d[10..6] [100001]. + kMipsFcvtws, // cvt.w.d d,s [01000110000] [00000] s[15..11] d[10..6] [100100]. + kMipsFcvtwd, // cvt.w.d d,s [01000110001] [00000] s[15..11] d[10..6] [100100]. + kMipsFmovs, // mov.s d,s [01000110000] [00000] s[15..11] d[10..6] [000110]. + kMipsFmovd, // mov.d d,s [01000110001] [00000] s[15..11] d[10..6] [000110]. + kMipsFlwc1, // lwc1 t,o(b) [110001] b[25..21] t[20..16] o[15..0]. + kMipsFldc1, // ldc1 t,o(b) [110101] b[25..21] t[20..16] o[15..0]. + kMipsFswc1, // swc1 t,o(b) [111001] b[25..21] t[20..16] o[15..0]. + kMipsFsdc1, // sdc1 t,o(b) [111101] b[25..21] t[20..16] o[15..0]. kMipsMfc1, // mfc1 t,s [01000100000] t[20..16] s[15..11] [00000000000]. kMipsMtc1, // mtc1 t,s [01000100100] t[20..16] s[15..11] [00000000000]. - kMipsDelta, // Psuedo for ori t, s, <label>-<label>. - kMipsDeltaHi, // Pseudo for lui t, high16(<label>-<label>). - kMipsDeltaLo, // Pseudo for ori t, s, low16(<label>-<label>). + kMipsDelta, // Psuedo for ori t, s, <label>-<label>. + kMipsDeltaHi, // Pseudo for lui t, high16(<label>-<label>). + kMipsDeltaLo, // Pseudo for ori t, s, low16(<label>-<label>). kMipsCurrPC, // jal to .+8 to materialize pc. kMipsSync, // sync kind [000000] [0000000000000000] s[10..6] [001111]. kMipsUndefined, // undefined [011001xxxxxxxxxxxxxxxx]. @@ -412,7 +412,7 @@ struct MipsEncodingMap { struct { MipsEncodingKind kind; int end; // end for kFmtBitBlt, 1-bit slice end for FP regs. - int start; // start for kFmtBitBlt, 4-bit slice end for FP regs. + int start; // start for kFmtBitBlt, 4-bit slice end for FP regs. } field_loc[4]; MipsOpCode opcode; uint64_t flags; @@ -425,7 +425,7 @@ extern MipsEncodingMap EncodingMap[kMipsLast]; #define IS_UIMM16(v) ((0 <= (v)) && ((v) <= 65535)) #define IS_SIMM16(v) ((-32768 <= (v)) && ((v) <= 32766)) -#define IS_SIMM16_2WORD(v) ((-32764 <= (v)) && ((v) <= 32763)) // 2 offsets must fit. +#define IS_SIMM16_2WORD(v) ((-32764 <= (v)) && ((v) <= 32763)) // 2 offsets must fit. } // namespace art diff --git a/compiler/dex/quick/mips/target_mips.cc b/compiler/dex/quick/mips/target_mips.cc index 21ba69ccd6..0a17fb1078 100644 --- a/compiler/dex/quick/mips/target_mips.cc +++ b/compiler/dex/quick/mips/target_mips.cc @@ -477,7 +477,7 @@ void MipsMir2Lir::CompilerInitializeRegAlloc() { // Keep special registers from being allocated for (int i = 0; i < num_reserved; i++) { if (NO_SUSPEND && (ReservedRegs[i] == rMIPS_SUSPEND)) { - //To measure cost of suspend check + // To measure cost of suspend check continue; } MarkInUse(ReservedRegs[i]); @@ -572,4 +572,4 @@ const char* MipsMir2Lir::GetTargetInstFmt(int opcode) { return MipsMir2Lir::EncodingMap[opcode].fmt; } -} // namespace art +} // namespace art diff --git a/compiler/dex/quick/mips/utility_mips.cc b/compiler/dex/quick/mips/utility_mips.cc index 79f6f16457..68b26f1936 100644 --- a/compiler/dex/quick/mips/utility_mips.cc +++ b/compiler/dex/quick/mips/utility_mips.cc @@ -63,7 +63,7 @@ bool MipsMir2Lir::InexpensiveConstantLong(int64_t value) { } bool MipsMir2Lir::InexpensiveConstantDouble(int64_t value) { - return false; // TUNING + return false; // TUNING } /* diff --git a/compiler/dex/quick/mir_to_lir.h b/compiler/dex/quick/mir_to_lir.h index 4774456646..a34e9295e9 100644 --- a/compiler/dex/quick/mir_to_lir.h +++ b/compiler/dex/quick/mir_to_lir.h @@ -157,7 +157,7 @@ Mir2Lir* X86CodeGenerator(CompilationUnit* const cu, MIRGraph* const mir_graph, #define ENCODE_ALL (~0ULL) #define ENCODE_MEM (ENCODE_DALVIK_REG | ENCODE_LITERAL | \ ENCODE_HEAP_REF | ENCODE_MUST_NOT_ALIAS) -//TODO: replace these macros +// TODO: replace these macros #define SLOW_FIELD_PATH (cu_->enable_debug & (1 << kDebugSlowFieldPath)) #define SLOW_INVOKE_PATH (cu_->enable_debug & (1 << kDebugSlowInvokePath)) #define SLOW_STRING_PATH (cu_->enable_debug & (1 << kDebugSlowStringPath)) @@ -726,7 +726,7 @@ class Mir2Lir : public Backend { GrowableArray<LIR*> throw_launchpads_; GrowableArray<LIR*> suspend_launchpads_; GrowableArray<LIR*> intrinsic_launchpads_; - SafeMap<unsigned int, LIR*> boundary_map_; // boundary lookup cache. + SafeMap<unsigned int, LIR*> boundary_map_; // boundary lookup cache. /* * Holds mapping from native PC to dex PC for safepoints where we may deoptimize. * Native PC is on the return address of the safepointed operation. Dex PC is for diff --git a/compiler/dex/quick/ralloc_util.cc b/compiler/dex/quick/ralloc_util.cc index 4542f8f0b0..d59c986dda 100644 --- a/compiler/dex/quick/ralloc_util.cc +++ b/compiler/dex/quick/ralloc_util.cc @@ -198,7 +198,7 @@ int Mir2Lir::AllocPreservedSingle(int s_reg, bool even) { * s_reg<=sX[even] & (s_reg+1)<= sX+1. */ int Mir2Lir::AllocPreservedDouble(int s_reg) { - int res = -1; // Assume failure + int res = -1; // Assume failure int v_reg = mir_graph_->SRegToVReg(s_reg); int p_map_idx = SRegToPMap(s_reg); if (promotion_map_[p_map_idx+1].fp_location == kLocPhysReg) { @@ -303,7 +303,7 @@ int Mir2Lir::AllocTempBody(RegisterInfo* p, int num_regs, int* next_temp, return -1; // No register available } -//REDO: too many assumptions. +// REDO: too many assumptions. int Mir2Lir::AllocTempDouble() { RegisterInfo* p = reg_pool_->FPRegs; int num_regs = reg_pool_->num_fp_regs; @@ -629,7 +629,7 @@ void Mir2Lir::FlushAllRegs() { } -//TUNING: rewrite all of this reg stuff. Probably use an attribute table +// TUNING: rewrite all of this reg stuff. Probably use an attribute table bool Mir2Lir::RegClassMatches(int reg_class, int reg) { if (reg_class == kAnyReg) { return true; @@ -917,7 +917,7 @@ void Mir2Lir::CountRefs(RefCounts* core_counts, RefCounts* fp_counts) { RegLocation loc = mir_graph_->reg_location_[i]; RefCounts* counts = loc.fp ? fp_counts : core_counts; int p_map_idx = SRegToPMap(loc.s_reg_low); - //Don't count easily regenerated immediates + // Don't count easily regenerated immediates if (loc.fp || !IsInexpensiveConstant(loc)) { counts[p_map_idx].count += mir_graph_->GetUseCount(i); } @@ -1152,7 +1152,7 @@ int Mir2Lir::GetSRegHi(int lowSreg) { } bool Mir2Lir::oat_live_out(int s_reg) { - //For now. + // For now. return true; } diff --git a/compiler/dex/quick/x86/assemble_x86.cc b/compiler/dex/quick/x86/assemble_x86.cc index d864115fc0..e8834320a9 100644 --- a/compiler/dex/quick/x86/assemble_x86.cc +++ b/compiler/dex/quick/x86/assemble_x86.cc @@ -474,7 +474,7 @@ int X86Mir2Lir::GetInsnSize(LIR* lir) { return ComputeSize(entry, lir->operands[1], 0x12345678, true); } else { DCHECK(entry->opcode == kX86PcRelAdr); - return 5; // opcode with reg + 4 byte immediate + return 5; // opcode with reg + 4 byte immediate } case kMacro: DCHECK_EQ(lir->opcode, static_cast<int>(kX86StartOfMethod)); @@ -1342,7 +1342,7 @@ AssemblerStatus X86Mir2Lir::AssembleInstructions(uintptr_t start_addr) { case kShiftRegImm: // lir operands - 0: reg, 1: immediate EmitShiftRegImm(entry, lir->operands[0], lir->operands[1]); break; - case kShiftRegCl: // lir operands - 0: reg, 1: cl + case kShiftRegCl: // lir operands - 0: reg, 1: cl EmitShiftRegCl(entry, lir->operands[0], lir->operands[1]); break; case kRegCond: // lir operands - 0: reg, 1: condition diff --git a/compiler/dex/quick/x86/call_x86.cc b/compiler/dex/quick/x86/call_x86.cc index 1aeb39ae4b..d530a1c644 100644 --- a/compiler/dex/quick/x86/call_x86.cc +++ b/compiler/dex/quick/x86/call_x86.cc @@ -87,7 +87,7 @@ void X86Mir2Lir::GenPackedSwitch(MIR* mir, uint32_t table_offset, rl_src = LoadValue(rl_src, kCoreReg); int start_of_method_reg = AllocTemp(); // Materialize a pointer to the switch table - //NewLIR0(kX86Bkpt); + // NewLIR0(kX86Bkpt); NewLIR1(kX86StartOfMethod, start_of_method_reg); int low_key = s4FromSwitchData(&table[2]); int keyReg; diff --git a/compiler/dex/quick/x86/fp_x86.cc b/compiler/dex/quick/x86/fp_x86.cc index f2ecf6c959..cc6f374488 100644 --- a/compiler/dex/quick/x86/fp_x86.cc +++ b/compiler/dex/quick/x86/fp_x86.cc @@ -373,4 +373,4 @@ bool X86Mir2Lir::GenInlinedSqrt(CallInfo* info) { -} // namespace art +} // namespace art diff --git a/compiler/dex/quick/x86/target_x86.cc b/compiler/dex/quick/x86/target_x86.cc index 5b64a6b5c3..2c9b3c837c 100644 --- a/compiler/dex/quick/x86/target_x86.cc +++ b/compiler/dex/quick/x86/target_x86.cc @@ -23,7 +23,7 @@ namespace art { -//FIXME: restore "static" when usage uncovered +// FIXME: restore "static" when usage uncovered /*static*/ int core_regs[] = { rAX, rCX, rDX, rBX, rX86_SP, rBP, rSI, rDI #ifdef TARGET_REX_SUPPORT @@ -541,4 +541,4 @@ const char* X86Mir2Lir::GetTargetInstFmt(int opcode) { return X86Mir2Lir::EncodingMap[opcode].fmt; } -} // namespace art +} // namespace art diff --git a/compiler/dex/quick/x86/utility_x86.cc b/compiler/dex/quick/x86/utility_x86.cc index 75367a340a..e15995fef4 100644 --- a/compiler/dex/quick/x86/utility_x86.cc +++ b/compiler/dex/quick/x86/utility_x86.cc @@ -61,7 +61,7 @@ bool X86Mir2Lir::InexpensiveConstantLong(int64_t value) { } bool X86Mir2Lir::InexpensiveConstantDouble(int64_t value) { - return false; // TUNING + return false; // TUNING } /* @@ -135,7 +135,7 @@ LIR* X86Mir2Lir::OpRegImm(OpKind op, int r_dest_src1, int value) { case kOpAdd: opcode = byte_imm ? kX86Add32RI8 : kX86Add32RI; break; case kOpOr: opcode = byte_imm ? kX86Or32RI8 : kX86Or32RI; break; case kOpAdc: opcode = byte_imm ? kX86Adc32RI8 : kX86Adc32RI; break; - //case kOpSbb: opcode = kX86Sbb32RI; break; + // case kOpSbb: opcode = kX86Sbb32RI; break; case kOpAnd: opcode = byte_imm ? kX86And32RI8 : kX86And32RI; break; case kOpSub: opcode = byte_imm ? kX86Sub32RI8 : kX86Sub32RI; break; case kOpXor: opcode = byte_imm ? kX86Xor32RI8 : kX86Xor32RI; break; @@ -221,7 +221,7 @@ LIR* X86Mir2Lir::OpRegMem(OpKind op, int r_dest, int rBase, LIR* X86Mir2Lir::OpRegRegReg(OpKind op, int r_dest, int r_src1, int r_src2) { if (r_dest != r_src1 && r_dest != r_src2) { - if (op == kOpAdd) { // lea special case, except can't encode rbp as base + if (op == kOpAdd) { // lea special case, except can't encode rbp as base if (r_src1 == r_src2) { OpRegCopy(r_dest, r_src1); return OpRegImm(kOpLsl, r_dest, 1); @@ -279,11 +279,11 @@ LIR* X86Mir2Lir::OpRegRegImm(OpKind op, int r_dest, int r_src, } } if (r_dest != r_src) { - if (false && op == kOpLsl && value >= 0 && value <= 3) { // lea shift special case + if (false && op == kOpLsl && value >= 0 && value <= 3) { // lea shift special case // TODO: fix bug in LEA encoding when disp == 0 return NewLIR5(kX86Lea32RA, r_dest, r5sib_no_base /* base */, r_src /* index */, value /* scale */, 0 /* disp */); - } else if (op == kOpAdd) { // lea add special case + } else if (op == kOpAdd) { // lea add special case return NewLIR5(kX86Lea32RA, r_dest, r_src /* base */, r4sib_no_index /* index */, 0 /* scale */, value /* disp */); } diff --git a/compiler/dex/quick/x86/x86_lir.h b/compiler/dex/quick/x86/x86_lir.h index 73e562e85f..643a3d5b8f 100644 --- a/compiler/dex/quick/x86/x86_lir.h +++ b/compiler/dex/quick/x86/x86_lir.h @@ -219,7 +219,7 @@ enum X86NativeRegisterPool { */ enum X86OpCode { kX86First = 0, - kX8632BitData = kX86First, // data [31..0]. + kX8632BitData = kX86First, // data [31..0]. kX86Bkpt, kX86Nop, // Define groups of binary operations @@ -322,12 +322,12 @@ enum X86OpCode { Binary0fOpCode(kX86Movss), kX86MovssMR, kX86MovssAR, - Binary0fOpCode(kX86Cvtsi2sd), // int to double - Binary0fOpCode(kX86Cvtsi2ss), // int to float - Binary0fOpCode(kX86Cvttsd2si),// truncating double to int - Binary0fOpCode(kX86Cvttss2si),// truncating float to int - Binary0fOpCode(kX86Cvtsd2si), // rounding double to int - Binary0fOpCode(kX86Cvtss2si), // rounding float to int + Binary0fOpCode(kX86Cvtsi2sd), // int to double + Binary0fOpCode(kX86Cvtsi2ss), // int to float + Binary0fOpCode(kX86Cvttsd2si), // truncating double to int + Binary0fOpCode(kX86Cvttss2si), // truncating float to int + Binary0fOpCode(kX86Cvtsd2si), // rounding double to int + Binary0fOpCode(kX86Cvtss2si), // rounding float to int Binary0fOpCode(kX86Ucomisd), // unordered double compare Binary0fOpCode(kX86Ucomiss), // unordered float compare Binary0fOpCode(kX86Comisd), // double compare @@ -338,8 +338,8 @@ enum X86OpCode { Binary0fOpCode(kX86Addss), // float add Binary0fOpCode(kX86Mulsd), // double multiply Binary0fOpCode(kX86Mulss), // float multiply - Binary0fOpCode(kX86Cvtsd2ss), // double to float - Binary0fOpCode(kX86Cvtss2sd), // float to double + Binary0fOpCode(kX86Cvtsd2ss), // double to float + Binary0fOpCode(kX86Cvtss2sd), // float to double Binary0fOpCode(kX86Subsd), // double subtract Binary0fOpCode(kX86Subss), // float subtract Binary0fOpCode(kX86Divsd), // double divide @@ -347,13 +347,13 @@ enum X86OpCode { kX86PsrlqRI, // right shift of floating point registers kX86PsllqRI, // left shift of floating point registers Binary0fOpCode(kX86Movdxr), // move into xmm from gpr - kX86MovdrxRR, kX86MovdrxMR, kX86MovdrxAR,// move into reg from xmm - kX86Set8R, kX86Set8M, kX86Set8A,// set byte depending on condition operand + kX86MovdrxRR, kX86MovdrxMR, kX86MovdrxAR, // move into reg from xmm + kX86Set8R, kX86Set8M, kX86Set8A, // set byte depending on condition operand kX86Mfence, // memory barrier Binary0fOpCode(kX86Imul16), // 16bit multiply Binary0fOpCode(kX86Imul32), // 32bit multiply - kX86CmpxchgRR, kX86CmpxchgMR, kX86CmpxchgAR,// compare and exchange - kX86LockCmpxchgRR, kX86LockCmpxchgMR, kX86LockCmpxchgAR,// locked compare and exchange + kX86CmpxchgRR, kX86CmpxchgMR, kX86CmpxchgAR, // compare and exchange + kX86LockCmpxchgRR, kX86LockCmpxchgMR, kX86LockCmpxchgAR, // locked compare and exchange Binary0fOpCode(kX86Movzx8), // zero-extend 8-bit value Binary0fOpCode(kX86Movzx16), // zero-extend 16-bit value Binary0fOpCode(kX86Movsx8), // sign-extend 8-bit value @@ -383,9 +383,9 @@ enum X86EncodingKind { kNullary, // Opcode that takes no arguments. kReg, kMem, kArray, // R, M and A instruction kinds. kMemReg, kArrayReg, kThreadReg, // MR, AR and TR instruction kinds. - kRegReg, kRegMem, kRegArray, kRegThread, // RR, RM, RA and RT instruction kinds. + kRegReg, kRegMem, kRegArray, kRegThread, // RR, RM, RA and RT instruction kinds. kRegRegStore, // RR following the store modrm reg-reg encoding rather than the load. - kRegImm, kMemImm, kArrayImm, kThreadImm, // RI, MI, AI and TI instruction kinds. + kRegImm, kMemImm, kArrayImm, kThreadImm, // RI, MI, AI and TI instruction kinds. kRegRegImm, kRegMemImm, kRegArrayImm, // RRI, RMI and RAI instruction kinds. kMovRegImm, // Shorter form move RI. kShiftRegImm, kShiftMemImm, kShiftArrayImm, // Shift opcode with immediate. @@ -407,13 +407,13 @@ struct X86EncodingMap { uint8_t prefix1; // non-zero => a prefix byte uint8_t prefix2; // non-zero => a second prefix byte uint8_t opcode; // 1 byte opcode - uint8_t extra_opcode1; // possible extra opcode byte - uint8_t extra_opcode2; // possible second extra opcode byte + uint8_t extra_opcode1; // possible extra opcode byte + uint8_t extra_opcode2; // possible second extra opcode byte // 3bit opcode that gets encoded in the register bits of the modrm byte, use determined by the // encoding kind uint8_t modrm_opcode; uint8_t ax_opcode; // non-zero => shorter encoding for AX as a destination - uint8_t immediate_bytes; // number of bytes of immediate + uint8_t immediate_bytes; // number of bytes of immediate } skeleton; const char *name; const char* fmt; diff --git a/compiler/dex/ssa_transformation.cc b/compiler/dex/ssa_transformation.cc index 7739e2996f..18d8e93b1b 100644 --- a/compiler/dex/ssa_transformation.cc +++ b/compiler/dex/ssa_transformation.cc @@ -241,7 +241,7 @@ bool MIRGraph::ComputeDominanceFrontier(BasicBlock* bb) { /* Calculate DF_up */ ArenaBitVector::Iterator bv_iterator(bb->i_dominated); while (true) { - //TUNING: hot call to BitVectorIteratorNext + // TUNING: hot call to BitVectorIteratorNext int dominated_idx = bv_iterator.Next(); if (dominated_idx == -1) { break; @@ -249,7 +249,7 @@ bool MIRGraph::ComputeDominanceFrontier(BasicBlock* bb) { BasicBlock* dominated_bb = GetBasicBlock(dominated_idx); ArenaBitVector::Iterator df_iterator(dominated_bb->dom_frontier); while (true) { - //TUNING: hot call to BitVectorIteratorNext + // TUNING: hot call to BitVectorIteratorNext int df_up_idx = df_iterator.Next(); if (df_up_idx == -1) { break; @@ -530,7 +530,7 @@ void MIRGraph::InsertPhiNodes() { BasicBlock* def_bb = GetBasicBlock(idx); /* Merge the dominance frontier to tmp_blocks */ - //TUNING: hot call to Union(). + // TUNING: hot call to Union(). if (def_bb->dom_frontier != NULL) { tmp_blocks->Union(def_bb->dom_frontier); } @@ -568,7 +568,7 @@ void MIRGraph::InsertPhiNodes() { phi->dalvikInsn.opcode = static_cast<Instruction::Code>(kMirOpPhi); phi->dalvikInsn.vA = dalvik_reg; phi->offset = phi_bb->start_offset; - phi->m_unit_index = 0; // Arbitrarily assign all Phi nodes to outermost method. + phi->m_unit_index = 0; // Arbitrarily assign all Phi nodes to outermost method. PrependMIR(phi_bb, phi); } } diff --git a/compiler/dex/vreg_analysis.cc b/compiler/dex/vreg_analysis.cc index b50fe71b85..5ee675306d 100644 --- a/compiler/dex/vreg_analysis.cc +++ b/compiler/dex/vreg_analysis.cc @@ -333,7 +333,7 @@ bool MIRGraph::InferTypeAndSize(BasicBlock* bb) { static const char* storage_name[] = {" Frame ", "PhysReg", " Spill "}; void MIRGraph::DumpRegLocTable(RegLocation* table, int count) { - //FIXME: Quick-specific. Move to Quick (and make a generic version for MIRGraph? + // FIXME: Quick-specific. Move to Quick (and make a generic version for MIRGraph? Mir2Lir* cg = static_cast<Mir2Lir*>(cu_->cg.get()); if (cg != NULL) { for (int i = 0; i < count; i++) { diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index c2a1312354..038957e128 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1628,416 +1628,416 @@ void CompilerDriver::VerifyDexFile(jobject class_loader, const DexFile& dex_file } static const char* class_initializer_black_list[] = { - "Landroid/app/ActivityThread;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Landroid/bluetooth/BluetoothAudioGateway;", // Calls android.bluetooth.BluetoothAudioGateway.classInitNative(). - "Landroid/bluetooth/HeadsetBase;", // Calls android.bluetooth.HeadsetBase.classInitNative(). - "Landroid/content/res/CompatibilityInfo;", // Requires android.util.DisplayMetrics -..-> android.os.SystemProperties.native_get_int. - "Landroid/content/res/CompatibilityInfo$1;", // Requires android.util.DisplayMetrics -..-> android.os.SystemProperties.native_get_int. - "Landroid/content/UriMatcher;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Landroid/database/CursorWindow;", // Requires android.util.DisplayMetrics -..-> android.os.SystemProperties.native_get_int. - "Landroid/database/sqlite/SQLiteConnection;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Landroid/database/sqlite/SQLiteConnection$Operation;", // Requires SimpleDateFormat -> java.util.Locale. - "Landroid/database/sqlite/SQLiteDatabaseConfiguration;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Landroid/database/sqlite/SQLiteDebug;", // Calls android.util.Log.isLoggable. - "Landroid/database/sqlite/SQLiteOpenHelper;", // Calls Class.getSimpleName -> Class.isAnonymousClass -> Class.getDex. - "Landroid/database/sqlite/SQLiteQueryBuilder;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Landroid/drm/DrmManagerClient;", // Calls System.loadLibrary. - "Landroid/graphics/drawable/AnimatedRotateDrawable;", // Sub-class of Drawable. - "Landroid/graphics/drawable/AnimationDrawable;", // Sub-class of Drawable. - "Landroid/graphics/drawable/BitmapDrawable;", // Sub-class of Drawable. - "Landroid/graphics/drawable/ClipDrawable;", // Sub-class of Drawable. - "Landroid/graphics/drawable/ColorDrawable;", // Sub-class of Drawable. - "Landroid/graphics/drawable/Drawable;", // Requires android.graphics.Rect. - "Landroid/graphics/drawable/DrawableContainer;", // Sub-class of Drawable. - "Landroid/graphics/drawable/GradientDrawable;", // Sub-class of Drawable. - "Landroid/graphics/drawable/LayerDrawable;", // Sub-class of Drawable. - "Landroid/graphics/drawable/NinePatchDrawable;", // Sub-class of Drawable. - "Landroid/graphics/drawable/RotateDrawable;", // Sub-class of Drawable. - "Landroid/graphics/drawable/ScaleDrawable;", // Sub-class of Drawable. - "Landroid/graphics/drawable/ShapeDrawable;", // Sub-class of Drawable. - "Landroid/graphics/drawable/StateListDrawable;", // Sub-class of Drawable. - "Landroid/graphics/drawable/TransitionDrawable;", // Sub-class of Drawable. - "Landroid/graphics/Matrix;", // Calls android.graphics.Matrix.native_create. - "Landroid/graphics/Matrix$1;", // Requires Matrix. - "Landroid/graphics/PixelFormat;", // Calls android.graphics.PixelFormat.nativeClassInit(). - "Landroid/graphics/Rect;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Landroid/graphics/SurfaceTexture;", // Calls android.graphics.SurfaceTexture.nativeClassInit(). - "Landroid/graphics/Typeface;", // Calls android.graphics.Typeface.nativeCreate. - "Landroid/inputmethodservice/ExtractEditText;", // Requires android.widget.TextView. - "Landroid/media/AmrInputStream;", // Calls OsConstants.initConstants. - "Landroid/media/CamcorderProfile;", // Calls OsConstants.initConstants. - "Landroid/media/CameraProfile;", // Calls System.loadLibrary. - "Landroid/media/DecoderCapabilities;", // Calls System.loadLibrary. - "Landroid/media/EncoderCapabilities;", // Calls OsConstants.initConstants. - "Landroid/media/ExifInterface;", // Calls OsConstants.initConstants. - "Landroid/media/MediaCodec;", // Calls OsConstants.initConstants. - "Landroid/media/MediaCodecList;", // Calls OsConstants.initConstants. - "Landroid/media/MediaCrypto;", // Calls OsConstants.initConstants. - "Landroid/media/MediaDrm;", // Calls OsConstants.initConstants. - "Landroid/media/MediaExtractor;", // Calls OsConstants.initConstants. - "Landroid/media/MediaFile;", // Requires DecoderCapabilities. - "Landroid/media/MediaMetadataRetriever;", // Calls OsConstants.initConstants. - "Landroid/media/MediaMuxer;", // Calls OsConstants.initConstants. - "Landroid/media/MediaPlayer;", // Calls System.loadLibrary. - "Landroid/media/MediaRecorder;", // Calls System.loadLibrary. - "Landroid/media/MediaScanner;", // Calls System.loadLibrary. - "Landroid/media/ResampleInputStream;", // Calls OsConstants.initConstants. - "Landroid/media/SoundPool;", // Calls OsConstants.initConstants. - "Landroid/media/videoeditor/MediaArtistNativeHelper;", // Calls OsConstants.initConstants. - "Landroid/media/videoeditor/VideoEditorProfile;", // Calls OsConstants.initConstants. - "Landroid/mtp/MtpDatabase;", // Calls OsConstants.initConstants. - "Landroid/mtp/MtpDevice;", // Calls OsConstants.initConstants. - "Landroid/mtp/MtpServer;", // Calls OsConstants.initConstants. - "Landroid/net/NetworkInfo;", // Calls java.util.EnumMap.<init> -> java.lang.Enum.getSharedConstants -> System.identityHashCode. - "Landroid/net/Proxy;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Landroid/net/SSLCertificateSocketFactory;", // Requires javax.net.ssl.HttpsURLConnection. - "Landroid/net/Uri;", // Calls Class.getSimpleName -> Class.isAnonymousClass -> Class.getDex. - "Landroid/net/Uri$AbstractHierarchicalUri;", // Requires Uri. - "Landroid/net/Uri$HierarchicalUri;", // Requires Uri. - "Landroid/net/Uri$OpaqueUri;", // Requires Uri. - "Landroid/net/Uri$StringUri;", // Requires Uri. - "Landroid/net/WebAddress;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Landroid/nfc/NdefRecord;", // Calls String.getBytes -> java.nio.charset.Charset. - "Landroid/opengl/EGL14;", // Calls android.opengl.EGL14._nativeClassInit. - "Landroid/opengl/GLES10;", // Calls android.opengl.GLES10._nativeClassInit. - "Landroid/opengl/GLES10Ext;", // Calls android.opengl.GLES10Ext._nativeClassInit. - "Landroid/opengl/GLES11;", // Requires GLES10. - "Landroid/opengl/GLES11Ext;", // Calls android.opengl.GLES11Ext._nativeClassInit. - "Landroid/opengl/GLES20;", // Calls android.opengl.GLES20._nativeClassInit. - "Landroid/opengl/GLUtils;", // Calls android.opengl.GLUtils.nativeClassInit. - "Landroid/os/Build;", // Calls -..-> android.os.SystemProperties.native_get. - "Landroid/os/Build$VERSION;", // Requires Build. - "Landroid/os/Debug;", // Requires android.os.Environment. - "Landroid/os/Environment;", // Calls System.getenv. - "Landroid/os/FileUtils;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Landroid/os/StrictMode;", // Calls android.util.Log.isLoggable. - "Landroid/os/StrictMode$VmPolicy;", // Requires StrictMode. - "Landroid/os/Trace;", // Calls android.os.Trace.nativeGetEnabledTags. - "Landroid/os/UEventObserver;", // Calls Class.getSimpleName -> Class.isAnonymousClass -> Class.getDex. - "Landroid/provider/ContactsContract;", // Calls OsConstants.initConstants. - "Landroid/provider/Settings$Global;", // Calls OsConstants.initConstants. - "Landroid/provider/Settings$Secure;", // Requires android.net.Uri. - "Landroid/provider/Settings$System;", // Requires android.net.Uri. - "Landroid/renderscript/RenderScript;", // Calls System.loadLibrary. - "Landroid/server/BluetoothService;", // Calls android.server.BluetoothService.classInitNative. - "Landroid/server/BluetoothEventLoop;", // Calls android.server.BluetoothEventLoop.classInitNative. - "Landroid/telephony/PhoneNumberUtils;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Landroid/telephony/TelephonyManager;", // Calls OsConstants.initConstants. - "Landroid/text/AutoText;", // Requires android.util.DisplayMetrics -..-> android.os.SystemProperties.native_get_int. - "Landroid/text/Layout;", // Calls com.android.internal.util.ArrayUtils.emptyArray -> System.identityHashCode. - "Landroid/text/BoringLayout;", // Requires Layout. - "Landroid/text/DynamicLayout;", // Requires Layout. - "Landroid/text/Html$HtmlParser;", // Calls -..-> String.toLowerCase -> java.util.Locale. - "Landroid/text/StaticLayout;", // Requires Layout. - "Landroid/text/TextUtils;", // Requires android.util.DisplayMetrics. - "Landroid/util/DisplayMetrics;", // Calls SystemProperties.native_get_int. - "Landroid/util/Patterns;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Landroid/view/Choreographer;", // Calls SystemProperties.native_get_boolean. - "Landroid/util/Patterns;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Landroid/view/GLES20Canvas;", // Calls GLES20Canvas.nIsAvailable(). - "Landroid/view/GLES20RecordingCanvas;", // Requires android.view.GLES20Canvas. - "Landroid/view/GestureDetector;", // Calls android.view.GLES20Canvas.nIsAvailable. - "Landroid/view/HardwareRenderer$Gl20Renderer;", // Requires SystemProperties.native_get. - "Landroid/view/HardwareRenderer$GlRenderer;", // Requires SystemProperties.native_get. - "Landroid/view/InputEventConsistencyVerifier;", // Requires android.os.Build. - "Landroid/view/Surface;", // Requires SystemProperties.native_get. - "Landroid/view/SurfaceControl;", // Calls OsConstants.initConstants. - "Landroid/view/animation/AlphaAnimation;", // Requires Animation. - "Landroid/view/animation/Animation;", // Calls SystemProperties.native_get_boolean. - "Landroid/view/animation/AnimationSet;", // Calls OsConstants.initConstants. - "Landroid/view/textservice/SpellCheckerSubtype;", // Calls Class.getDex(). - "Landroid/webkit/JniUtil;", // Calls System.loadLibrary. - "Landroid/webkit/PluginManager;", // // Calls OsConstants.initConstants. - "Landroid/webkit/WebViewCore;", // Calls System.loadLibrary. + "Landroid/app/ActivityThread;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/bluetooth/BluetoothAudioGateway;", // Calls android.bluetooth.BluetoothAudioGateway.classInitNative(). + "Landroid/bluetooth/HeadsetBase;", // Calls android.bluetooth.HeadsetBase.classInitNative(). + "Landroid/content/res/CompatibilityInfo;", // Requires android.util.DisplayMetrics -..-> android.os.SystemProperties.native_get_int. + "Landroid/content/res/CompatibilityInfo$1;", // Requires android.util.DisplayMetrics -..-> android.os.SystemProperties.native_get_int. + "Landroid/content/UriMatcher;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/database/CursorWindow;", // Requires android.util.DisplayMetrics -..-> android.os.SystemProperties.native_get_int. + "Landroid/database/sqlite/SQLiteConnection;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/database/sqlite/SQLiteConnection$Operation;", // Requires SimpleDateFormat -> java.util.Locale. + "Landroid/database/sqlite/SQLiteDatabaseConfiguration;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/database/sqlite/SQLiteDebug;", // Calls android.util.Log.isLoggable. + "Landroid/database/sqlite/SQLiteOpenHelper;", // Calls Class.getSimpleName -> Class.isAnonymousClass -> Class.getDex. + "Landroid/database/sqlite/SQLiteQueryBuilder;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/drm/DrmManagerClient;", // Calls System.loadLibrary. + "Landroid/graphics/drawable/AnimatedRotateDrawable;", // Sub-class of Drawable. + "Landroid/graphics/drawable/AnimationDrawable;", // Sub-class of Drawable. + "Landroid/graphics/drawable/BitmapDrawable;", // Sub-class of Drawable. + "Landroid/graphics/drawable/ClipDrawable;", // Sub-class of Drawable. + "Landroid/graphics/drawable/ColorDrawable;", // Sub-class of Drawable. + "Landroid/graphics/drawable/Drawable;", // Requires android.graphics.Rect. + "Landroid/graphics/drawable/DrawableContainer;", // Sub-class of Drawable. + "Landroid/graphics/drawable/GradientDrawable;", // Sub-class of Drawable. + "Landroid/graphics/drawable/LayerDrawable;", // Sub-class of Drawable. + "Landroid/graphics/drawable/NinePatchDrawable;", // Sub-class of Drawable. + "Landroid/graphics/drawable/RotateDrawable;", // Sub-class of Drawable. + "Landroid/graphics/drawable/ScaleDrawable;", // Sub-class of Drawable. + "Landroid/graphics/drawable/ShapeDrawable;", // Sub-class of Drawable. + "Landroid/graphics/drawable/StateListDrawable;", // Sub-class of Drawable. + "Landroid/graphics/drawable/TransitionDrawable;", // Sub-class of Drawable. + "Landroid/graphics/Matrix;", // Calls android.graphics.Matrix.native_create. + "Landroid/graphics/Matrix$1;", // Requires Matrix. + "Landroid/graphics/PixelFormat;", // Calls android.graphics.PixelFormat.nativeClassInit(). + "Landroid/graphics/Rect;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/graphics/SurfaceTexture;", // Calls android.graphics.SurfaceTexture.nativeClassInit(). + "Landroid/graphics/Typeface;", // Calls android.graphics.Typeface.nativeCreate. + "Landroid/inputmethodservice/ExtractEditText;", // Requires android.widget.TextView. + "Landroid/media/AmrInputStream;", // Calls OsConstants.initConstants. + "Landroid/media/CamcorderProfile;", // Calls OsConstants.initConstants. + "Landroid/media/CameraProfile;", // Calls System.loadLibrary. + "Landroid/media/DecoderCapabilities;", // Calls System.loadLibrary. + "Landroid/media/EncoderCapabilities;", // Calls OsConstants.initConstants. + "Landroid/media/ExifInterface;", // Calls OsConstants.initConstants. + "Landroid/media/MediaCodec;", // Calls OsConstants.initConstants. + "Landroid/media/MediaCodecList;", // Calls OsConstants.initConstants. + "Landroid/media/MediaCrypto;", // Calls OsConstants.initConstants. + "Landroid/media/MediaDrm;", // Calls OsConstants.initConstants. + "Landroid/media/MediaExtractor;", // Calls OsConstants.initConstants. + "Landroid/media/MediaFile;", // Requires DecoderCapabilities. + "Landroid/media/MediaMetadataRetriever;", // Calls OsConstants.initConstants. + "Landroid/media/MediaMuxer;", // Calls OsConstants.initConstants. + "Landroid/media/MediaPlayer;", // Calls System.loadLibrary. + "Landroid/media/MediaRecorder;", // Calls System.loadLibrary. + "Landroid/media/MediaScanner;", // Calls System.loadLibrary. + "Landroid/media/ResampleInputStream;", // Calls OsConstants.initConstants. + "Landroid/media/SoundPool;", // Calls OsConstants.initConstants. + "Landroid/media/videoeditor/MediaArtistNativeHelper;", // Calls OsConstants.initConstants. + "Landroid/media/videoeditor/VideoEditorProfile;", // Calls OsConstants.initConstants. + "Landroid/mtp/MtpDatabase;", // Calls OsConstants.initConstants. + "Landroid/mtp/MtpDevice;", // Calls OsConstants.initConstants. + "Landroid/mtp/MtpServer;", // Calls OsConstants.initConstants. + "Landroid/net/NetworkInfo;", // Calls java.util.EnumMap.<init> -> java.lang.Enum.getSharedConstants -> System.identityHashCode. + "Landroid/net/Proxy;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/net/SSLCertificateSocketFactory;", // Requires javax.net.ssl.HttpsURLConnection. + "Landroid/net/Uri;", // Calls Class.getSimpleName -> Class.isAnonymousClass -> Class.getDex. + "Landroid/net/Uri$AbstractHierarchicalUri;", // Requires Uri. + "Landroid/net/Uri$HierarchicalUri;", // Requires Uri. + "Landroid/net/Uri$OpaqueUri;", // Requires Uri. + "Landroid/net/Uri$StringUri;", // Requires Uri. + "Landroid/net/WebAddress;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/nfc/NdefRecord;", // Calls String.getBytes -> java.nio.charset.Charset. + "Landroid/opengl/EGL14;", // Calls android.opengl.EGL14._nativeClassInit. + "Landroid/opengl/GLES10;", // Calls android.opengl.GLES10._nativeClassInit. + "Landroid/opengl/GLES10Ext;", // Calls android.opengl.GLES10Ext._nativeClassInit. + "Landroid/opengl/GLES11;", // Requires GLES10. + "Landroid/opengl/GLES11Ext;", // Calls android.opengl.GLES11Ext._nativeClassInit. + "Landroid/opengl/GLES20;", // Calls android.opengl.GLES20._nativeClassInit. + "Landroid/opengl/GLUtils;", // Calls android.opengl.GLUtils.nativeClassInit. + "Landroid/os/Build;", // Calls -..-> android.os.SystemProperties.native_get. + "Landroid/os/Build$VERSION;", // Requires Build. + "Landroid/os/Debug;", // Requires android.os.Environment. + "Landroid/os/Environment;", // Calls System.getenv. + "Landroid/os/FileUtils;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/os/StrictMode;", // Calls android.util.Log.isLoggable. + "Landroid/os/StrictMode$VmPolicy;", // Requires StrictMode. + "Landroid/os/Trace;", // Calls android.os.Trace.nativeGetEnabledTags. + "Landroid/os/UEventObserver;", // Calls Class.getSimpleName -> Class.isAnonymousClass -> Class.getDex. + "Landroid/provider/ContactsContract;", // Calls OsConstants.initConstants. + "Landroid/provider/Settings$Global;", // Calls OsConstants.initConstants. + "Landroid/provider/Settings$Secure;", // Requires android.net.Uri. + "Landroid/provider/Settings$System;", // Requires android.net.Uri. + "Landroid/renderscript/RenderScript;", // Calls System.loadLibrary. + "Landroid/server/BluetoothService;", // Calls android.server.BluetoothService.classInitNative. + "Landroid/server/BluetoothEventLoop;", // Calls android.server.BluetoothEventLoop.classInitNative. + "Landroid/telephony/PhoneNumberUtils;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/telephony/TelephonyManager;", // Calls OsConstants.initConstants. + "Landroid/text/AutoText;", // Requires android.util.DisplayMetrics -..-> android.os.SystemProperties.native_get_int. + "Landroid/text/Layout;", // Calls com.android.internal.util.ArrayUtils.emptyArray -> System.identityHashCode. + "Landroid/text/BoringLayout;", // Requires Layout. + "Landroid/text/DynamicLayout;", // Requires Layout. + "Landroid/text/Html$HtmlParser;", // Calls -..-> String.toLowerCase -> java.util.Locale. + "Landroid/text/StaticLayout;", // Requires Layout. + "Landroid/text/TextUtils;", // Requires android.util.DisplayMetrics. + "Landroid/util/DisplayMetrics;", // Calls SystemProperties.native_get_int. + "Landroid/util/Patterns;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/view/Choreographer;", // Calls SystemProperties.native_get_boolean. + "Landroid/util/Patterns;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/view/GLES20Canvas;", // Calls GLES20Canvas.nIsAvailable(). + "Landroid/view/GLES20RecordingCanvas;", // Requires android.view.GLES20Canvas. + "Landroid/view/GestureDetector;", // Calls android.view.GLES20Canvas.nIsAvailable. + "Landroid/view/HardwareRenderer$Gl20Renderer;", // Requires SystemProperties.native_get. + "Landroid/view/HardwareRenderer$GlRenderer;", // Requires SystemProperties.native_get. + "Landroid/view/InputEventConsistencyVerifier;", // Requires android.os.Build. + "Landroid/view/Surface;", // Requires SystemProperties.native_get. + "Landroid/view/SurfaceControl;", // Calls OsConstants.initConstants. + "Landroid/view/animation/AlphaAnimation;", // Requires Animation. + "Landroid/view/animation/Animation;", // Calls SystemProperties.native_get_boolean. + "Landroid/view/animation/AnimationSet;", // Calls OsConstants.initConstants. + "Landroid/view/textservice/SpellCheckerSubtype;", // Calls Class.getDex(). + "Landroid/webkit/JniUtil;", // Calls System.loadLibrary. + "Landroid/webkit/PluginManager;", // // Calls OsConstants.initConstants. + "Landroid/webkit/WebViewCore;", // Calls System.loadLibrary. "Landroid/webkit/WebViewFactory$Preloader;", // Calls to Class.forName. - "Landroid/webkit/WebViewInputDispatcher;", // Calls Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Landroid/webkit/URLUtil;", // Calls Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Landroid/widget/AutoCompleteTextView;", // Requires TextView. - "Landroid/widget/Button;", // Requires TextView. - "Landroid/widget/CheckBox;", // Requires TextView. - "Landroid/widget/CheckedTextView;", // Requires TextView. - "Landroid/widget/CompoundButton;", // Requires TextView. - "Landroid/widget/EditText;", // Requires TextView. - "Landroid/widget/NumberPicker;", // Requires java.util.Locale. - "Landroid/widget/ScrollBarDrawable;", // Sub-class of Drawable. - "Landroid/widget/SearchView$SearchAutoComplete;", // Requires TextView. - "Landroid/widget/Switch;", // Requires TextView. - "Landroid/widget/TextView;", // Calls Paint.<init> -> Paint.native_init. - "Lcom/android/i18n/phonenumbers/AsYouTypeFormatter;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Lcom/android/i18n/phonenumbers/MetadataManager;", // Calls OsConstants.initConstants. - "Lcom/android/i18n/phonenumbers/PhoneNumberMatcher;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Lcom/android/i18n/phonenumbers/PhoneNumberUtil;", // Requires java.util.logging.LogManager. - "Lcom/android/i18n/phonenumbers/geocoding/AreaCodeMap;", // Calls OsConstants.initConstants. - "Lcom/android/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder;", // Calls OsConstants.initConstants. - "Lcom/android/internal/os/SamplingProfilerIntegration;", // Calls SystemProperties.native_get_int. - "Lcom/android/internal/policy/impl/PhoneWindow;", // Calls android.os.Binder.init. - "Lcom/android/internal/view/menu/ActionMenuItemView;", // Requires TextView. - "Lcom/android/internal/widget/DialogTitle;", // Requires TextView. - "Lcom/android/org/bouncycastle/asn1/StreamUtil;", // Calls Runtime.getRuntime().maxMemory(). - "Lcom/android/org/bouncycastle/asn1/pkcs/MacData;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/asn1/pkcs/RSASSAPSSparams;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/asn1/cms/SignedData;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/asn1/x509/GeneralSubtree;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/asn1/x9/X9ECParameters;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/crypto/digests/OpenSSLDigest$MD5;", // Requires com.android.org.conscrypt.NativeCrypto. - "Lcom/android/org/bouncycastle/crypto/digests/OpenSSLDigest$SHA1;", // Requires com.android.org.conscrypt.NativeCrypto. - "Lcom/android/org/bouncycastle/crypto/digests/OpenSSLDigest$SHA256;", // Requires com.android.org.conscrypt.NativeCrypto. - "Lcom/android/org/bouncycastle/crypto/digests/OpenSSLDigest$SHA384;", // Requires com.android.org.conscrypt.NativeCrypto. - "Lcom/android/org/bouncycastle/crypto/digests/OpenSSLDigest$SHA512;", // Requires com.android.org.conscrypt.NativeCrypto. - "Lcom/android/org/bouncycastle/crypto/engines/RSABlindedEngine;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/crypto/generators/DHKeyGeneratorHelper;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/crypto/generators/DHParametersGenerator;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/crypto/generators/DHParametersHelper;", // Calls System.getenv -> OsConstants.initConstants. - "Lcom/android/org/bouncycastle/crypto/generators/DSAKeyPairGenerator;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/crypto/generators/DSAParametersGenerator;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/crypto/generators/RSAKeyPairGenerator;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/dh/KeyPairGeneratorSpi;", // Calls OsConstants.initConstants. - "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/dsa/KeyPairGeneratorSpi;", // Calls OsConstants.initConstants. - "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi$EC;", // Calls OsConstants.initConstants. - "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi$ECDH;", // Calls OsConstants.initConstants. - "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi$ECDHC;", // Calls OsConstants.initConstants. - "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi$ECDSA;", // Calls OsConstants.initConstants. - "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi$ECMQV;", // Calls OsConstants.initConstants. - "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi;", // Calls OsConstants.initConstants. - "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateCrtKey;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateKey;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/rsa/KeyPairGeneratorSpi;", // Calls OsConstants.initConstants. - "Lcom/android/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi$BCPKCS12KeyStore;", // Calls Thread.currentThread. - "Lcom/android/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi;", // Calls Thread.currentThread. - "Lcom/android/org/bouncycastle/jce/PKCS10CertificationRequest;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/jce/provider/CertBlacklist;", // Calls System.getenv -> OsConstants.initConstants. - "Lcom/android/org/bouncycastle/jce/provider/JCERSAPrivateCrtKey;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/jce/provider/JCERSAPrivateKey;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi;", // Calls System.getenv -> OsConstants.initConstants. - "Lcom/android/org/bouncycastle/math/ec/ECConstants;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/math/ec/Tnaf;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/util/BigIntegers;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/bouncycastle/x509/X509Util;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lcom/android/org/conscrypt/CipherSuite;", // Calls OsConstants.initConstants. - "Lcom/android/org/conscrypt/FileClientSessionCache$CacheFile;", // Calls OsConstants.initConstants. - "Lcom/android/org/conscrypt/HandshakeIODataStream;", // Calls OsConstants.initConstants. - "Lcom/android/org/conscrypt/Logger;", // Calls OsConstants.initConstants. - "Lcom/android/org/conscrypt/NativeCrypto;", // Calls native NativeCrypto.clinit(). - "Lcom/android/org/conscrypt/OpenSSLECKeyPairGenerator;", // Calls OsConstants.initConstants. - "Lcom/android/org/conscrypt/OpenSSLEngine;", // Requires com.android.org.conscrypt.NativeCrypto. - "Lcom/android/org/conscrypt/OpenSSLMac$HmacMD5;", // Calls native NativeCrypto.clinit(). - "Lcom/android/org/conscrypt/OpenSSLMac$HmacSHA1;", // Calls native NativeCrypto.clinit(). - "Lcom/android/org/conscrypt/OpenSSLMac$HmacSHA256;", // Calls native NativeCrypto.clinit(). - "Lcom/android/org/conscrypt/OpenSSLMac$HmacSHA384;", // Calls native NativeCrypto.clinit(). - "Lcom/android/org/conscrypt/OpenSSLMac$HmacSHA512;", // Calls native NativeCrypto.clinit(). - "Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK$MD5;", // Requires com.android.org.conscrypt.NativeCrypto. - "Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK$SHA1;", // Requires com.android.org.conscrypt.NativeCrypto. - "Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK$SHA256;", // Requires com.android.org.conscrypt.NativeCrypto. - "Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK$SHA384;", // Requires com.android.org.conscrypt.NativeCrypto. - "Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK$SHA512;", // Requires com.android.org.conscrypt.NativeCrypto. - "Lcom/android/org/conscrypt/OpenSSLX509CertPath;", // Calls OsConstants.initConstants. - "Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;", // Calls OsConstants.initConstants. - "Lcom/android/org/conscrypt/PRF;", // Calls OsConstants.initConstants. - "Lcom/android/org/conscrypt/SSLSessionImpl;", // Calls OsConstants.initConstants. - "Lcom/android/org/conscrypt/TrustedCertificateStore;", // Calls System.getenv -> OsConstants.initConstants. - "Lcom/android/okhttp/ConnectionPool;", // Calls OsConstants.initConstants. - "Lcom/android/okhttp/OkHttpClient;", // Calls OsConstants.initConstants. - "Lcom/android/okhttp/internal/DiskLruCache;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Lcom/android/okhttp/internal/Util;", // Calls OsConstants.initConstants. - "Lcom/android/okhttp/internal/http/HttpsURLConnectionImpl;", // Calls VMClassLoader.getBootClassPathSize. - "Lcom/android/okhttp/internal/spdy/SpdyConnection;", // Calls OsConstants.initConstants. - "Lcom/android/okhttp/internal/spdy/SpdyReader;", // Calls OsConstants.initConstants. - "Lcom/android/okhttp/internal/tls/OkHostnameVerifier;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Lcom/google/android/gles_jni/EGLContextImpl;", // Calls com.google.android.gles_jni.EGLImpl._nativeClassInit. - "Lcom/google/android/gles_jni/EGLImpl;", // Calls com.google.android.gles_jni.EGLImpl._nativeClassInit. - "Lcom/google/android/gles_jni/GLImpl;", // Calls com.google.android.gles_jni.GLImpl._nativeClassInit. - "Lgov/nist/core/GenericObject;", // Calls OsConstants.initConstants. - "Lgov/nist/core/Host;", // Calls OsConstants.initConstants. - "Lgov/nist/core/HostPort;", // Calls OsConstants.initConstants. - "Lgov/nist/core/NameValue;", // Calls OsConstants.initConstants. - "Lgov/nist/core/net/DefaultNetworkLayer;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/Utils;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/address/AddressImpl;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/address/Authority;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/address/GenericURI;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/address/NetObject;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/address/SipUri;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/address/TelephoneNumber;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/address/UserInfo;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/Accept;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/AcceptEncoding;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/AcceptLanguage;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/AddressParametersHeader;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/AlertInfoList;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/AllowEvents;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/AllowEventsList;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/AuthenticationInfo;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/Authorization;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/CSeq;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/CallIdentifier;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/Challenge;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ContactList;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ContentEncoding;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ContentEncodingList;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ContentLanguageList;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ContentType;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/Credentials;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ErrorInfoList;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/Expires;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/From;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/MimeVersion;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/NameMap;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/Priority;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/Protocol;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ProxyAuthenticate;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ProxyAuthenticateList;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ProxyAuthorizationList;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ProxyRequire;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ProxyRequireList;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/RSeq;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/RecordRoute;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ReferTo;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/RequestLine;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/Require;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/RetryAfter;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/SIPETag;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/SIPHeader;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/SIPHeaderNamesCache;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/StatusLine;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/SubscriptionState;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/TimeStamp;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/UserAgent;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/Unsupported;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/Warning;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ViaList;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/extensions/Join;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/extensions/References;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/extensions/Replaces;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ims/PAccessNetworkInfo;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ims/PAssertedIdentity;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ims/PAssertedIdentityList;", // Calls OsConstants.initConstants. + "Landroid/webkit/WebViewInputDispatcher;", // Calls Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/webkit/URLUtil;", // Calls Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Landroid/widget/AutoCompleteTextView;", // Requires TextView. + "Landroid/widget/Button;", // Requires TextView. + "Landroid/widget/CheckBox;", // Requires TextView. + "Landroid/widget/CheckedTextView;", // Requires TextView. + "Landroid/widget/CompoundButton;", // Requires TextView. + "Landroid/widget/EditText;", // Requires TextView. + "Landroid/widget/NumberPicker;", // Requires java.util.Locale. + "Landroid/widget/ScrollBarDrawable;", // Sub-class of Drawable. + "Landroid/widget/SearchView$SearchAutoComplete;", // Requires TextView. + "Landroid/widget/Switch;", // Requires TextView. + "Landroid/widget/TextView;", // Calls Paint.<init> -> Paint.native_init. + "Lcom/android/i18n/phonenumbers/AsYouTypeFormatter;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Lcom/android/i18n/phonenumbers/MetadataManager;", // Calls OsConstants.initConstants. + "Lcom/android/i18n/phonenumbers/PhoneNumberMatcher;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Lcom/android/i18n/phonenumbers/PhoneNumberUtil;", // Requires java.util.logging.LogManager. + "Lcom/android/i18n/phonenumbers/geocoding/AreaCodeMap;", // Calls OsConstants.initConstants. + "Lcom/android/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder;", // Calls OsConstants.initConstants. + "Lcom/android/internal/os/SamplingProfilerIntegration;", // Calls SystemProperties.native_get_int. + "Lcom/android/internal/policy/impl/PhoneWindow;", // Calls android.os.Binder.init. + "Lcom/android/internal/view/menu/ActionMenuItemView;", // Requires TextView. + "Lcom/android/internal/widget/DialogTitle;", // Requires TextView. + "Lcom/android/org/bouncycastle/asn1/StreamUtil;", // Calls Runtime.getRuntime().maxMemory(). + "Lcom/android/org/bouncycastle/asn1/pkcs/MacData;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/asn1/pkcs/RSASSAPSSparams;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/asn1/cms/SignedData;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/asn1/x509/GeneralSubtree;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/asn1/x9/X9ECParameters;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/crypto/digests/OpenSSLDigest$MD5;", // Requires com.android.org.conscrypt.NativeCrypto. + "Lcom/android/org/bouncycastle/crypto/digests/OpenSSLDigest$SHA1;", // Requires com.android.org.conscrypt.NativeCrypto. + "Lcom/android/org/bouncycastle/crypto/digests/OpenSSLDigest$SHA256;", // Requires com.android.org.conscrypt.NativeCrypto. + "Lcom/android/org/bouncycastle/crypto/digests/OpenSSLDigest$SHA384;", // Requires com.android.org.conscrypt.NativeCrypto. + "Lcom/android/org/bouncycastle/crypto/digests/OpenSSLDigest$SHA512;", // Requires com.android.org.conscrypt.NativeCrypto. + "Lcom/android/org/bouncycastle/crypto/engines/RSABlindedEngine;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/crypto/generators/DHKeyGeneratorHelper;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/crypto/generators/DHParametersGenerator;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/crypto/generators/DHParametersHelper;", // Calls System.getenv -> OsConstants.initConstants. + "Lcom/android/org/bouncycastle/crypto/generators/DSAKeyPairGenerator;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/crypto/generators/DSAParametersGenerator;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/crypto/generators/RSAKeyPairGenerator;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/dh/KeyPairGeneratorSpi;", // Calls OsConstants.initConstants. + "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/dsa/KeyPairGeneratorSpi;", // Calls OsConstants.initConstants. + "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi$EC;", // Calls OsConstants.initConstants. + "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi$ECDH;", // Calls OsConstants.initConstants. + "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi$ECDHC;", // Calls OsConstants.initConstants. + "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi$ECDSA;", // Calls OsConstants.initConstants. + "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi$ECMQV;", // Calls OsConstants.initConstants. + "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi;", // Calls OsConstants.initConstants. + "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateCrtKey;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateKey;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/jcajce/provider/asymmetric/rsa/KeyPairGeneratorSpi;", // Calls OsConstants.initConstants. + "Lcom/android/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi$BCPKCS12KeyStore;", // Calls Thread.currentThread. + "Lcom/android/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi;", // Calls Thread.currentThread. + "Lcom/android/org/bouncycastle/jce/PKCS10CertificationRequest;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/jce/provider/CertBlacklist;", // Calls System.getenv -> OsConstants.initConstants. + "Lcom/android/org/bouncycastle/jce/provider/JCERSAPrivateCrtKey;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/jce/provider/JCERSAPrivateKey;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi;", // Calls System.getenv -> OsConstants.initConstants. + "Lcom/android/org/bouncycastle/math/ec/ECConstants;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/math/ec/Tnaf;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/util/BigIntegers;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/bouncycastle/x509/X509Util;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lcom/android/org/conscrypt/CipherSuite;", // Calls OsConstants.initConstants. + "Lcom/android/org/conscrypt/FileClientSessionCache$CacheFile;", // Calls OsConstants.initConstants. + "Lcom/android/org/conscrypt/HandshakeIODataStream;", // Calls OsConstants.initConstants. + "Lcom/android/org/conscrypt/Logger;", // Calls OsConstants.initConstants. + "Lcom/android/org/conscrypt/NativeCrypto;", // Calls native NativeCrypto.clinit(). + "Lcom/android/org/conscrypt/OpenSSLECKeyPairGenerator;", // Calls OsConstants.initConstants. + "Lcom/android/org/conscrypt/OpenSSLEngine;", // Requires com.android.org.conscrypt.NativeCrypto. + "Lcom/android/org/conscrypt/OpenSSLMac$HmacMD5;", // Calls native NativeCrypto.clinit(). + "Lcom/android/org/conscrypt/OpenSSLMac$HmacSHA1;", // Calls native NativeCrypto.clinit(). + "Lcom/android/org/conscrypt/OpenSSLMac$HmacSHA256;", // Calls native NativeCrypto.clinit(). + "Lcom/android/org/conscrypt/OpenSSLMac$HmacSHA384;", // Calls native NativeCrypto.clinit(). + "Lcom/android/org/conscrypt/OpenSSLMac$HmacSHA512;", // Calls native NativeCrypto.clinit(). + "Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK$MD5;", // Requires com.android.org.conscrypt.NativeCrypto. + "Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK$SHA1;", // Requires com.android.org.conscrypt.NativeCrypto. + "Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK$SHA256;", // Requires com.android.org.conscrypt.NativeCrypto. + "Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK$SHA384;", // Requires com.android.org.conscrypt.NativeCrypto. + "Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK$SHA512;", // Requires com.android.org.conscrypt.NativeCrypto. + "Lcom/android/org/conscrypt/OpenSSLX509CertPath;", // Calls OsConstants.initConstants. + "Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;", // Calls OsConstants.initConstants. + "Lcom/android/org/conscrypt/PRF;", // Calls OsConstants.initConstants. + "Lcom/android/org/conscrypt/SSLSessionImpl;", // Calls OsConstants.initConstants. + "Lcom/android/org/conscrypt/TrustedCertificateStore;", // Calls System.getenv -> OsConstants.initConstants. + "Lcom/android/okhttp/ConnectionPool;", // Calls OsConstants.initConstants. + "Lcom/android/okhttp/OkHttpClient;", // Calls OsConstants.initConstants. + "Lcom/android/okhttp/internal/DiskLruCache;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Lcom/android/okhttp/internal/Util;", // Calls OsConstants.initConstants. + "Lcom/android/okhttp/internal/http/HttpsURLConnectionImpl;", // Calls VMClassLoader.getBootClassPathSize. + "Lcom/android/okhttp/internal/spdy/SpdyConnection;", // Calls OsConstants.initConstants. + "Lcom/android/okhttp/internal/spdy/SpdyReader;", // Calls OsConstants.initConstants. + "Lcom/android/okhttp/internal/tls/OkHostnameVerifier;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Lcom/google/android/gles_jni/EGLContextImpl;", // Calls com.google.android.gles_jni.EGLImpl._nativeClassInit. + "Lcom/google/android/gles_jni/EGLImpl;", // Calls com.google.android.gles_jni.EGLImpl._nativeClassInit. + "Lcom/google/android/gles_jni/GLImpl;", // Calls com.google.android.gles_jni.GLImpl._nativeClassInit. + "Lgov/nist/core/GenericObject;", // Calls OsConstants.initConstants. + "Lgov/nist/core/Host;", // Calls OsConstants.initConstants. + "Lgov/nist/core/HostPort;", // Calls OsConstants.initConstants. + "Lgov/nist/core/NameValue;", // Calls OsConstants.initConstants. + "Lgov/nist/core/net/DefaultNetworkLayer;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/Utils;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/address/AddressImpl;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/address/Authority;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/address/GenericURI;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/address/NetObject;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/address/SipUri;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/address/TelephoneNumber;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/address/UserInfo;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/Accept;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/AcceptEncoding;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/AcceptLanguage;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/AddressParametersHeader;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/AlertInfoList;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/AllowEvents;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/AllowEventsList;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/AuthenticationInfo;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/Authorization;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/CSeq;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/CallIdentifier;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/Challenge;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ContactList;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ContentEncoding;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ContentEncodingList;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ContentLanguageList;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ContentType;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/Credentials;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ErrorInfoList;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/Expires;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/From;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/MimeVersion;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/NameMap;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/Priority;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/Protocol;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ProxyAuthenticate;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ProxyAuthenticateList;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ProxyAuthorizationList;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ProxyRequire;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ProxyRequireList;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/RSeq;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/RecordRoute;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ReferTo;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/RequestLine;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/Require;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/RetryAfter;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/SIPETag;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/SIPHeader;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/SIPHeaderNamesCache;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/StatusLine;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/SubscriptionState;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/TimeStamp;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/UserAgent;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/Unsupported;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/Warning;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ViaList;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/extensions/Join;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/extensions/References;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/extensions/Replaces;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ims/PAccessNetworkInfo;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ims/PAssertedIdentity;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ims/PAssertedIdentityList;", // Calls OsConstants.initConstants. "Lgov/nist/javax/sip/header/ims/PAssociatedURI;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ims/PCalledPartyID;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ims/PChargingVector;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ims/PCalledPartyID;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ims/PChargingVector;", // Calls OsConstants.initConstants. "Lgov/nist/javax/sip/header/ims/PPreferredIdentity;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ims/PVisitedNetworkIDList;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ims/PathList;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ims/SecurityAgree;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ims/SecurityClient;", // Calls OsConstants.initConstants. - "Lgov/nist/javax/sip/header/ims/ServiceRoute;", // Calls OsConstants.initConstants. - "Ljava/io/Console;", // Has FileDescriptor(s). - "Ljava/io/File;", // Calls to Random.<init> -> System.currentTimeMillis -> OsConstants.initConstants. - "Ljava/io/FileDescriptor;", // Requires libcore.io.OsConstants. - "Ljava/io/ObjectInputStream;", // Requires java.lang.ClassLoader$SystemClassLoader. + "Lgov/nist/javax/sip/header/ims/PVisitedNetworkIDList;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ims/PathList;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ims/SecurityAgree;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ims/SecurityClient;", // Calls OsConstants.initConstants. + "Lgov/nist/javax/sip/header/ims/ServiceRoute;", // Calls OsConstants.initConstants. + "Ljava/io/Console;", // Has FileDescriptor(s). + "Ljava/io/File;", // Calls to Random.<init> -> System.currentTimeMillis -> OsConstants.initConstants. + "Ljava/io/FileDescriptor;", // Requires libcore.io.OsConstants. + "Ljava/io/ObjectInputStream;", // Requires java.lang.ClassLoader$SystemClassLoader. "Ljava/io/ObjectStreamClass;", // Calls to Class.forName -> java.io.FileDescriptor. - "Ljava/io/ObjectStreamConstants;", // Instance of non-image class SerializablePermission. - "Ljava/lang/ClassLoader$SystemClassLoader;", // Calls System.getProperty -> OsConstants.initConstants. - "Ljava/lang/HexStringParser;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Ljava/lang/ProcessManager;", // Calls Thread.currentThread. - "Ljava/lang/Runtime;", // Calls System.getProperty -> OsConstants.initConstants. - "Ljava/lang/System;", // Calls OsConstants.initConstants. - "Ljava/math/BigDecimal;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Ljava/math/BigInteger;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Ljava/math/Primality;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Ljava/math/Multiplication;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Ljava/net/InetAddress;", // Requires libcore.io.OsConstants. - "Ljava/net/Inet4Address;", // Sub-class of InetAddress. - "Ljava/net/Inet6Address;", // Sub-class of InetAddress. - "Ljava/net/InetUnixAddress;", // Sub-class of InetAddress. - "Ljava/nio/charset/Charset;", // Calls Charset.getDefaultCharset -> System.getProperty -> OsConstants.initConstants. - "Ljava/nio/charset/CharsetICU;", // Sub-class of Charset. - "Ljava/nio/charset/Charsets;", // Calls Charset.forName. - "Ljava/nio/charset/StandardCharsets;", // Calls OsConstants.initConstants. - "Ljava/security/AlgorithmParameterGenerator;", // Calls OsConstants.initConstants. - "Ljava/security/KeyPairGenerator$KeyPairGeneratorImpl;", // Calls OsConstants.initConstants. - "Ljava/security/KeyPairGenerator;", // Calls OsConstants.initConstants. - "Ljava/security/Security;", // Tries to do disk IO for "security.properties". - "Ljava/security/spec/RSAKeyGenParameterSpec;", // java.math.NativeBN.BN_new() - "Ljava/sql/Date;", // Calls OsConstants.initConstants. - "Ljava/sql/DriverManager;", // Calls OsConstants.initConstants. - "Ljava/sql/Time;", // Calls OsConstants.initConstants. - "Ljava/sql/Timestamp;", // Calls OsConstants.initConstants. - "Ljava/util/Date;", // Calls Date.<init> -> System.currentTimeMillis -> OsConstants.initConstants. - "Ljava/util/ListResourceBundle;", // Calls OsConstants.initConstants. - "Ljava/util/Locale;", // Calls System.getProperty -> OsConstants.initConstants. - "Ljava/util/PropertyResourceBundle;", // Calls OsConstants.initConstants. - "Ljava/util/ResourceBundle;", // Calls OsConstants.initConstants. - "Ljava/util/ResourceBundle$MissingBundle;", // Calls OsConstants.initConstants. - "Ljava/util/Scanner;", // regex.Pattern.compileImpl. - "Ljava/util/SimpleTimeZone;", // Sub-class of TimeZone. - "Ljava/util/TimeZone;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. - "Ljava/util/concurrent/ConcurrentHashMap$Segment;", // Calls Runtime.getRuntime().availableProcessors(). - "Ljava/util/concurrent/ConcurrentSkipListMap;", // Calls OsConstants.initConstants. - "Ljava/util/concurrent/Exchanger;", // Calls OsConstants.initConstants. - "Ljava/util/concurrent/ForkJoinPool;", // Calls OsConstants.initConstants. - "Ljava/util/concurrent/LinkedTransferQueue;", // Calls OsConstants.initConstants. - "Ljava/util/concurrent/Phaser;", // Calls OsConstants.initConstants. - "Ljava/util/concurrent/ScheduledThreadPoolExecutor;", // Calls AtomicLong.VMSupportsCS8() - "Ljava/util/concurrent/SynchronousQueue;", // Calls OsConstants.initConstants. - "Ljava/util/concurrent/atomic/AtomicLong;", // Calls AtomicLong.VMSupportsCS8() - "Ljava/util/logging/LogManager;", // Calls System.getProperty -> OsConstants.initConstants. - "Ljava/util/prefs/AbstractPreferences;", // Calls OsConstants.initConstants. - "Ljava/util/prefs/FilePreferencesImpl;", // Calls OsConstants.initConstants. - "Ljava/util/prefs/FilePreferencesFactoryImpl;", // Calls OsConstants.initConstants. - "Ljava/util/prefs/Preferences;", // Calls OsConstants.initConstants. - "Ljavax/crypto/KeyAgreement;", // Calls OsConstants.initConstants. - "Ljavax/crypto/KeyGenerator;", // Calls OsConstants.initConstants. - "Ljavax/security/cert/X509Certificate;", // Calls VMClassLoader.getBootClassPathSize. - "Ljavax/security/cert/X509Certificate$1;", // Calls VMClassLoader.getBootClassPathSize. - "Ljavax/microedition/khronos/egl/EGL10;", // Requires EGLContext. - "Ljavax/microedition/khronos/egl/EGLContext;", // Requires com.google.android.gles_jni.EGLImpl. - "Ljavax/xml/datatype/DatatypeConstants;", // Calls OsConstants.initConstants. - "Ljavax/xml/datatype/FactoryFinder;", // Calls OsConstants.initConstants. - "Ljavax/xml/namespace/QName;", // Calls OsConstants.initConstants. - "Ljavax/xml/validation/SchemaFactoryFinder;", // Calls OsConstants.initConstants. - "Ljavax/xml/xpath/XPathConstants;", // Calls OsConstants.initConstants. - "Ljavax/xml/xpath/XPathFactoryFinder;", // Calls OsConstants.initConstants. - "Llibcore/icu/LocaleData;", // Requires java.util.Locale. - "Llibcore/icu/TimeZoneNames;", // Requires java.util.TimeZone. + "Ljava/io/ObjectStreamConstants;", // Instance of non-image class SerializablePermission. + "Ljava/lang/ClassLoader$SystemClassLoader;", // Calls System.getProperty -> OsConstants.initConstants. + "Ljava/lang/HexStringParser;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Ljava/lang/ProcessManager;", // Calls Thread.currentThread. + "Ljava/lang/Runtime;", // Calls System.getProperty -> OsConstants.initConstants. + "Ljava/lang/System;", // Calls OsConstants.initConstants. + "Ljava/math/BigDecimal;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Ljava/math/BigInteger;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Ljava/math/Primality;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Ljava/math/Multiplication;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Ljava/net/InetAddress;", // Requires libcore.io.OsConstants. + "Ljava/net/Inet4Address;", // Sub-class of InetAddress. + "Ljava/net/Inet6Address;", // Sub-class of InetAddress. + "Ljava/net/InetUnixAddress;", // Sub-class of InetAddress. + "Ljava/nio/charset/Charset;", // Calls Charset.getDefaultCharset -> System.getProperty -> OsConstants.initConstants. + "Ljava/nio/charset/CharsetICU;", // Sub-class of Charset. + "Ljava/nio/charset/Charsets;", // Calls Charset.forName. + "Ljava/nio/charset/StandardCharsets;", // Calls OsConstants.initConstants. + "Ljava/security/AlgorithmParameterGenerator;", // Calls OsConstants.initConstants. + "Ljava/security/KeyPairGenerator$KeyPairGeneratorImpl;", // Calls OsConstants.initConstants. + "Ljava/security/KeyPairGenerator;", // Calls OsConstants.initConstants. + "Ljava/security/Security;", // Tries to do disk IO for "security.properties". + "Ljava/security/spec/RSAKeyGenParameterSpec;", // java.math.NativeBN.BN_new() + "Ljava/sql/Date;", // Calls OsConstants.initConstants. + "Ljava/sql/DriverManager;", // Calls OsConstants.initConstants. + "Ljava/sql/Time;", // Calls OsConstants.initConstants. + "Ljava/sql/Timestamp;", // Calls OsConstants.initConstants. + "Ljava/util/Date;", // Calls Date.<init> -> System.currentTimeMillis -> OsConstants.initConstants. + "Ljava/util/ListResourceBundle;", // Calls OsConstants.initConstants. + "Ljava/util/Locale;", // Calls System.getProperty -> OsConstants.initConstants. + "Ljava/util/PropertyResourceBundle;", // Calls OsConstants.initConstants. + "Ljava/util/ResourceBundle;", // Calls OsConstants.initConstants. + "Ljava/util/ResourceBundle$MissingBundle;", // Calls OsConstants.initConstants. + "Ljava/util/Scanner;", // regex.Pattern.compileImpl. + "Ljava/util/SimpleTimeZone;", // Sub-class of TimeZone. + "Ljava/util/TimeZone;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Ljava/util/concurrent/ConcurrentHashMap$Segment;", // Calls Runtime.getRuntime().availableProcessors(). + "Ljava/util/concurrent/ConcurrentSkipListMap;", // Calls OsConstants.initConstants. + "Ljava/util/concurrent/Exchanger;", // Calls OsConstants.initConstants. + "Ljava/util/concurrent/ForkJoinPool;", // Calls OsConstants.initConstants. + "Ljava/util/concurrent/LinkedTransferQueue;", // Calls OsConstants.initConstants. + "Ljava/util/concurrent/Phaser;", // Calls OsConstants.initConstants. + "Ljava/util/concurrent/ScheduledThreadPoolExecutor;", // Calls AtomicLong.VMSupportsCS8() + "Ljava/util/concurrent/SynchronousQueue;", // Calls OsConstants.initConstants. + "Ljava/util/concurrent/atomic/AtomicLong;", // Calls AtomicLong.VMSupportsCS8() + "Ljava/util/logging/LogManager;", // Calls System.getProperty -> OsConstants.initConstants. + "Ljava/util/prefs/AbstractPreferences;", // Calls OsConstants.initConstants. + "Ljava/util/prefs/FilePreferencesImpl;", // Calls OsConstants.initConstants. + "Ljava/util/prefs/FilePreferencesFactoryImpl;", // Calls OsConstants.initConstants. + "Ljava/util/prefs/Preferences;", // Calls OsConstants.initConstants. + "Ljavax/crypto/KeyAgreement;", // Calls OsConstants.initConstants. + "Ljavax/crypto/KeyGenerator;", // Calls OsConstants.initConstants. + "Ljavax/security/cert/X509Certificate;", // Calls VMClassLoader.getBootClassPathSize. + "Ljavax/security/cert/X509Certificate$1;", // Calls VMClassLoader.getBootClassPathSize. + "Ljavax/microedition/khronos/egl/EGL10;", // Requires EGLContext. + "Ljavax/microedition/khronos/egl/EGLContext;", // Requires com.google.android.gles_jni.EGLImpl. + "Ljavax/xml/datatype/DatatypeConstants;", // Calls OsConstants.initConstants. + "Ljavax/xml/datatype/FactoryFinder;", // Calls OsConstants.initConstants. + "Ljavax/xml/namespace/QName;", // Calls OsConstants.initConstants. + "Ljavax/xml/validation/SchemaFactoryFinder;", // Calls OsConstants.initConstants. + "Ljavax/xml/xpath/XPathConstants;", // Calls OsConstants.initConstants. + "Ljavax/xml/xpath/XPathFactoryFinder;", // Calls OsConstants.initConstants. + "Llibcore/icu/LocaleData;", // Requires java.util.Locale. + "Llibcore/icu/TimeZoneNames;", // Requires java.util.TimeZone. "Llibcore/io/IoUtils;", // Calls Random.<init> -> System.currentTimeMillis -> FileDescriptor -> OsConstants.initConstants. - "Llibcore/io/OsConstants;", // Platform specific. - "Llibcore/net/MimeUtils;", // Calls libcore.net.MimeUtils.getContentTypesPropertiesStream -> System.getProperty. - "Llibcore/reflect/Types;", // Calls OsConstants.initConstants. - "Llibcore/util/ZoneInfo;", // Sub-class of TimeZone. - "Llibcore/util/ZoneInfoDB;", // Calls System.getenv -> OsConstants.initConstants. - "Lorg/apache/commons/logging/LogFactory;", // Calls System.getProperty. - "Lorg/apache/commons/logging/impl/LogFactoryImpl;", // Calls OsConstants.initConstants. - "Lorg/apache/harmony/security/fortress/Services;", // Calls ClassLoader.getSystemClassLoader -> System.getProperty. - "Lorg/apache/harmony/security/provider/cert/X509CertFactoryImpl;", // Requires java.nio.charsets.Charsets. - "Lorg/apache/harmony/security/provider/crypto/RandomBitsSupplier;", // Requires java.io.File. - "Lorg/apache/harmony/security/utils/AlgNameMapper;", // Requires java.util.Locale. - "Lorg/apache/harmony/security/pkcs10/CertificationRequest;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/pkcs10/CertificationRequestInfo;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/pkcs7/AuthenticatedAttributes;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/pkcs7/SignedData;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/pkcs7/SignerInfo;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/pkcs8/PrivateKeyInfo;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl;", // Calls OsConstants.initConstants. - "Lorg/apache/harmony/security/x501/AttributeTypeAndValue;", // Calls IntegralToString.convertInt -> Thread.currentThread. - "Lorg/apache/harmony/security/x501/DirectoryString;", // Requires BigInteger. - "Lorg/apache/harmony/security/x501/Name;", // Requires org.apache.harmony.security.x501.AttributeTypeAndValue. - "Lorg/apache/harmony/security/x509/AccessDescription;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/x509/AuthorityKeyIdentifier;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/x509/CRLDistributionPoints;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/x509/Certificate;", // Requires org.apache.harmony.security.x509.TBSCertificate. - "Lorg/apache/harmony/security/x509/CertificateIssuer;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/x509/CertificateList;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/x509/DistributionPoint;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/x509/DistributionPointName;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/x509/EDIPartyName;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lorg/apache/harmony/security/x509/GeneralName;", // Requires org.apache.harmony.security.x501.Name. - "Lorg/apache/harmony/security/x509/GeneralNames;", // Requires GeneralName. - "Lorg/apache/harmony/security/x509/GeneralSubtree;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/x509/GeneralSubtrees;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/x509/InfoAccessSyntax;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/x509/IssuingDistributionPoint;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/x509/NameConstraints;", // Calls Thread.currentThread. - "Lorg/apache/harmony/security/x509/TBSCertList$RevokedCertificate;", // Calls NativeBN.BN_new(). - "Lorg/apache/harmony/security/x509/TBSCertList;", // Calls Thread.currentThread. + "Llibcore/io/OsConstants;", // Platform specific. + "Llibcore/net/MimeUtils;", // Calls libcore.net.MimeUtils.getContentTypesPropertiesStream -> System.getProperty. + "Llibcore/reflect/Types;", // Calls OsConstants.initConstants. + "Llibcore/util/ZoneInfo;", // Sub-class of TimeZone. + "Llibcore/util/ZoneInfoDB;", // Calls System.getenv -> OsConstants.initConstants. + "Lorg/apache/commons/logging/LogFactory;", // Calls System.getProperty. + "Lorg/apache/commons/logging/impl/LogFactoryImpl;", // Calls OsConstants.initConstants. + "Lorg/apache/harmony/security/fortress/Services;", // Calls ClassLoader.getSystemClassLoader -> System.getProperty. + "Lorg/apache/harmony/security/provider/cert/X509CertFactoryImpl;", // Requires java.nio.charsets.Charsets. + "Lorg/apache/harmony/security/provider/crypto/RandomBitsSupplier;", // Requires java.io.File. + "Lorg/apache/harmony/security/utils/AlgNameMapper;", // Requires java.util.Locale. + "Lorg/apache/harmony/security/pkcs10/CertificationRequest;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/pkcs10/CertificationRequestInfo;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/pkcs7/AuthenticatedAttributes;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/pkcs7/SignedData;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/pkcs7/SignerInfo;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/pkcs8/PrivateKeyInfo;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl;", // Calls OsConstants.initConstants. + "Lorg/apache/harmony/security/x501/AttributeTypeAndValue;", // Calls IntegralToString.convertInt -> Thread.currentThread. + "Lorg/apache/harmony/security/x501/DirectoryString;", // Requires BigInteger. + "Lorg/apache/harmony/security/x501/Name;", // Requires org.apache.harmony.security.x501.AttributeTypeAndValue. + "Lorg/apache/harmony/security/x509/AccessDescription;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/x509/AuthorityKeyIdentifier;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/x509/CRLDistributionPoints;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/x509/Certificate;", // Requires org.apache.harmony.security.x509.TBSCertificate. + "Lorg/apache/harmony/security/x509/CertificateIssuer;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/x509/CertificateList;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/x509/DistributionPoint;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/x509/DistributionPointName;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/x509/EDIPartyName;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lorg/apache/harmony/security/x509/GeneralName;", // Requires org.apache.harmony.security.x501.Name. + "Lorg/apache/harmony/security/x509/GeneralNames;", // Requires GeneralName. + "Lorg/apache/harmony/security/x509/GeneralSubtree;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/x509/GeneralSubtrees;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/x509/InfoAccessSyntax;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/x509/IssuingDistributionPoint;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/x509/NameConstraints;", // Calls Thread.currentThread. + "Lorg/apache/harmony/security/x509/TBSCertList$RevokedCertificate;", // Calls NativeBN.BN_new(). + "Lorg/apache/harmony/security/x509/TBSCertList;", // Calls Thread.currentThread. "Lorg/apache/harmony/security/x509/TBSCertificate;", // Requires org.apache.harmony.security.x501.Name. - "Lorg/apache/harmony/security/x509/Time;", // Calls native ... -> java.math.NativeBN.BN_new(). - "Lorg/apache/harmony/security/x509/Validity;", // Requires x509.Time. - "Lorg/apache/harmony/security/x509/tsp/TSTInfo;", // Calls Thread.currentThread. - "Lorg/apache/harmony/xml/ExpatParser;", // Calls native ExpatParser.staticInitialize. - "Lorg/apache/harmony/xml/ExpatParser$EntityParser;", // Calls ExpatParser.staticInitialize. - "Lorg/apache/http/conn/params/ConnRouteParams;", // Requires java.util.Locale. - "Lorg/apache/http/conn/ssl/SSLSocketFactory;", // Calls java.security.Security.getProperty. - "Lorg/apache/http/conn/util/InetAddressUtils;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. + "Lorg/apache/harmony/security/x509/Time;", // Calls native ... -> java.math.NativeBN.BN_new(). + "Lorg/apache/harmony/security/x509/Validity;", // Requires x509.Time. + "Lorg/apache/harmony/security/x509/tsp/TSTInfo;", // Calls Thread.currentThread. + "Lorg/apache/harmony/xml/ExpatParser;", // Calls native ExpatParser.staticInitialize. + "Lorg/apache/harmony/xml/ExpatParser$EntityParser;", // Calls ExpatParser.staticInitialize. + "Lorg/apache/http/conn/params/ConnRouteParams;", // Requires java.util.Locale. + "Lorg/apache/http/conn/ssl/SSLSocketFactory;", // Calls java.security.Security.getProperty. + "Lorg/apache/http/conn/util/InetAddressUtils;", // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl. }; static void InitializeClass(const ParallelCompilationManager* manager, size_t class_def_index) diff --git a/compiler/driver/dex_compilation_unit.cc b/compiler/driver/dex_compilation_unit.cc index 6ba338aa96..eb8941b15f 100644 --- a/compiler/driver/dex_compilation_unit.cc +++ b/compiler/driver/dex_compilation_unit.cc @@ -60,4 +60,4 @@ const std::string& DexCompilationUnit::GetSymbol() { return symbol_; } -} // namespace art +} // namespace art diff --git a/compiler/driver/dex_compilation_unit.h b/compiler/driver/dex_compilation_unit.h index facc9cbd32..5bf0086075 100644 --- a/compiler/driver/dex_compilation_unit.h +++ b/compiler/driver/dex_compilation_unit.h @@ -111,6 +111,6 @@ class DexCompilationUnit { std::string symbol_; }; -} // namespace art +} // namespace art #endif // ART_COMPILER_DRIVER_DEX_COMPILATION_UNIT_H_ diff --git a/compiler/elf_fixup.cc b/compiler/elf_fixup.cc index 127bc85d2c..6c090fdbec 100644 --- a/compiler/elf_fixup.cc +++ b/compiler/elf_fixup.cc @@ -62,22 +62,22 @@ bool ElfFixup::Fixup(File* file, uintptr_t oat_data_begin) { } // MIPS seems to break the rules d_val vs d_ptr even though their values are between DT_LOPROC and DT_HIPROC -#define DT_MIPS_RLD_VERSION 0x70000001 // d_val -#define DT_MIPS_TIME_STAMP 0x70000002 // d_val -#define DT_MIPS_ICHECKSUM 0x70000003 // d_val -#define DT_MIPS_IVERSION 0x70000004 // d_val -#define DT_MIPS_FLAGS 0x70000005 // d_val -#define DT_MIPS_BASE_ADDRESS 0x70000006 // d_ptr -#define DT_MIPS_CONFLICT 0x70000008 // d_ptr -#define DT_MIPS_LIBLIST 0x70000009 // d_ptr -#define DT_MIPS_LOCAL_GOTNO 0x7000000A // d_val -#define DT_MIPS_CONFLICTNO 0x7000000B // d_val -#define DT_MIPS_LIBLISTNO 0x70000010 // d_val -#define DT_MIPS_SYMTABNO 0x70000011 // d_val -#define DT_MIPS_UNREFEXTNO 0x70000012 // d_val -#define DT_MIPS_GOTSYM 0x70000013 // d_val -#define DT_MIPS_HIPAGENO 0x70000014 // d_val -#define DT_MIPS_RLD_MAP 0x70000016 // d_ptr +#define DT_MIPS_RLD_VERSION 0x70000001 // d_val +#define DT_MIPS_TIME_STAMP 0x70000002 // d_val +#define DT_MIPS_ICHECKSUM 0x70000003 // d_val +#define DT_MIPS_IVERSION 0x70000004 // d_val +#define DT_MIPS_FLAGS 0x70000005 // d_val +#define DT_MIPS_BASE_ADDRESS 0x70000006 // d_ptr +#define DT_MIPS_CONFLICT 0x70000008 // d_ptr +#define DT_MIPS_LIBLIST 0x70000009 // d_ptr +#define DT_MIPS_LOCAL_GOTNO 0x7000000A // d_val +#define DT_MIPS_CONFLICTNO 0x7000000B // d_val +#define DT_MIPS_LIBLISTNO 0x70000010 // d_val +#define DT_MIPS_SYMTABNO 0x70000011 // d_val +#define DT_MIPS_UNREFEXTNO 0x70000012 // d_val +#define DT_MIPS_GOTSYM 0x70000013 // d_val +#define DT_MIPS_HIPAGENO 0x70000014 // d_val +#define DT_MIPS_RLD_MAP 0x70000016 // d_ptr bool ElfFixup::FixupDynamic(ElfFile& elf_file, uintptr_t base_address) { // TODO: C++0x auto. diff --git a/compiler/elf_writer_mclinker.h b/compiler/elf_writer_mclinker.h index bdadf8f206..5da178c0c4 100644 --- a/compiler/elf_writer_mclinker.h +++ b/compiler/elf_writer_mclinker.h @@ -30,7 +30,7 @@ class LDSymbol; class Linker; class LinkerConfig; class Module; -} // namespace mcld +} // namespace mcld namespace art { diff --git a/compiler/elf_writer_quick.cc b/compiler/elf_writer_quick.cc index f2db5d834c..29963fee54 100644 --- a/compiler/elf_writer_quick.cc +++ b/compiler/elf_writer_quick.cc @@ -137,7 +137,7 @@ bool ElfWriterQuick::Write(OatWriter& oat_writer, // .dynsym uint32_t dynsym_alignment = sizeof(llvm::ELF::Elf32_Word); uint32_t dynsym_offset = expected_offset = RoundUp(expected_offset, dynsym_alignment); - const uint8_t SYM_UNDEF = 0; // aka STN_UNDEF + const uint8_t SYM_UNDEF = 0; // aka STN_UNDEF const uint8_t SYM_OATDATA = 1; const uint8_t SYM_OATEXEC = 2; const uint8_t SYM_OATLASTWORD = 3; @@ -510,7 +510,7 @@ bool ElfWriterQuick::Write(OatWriter& oat_writer, section_headers[SH_HASH].sh_link = SH_DYNSYM; section_headers[SH_HASH].sh_info = 0; section_headers[SH_HASH].sh_addralign = hash_alignment; - section_headers[SH_HASH].sh_entsize = sizeof(llvm::ELF::Elf32_Word); // This is Elf32_Word even on 64-bit + section_headers[SH_HASH].sh_entsize = sizeof(llvm::ELF::Elf32_Word); // This is Elf32_Word even on 64-bit section_headers[SH_RODATA].sh_name = shstrtab_rodata_offset; section_headers[SH_RODATA].sh_type = llvm::ELF::SHT_PROGBITS; diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc index 1612f7eb33..e73d021c0c 100644 --- a/compiler/image_writer.cc +++ b/compiler/image_writer.cc @@ -119,7 +119,7 @@ bool ImageWriter::Write(const std::string& image_filename, return false; } #ifndef NDEBUG - { // NOLINT(whitespace/braces) + { // NOLINT(whitespace/braces) ScopedObjectAccess soa(Thread::Current()); CheckNonImageClassesRemoved(); } @@ -397,7 +397,7 @@ void ImageWriter::CalculateNewObjectOffsets(size_t oat_loaded_size, size_t oat_d // leave space for the header, but do not write it yet, we need to // know where image_roots is going to end up - image_end_ += RoundUp(sizeof(ImageHeader), 8); // 64-bit-alignment + image_end_ += RoundUp(sizeof(ImageHeader), 8); // 64-bit-alignment { WriterMutexLock mu(self, *Locks::heap_bitmap_lock_); @@ -462,7 +462,7 @@ void ImageWriter::CopyAndFixupObjectsCallback(Object* object, void* arg) { DCHECK_LT(offset + n, image_writer->image_->Size()); memcpy(dst, src, n); Object* copy = reinterpret_cast<Object*>(dst); - copy->SetField32(Object::MonitorOffset(), 0, false); // We may have inflated the lock during compilation. + copy->SetField32(Object::MonitorOffset(), 0, false); // We may have inflated the lock during compilation. image_writer->FixupObject(obj, copy); } diff --git a/compiler/jni/portable/jni_compiler.cc b/compiler/jni/portable/jni_compiler.cc index 0e5837846c..e05f291a73 100644 --- a/compiler/jni/portable/jni_compiler.cc +++ b/compiler/jni/portable/jni_compiler.cc @@ -148,8 +148,8 @@ CompiledMethod* JniCompiler::Compile() { // Variables for GetElementPtr ::llvm::Value* gep_index[] = { - irb_.getInt32(0), // No displacement for shadow frame pointer - irb_.getInt32(1), // SIRT + irb_.getInt32(0), // No displacement for shadow frame pointer + irb_.getInt32(1), // SIRT NULL, }; @@ -185,7 +185,7 @@ CompiledMethod* JniCompiler::Compile() { } ::llvm::Value* saved_local_ref_cookie; - { // JniMethodStart + { // JniMethodStart RuntimeId func_id = is_synchronized ? JniMethodStartSynchronized : JniMethodStart; ::llvm::SmallVector< ::llvm::Value*, 2> args; @@ -200,7 +200,7 @@ CompiledMethod* JniCompiler::Compile() { // Call!!! ::llvm::Value* retval = irb_.CreateCall(code_addr, args); - { // JniMethodEnd + { // JniMethodEnd bool is_return_ref = return_shorty == 'L'; RuntimeId func_id = is_return_ref ? (is_synchronized ? JniMethodEndWithReferenceSynchronized @@ -281,7 +281,7 @@ void JniCompiler::CreateFunction(const std::string& func_name) { // Get argument type std::vector< ::llvm::Type*> args_type; - args_type.push_back(irb_.getJObjectTy()); // method object pointer + args_type.push_back(irb_.getJObjectTy()); // method object pointer if (!is_static || is_native_function) { // "this" object pointer for non-static @@ -296,5 +296,5 @@ void JniCompiler::CreateFunction(const std::string& func_name) { return ::llvm::FunctionType::get(ret_type, args_type, false); } -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art diff --git a/compiler/llvm/backend_types.h b/compiler/llvm/backend_types.h index 095040e5eb..8ca88ddeab 100644 --- a/compiler/llvm/backend_types.h +++ b/compiler/llvm/backend_types.h @@ -97,8 +97,8 @@ inline JType GetJTypeFromShorty(char shorty_jty) { } } -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art #endif // ART_COMPILER_LLVM_BACKEND_TYPES_H_ diff --git a/compiler/llvm/compiler_llvm.cc b/compiler/llvm/compiler_llvm.cc index 4475b25043..6b19a37b6f 100644 --- a/compiler/llvm/compiler_llvm.cc +++ b/compiler/llvm/compiler_llvm.cc @@ -57,7 +57,7 @@ void InitializeLLVM() { llvm::llvm_start_multithreaded(); // NOTE: Uncomment following line to show the time consumption of LLVM passes - //llvm::TimePassesIsEnabled = true; + // llvm::TimePassesIsEnabled = true; // Initialize LLVM target-specific options. art::llvm::InitialBackendOptions(); @@ -96,7 +96,7 @@ void InitializeLLVM() { // Two reasons: (1) the order of the destruction of static objects, or // (2) dlopen/dlclose side-effect on static objects. -} // anonymous namespace +} // anonymous namespace namespace art { @@ -171,8 +171,8 @@ CompileNativeMethod(DexCompilationUnit* dex_compilation_unit) { } -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art inline static art::llvm::CompilerLLVM* ContextOf(art::CompilerDriver& driver) { void *compiler_context = driver.GetCompilerContext(); diff --git a/compiler/llvm/compiler_llvm.h b/compiler/llvm/compiler_llvm.h index 77841d8564..20934ab209 100644 --- a/compiler/llvm/compiler_llvm.h +++ b/compiler/llvm/compiler_llvm.h @@ -97,7 +97,7 @@ class CompilerLLVM { }; -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art #endif // ART_COMPILER_LLVM_COMPILER_LLVM_H_ diff --git a/compiler/llvm/gbc_expander.cc b/compiler/llvm/gbc_expander.cc index c990ee629a..a727d06cb2 100644 --- a/compiler/llvm/gbc_expander.cc +++ b/compiler/llvm/gbc_expander.cc @@ -439,7 +439,7 @@ bool GBCExpanderPass::runOnFunction(llvm::Function& func) { shadow_frame_ = NULL; old_shadow_frame_ = NULL; func_ = &func; - changed_ = false; // Assume unchanged + changed_ = false; // Assume unchanged shadow_frame_vreg_addresses_.resize(dex_compilation_unit_->GetCodeItem()->registers_size_, NULL); basic_blocks_.resize(dex_compilation_unit_->GetCodeItem()->insns_size_in_code_units_); @@ -456,7 +456,7 @@ bool GBCExpanderPass::runOnFunction(llvm::Function& func) { } // Insert stack overflow check - InsertStackOverflowCheck(func); // TODO: Use intrinsic. + InsertStackOverflowCheck(func); // TODO: Use intrinsic. // Rewrite the intrinsics RewriteFunction(); @@ -565,7 +565,7 @@ void GBCExpanderPass::RewriteFunction() { llvm::PHINode *phi = llvm::dyn_cast<llvm::PHINode>(inst_iter); if (!phi) { - break; // Meet non-phi instruction. Done. + break; // Meet non-phi instruction. Done. } if (handler_phi[phi] == NULL) { @@ -611,7 +611,7 @@ void GBCExpanderPass::UpdatePhiInstruction(llvm::BasicBlock* old_basic_block, llvm::TerminatorInst* term_inst = new_basic_block->getTerminator(); if (!term_inst) { - return; // No terminating instruction in new_basic_block. Nothing to do. + return; // No terminating instruction in new_basic_block. Nothing to do. } // Iterate every succeeding basic block @@ -627,7 +627,7 @@ void GBCExpanderPass::UpdatePhiInstruction(llvm::BasicBlock* old_basic_block, llvm::PHINode *phi = llvm::dyn_cast<llvm::PHINode>(inst_iter); if (!phi) { - break; // Meet non-phi instruction. Done. + break; // Meet non-phi instruction. Done. } // Update the incoming block of this phi instruction @@ -895,7 +895,7 @@ llvm::Value* GBCExpanderPass::EmitInvoke(llvm::CallInst& call_inst) { // Load the actual parameter std::vector<llvm::Value*> args; - args.push_back(callee_method_object_addr); // method object for callee + args.push_back(callee_method_object_addr); // method object for callee for (uint32_t i = 3; i < call_inst.getNumArgOperands(); ++i) { args.push_back(call_inst.getArgOperand(i)); @@ -1378,9 +1378,9 @@ void GBCExpanderPass::Expand_SetVReg(llvm::Value* entry_idx, DCHECK(shadow_frame_ != NULL); llvm::Value* gep_index[] = { - irb_.getInt32(0), // No pointer displacement - irb_.getInt32(1), // VRegs - entry_idx // Pointer field + irb_.getInt32(0), // No pointer displacement + irb_.getInt32(1), // VRegs + entry_idx // Pointer field }; // A shadow frame address must dominate every use in the function so we @@ -1601,7 +1601,7 @@ void GBCExpanderPass::Expand_HLArrayPut(llvm::CallInst& call_inst, llvm::Value* array_elem_addr = EmitArrayGEP(array_addr, index_value, elem_jty); - if (elem_jty == kObject) { // If put an object, check the type, and mark GC card table. + if (elem_jty == kObject) { // If put an object, check the type, and mark GC card table. llvm::Function* runtime_func = irb_.GetRuntime(CheckPutArrayElement); irb_.CreateCall2(runtime_func, new_value, array_addr); @@ -1744,7 +1744,7 @@ void GBCExpanderPass::Expand_HLIPut(llvm::CallInst& call_inst, irb_.CreateMemoryBarrier(art::kLoadLoad); } - if (field_jty == kObject) { // If put an object, mark the GC card table. + if (field_jty == kObject) { // If put an object, mark the GC card table. EmitMarkGCCard(new_value, object_addr); } } @@ -2050,7 +2050,7 @@ void GBCExpanderPass::Expand_HLSput(llvm::CallInst& call_inst, irb_.CreateMemoryBarrier(art::kStoreLoad); } - if (field_jty == kObject) { // If put an object, mark the GC card table. + if (field_jty == kObject) { // If put an object, mark the GC card table. EmitMarkGCCard(new_value, static_storage_addr); } } @@ -2368,8 +2368,8 @@ llvm::Value* GBCExpanderPass::Expand_HLFilledNewArray(llvm::CallInst& call_inst) const char* type_desc = dex_compilation_unit_->GetDexFile()->StringByTypeIdx(type_idx, &type_desc_len); - DCHECK_GE(type_desc_len, 2u); // should be guaranteed by verifier - DCHECK_EQ(type_desc[0], '['); // should be guaranteed by verifier + DCHECK_GE(type_desc_len, 2u); // should be guaranteed by verifier + DCHECK_EQ(type_desc[0], '['); // should be guaranteed by verifier bool is_elem_int_ty = (type_desc[1] == 'I'); uint32_t alignment; @@ -2683,10 +2683,10 @@ llvm::FunctionType* GBCExpanderPass::GetFunctionType(llvm::Type* ret_type, uint3 // Get argument type std::vector<llvm::Type*> args_type; - args_type.push_back(irb_.getJObjectTy()); // method object pointer + args_type.push_back(irb_.getJObjectTy()); // method object pointer if (!is_static) { - args_type.push_back(irb_.getJType('L')); // "this" object pointer + args_type.push_back(irb_.getJType('L')); // "this" object pointer } for (uint32_t i = 1; i < shorty_size; ++i) { @@ -2732,11 +2732,11 @@ int32_t GBCExpanderPass::GetTryItemOffset(uint32_t dex_pc) { } else if (dex_pc >= end) { min = mid + 1; } else { - return mid; // found + return mid; // found } } - return -1; // not found + return -1; // not found } llvm::BasicBlock* GBCExpanderPass::GetLandingPadBasicBlock(uint32_t dex_pc) { @@ -2744,7 +2744,7 @@ llvm::BasicBlock* GBCExpanderPass::GetLandingPadBasicBlock(uint32_t dex_pc) { int32_t ti_offset = GetTryItemOffset(dex_pc); if (ti_offset == -1) { - return NULL; // No landing pad is available for this address. + return NULL; // No landing pad is available for this address. } // Check for the existing landing pad basic block @@ -3783,7 +3783,7 @@ GBCExpanderPass::ExpandIntrinsic(IntrinsicHelper::IntrinsicId intr_id, //==- Unknown Cases ----------------------------------------------------==// case IntrinsicHelper::MaxIntrinsicId: case IntrinsicHelper::UnknownId: - //default: + // default: // NOTE: "default" is intentionally commented so that C/C++ compiler will // give some warning on unmatched cases. // NOTE: We should not implement these cases. @@ -3793,7 +3793,7 @@ GBCExpanderPass::ExpandIntrinsic(IntrinsicHelper::IntrinsicId intr_id, return NULL; } // NOLINT(readability/fn_size) -} // anonymous namespace +} // anonymous namespace namespace art { namespace llvm { @@ -3804,5 +3804,5 @@ CreateGBCExpanderPass(const IntrinsicHelper& intrinsic_helper, IRBuilder& irb, return new GBCExpanderPass(intrinsic_helper, irb, driver, dex_compilation_unit); } -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art diff --git a/compiler/llvm/generated/art_module.cc b/compiler/llvm/generated/art_module.cc index bcd90b96a1..f3c5a5a6c6 100644 --- a/compiler/llvm/generated/art_module.cc +++ b/compiler/llvm/generated/art_module.cc @@ -380,7 +380,7 @@ if (!func___art_type_list) { func___art_type_list = Function::Create( /*Type=*/FuncTy_0, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"__art_type_list", mod); // (external, no body) + /*Name=*/"__art_type_list", mod); // (external, no body) func___art_type_list->setCallingConv(CallingConv::C); } AttributeSet func___art_type_list_PAL; @@ -391,7 +391,7 @@ if (!func_art_portable_get_current_thread_from_code) { func_art_portable_get_current_thread_from_code = Function::Create( /*Type=*/FuncTy_3, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_get_current_thread_from_code", mod); // (external, no body) + /*Name=*/"art_portable_get_current_thread_from_code", mod); // (external, no body) func_art_portable_get_current_thread_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_get_current_thread_from_code_PAL; @@ -402,7 +402,7 @@ if (!func_art_portable_set_current_thread_from_code) { func_art_portable_set_current_thread_from_code = Function::Create( /*Type=*/FuncTy_4, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_set_current_thread_from_code", mod); // (external, no body) + /*Name=*/"art_portable_set_current_thread_from_code", mod); // (external, no body) func_art_portable_set_current_thread_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_set_current_thread_from_code_PAL; @@ -413,7 +413,7 @@ if (!func_art_portable_lock_object_from_code) { func_art_portable_lock_object_from_code = Function::Create( /*Type=*/FuncTy_5, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_lock_object_from_code", mod); // (external, no body) + /*Name=*/"art_portable_lock_object_from_code", mod); // (external, no body) func_art_portable_lock_object_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_lock_object_from_code_PAL; @@ -424,7 +424,7 @@ if (!func_art_portable_unlock_object_from_code) { func_art_portable_unlock_object_from_code = Function::Create( /*Type=*/FuncTy_5, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_unlock_object_from_code", mod); // (external, no body) + /*Name=*/"art_portable_unlock_object_from_code", mod); // (external, no body) func_art_portable_unlock_object_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_unlock_object_from_code_PAL; @@ -435,7 +435,7 @@ if (!func_art_portable_test_suspend_from_code) { func_art_portable_test_suspend_from_code = Function::Create( /*Type=*/FuncTy_6, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_test_suspend_from_code", mod); // (external, no body) + /*Name=*/"art_portable_test_suspend_from_code", mod); // (external, no body) func_art_portable_test_suspend_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_test_suspend_from_code_PAL; @@ -446,7 +446,7 @@ if (!func_art_portable_push_shadow_frame_from_code) { func_art_portable_push_shadow_frame_from_code = Function::Create( /*Type=*/FuncTy_7, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_push_shadow_frame_from_code", mod); // (external, no body) + /*Name=*/"art_portable_push_shadow_frame_from_code", mod); // (external, no body) func_art_portable_push_shadow_frame_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_push_shadow_frame_from_code_PAL; @@ -457,7 +457,7 @@ if (!func_art_portable_pop_shadow_frame_from_code) { func_art_portable_pop_shadow_frame_from_code = Function::Create( /*Type=*/FuncTy_8, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_pop_shadow_frame_from_code", mod); // (external, no body) + /*Name=*/"art_portable_pop_shadow_frame_from_code", mod); // (external, no body) func_art_portable_pop_shadow_frame_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_pop_shadow_frame_from_code_PAL; @@ -468,7 +468,7 @@ if (!func_art_portable_get_and_clear_exception) { func_art_portable_get_and_clear_exception = Function::Create( /*Type=*/FuncTy_4, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_get_and_clear_exception", mod); // (external, no body) + /*Name=*/"art_portable_get_and_clear_exception", mod); // (external, no body) func_art_portable_get_and_clear_exception->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_get_and_clear_exception_PAL; @@ -479,7 +479,7 @@ if (!func_art_portable_throw_div_zero_from_code) { func_art_portable_throw_div_zero_from_code = Function::Create( /*Type=*/FuncTy_9, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_throw_div_zero_from_code", mod); // (external, no body) + /*Name=*/"art_portable_throw_div_zero_from_code", mod); // (external, no body) func_art_portable_throw_div_zero_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_throw_div_zero_from_code_PAL; @@ -490,7 +490,7 @@ if (!func_art_portable_throw_array_bounds_from_code) { func_art_portable_throw_array_bounds_from_code = Function::Create( /*Type=*/FuncTy_10, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_throw_array_bounds_from_code", mod); // (external, no body) + /*Name=*/"art_portable_throw_array_bounds_from_code", mod); // (external, no body) func_art_portable_throw_array_bounds_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_throw_array_bounds_from_code_PAL; @@ -501,7 +501,7 @@ if (!func_art_portable_throw_no_such_method_from_code) { func_art_portable_throw_no_such_method_from_code = Function::Create( /*Type=*/FuncTy_11, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_throw_no_such_method_from_code", mod); // (external, no body) + /*Name=*/"art_portable_throw_no_such_method_from_code", mod); // (external, no body) func_art_portable_throw_no_such_method_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_throw_no_such_method_from_code_PAL; @@ -512,7 +512,7 @@ if (!func_art_portable_throw_null_pointer_exception_from_code) { func_art_portable_throw_null_pointer_exception_from_code = Function::Create( /*Type=*/FuncTy_11, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_throw_null_pointer_exception_from_code", mod); // (external, no body) + /*Name=*/"art_portable_throw_null_pointer_exception_from_code", mod); // (external, no body) func_art_portable_throw_null_pointer_exception_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_throw_null_pointer_exception_from_code_PAL; @@ -523,7 +523,7 @@ if (!func_art_portable_throw_stack_overflow_from_code) { func_art_portable_throw_stack_overflow_from_code = Function::Create( /*Type=*/FuncTy_9, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_throw_stack_overflow_from_code", mod); // (external, no body) + /*Name=*/"art_portable_throw_stack_overflow_from_code", mod); // (external, no body) func_art_portable_throw_stack_overflow_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_throw_stack_overflow_from_code_PAL; @@ -534,7 +534,7 @@ if (!func_art_portable_throw_exception_from_code) { func_art_portable_throw_exception_from_code = Function::Create( /*Type=*/FuncTy_6, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_throw_exception_from_code", mod); // (external, no body) + /*Name=*/"art_portable_throw_exception_from_code", mod); // (external, no body) func_art_portable_throw_exception_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_throw_exception_from_code_PAL; @@ -545,7 +545,7 @@ if (!func_art_portable_find_catch_block_from_code) { func_art_portable_find_catch_block_from_code = Function::Create( /*Type=*/FuncTy_12, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_find_catch_block_from_code", mod); // (external, no body) + /*Name=*/"art_portable_find_catch_block_from_code", mod); // (external, no body) func_art_portable_find_catch_block_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_find_catch_block_from_code_PAL; @@ -556,7 +556,7 @@ if (!func_art_portable_alloc_object_from_code) { func_art_portable_alloc_object_from_code = Function::Create( /*Type=*/FuncTy_13, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_alloc_object_from_code", mod); // (external, no body) + /*Name=*/"art_portable_alloc_object_from_code", mod); // (external, no body) func_art_portable_alloc_object_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_alloc_object_from_code_PAL; @@ -567,7 +567,7 @@ if (!func_art_portable_alloc_object_from_code_with_access_check) { func_art_portable_alloc_object_from_code_with_access_check = Function::Create( /*Type=*/FuncTy_13, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_alloc_object_from_code_with_access_check", mod); // (external, no body) + /*Name=*/"art_portable_alloc_object_from_code_with_access_check", mod); // (external, no body) func_art_portable_alloc_object_from_code_with_access_check->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_alloc_object_from_code_with_access_check_PAL; @@ -578,7 +578,7 @@ if (!func_art_portable_alloc_array_from_code) { func_art_portable_alloc_array_from_code = Function::Create( /*Type=*/FuncTy_14, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_alloc_array_from_code", mod); // (external, no body) + /*Name=*/"art_portable_alloc_array_from_code", mod); // (external, no body) func_art_portable_alloc_array_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_alloc_array_from_code_PAL; @@ -589,7 +589,7 @@ if (!func_art_portable_alloc_array_from_code_with_access_check) { func_art_portable_alloc_array_from_code_with_access_check = Function::Create( /*Type=*/FuncTy_14, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_alloc_array_from_code_with_access_check", mod); // (external, no body) + /*Name=*/"art_portable_alloc_array_from_code_with_access_check", mod); // (external, no body) func_art_portable_alloc_array_from_code_with_access_check->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_alloc_array_from_code_with_access_check_PAL; @@ -600,7 +600,7 @@ if (!func_art_portable_check_and_alloc_array_from_code) { func_art_portable_check_and_alloc_array_from_code = Function::Create( /*Type=*/FuncTy_14, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_check_and_alloc_array_from_code", mod); // (external, no body) + /*Name=*/"art_portable_check_and_alloc_array_from_code", mod); // (external, no body) func_art_portable_check_and_alloc_array_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_check_and_alloc_array_from_code_PAL; @@ -611,7 +611,7 @@ if (!func_art_portable_check_and_alloc_array_from_code_with_access_check) { func_art_portable_check_and_alloc_array_from_code_with_access_check = Function::Create( /*Type=*/FuncTy_14, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_check_and_alloc_array_from_code_with_access_check", mod); // (external, no body) + /*Name=*/"art_portable_check_and_alloc_array_from_code_with_access_check", mod); // (external, no body) func_art_portable_check_and_alloc_array_from_code_with_access_check->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_check_and_alloc_array_from_code_with_access_check_PAL; @@ -622,7 +622,7 @@ if (!func_art_portable_find_instance_field_from_code) { func_art_portable_find_instance_field_from_code = Function::Create( /*Type=*/FuncTy_15, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_find_instance_field_from_code", mod); // (external, no body) + /*Name=*/"art_portable_find_instance_field_from_code", mod); // (external, no body) func_art_portable_find_instance_field_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_find_instance_field_from_code_PAL; @@ -633,7 +633,7 @@ if (!func_art_portable_find_static_field_from_code) { func_art_portable_find_static_field_from_code = Function::Create( /*Type=*/FuncTy_15, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_find_static_field_from_code", mod); // (external, no body) + /*Name=*/"art_portable_find_static_field_from_code", mod); // (external, no body) func_art_portable_find_static_field_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_find_static_field_from_code_PAL; @@ -644,7 +644,7 @@ if (!func_art_portable_find_static_method_from_code_with_access_check) { func_art_portable_find_static_method_from_code_with_access_check = Function::Create( /*Type=*/FuncTy_16, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_find_static_method_from_code_with_access_check", mod); // (external, no body) + /*Name=*/"art_portable_find_static_method_from_code_with_access_check", mod); // (external, no body) func_art_portable_find_static_method_from_code_with_access_check->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_find_static_method_from_code_with_access_check_PAL; @@ -655,7 +655,7 @@ if (!func_art_portable_find_direct_method_from_code_with_access_check) { func_art_portable_find_direct_method_from_code_with_access_check = Function::Create( /*Type=*/FuncTy_16, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_find_direct_method_from_code_with_access_check", mod); // (external, no body) + /*Name=*/"art_portable_find_direct_method_from_code_with_access_check", mod); // (external, no body) func_art_portable_find_direct_method_from_code_with_access_check->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_find_direct_method_from_code_with_access_check_PAL; @@ -666,7 +666,7 @@ if (!func_art_portable_find_virtual_method_from_code_with_access_check) { func_art_portable_find_virtual_method_from_code_with_access_check = Function::Create( /*Type=*/FuncTy_16, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_find_virtual_method_from_code_with_access_check", mod); // (external, no body) + /*Name=*/"art_portable_find_virtual_method_from_code_with_access_check", mod); // (external, no body) func_art_portable_find_virtual_method_from_code_with_access_check->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_find_virtual_method_from_code_with_access_check_PAL; @@ -677,7 +677,7 @@ if (!func_art_portable_find_super_method_from_code_with_access_check) { func_art_portable_find_super_method_from_code_with_access_check = Function::Create( /*Type=*/FuncTy_16, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_find_super_method_from_code_with_access_check", mod); // (external, no body) + /*Name=*/"art_portable_find_super_method_from_code_with_access_check", mod); // (external, no body) func_art_portable_find_super_method_from_code_with_access_check->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_find_super_method_from_code_with_access_check_PAL; @@ -688,7 +688,7 @@ if (!func_art_portable_find_interface_method_from_code_with_access_check) { func_art_portable_find_interface_method_from_code_with_access_check = Function::Create( /*Type=*/FuncTy_16, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_find_interface_method_from_code_with_access_check", mod); // (external, no body) + /*Name=*/"art_portable_find_interface_method_from_code_with_access_check", mod); // (external, no body) func_art_portable_find_interface_method_from_code_with_access_check->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_find_interface_method_from_code_with_access_check_PAL; @@ -699,7 +699,7 @@ if (!func_art_portable_find_interface_method_from_code) { func_art_portable_find_interface_method_from_code = Function::Create( /*Type=*/FuncTy_16, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_find_interface_method_from_code", mod); // (external, no body) + /*Name=*/"art_portable_find_interface_method_from_code", mod); // (external, no body) func_art_portable_find_interface_method_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_find_interface_method_from_code_PAL; @@ -710,7 +710,7 @@ if (!func_art_portable_initialize_static_storage_from_code) { func_art_portable_initialize_static_storage_from_code = Function::Create( /*Type=*/FuncTy_13, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_initialize_static_storage_from_code", mod); // (external, no body) + /*Name=*/"art_portable_initialize_static_storage_from_code", mod); // (external, no body) func_art_portable_initialize_static_storage_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_initialize_static_storage_from_code_PAL; @@ -721,7 +721,7 @@ if (!func_art_portable_initialize_type_from_code) { func_art_portable_initialize_type_from_code = Function::Create( /*Type=*/FuncTy_13, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_initialize_type_from_code", mod); // (external, no body) + /*Name=*/"art_portable_initialize_type_from_code", mod); // (external, no body) func_art_portable_initialize_type_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_initialize_type_from_code_PAL; @@ -732,7 +732,7 @@ if (!func_art_portable_initialize_type_and_verify_access_from_code) { func_art_portable_initialize_type_and_verify_access_from_code = Function::Create( /*Type=*/FuncTy_13, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_initialize_type_and_verify_access_from_code", mod); // (external, no body) + /*Name=*/"art_portable_initialize_type_and_verify_access_from_code", mod); // (external, no body) func_art_portable_initialize_type_and_verify_access_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_initialize_type_and_verify_access_from_code_PAL; @@ -743,7 +743,7 @@ if (!func_art_portable_resolve_string_from_code) { func_art_portable_resolve_string_from_code = Function::Create( /*Type=*/FuncTy_17, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_resolve_string_from_code", mod); // (external, no body) + /*Name=*/"art_portable_resolve_string_from_code", mod); // (external, no body) func_art_portable_resolve_string_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_resolve_string_from_code_PAL; @@ -754,7 +754,7 @@ if (!func_art_portable_set32_static_from_code) { func_art_portable_set32_static_from_code = Function::Create( /*Type=*/FuncTy_18, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_set32_static_from_code", mod); // (external, no body) + /*Name=*/"art_portable_set32_static_from_code", mod); // (external, no body) func_art_portable_set32_static_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_set32_static_from_code_PAL; @@ -765,7 +765,7 @@ if (!func_art_portable_set64_static_from_code) { func_art_portable_set64_static_from_code = Function::Create( /*Type=*/FuncTy_19, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_set64_static_from_code", mod); // (external, no body) + /*Name=*/"art_portable_set64_static_from_code", mod); // (external, no body) func_art_portable_set64_static_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_set64_static_from_code_PAL; @@ -776,7 +776,7 @@ if (!func_art_portable_set_obj_static_from_code) { func_art_portable_set_obj_static_from_code = Function::Create( /*Type=*/FuncTy_20, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_set_obj_static_from_code", mod); // (external, no body) + /*Name=*/"art_portable_set_obj_static_from_code", mod); // (external, no body) func_art_portable_set_obj_static_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_set_obj_static_from_code_PAL; @@ -787,7 +787,7 @@ if (!func_art_portable_get32_static_from_code) { func_art_portable_get32_static_from_code = Function::Create( /*Type=*/FuncTy_21, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_get32_static_from_code", mod); // (external, no body) + /*Name=*/"art_portable_get32_static_from_code", mod); // (external, no body) func_art_portable_get32_static_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_get32_static_from_code_PAL; @@ -798,7 +798,7 @@ if (!func_art_portable_get64_static_from_code) { func_art_portable_get64_static_from_code = Function::Create( /*Type=*/FuncTy_22, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_get64_static_from_code", mod); // (external, no body) + /*Name=*/"art_portable_get64_static_from_code", mod); // (external, no body) func_art_portable_get64_static_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_get64_static_from_code_PAL; @@ -809,7 +809,7 @@ if (!func_art_portable_get_obj_static_from_code) { func_art_portable_get_obj_static_from_code = Function::Create( /*Type=*/FuncTy_23, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_get_obj_static_from_code", mod); // (external, no body) + /*Name=*/"art_portable_get_obj_static_from_code", mod); // (external, no body) func_art_portable_get_obj_static_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_get_obj_static_from_code_PAL; @@ -820,7 +820,7 @@ if (!func_art_portable_set32_instance_from_code) { func_art_portable_set32_instance_from_code = Function::Create( /*Type=*/FuncTy_24, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_set32_instance_from_code", mod); // (external, no body) + /*Name=*/"art_portable_set32_instance_from_code", mod); // (external, no body) func_art_portable_set32_instance_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_set32_instance_from_code_PAL; @@ -831,7 +831,7 @@ if (!func_art_portable_set64_instance_from_code) { func_art_portable_set64_instance_from_code = Function::Create( /*Type=*/FuncTy_25, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_set64_instance_from_code", mod); // (external, no body) + /*Name=*/"art_portable_set64_instance_from_code", mod); // (external, no body) func_art_portable_set64_instance_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_set64_instance_from_code_PAL; @@ -842,7 +842,7 @@ if (!func_art_portable_set_obj_instance_from_code) { func_art_portable_set_obj_instance_from_code = Function::Create( /*Type=*/FuncTy_26, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_set_obj_instance_from_code", mod); // (external, no body) + /*Name=*/"art_portable_set_obj_instance_from_code", mod); // (external, no body) func_art_portable_set_obj_instance_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_set_obj_instance_from_code_PAL; @@ -853,7 +853,7 @@ if (!func_art_portable_get32_instance_from_code) { func_art_portable_get32_instance_from_code = Function::Create( /*Type=*/FuncTy_20, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_get32_instance_from_code", mod); // (external, no body) + /*Name=*/"art_portable_get32_instance_from_code", mod); // (external, no body) func_art_portable_get32_instance_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_get32_instance_from_code_PAL; @@ -864,7 +864,7 @@ if (!func_art_portable_get64_instance_from_code) { func_art_portable_get64_instance_from_code = Function::Create( /*Type=*/FuncTy_27, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_get64_instance_from_code", mod); // (external, no body) + /*Name=*/"art_portable_get64_instance_from_code", mod); // (external, no body) func_art_portable_get64_instance_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_get64_instance_from_code_PAL; @@ -875,7 +875,7 @@ if (!func_art_portable_get_obj_instance_from_code) { func_art_portable_get_obj_instance_from_code = Function::Create( /*Type=*/FuncTy_13, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_get_obj_instance_from_code", mod); // (external, no body) + /*Name=*/"art_portable_get_obj_instance_from_code", mod); // (external, no body) func_art_portable_get_obj_instance_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_get_obj_instance_from_code_PAL; @@ -886,7 +886,7 @@ if (!func_art_portable_decode_jobject_in_thread) { func_art_portable_decode_jobject_in_thread = Function::Create( /*Type=*/FuncTy_28, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_decode_jobject_in_thread", mod); // (external, no body) + /*Name=*/"art_portable_decode_jobject_in_thread", mod); // (external, no body) func_art_portable_decode_jobject_in_thread->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_decode_jobject_in_thread_PAL; @@ -897,7 +897,7 @@ if (!func_art_portable_fill_array_data_from_code) { func_art_portable_fill_array_data_from_code = Function::Create( /*Type=*/FuncTy_29, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_fill_array_data_from_code", mod); // (external, no body) + /*Name=*/"art_portable_fill_array_data_from_code", mod); // (external, no body) func_art_portable_fill_array_data_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_fill_array_data_from_code_PAL; @@ -908,7 +908,7 @@ if (!func_art_portable_is_assignable_from_code) { func_art_portable_is_assignable_from_code = Function::Create( /*Type=*/FuncTy_30, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_is_assignable_from_code", mod); // (external, no body) + /*Name=*/"art_portable_is_assignable_from_code", mod); // (external, no body) func_art_portable_is_assignable_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_is_assignable_from_code_PAL; @@ -919,7 +919,7 @@ if (!func_art_portable_check_cast_from_code) { func_art_portable_check_cast_from_code = Function::Create( /*Type=*/FuncTy_5, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_check_cast_from_code", mod); // (external, no body) + /*Name=*/"art_portable_check_cast_from_code", mod); // (external, no body) func_art_portable_check_cast_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_check_cast_from_code_PAL; @@ -930,7 +930,7 @@ if (!func_art_portable_check_put_array_element_from_code) { func_art_portable_check_put_array_element_from_code = Function::Create( /*Type=*/FuncTy_5, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_check_put_array_element_from_code", mod); // (external, no body) + /*Name=*/"art_portable_check_put_array_element_from_code", mod); // (external, no body) func_art_portable_check_put_array_element_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_check_put_array_element_from_code_PAL; @@ -941,7 +941,7 @@ if (!func_art_d2l) { func_art_d2l = Function::Create( /*Type=*/FuncTy_31, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_d2l", mod); // (external, no body) + /*Name=*/"art_d2l", mod); // (external, no body) func_art_d2l->setCallingConv(CallingConv::C); } AttributeSet func_art_d2l_PAL; @@ -952,7 +952,7 @@ if (!func_art_d2i) { func_art_d2i = Function::Create( /*Type=*/FuncTy_32, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_d2i", mod); // (external, no body) + /*Name=*/"art_d2i", mod); // (external, no body) func_art_d2i->setCallingConv(CallingConv::C); } AttributeSet func_art_d2i_PAL; @@ -963,7 +963,7 @@ if (!func_art_f2l) { func_art_f2l = Function::Create( /*Type=*/FuncTy_33, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_f2l", mod); // (external, no body) + /*Name=*/"art_f2l", mod); // (external, no body) func_art_f2l->setCallingConv(CallingConv::C); } AttributeSet func_art_f2l_PAL; @@ -974,7 +974,7 @@ if (!func_art_f2i) { func_art_f2i = Function::Create( /*Type=*/FuncTy_34, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_f2i", mod); // (external, no body) + /*Name=*/"art_f2i", mod); // (external, no body) func_art_f2i->setCallingConv(CallingConv::C); } AttributeSet func_art_f2i_PAL; @@ -985,7 +985,7 @@ if (!func_art_portable_jni_method_start) { func_art_portable_jni_method_start = Function::Create( /*Type=*/FuncTy_35, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_jni_method_start", mod); // (external, no body) + /*Name=*/"art_portable_jni_method_start", mod); // (external, no body) func_art_portable_jni_method_start->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_jni_method_start_PAL; @@ -996,7 +996,7 @@ if (!func_art_portable_jni_method_start_synchronized) { func_art_portable_jni_method_start_synchronized = Function::Create( /*Type=*/FuncTy_30, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_jni_method_start_synchronized", mod); // (external, no body) + /*Name=*/"art_portable_jni_method_start_synchronized", mod); // (external, no body) func_art_portable_jni_method_start_synchronized->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_jni_method_start_synchronized_PAL; @@ -1007,7 +1007,7 @@ if (!func_art_portable_jni_method_end) { func_art_portable_jni_method_end = Function::Create( /*Type=*/FuncTy_15, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_jni_method_end", mod); // (external, no body) + /*Name=*/"art_portable_jni_method_end", mod); // (external, no body) func_art_portable_jni_method_end->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_jni_method_end_PAL; @@ -1018,7 +1018,7 @@ if (!func_art_portable_jni_method_end_synchronized) { func_art_portable_jni_method_end_synchronized = Function::Create( /*Type=*/FuncTy_36, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_jni_method_end_synchronized", mod); // (external, no body) + /*Name=*/"art_portable_jni_method_end_synchronized", mod); // (external, no body) func_art_portable_jni_method_end_synchronized->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_jni_method_end_synchronized_PAL; @@ -1029,7 +1029,7 @@ if (!func_art_portable_jni_method_end_with_reference) { func_art_portable_jni_method_end_with_reference = Function::Create( /*Type=*/FuncTy_37, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_jni_method_end_with_reference", mod); // (external, no body) + /*Name=*/"art_portable_jni_method_end_with_reference", mod); // (external, no body) func_art_portable_jni_method_end_with_reference->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_jni_method_end_with_reference_PAL; @@ -1040,7 +1040,7 @@ if (!func_art_portable_jni_method_end_with_reference_synchronized) { func_art_portable_jni_method_end_with_reference_synchronized = Function::Create( /*Type=*/FuncTy_38, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_jni_method_end_with_reference_synchronized", mod); // (external, no body) + /*Name=*/"art_portable_jni_method_end_with_reference_synchronized", mod); // (external, no body) func_art_portable_jni_method_end_with_reference_synchronized->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_jni_method_end_with_reference_synchronized_PAL; @@ -1051,7 +1051,7 @@ if (!func_art_portable_is_exception_pending_from_code) { func_art_portable_is_exception_pending_from_code = Function::Create( /*Type=*/FuncTy_39, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_is_exception_pending_from_code", mod); // (external, no body) + /*Name=*/"art_portable_is_exception_pending_from_code", mod); // (external, no body) func_art_portable_is_exception_pending_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_is_exception_pending_from_code_PAL; @@ -1062,7 +1062,7 @@ if (!func_art_portable_mark_gc_card_from_code) { func_art_portable_mark_gc_card_from_code = Function::Create( /*Type=*/FuncTy_5, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_mark_gc_card_from_code", mod); // (external, no body) + /*Name=*/"art_portable_mark_gc_card_from_code", mod); // (external, no body) func_art_portable_mark_gc_card_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_mark_gc_card_from_code_PAL; @@ -1073,7 +1073,7 @@ if (!func_art_portable_proxy_invoke_handler_from_code) { func_art_portable_proxy_invoke_handler_from_code = Function::Create( /*Type=*/FuncTy_40, /*Linkage=*/GlobalValue::ExternalLinkage, - /*Name=*/"art_portable_proxy_invoke_handler_from_code", mod); // (external, no body) + /*Name=*/"art_portable_proxy_invoke_handler_from_code", mod); // (external, no body) func_art_portable_proxy_invoke_handler_from_code->setCallingConv(CallingConv::C); } AttributeSet func_art_portable_proxy_invoke_handler_from_code_PAL; @@ -1092,5 +1092,5 @@ return mod; } -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art diff --git a/compiler/llvm/intrinsic_helper.cc b/compiler/llvm/intrinsic_helper.cc index a34cb330bc..e5e7998f6c 100644 --- a/compiler/llvm/intrinsic_helper.cc +++ b/compiler/llvm/intrinsic_helper.cc @@ -174,5 +174,5 @@ IntrinsicHelper::IntrinsicHelper(::llvm::LLVMContext& context, return; } -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art diff --git a/compiler/llvm/intrinsic_helper.h b/compiler/llvm/intrinsic_helper.h index bb123fd575..657db402fa 100644 --- a/compiler/llvm/intrinsic_helper.h +++ b/compiler/llvm/intrinsic_helper.h @@ -151,7 +151,7 @@ class IntrinsicHelper { ::llvm::DenseMap<const ::llvm::Function*, IntrinsicId> intrinsic_funcs_map_; }; -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art #endif // ART_COMPILER_LLVM_INTRINSIC_HELPER_H_ diff --git a/compiler/llvm/ir_builder.cc b/compiler/llvm/ir_builder.cc index a65cf2bdae..9644ebd976 100644 --- a/compiler/llvm/ir_builder.cc +++ b/compiler/llvm/ir_builder.cc @@ -126,5 +126,5 @@ IRBuilder::IRBuilder(::llvm::LLVMContext& context, ::llvm::Module& module, } -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art diff --git a/compiler/llvm/ir_builder.h b/compiler/llvm/ir_builder.h index c81ba278a8..03498efcbb 100644 --- a/compiler/llvm/ir_builder.h +++ b/compiler/llvm/ir_builder.h @@ -482,7 +482,7 @@ class IRBuilder : public LLVMIRBuilder { }; -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art #endif // ART_COMPILER_LLVM_IR_BUILDER_H_ diff --git a/compiler/llvm/llvm_compilation_unit.cc b/compiler/llvm/llvm_compilation_unit.cc index d4568b5a4c..9296fc7050 100644 --- a/compiler/llvm/llvm_compilation_unit.cc +++ b/compiler/llvm/llvm_compilation_unit.cc @@ -134,7 +134,7 @@ LlvmCompilationUnit::LlvmCompilationUnit(const CompilerLLVM* compiler_llvm, size LlvmCompilationUnit::~LlvmCompilationUnit() { - ::llvm::LLVMContext* llvm_context = context_.release(); // Managed by llvm_info_ + ::llvm::LLVMContext* llvm_context = context_.release(); // Managed by llvm_info_ CHECK(llvm_context != NULL); } @@ -274,9 +274,9 @@ bool LlvmCompilationUnit::MaterializeToRawOStream(::llvm::raw_ostream& out_strea ::llvm::PassManagerBuilder pm_builder; // TODO: Use inliner after we can do IPO. pm_builder.Inliner = NULL; - //pm_builder.Inliner = ::llvm::createFunctionInliningPass(); - //pm_builder.Inliner = ::llvm::createAlwaysInlinerPass(); - //pm_builder.Inliner = ::llvm::createPartialInliningPass(); + // pm_builder.Inliner = ::llvm::createFunctionInliningPass(); + // pm_builder.Inliner = ::llvm::createAlwaysInlinerPass(); + // pm_builder.Inliner = ::llvm::createPartialInliningPass(); pm_builder.OptLevel = 3; pm_builder.DisableSimplifyLibCalls = 1; pm_builder.DisableUnitAtATime = 1; @@ -338,5 +338,5 @@ void LlvmCompilationUnit::CheckCodeAlign(uint32_t align) const { } -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art diff --git a/compiler/llvm/llvm_compilation_unit.h b/compiler/llvm/llvm_compilation_unit.h index 9de132379b..ced9f812c0 100644 --- a/compiler/llvm/llvm_compilation_unit.h +++ b/compiler/llvm/llvm_compilation_unit.h @@ -109,7 +109,7 @@ class LlvmCompilationUnit { UniquePtr< ::llvm::LLVMContext> context_; UniquePtr<IRBuilder> irb_; UniquePtr<RuntimeSupportBuilder> runtime_support_; - ::llvm::Module* module_; // Managed by context_ + ::llvm::Module* module_; // Managed by context_ UniquePtr<IntrinsicHelper> intrinsic_helper_; UniquePtr<LLVMInfo> llvm_info_; CompilerDriver* driver_; @@ -132,7 +132,7 @@ class LlvmCompilationUnit { friend class CompilerLLVM; // For LlvmCompilationUnit constructor }; -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art #endif // ART_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ diff --git a/compiler/llvm/md_builder.cc b/compiler/llvm/md_builder.cc index 1bd76dddba..4331557a4a 100644 --- a/compiler/llvm/md_builder.cc +++ b/compiler/llvm/md_builder.cc @@ -113,5 +113,5 @@ namespace llvm { } -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art diff --git a/compiler/llvm/md_builder.h b/compiler/llvm/md_builder.h index 65c52c937d..1246f9bd2b 100644 --- a/compiler/llvm/md_builder.h +++ b/compiler/llvm/md_builder.h @@ -65,7 +65,7 @@ class MDBuilder : public LLVMMDBuilder { }; -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art #endif // ART_COMPILER_LLVM_MD_BUILDER_H_ diff --git a/compiler/llvm/runtime_support_builder.cc b/compiler/llvm/runtime_support_builder.cc index e6479e0fd8..729980309d 100644 --- a/compiler/llvm/runtime_support_builder.cc +++ b/compiler/llvm/runtime_support_builder.cc @@ -276,5 +276,5 @@ void RuntimeSupportBuilder::EmitMarkGCCard(::llvm::Value* value, ::llvm::Value* } -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art diff --git a/compiler/llvm/runtime_support_builder.h b/compiler/llvm/runtime_support_builder.h index c3c0856bd0..e92ac0a908 100644 --- a/compiler/llvm/runtime_support_builder.h +++ b/compiler/llvm/runtime_support_builder.h @@ -92,7 +92,7 @@ class RuntimeSupportBuilder { }; -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art #endif // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_ diff --git a/compiler/llvm/runtime_support_builder_arm.cc b/compiler/llvm/runtime_support_builder_arm.cc index 5a9d2b896a..569d825272 100644 --- a/compiler/llvm/runtime_support_builder_arm.cc +++ b/compiler/llvm/runtime_support_builder_arm.cc @@ -52,7 +52,7 @@ char LDRSTRSuffixByType(art::llvm::IRBuilder& irb, Type* type) { } } -} // namespace +} // namespace namespace art { namespace llvm { @@ -135,5 +135,5 @@ void RuntimeSupportBuilderARM::EmitUnlockObject(Value* object) { irb_.CreateCall(func); } -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art diff --git a/compiler/llvm/runtime_support_builder_arm.h b/compiler/llvm/runtime_support_builder_arm.h index 6aa23b2306..5a353d7f30 100644 --- a/compiler/llvm/runtime_support_builder_arm.h +++ b/compiler/llvm/runtime_support_builder_arm.h @@ -40,7 +40,7 @@ class RuntimeSupportBuilderARM : public RuntimeSupportBuilder { virtual void EmitUnlockObject(::llvm::Value* object); }; -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art #endif // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_ diff --git a/compiler/llvm/runtime_support_builder_thumb2.cc b/compiler/llvm/runtime_support_builder_thumb2.cc index b8a5f05416..f0cb4a2d7b 100644 --- a/compiler/llvm/runtime_support_builder_thumb2.cc +++ b/compiler/llvm/runtime_support_builder_thumb2.cc @@ -77,7 +77,7 @@ void RuntimeSupportBuilderThumb2::EmitLockObject(Value* object) { irb_.CreateBr(basic_block_cont); irb_.SetInsertPoint(basic_block_cont); - { // Memory barrier + { // Memory barrier FunctionType* asm_ty = FunctionType::get(/*Result=*/Type::getVoidTy(context_), /*isVarArg=*/false); InlineAsm* func = InlineAsm::get(asm_ty, "dmb sy", "", true); @@ -86,5 +86,5 @@ void RuntimeSupportBuilderThumb2::EmitLockObject(Value* object) { } -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art diff --git a/compiler/llvm/runtime_support_builder_thumb2.h b/compiler/llvm/runtime_support_builder_thumb2.h index 941bd6b2bb..c47a2744ef 100644 --- a/compiler/llvm/runtime_support_builder_thumb2.h +++ b/compiler/llvm/runtime_support_builder_thumb2.h @@ -31,7 +31,7 @@ class RuntimeSupportBuilderThumb2 : public RuntimeSupportBuilderARM { virtual void EmitLockObject(::llvm::Value* object); }; -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art #endif // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_ diff --git a/compiler/llvm/runtime_support_builder_x86.cc b/compiler/llvm/runtime_support_builder_x86.cc index c056e58cb9..3d11f9df5b 100644 --- a/compiler/llvm/runtime_support_builder_x86.cc +++ b/compiler/llvm/runtime_support_builder_x86.cc @@ -80,5 +80,5 @@ Value* RuntimeSupportBuilderX86::EmitSetCurrentThread(Value*) { } -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art diff --git a/compiler/llvm/runtime_support_builder_x86.h b/compiler/llvm/runtime_support_builder_x86.h index 831d022ce5..5f36e7ce18 100644 --- a/compiler/llvm/runtime_support_builder_x86.h +++ b/compiler/llvm/runtime_support_builder_x86.h @@ -36,7 +36,7 @@ class RuntimeSupportBuilderX86 : public RuntimeSupportBuilder { virtual ::llvm::Value* EmitSetCurrentThread(::llvm::Value* thread); }; -} // namespace llvm -} // namespace art +} // namespace llvm +} // namespace art #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 c0e76addc6..2634c683f1 100644 --- a/compiler/llvm/runtime_support_llvm_func.h +++ b/compiler/llvm/runtime_support_llvm_func.h @@ -31,8 +31,8 @@ namespace runtime_support { MAX_ID }; -} // namespace runtime_support -} // namespace llvm -} // namespace art +} // namespace runtime_support +} // namespace llvm +} // namespace art #endif // ART_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_FUNC_H_ diff --git a/compiler/sea_ir/code_gen.cc b/compiler/sea_ir/code_gen.cc index 41bf9a6f00..f359849d4d 100644 --- a/compiler/sea_ir/code_gen.cc +++ b/compiler/sea_ir/code_gen.cc @@ -111,7 +111,7 @@ void CodeGenVisitor::Visit(Region* region) { void CodeGenVisitor::Visit(InstructionNode* instruction) { std::string instr = instruction->GetInstruction()->DumpString(NULL); - DCHECK(0); // This whole function is useful only during development. + DCHECK(0); // This whole function is useful only during development. } void CodeGenVisitor::Visit(ConstInstructionNode* instruction) { std::string instr = instruction->GetInstruction()->DumpString(NULL); @@ -270,4 +270,4 @@ void CodeGenPostpassVisitor::Visit(SignatureNode* signature) { DCHECK_EQ(signature->GetDefinitions().size(), 1u) << "Signature nodes must correspond to a single parameter register."; } -} // end namespace sea_ir +} // namespace sea_ir diff --git a/compiler/sea_ir/code_gen.h b/compiler/sea_ir/code_gen.h index 0f0b2f7af6..aba8d5c7f8 100644 --- a/compiler/sea_ir/code_gen.h +++ b/compiler/sea_ir/code_gen.h @@ -103,7 +103,7 @@ class CodeGenPrepassVisitor: public CodeGenPassVisitor { void Visit(ConstInstructionNode* instruction) { } void Visit(ReturnInstructionNode* instruction) { } void Visit(IfNeInstructionNode* instruction) { } - //void Visit(AddIntLitInstructionNode* instruction) { } + // void Visit(AddIntLitInstructionNode* instruction) { } void Visit(MoveResultInstructionNode* instruction) { } void Visit(InvokeStaticInstructionNode* instruction) { } void Visit(AddIntInstructionNode* instruction) { } @@ -122,7 +122,7 @@ class CodeGenPostpassVisitor: public CodeGenPassVisitor { void Visit(ConstInstructionNode* instruction) { } void Visit(ReturnInstructionNode* instruction) { } void Visit(IfNeInstructionNode* instruction) { } - //void Visit(AddIntLitInstructionNode* instruction) { } + // void Visit(AddIntLitInstructionNode* instruction) { } void Visit(MoveResultInstructionNode* instruction) { } void Visit(InvokeStaticInstructionNode* instruction) { } void Visit(AddIntInstructionNode* instruction) { } @@ -141,7 +141,7 @@ class CodeGenVisitor: public CodeGenPassVisitor { void Visit(ConstInstructionNode* instruction); void Visit(ReturnInstructionNode* instruction); void Visit(IfNeInstructionNode* instruction); - //void Visit(AddIntLitInstructionNode* instruction); + // void Visit(AddIntLitInstructionNode* instruction); void Visit(MoveResultInstructionNode* instruction); void Visit(InvokeStaticInstructionNode* instruction); void Visit(AddIntInstructionNode* instruction); @@ -149,5 +149,5 @@ class CodeGenVisitor: public CodeGenPassVisitor { void Visit(IfEqzInstructionNode* instruction); void Visit(PhiInstructionNode* region) { } }; -} // end namespace sea_ir +} // namespace sea_ir #endif // ART_COMPILER_SEA_IR_CODE_GEN_H_ diff --git a/compiler/sea_ir/frontend.cc b/compiler/sea_ir/frontend.cc index bae3cb296c..8fc1cf8315 100644 --- a/compiler/sea_ir/frontend.cc +++ b/compiler/sea_ir/frontend.cc @@ -62,7 +62,7 @@ CompiledMethod* SeaIrCompileOneMethod(CompilerDriver& compiler, #if defined(ART_USE_PORTABLE_COMPILER) , llvm_compilation_unit #endif - ); // NOLINT + ); // NOLINT } extern "C" art::CompiledMethod* @@ -79,4 +79,4 @@ extern "C" art::CompiledMethod* } #endif -} // end namespace art +} // namespace art diff --git a/compiler/sea_ir/instruction_nodes.h b/compiler/sea_ir/instruction_nodes.h index f6d2dd8d3d..5c9cfe19dc 100644 --- a/compiler/sea_ir/instruction_nodes.h +++ b/compiler/sea_ir/instruction_nodes.h @@ -144,7 +144,7 @@ class UnnamedConstInstructionNode: public ConstInstructionNode { std::stringstream ss; ss << def_it->first; result.append(ss.str()); - result += "\"] ; // ssa edge\n"; + result += "\"] ; // ssa edge\n"; } } } @@ -179,7 +179,7 @@ class MoveResultInstructionNode: public InstructionNode { public: explicit MoveResultInstructionNode(const art::Instruction* inst): InstructionNode(inst) { } std::vector<int> GetUses() { - std::vector<int> uses; // Using vector<> instead of set<> because order matters. + std::vector<int> uses; // Using vector<> instead of set<> because order matters. uses.push_back(RETURN_REGISTER); return uses; } @@ -246,5 +246,5 @@ class IfEqzInstructionNode: public InstructionNode { v->Traverse(this); } }; -} // end namespace sea_ir +} // namespace sea_ir #endif // ART_COMPILER_SEA_IR_INSTRUCTION_NODES_H_ diff --git a/compiler/sea_ir/instruction_tools.cc b/compiler/sea_ir/instruction_tools.cc index 5433591457..9627497805 100644 --- a/compiler/sea_ir/instruction_tools.cc +++ b/compiler/sea_ir/instruction_tools.cc @@ -794,4 +794,4 @@ const int InstructionTools::instruction_attributes_[] = { // FF UNUSED_FF DF_NOP }; -} // end namespace sea_ir +} // namespace sea_ir diff --git a/compiler/sea_ir/instruction_tools.h b/compiler/sea_ir/instruction_tools.h index 0c227532b8..d3871008a4 100644 --- a/compiler/sea_ir/instruction_tools.h +++ b/compiler/sea_ir/instruction_tools.h @@ -121,5 +121,5 @@ class InstructionTools { static bool IsDefinition(const art::Instruction* instruction); static const int instruction_attributes_[]; }; -} // end namespace sea_ir +} // namespace sea_ir #endif // ART_COMPILER_SEA_IR_INSTRUCTION_TOOLS_H_ diff --git a/compiler/sea_ir/sea.cc b/compiler/sea_ir/sea.cc index d1db7b6223..3488afd5be 100644 --- a/compiler/sea_ir/sea.cc +++ b/compiler/sea_ir/sea.cc @@ -153,16 +153,16 @@ Region* SeaGraph::Intersect(Region* i, Region* j) { while (finger1 != finger2) { while (finger1->GetRPO() > finger2->GetRPO()) { DCHECK(NULL != finger1); - finger1 = finger1->GetIDominator(); // should have: finger1 != NULL + finger1 = finger1->GetIDominator(); // should have: finger1 != NULL DCHECK(NULL != finger1); } while (finger1->GetRPO() < finger2->GetRPO()) { DCHECK(NULL != finger2); - finger2 = finger2->GetIDominator(); // should have: finger1 != NULL + finger2 = finger2->GetIDominator(); // should have: finger1 != NULL DCHECK(NULL != finger2); } } - return finger1; // finger1 should be equal to finger2 at this point. + return finger1; // finger1 should be equal to finger2 at this point. } void SeaGraph::ComputeDownExposedDefs() { @@ -248,7 +248,7 @@ void SeaGraph::BuildMethodSeaGraph(const art::DexFile::CodeItem* code_item, int32_t offset = inst->GetTargetOffset(); std::map<const uint16_t*, Region*>::iterator it = target_regions.find(&code[i + offset]); DCHECK(it != target_regions.end()); - AddEdge(r, it->second); // Add edge to branch target. + AddEdge(r, it->second); // Add edge to branch target. } std::map<const uint16_t*, Region*>::iterator it = target_regions.find(&code[i]); @@ -257,7 +257,7 @@ void SeaGraph::BuildMethodSeaGraph(const art::DexFile::CodeItem* code_item, Region* nextRegion = it->second; if (last_node->GetInstruction()->IsBranch() && last_node->GetInstruction()->CanFlowThrough()) { - AddEdge(r, it->second); // Add flow-through edge. + AddEdge(r, it->second); // Add flow-through edge. } r = nextRegion; } @@ -421,7 +421,7 @@ void SeaGraph::CompileMethod(const art::DexFile::CodeItem* code_item, uint32_t class_def_idx, uint32_t method_idx, const art::DexFile& dex_file) { // Two passes: Builds the intermediate structure (non-SSA) of the sea-ir for the function. BuildMethodSeaGraph(code_item, dex_file, class_def_idx, method_idx); - //Pass: Compute reverse post-order of regions. + // Pass: Compute reverse post-order of regions. ComputeRPO(); // Multiple passes: compute immediate dominators. ComputeIDominators(); @@ -502,14 +502,14 @@ void Region::ToDot(std::string& result) const { for (std::vector<PhiInstructionNode*>::const_iterator cit = phi_instructions_.begin(); cit != phi_instructions_.end(); cit++) { (*cit)->ToDot(result); - result += StringId() + " -> " + (*cit)->StringId() + "; // phi-function \n"; + result += StringId() + " -> " + (*cit)->StringId() + "; // phi-function \n"; } // Save instruction nodes. for (std::vector<InstructionNode*>::const_iterator cit = instructions_.begin(); cit != instructions_.end(); cit++) { (*cit)->ToDot(result); - result += StringId() + " -> " + (*cit)->StringId() + "; // region -> instruction \n"; + result += StringId() + " -> " + (*cit)->StringId() + "; // region -> instruction \n"; } for (std::vector<Region*>::const_iterator cit = successors_.begin(); cit != successors_.end(); @@ -527,14 +527,14 @@ void Region::ToDot(std::string& result) const { reaching_set_it++) { result += (*reaching_set_it)->StringId() + " -> " + StringId() + - " [style=dotted]; // Reaching def.\n"; + " [style=dotted]; // Reaching def.\n"; } } // Save dominance frontier. for (std::set<Region*>::const_iterator cit = df_.begin(); cit != df_.end(); cit++) { result += StringId() + " -> " + (*cit)->StringId() + - " [color=gray]; // Dominance frontier.\n"; + " [color=gray]; // Dominance frontier.\n"; } result += "// End Region.\n"; } @@ -711,7 +711,7 @@ void InstructionNode::ToDot(std::string& result) const { if (NULL != def_it->second) { result += def_it->second->StringId() + " -> " + StringId() +"[color=red,label=\""; result += art::StringPrintf("%d", def_it->first); - result += "\"] ; // ssa edge\n"; + result += "\"] ; // ssa edge\n"; } } } @@ -740,7 +740,7 @@ std::vector<int> InstructionNode::GetDefinitions() const { } std::vector<int> InstructionNode::GetUses() { - std::vector<int> uses; // Using vector<> instead of set<> because order matters. + std::vector<int> uses; // Using vector<> instead of set<> because order matters. if (!InstructionTools::IsDefinition(instruction_) && (instruction_->HasVRegA())) { int vA = instruction_->VRegA(); uses.push_back(vA); @@ -770,8 +770,8 @@ void PhiInstructionNode::ToDot(std::string& result) const { def_it != defs_from_pred->end(); def_it++) { result += (*def_it)->StringId() + " -> " + StringId() +"[color=red,label=\"vR = "; result += art::StringPrintf("%d", GetRegisterNumber()); - result += "\"] ; // phi-ssa edge\n"; + result += "\"] ; // phi-ssa edge\n"; } } } -} // end namespace sea_ir +} // namespace sea_ir diff --git a/compiler/sea_ir/sea.h b/compiler/sea_ir/sea.h index a0a8086568..25ab1fed10 100644 --- a/compiler/sea_ir/sea.h +++ b/compiler/sea_ir/sea.h @@ -256,7 +256,7 @@ class SeaGraph: IVisitable { static void ComputeRPO(Region* crt_bb, int& crt_rpo); // Returns the "lowest common ancestor" of @i and @j in the dominator tree. static Region* Intersect(Region* i, Region* j); - //Returns the vector of parameters of the function. + // Returns the vector of parameters of the function. std::vector<SignatureNode*>* GetParameterNodes() { return ¶meters_; } @@ -320,5 +320,5 @@ class SeaGraph: IVisitable { std::vector<Region*> regions_; std::vector<SignatureNode*> parameters_; }; -} // end namespace sea_ir +} // namespace sea_ir #endif // ART_COMPILER_SEA_IR_SEA_H_ diff --git a/compiler/sea_ir/sea_node.h b/compiler/sea_ir/sea_node.h index efc1b0d15a..5d28f8aa72 100644 --- a/compiler/sea_ir/sea_node.h +++ b/compiler/sea_ir/sea_node.h @@ -76,5 +76,5 @@ class SeaNode: public IVisitable { // operators because that would lead to duplication of their unique ids. DISALLOW_COPY_AND_ASSIGN(SeaNode); }; -} // end namespace sea_ir +} // namespace sea_ir #endif // ART_COMPILER_SEA_IR_SEA_NODE_H_ diff --git a/compiler/sea_ir/visitor.h b/compiler/sea_ir/visitor.h index 985900856f..a4fec7b8a9 100644 --- a/compiler/sea_ir/visitor.h +++ b/compiler/sea_ir/visitor.h @@ -59,7 +59,7 @@ class IRVisitor { virtual void Visit(ConstInstructionNode* instruction) = 0; virtual void Visit(ReturnInstructionNode* instruction) = 0; virtual void Visit(IfNeInstructionNode* instruction) = 0; - //virtual void Visit(AddIntLitInstructionNode* instruction) = 0; + // virtual void Visit(AddIntLitInstructionNode* instruction) = 0; virtual void Visit(MoveResultInstructionNode* instruction) = 0; virtual void Visit(InvokeStaticInstructionNode* instruction) = 0; virtual void Visit(AddIntInstructionNode* instruction) = 0; @@ -90,5 +90,5 @@ class IRVisitor { protected: std::vector<Region*> ordered_regions_; }; -} // end namespace sea_ir +} // namespace sea_ir #endif // ART_COMPILER_SEA_IR_VISITOR_H_ diff --git a/compiler/stubs/portable/stubs.cc b/compiler/stubs/portable/stubs.cc index a7eea5183b..69568d7a19 100644 --- a/compiler/stubs/portable/stubs.cc +++ b/compiler/stubs/portable/stubs.cc @@ -55,7 +55,7 @@ const std::vector<uint8_t>* CreatePortableResolutionTrampoline() { return resolution_trampoline.release(); } -} // namespace arm +} // namespace arm namespace mips { const std::vector<uint8_t>* CreatePortableResolutionTrampoline() { @@ -72,7 +72,7 @@ const std::vector<uint8_t>* CreatePortableResolutionTrampoline() { ENTRYPOINT_OFFSET(pPortableResolutionTrampolineFromCode)); __ Move(A3, S1); // Pass Thread::Current() in A3 __ Move(A2, SP); // Pass SP for Method** callee_addr - __ Jalr(T9); // Call to resolution trampoline (callee, receiver, callee_addr, Thread*) + __ Jalr(T9); // Call to resolution trampoline (callee, receiver, callee_addr, Thread*) // Restore frame, argument registers, and RA. __ LoadFromOffset(kLoadWord, A0, SP, 0); @@ -84,9 +84,9 @@ const std::vector<uint8_t>* CreatePortableResolutionTrampoline() { Label resolve_fail; __ EmitBranch(V0, ZERO, &resolve_fail, true); - __ Jr(V0); // If V0 != 0 tail call method's code + __ Jr(V0); // If V0 != 0 tail call method's code __ Bind(&resolve_fail, false); - __ Jr(RA); // Return to caller to handle exception + __ Jr(RA); // Return to caller to handle exception assembler->EmitSlowPaths(); size_t cs = assembler->CodeSize(); @@ -96,7 +96,7 @@ const std::vector<uint8_t>* CreatePortableResolutionTrampoline() { return resolution_trampoline.release(); } -} // namespace mips +} // namespace mips namespace x86 { const std::vector<uint8_t>* CreatePortableResolutionTrampoline() { @@ -132,6 +132,6 @@ const std::vector<uint8_t>* CreatePortableResolutionTrampoline() { return resolution_trampoline.release(); } -} // namespace x86 +} // namespace x86 -} // namespace art +} // namespace art diff --git a/compiler/stubs/quick/stubs.cc b/compiler/stubs/quick/stubs.cc index 790b5d61d3..8fc2a81d24 100644 --- a/compiler/stubs/quick/stubs.cc +++ b/compiler/stubs/quick/stubs.cc @@ -95,7 +95,7 @@ const std::vector<uint8_t>* CreateInterpreterToQuickEntry() { return entry_stub.release(); } -} // namespace arm +} // namespace arm namespace mips { const std::vector<uint8_t>* CreateQuickResolutionTrampoline() { @@ -126,7 +126,7 @@ const std::vector<uint8_t>* CreateQuickResolutionTrampoline() { __ LoadFromOffset(kLoadWord, T9, S1, ENTRYPOINT_OFFSET(pQuickResolutionTrampolineFromCode)); __ Move(A3, S1); // Pass Thread::Current() in A3 __ Move(A2, SP); // Pass SP for Method** callee_addr - __ Jalr(T9); // Call to resolution trampoline (method_idx, receiver, sp, Thread*) + __ Jalr(T9); // Call to resolution trampoline (method_idx, receiver, sp, Thread*) // Restore registers which may have been modified by GC __ LoadFromOffset(kLoadWord, A0, SP, 0); @@ -144,7 +144,7 @@ const std::vector<uint8_t>* CreateQuickResolutionTrampoline() { __ LoadFromOffset(kLoadWord, RA, SP, 60); __ AddConstant(SP, SP, 64); - __ Move(T9, V0); // Put method's code in T9 + __ Move(T9, V0); // Put method's code in T9 __ Jr(T9); // Leaf call to method's code __ Break(); @@ -187,7 +187,7 @@ const std::vector<uint8_t>* CreateInterpreterToQuickEntry() { return entry_stub.release(); } -} // namespace mips +} // namespace mips namespace x86 { const std::vector<uint8_t>* CreateQuickResolutionTrampoline() { @@ -258,6 +258,6 @@ const std::vector<uint8_t>* CreateInterpreterToQuickEntry() { return entry_stub.release(); } -} // namespace x86 +} // namespace x86 -} // namespace art +} // namespace art diff --git a/compiler/utils/scoped_hashtable.h b/compiler/utils/scoped_hashtable.h index e38b90eab4..ccec7bafa4 100644 --- a/compiler/utils/scoped_hashtable.h +++ b/compiler/utils/scoped_hashtable.h @@ -66,6 +66,6 @@ class ScopedHashtable { private: std::list<std::map<K, V> > scopes; }; -} // end namespace utils +} // namespace utils #endif // ART_COMPILER_UTILS_SCOPED_HASHTABLE_H_ diff --git a/compiler/utils/scoped_hashtable_test.cc b/compiler/utils/scoped_hashtable_test.cc index 072da8c5bd..d5f9f7d035 100644 --- a/compiler/utils/scoped_hashtable_test.cc +++ b/compiler/utils/scoped_hashtable_test.cc @@ -65,4 +65,4 @@ TEST_F(ScopedHashtableTest, Basics) { EXPECT_TRUE(NULL == sht.Lookup(2)); } -} // end namespace art +} // namespace art |