Index: working_vm/vm/jitrino/src/codegenerator/ipf/include/IpfType.h =================================================================== --- working_vm/vm/jitrino/src/codegenerator/ipf/include/IpfType.h (revision 510455) +++ working_vm/vm/jitrino/src/codegenerator/ipf/include/IpfType.h (working copy) @@ -100,10 +100,10 @@ #define ROOT_SET_HEADER_SIZE 4 // header size in root set info block #define SAFE_POINT_HEADER_SIZE 12 // header size in safe points info block -#define LOG_ON ipfLogIsOn // Log for Code Generator is on -#define VERIFY_ON ipfVerifyIsOn // verification for Code Generator is on +#define LOG_ON 1 // Log for Code Generator is on +#define VERIFY_ON 1 // verification for Code Generator is on #define LOG_OUT Log::out() -#define STAT_ON 0 // Log for statistic +#define STAT_ON 0 // Log for statistic #define IPF_ERROR "ERROR in file " << __FILE__ << " line " << __LINE__ << " " #define IPF_LOG if (LOG_ON) LOG_OUT Index: working_vm/vm/jitrino/src/codegenerator/ipf/IpfCodeGenerator.cpp =================================================================== --- working_vm/vm/jitrino/src/codegenerator/ipf/IpfCodeGenerator.cpp (revision 510455) +++ working_vm/vm/jitrino/src/codegenerator/ipf/IpfCodeGenerator.cpp (working copy) @@ -33,7 +33,7 @@ #include "IpfPrologEpilogGenerator.h" #include "IpfRuntimeSupport.h" #include "IpfCfgVerifier.h" -#include "CodeGenerator.h" +#include "CodeSelectors.h" //#include "IpfInstrumentator.h" namespace Jitrino { Index: working_vm/vm/jitrino/src/optimizer/CodeGenerator.cpp =================================================================== --- working_vm/vm/jitrino/src/optimizer/CodeGenerator.cpp (revision 510455) +++ working_vm/vm/jitrino/src/optimizer/CodeGenerator.cpp (working copy) @@ -37,6 +37,9 @@ // code generator entry point // void HIR2LIRSelectorSessionAction::run() { + +#if defined(_IPF_) +#else CompilationContext* cc = getCompilationContext(); IRManager& irManager = *cc->getHIRManager(); CompilationInterface* ci = cc->getVMCompilationInterface(); @@ -48,12 +51,10 @@ MethodCodeSelector* mcs = new (mm) _MethodCodeSelector(irManager,methodDesc,varOpnds,&irManager.getFlowGraph(), opndManager, optFlags.sink_constants, optFlags.sink_constants1); -#if defined(_IPF_) - IPF::CodeGenerator cg(mm, *ci); -#else + Ia32::CodeGenerator cg; + cg.genCode(this, *mcs); #endif - cg.genCode(this, *mcs); } POINTER_SIZE_INT