From 31a4a6f5717f645da6b97ccc1e420ae1e1c71ce0 Mon Sep 17 00:00:00 2001 From: buzbee Date: Tue, 28 Feb 2012 15:36:15 -0800 Subject: More target-independence Continuing to move target-specific code from the Arm code generator into the independent realm. This will be done in multiple small steps. In this CL, the focus is on unifying the LIR data structure and various enums that don't really need to be target specific. Also creates two new shared source files: GenCommon.cc (to hold top-level code generation functions) and GenInvoke.cc (which is likely to be shared only by the Arm and Mips targets). Also added is a makefile hack to build for Mips (which we'll eventually remove when the compiler support multiple targets via the command line) and various minor cleanups. Overall, this CL moves more than 3,000 lines of code from target dependent to target independent. Change-Id: I431ca4ae728100ed7d0e9d83a966a3f789f731b1 --- src/compiler/codegen/mips/ArchUtility.cc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/compiler/codegen/mips/ArchUtility.cc') diff --git a/src/compiler/codegen/mips/ArchUtility.cc b/src/compiler/codegen/mips/ArchUtility.cc index f218436142..2e8d4170d5 100644 --- a/src/compiler/codegen/mips/ArchUtility.cc +++ b/src/compiler/codegen/mips/ArchUtility.cc @@ -221,50 +221,50 @@ void oatDumpLIRInsn(CompilationUnit* cUnit, LIR* arg, unsigned char* baseAddr) /* Handle pseudo-ops individually, and all regular insns as a group */ switch(lir->opcode) { - case kMipsPseudoMethodEntry: + case kPseudoMethodEntry: LOG(INFO) << "-------- method entry " << PrettyMethod(cUnit->method_idx, *cUnit->dex_file); break; - case kMipsPseudoMethodExit: + case kPseudoMethodExit: LOG(INFO) << "-------- Method_Exit"; break; - case kMipsPseudoBarrier: + case kPseudoBarrier: LOG(INFO) << "-------- BARRIER"; break; - case kMipsPseudoExtended: + case kPseudoExtended: LOG(INFO) << "-------- " << (char* ) dest; break; - case kMipsPseudoSSARep: + case kPseudoSSARep: DUMP_SSA_REP(LOG(INFO) << "-------- kMirOpPhi: " << (char* ) dest); break; - case kMipsPseudoEntryBlock: + case kPseudoEntryBlock: LOG(INFO) << "-------- entry offset: 0x" << std::hex << dest; break; - case kMipsPseudoDalvikByteCodeBoundary: + case kPseudoDalvikByteCodeBoundary: LOG(INFO) << "-------- dalvik offset: 0x" << std::hex << lir->generic.dalvikOffset << " @ " << (char* )lir->operands[0]; break; - case kMipsPseudoExitBlock: + case kPseudoExitBlock: LOG(INFO) << "-------- exit offset: 0x" << std::hex << dest; break; - case kMipsPseudoPseudoAlign4: + case kPseudoPseudoAlign4: LOG(INFO) << (intptr_t)baseAddr + offset << " (0x" << std::hex << offset << "): .align4"; break; - case kMipsPseudoEHBlockLabel: + case kPseudoEHBlockLabel: LOG(INFO) << "Exception_Handling:"; break; - case kMipsPseudoTargetLabel: - case kMipsPseudoNormalBlockLabel: + case kPseudoTargetLabel: + case kPseudoNormalBlockLabel: LOG(INFO) << "L" << (intptr_t)lir << ":"; break; - case kMipsPseudoThrowTarget: + case kPseudoThrowTarget: LOG(INFO) << "LT" << (intptr_t)lir << ":"; break; - case kMipsPseudoSuspendTarget: + case kPseudoSuspendTarget: LOG(INFO) << "LS" << (intptr_t)lir << ":"; break; - case kMipsPseudoCaseLabel: + case kPseudoCaseLabel: LOG(INFO) << "LC" << (intptr_t)lir << ": Case target 0x" << std::hex << lir->operands[0] << "|" << std::dec << lir->operands[0]; -- cgit v1.2.3-59-g8ed1b