Author: varlax
Date: Thu Feb 22 05:33:03 2007
New Revision: 510500
URL: http://svn.apache.org/viewvc?view=rev&rev=510500
Log:
Applied IPF compilation fix after H-3131
Modified:
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfCodeGenerator.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfType.h
harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeGenerator.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfCodeGenerator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfCodeGenerator.cpp?view=diff&rev=510500&r1=510499&r2=510500
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfCodeGenerator.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfCodeGenerator.cpp Thu
Feb 22 05:33:03 2007
@@ -33,7 +33,7 @@
#include "IpfPrologEpilogGenerator.h"
#include "IpfRuntimeSupport.h"
#include "IpfCfgVerifier.h"
-#include "CodeGenerator.h"
+#include "CodeSelectors.h"
//#include "IpfInstrumentator.h"
namespace Jitrino {
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfType.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfType.h?view=diff&rev=510500&r1=510499&r2=510500
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfType.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfType.h Thu Feb
22 05:33:03 2007
@@ -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
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeGenerator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeGenerator.cpp?view=diff&rev=510500&r1=510499&r2=510500
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeGenerator.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeGenerator.cpp Thu Feb 22 05:33:03
2007
@@ -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;
-#endif
cg.genCode(this, *mcs);
+#endif
}
POINTER_SIZE_INT
|