harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r543442 - in /harmony/enhanced/drlvm/trunk/vm/jitrino/src: codegenerator/ia32/ dynopt/ main/ optimizer/ optimizer/abcd/ optimizer/ssa/ shared/ translator/ translator/java/ vm/drl/
Date Fri, 01 Jun 2007 09:22:31 GMT
Author: varlax
Date: Fri Jun  1 02:22:28 2007
New Revision: 543442

URL: http://svn.apache.org/viewvc?view=rev&rev=543442
Log:
Applied HARMONY-4010 [drlvm][jit] Memory management improvement in Jitrino.OPT compiler

Removed:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryEstimates.h
Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32APIMagics.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeGenerator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayout.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutBottomUp.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutTopDown.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeSelector.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32ConstraintsResolver.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CopyExpansion.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32EarlyPropagation.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCSafePoints.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32I8Lowerer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalTrace.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc2.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc3.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAllocCheck.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32SpillGen.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackLayout.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32WebMaker.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/EdgeProfiler.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/ValueProfiler.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/CompilationContext.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/Jitrino.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeSelectors.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FastArrayFilling.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Loop.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/abcd.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/codelowerer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/devirtualizer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escapeanalyzer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/gcmanagedpointeranalyzer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/globalopndanalyzer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/hashvaluenumberer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/helper_inliner.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/irmanager.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/lazyexceptionopt.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/pidgenerator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/simplifier.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/ssa/SSA.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/syncopt.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/tailduplicator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Dominator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/LoopTree.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/TranslatorIntfc.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaFlowGraphBuilder.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaTranslator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/drl/DrlJITInterface.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32APIMagics.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32APIMagics.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32APIMagics.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32APIMagics.cpp Fri Jun  1 02:22:28 2007
@@ -82,7 +82,7 @@
 
 void APIMagicsHandlerSession::runImpl() {
     CompilationContext* cc = getCompilationContext();
-    MemoryManager tmpMM(1024, "Inline API methods");
+    MemoryManager tmpMM("Inline API methods");
     //finding all api magic calls
     IRManager* irm = cc->getLIRManager();
     ControlFlowGraph* fg = irm->getFlowGraph();

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp Fri Jun  1 02:22:28 2007
@@ -43,7 +43,7 @@
 class CodeEmitter : public SessionAction {
 public:
     CodeEmitter()
-        :memoryManager(0x1000, "CodeEmitter"),
+        :memoryManager("CodeEmitter"),
         exceptionHandlerInfos(memoryManager), constantAreaLayout(memoryManager),
         traversalInfo(memoryManager), methodLocationMap(memoryManager), 
         entryExitMap(memoryManager), instSizeMap(memoryManager)
@@ -789,7 +789,7 @@
         BasicBlock* handler = (BasicBlock*)edge->getTargetNode();
         Inst * catchInst = (Inst*)handler->getFirstInst();
         assert(catchInst && catchInst->getKind() == Inst::Kind_CatchPseudoInst);
-        MemoryManager mm(0x400, "CatchOpnds");
+        MemoryManager mm("CatchOpnds");
         BitSet * ls=new(mm) BitSet(mm, irManager->getOpndCount());
         irManager->getLiveAtExit(handler, *ls);
         for (Inst* inst = (Inst*)handler->getLastInst(); inst!=catchInst; inst = inst->getPrevInst()) {

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeGenerator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeGenerator.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeGenerator.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeGenerator.cpp Fri Jun  1 02:22:28 2007
@@ -125,7 +125,7 @@
     }
 
     bool slowLdString = sa->getBoolArg("SlowLdString", false); 
-    MemoryManager  codeSelectorMemManager(1024, "CodeGenerator::selectCode.codeSelectorMemManager");
+    MemoryManager  codeSelectorMemManager("CodeGenerator::selectCode.codeSelectorMemManager");
     MethodCodeSelector    codeSelector(*ci, mm, codeSelectorMemManager, *irManager, slowLdString);
 
     inputProvider.selectCode(codeSelector);

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayout.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayout.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayout.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayout.cpp Fri Jun  1 02:22:28 2007
@@ -65,7 +65,7 @@
 
 /**  Fix branches to work with the code layout */
 void Linearizer::fixBranches() {
-    MemoryManager tmpMM(1024, "Linearizer::fixBranches");
+    MemoryManager tmpMM("Linearizer::fixBranches");
     Nodes nodes(tmpMM);
     irManager->getFlowGraph()->getNodes(nodes);
     for (Nodes::const_iterator it = nodes.begin(), end = nodes.end(); it!=end; ++it)  {

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutBottomUp.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutBottomUp.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutBottomUp.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutBottomUp.cpp Fri Jun  1 02:22:28 2007
@@ -33,7 +33,7 @@
 
 BottomUpLayout::BottomUpLayout(IRManager* irm) : 
 Linearizer(irm), 
-mm(40*irm->getFlowGraph()->getNodeCount(), "Ia32::bottomUpLayout"), 
+mm("Ia32::bottomUpLayout"), 
 firstInChain(mm, irm->getFlowGraph()->getNodeCount(), false),
 lastInChain(mm, irm->getFlowGraph()->getNodeCount(), false),
 prevInLayoutBySuccessorId(mm, irm->getFlowGraph()->getNodeCount(), NULL)

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutTopDown.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutTopDown.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutTopDown.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutTopDown.cpp Fri Jun  1 02:22:28 2007
@@ -34,7 +34,7 @@
 
 TopDownLayout::TopDownLayout(IRManager* irm) 
 : Linearizer(irm), 
-memManager(40*irm->getFlowGraph()->getMaxNodeId(), "ia32::topdown_layout"),
+memManager("ia32::topdown_layout"),
 lastBlk(NULL), 
 neighboursBlocks(memManager),
 blockInfos(memManager, irm->getFlowGraph()->getMaxNodeId(), NULL)

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeSelector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeSelector.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeSelector.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeSelector.cpp Fri Jun  1 02:22:28 2007
@@ -396,7 +396,7 @@
 
 void CfgCodeSelector::fixNodeInfo() 
 {
-    MemoryManager tmpMM(1024, "Ia32CS:fixNodeInfoMM");
+    MemoryManager tmpMM("Ia32CS:fixNodeInfoMM");
     ControlFlowGraph* fg = irManager.getFlowGraph();
     Nodes nodes(tmpMM);
     fg->getNodes(nodes); //copy nodes -> loop creates new ones, so we can't use reference to cfg->getNodes()

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32ConstraintsResolver.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32ConstraintsResolver.h?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32ConstraintsResolver.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32ConstraintsResolver.h Fri Jun  1 02:22:28 2007
@@ -169,7 +169,7 @@
 public:
     ConstraintsResolverImpl(IRManager &irm, bool _second = false)
         :irManager(irm), 
-        memoryManager(irManager.getOpndCount()*16, "ConstraintsResolverImpl"),
+        memoryManager("ConstraintsResolverImpl"),
         basicBlocks(memoryManager, 0), originalOpndCount(0),
         liveOpnds(memoryManager,0),
         liveAtDispatchBlockEntry(memoryManager,0),

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CopyExpansion.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CopyExpansion.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CopyExpansion.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CopyExpansion.cpp Fri Jun  1 02:22:28 2007
@@ -60,7 +60,7 @@
     void run();
 
     SimpleStackOpndCoalescer(IRManager& irm)
-        :irManager(irm), memoryManager(0x1000, "SimpleStackOpndCoalescer"), 
+        :irManager(irm), memoryManager("SimpleStackOpndCoalescer"), 
         candidateInsts(memoryManager), intervals(memoryManager), opndReplacements(memoryManager), 
         replacementsAdded(0), emptyBlocks(false)
     {}

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32EarlyPropagation.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32EarlyPropagation.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32EarlyPropagation.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32EarlyPropagation.cpp Fri Jun  1 02:22:28 2007
@@ -73,7 +73,7 @@
         irManager->updateLoopInfo();
         uint32 opndCount=irManager->getOpndCount();
 
-        MemoryManager mm(0x100 + sizeof(OpndInfo) * opndCount + sizeof(Opnd*) * opndCount, "early_prop");
+        MemoryManager mm("early_prop");
         OpndInfo * opndInfos = new(mm) OpndInfo[opndCount];
         Node * currentLoopHeader = NULL;
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp Fri Jun  1 02:22:28 2007
@@ -539,7 +539,7 @@
     const POINTER_SIZE_INT* gcPointImage = GCMap::findGCSafePointStart((POINTER_SIZE_INT*)gcBlock, *context->p_eip);
 #endif  
     if (gcPointImage != NULL) {
-        MemoryManager mm(128,"RuntimeInterface::getGCRootSet");
+        MemoryManager mm("RuntimeInterface::getGCRootSet");
         GCSafePoint gcSite(mm, gcPointImage);
         if (gcSite.getNumOpnds() > 0) { 
             //this is a performance filter for empty points 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCSafePoints.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCSafePoints.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCSafePoints.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCSafePoints.cpp Fri Jun  1 02:22:28 2007
@@ -863,7 +863,7 @@
 void GCPointsBaseLiveRangeFixer::runImpl() {
     bool disableStaticOffsets = false;
     getArg("disable_static_offsets", disableStaticOffsets);
-    MemoryManager mm(MAX(512, irManager->getOpndCount()), "GCSafePointsMarker");
+    MemoryManager mm("GCSafePointsMarker");
     GCSafePointsInfo info(mm, *irManager, GCSafePointsInfo::MODE_1_FIX_BASES);
     
     if (Log::isEnabled()) {

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32I8Lowerer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32I8Lowerer.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32I8Lowerer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32I8Lowerer.cpp Fri Jun  1 02:22:28 2007
@@ -213,17 +213,7 @@
 
     ControlFlowGraph* fg = irManager->getFlowGraph();
 
-    const unsigned totalI8InstCountEstimate = fg->getNodeCount()*5;
-    unsigned memSizeEstimate = 
-            // for i8Insts
-            sizeof(Inst*)*totalI8InstCountEstimate +
-            // for loopInfo
-            sizeof(unsigned)*totalI8InstCountEstimate + 
-            // for pairs
-            (sizeof(Opnd*)+sizeof(Opnd**)*2)*totalI8InstCountEstimate;
-
-    memSizeEstimate = (unsigned)(memSizeEstimate*0.1);
-    MemoryManager memMgr(memSizeEstimate, "i8lowerer");
+    MemoryManager memMgr("i8lowerer");
 
     StlMap<Opnd *,Opnd **> pairs(memMgr);
     m_pairs = &pairs;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.cpp Fri Jun  1 02:22:28 2007
@@ -847,7 +847,7 @@
 //_________________________________________________________________________________________________
 void IRManager::layoutAliasOpnds() 
 {
-    MemoryManager mm(0x1000, "layoutAliasOpnds");
+    MemoryManager mm("layoutAliasOpnds");
     uint32 opndCount=getOpndCount();
     AliasRelation * relations=new  (memoryManager) AliasRelation[opndCount];
     getAliasRelations(relations);
@@ -1729,7 +1729,7 @@
 //_____________________________________________________________________________________________
 void IRManager::calculateStackDepth()
 {
-    MemoryManager mm(0x100, "calculateStackDepth");
+    MemoryManager mm("calculateStackDepth");
     StlVector<int32> stackDepths(mm, fg->getNodeCount(), -1);
     
     

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp Fri Jun  1 02:22:28 2007
@@ -189,7 +189,7 @@
                     ) 
 : compilationInterface(compIntfc), codeSelector(codeSel),   
   irManager(irM), typeManager(irM.getTypeManager()), 
-  memManager(0x2000, "InstCodeSelector"),
+  memManager("InstCodeSelector"),
   currentBasicBlock(currBasicBlock),
   inArgPos(0),
   seenReturn(false),               switchSrcOpnd(NULL), 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalTrace.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalTrace.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalTrace.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalTrace.cpp Fri Jun  1 02:22:28 2007
@@ -47,7 +47,7 @@
 #endif    
     }
 
-static MemoryManager mm(0x100, "printRuntimeOpndInternalHelper");
+static MemoryManager mm("printRuntimeOpndInternalHelper");
 static TypeManager *tm = NULL;
 void __stdcall methodEntry(const char * methodName, uint32 argInfoCount, CallingConvention::OpndInfo * argInfos)
 {
@@ -112,7 +112,7 @@
 //_________________________________________________________________________________________________
 void InternalTrace::runImpl()
 {
-    MemoryManager mm(0x400, "InternalTrace");
+    MemoryManager mm("InternalTrace");
 
     irManager->registerInternalHelperInfo("itrace_method_entry", IRManager::InternalHelperInfo((void*)&methodEntry, &CallingConvention_STDCALL));
     irManager->registerInternalHelperInfo("itrace_method_exit", IRManager::InternalHelperInfo((void*)&methodExit, &CallingConvention_STDCALL));

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp Fri Jun  1 02:22:28 2007
@@ -605,7 +605,7 @@
     BitSet * ls=irManager->getLiveAtEntry(node);
     os<<"Live at entry: "; printLiveSet(ls); os<<::std::endl;
 
-    MemoryManager mm(0x100, "IRLivenessPrinter::printNode");
+    MemoryManager mm("IRLivenessPrinter::printNode");
     ls=new(mm) BitSet(mm, irManager->getOpndCount());
     irManager->getLiveAtExit(node, *ls);
     os<<"Live at exit: "; printLiveSet(ls); os<<::std::endl;
@@ -1125,7 +1125,7 @@
 void IRLivenessDotPrinter::printNode(const Node * node)
 {
     ::std::ostream& out=getStream();
-    MemoryManager mm(0x2000, "IRLivenessDotPrinter::printNode");
+    MemoryManager mm("IRLivenessDotPrinter::printNode");
     printNodeName(node); 
     out << " [label=\"";
 
@@ -1405,7 +1405,7 @@
 //_________________________________________________________________________________________________
 void printRuntimeArgs(::std::ostream& os, uint32 opndCount, CallingConvention::OpndInfo * infos, JitFrameContext * context)
 {
-    MemoryManager mm(0x1000, "printRuntimeOpndInternalHelper");
+    MemoryManager mm("printRuntimeOpndInternalHelper");
     TypeManager tm(mm); tm.init();
     os<<opndCount<<" args: ";
     for (uint32 i=0; i<opndCount; i++){
@@ -1597,7 +1597,7 @@
 //_________________________________________________________________________________________________
 void __stdcall printRuntimeOpndInternalHelper(const void * p)
 {
-    MemoryManager mm(0x1000, "printRuntimeOpndInternalHelper");
+    MemoryManager mm("printRuntimeOpndInternalHelper");
     TypeManager tm(mm); tm.init();
     printRuntimeObjectOpnd(::std::cout, tm, p);
 }

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc2.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc2.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc2.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc2.cpp Fri Jun  1 02:22:28 2007
@@ -120,7 +120,7 @@
     Register* findReg (RegMask) const;
 
 
-    RegAlloc2 ()                    :mm(1000, "RegAlloc2"), registers(mm), opandmap(mm) {}
+    RegAlloc2 ()                    :mm("RegAlloc2"), registers(mm), opandmap(mm) {}
 
     uint32 getNeedInfo () const     {return NeedInfo_LivenessInfo;}
     uint32 getSideEffects () const  {return 0;}

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc3.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc3.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc3.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc3.cpp Fri Jun  1 02:22:28 2007
@@ -151,7 +151,7 @@
     StlVector<int> nstack;
 
 
-    RegAlloc3 ()                    : mm(1000, "RegAlloc3"), registers(mm), graph(mm), nstack(mm) {}
+    RegAlloc3 ()                    : mm("RegAlloc3"), registers(mm), graph(mm), nstack(mm) {}
 
     uint32 getNeedInfo () const     {return NeedInfo_LivenessInfo;}
     uint32 getSideEffects () const  {return coalesceCount == 0 ? 0 : SideEffect_InvalidatesLivenessInfo;}

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAllocCheck.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAllocCheck.h?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAllocCheck.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAllocCheck.h Fri Jun  1 02:22:28 2007
@@ -52,7 +52,7 @@
 
 public:
     
-    RegAllocCheck (const IRManager& x)      :irm(x), mm(1000, "RegAllocCheck") {}
+    RegAllocCheck (const IRManager& x)      :irm(x), mm("RegAllocCheck") {}
 
     bool run (bool checkloc);
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32SpillGen.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32SpillGen.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32SpillGen.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32SpillGen.cpp Fri Jun  1 02:22:28 2007
@@ -197,7 +197,7 @@
 //  -------
 
 
-    SpillGen ()                     : mm(1000, "SpillGen")
+    SpillGen ()                     : mm("SpillGen")
                                     , registers(mm), memopnds(mm)
                                     , instxs(mm), actives(mm), actsmap(mm)
                                     , lives_start(0), lives_exit(0)

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp Fri Jun  1 02:22:28 2007
@@ -117,7 +117,7 @@
     *serializedInfo = *this;
     serializedInfo->byteSize = getByteSize();
     data+=sizeof(StackInfo);
-    MemoryManager mm(0x100, "DepthInfo");
+    MemoryManager mm("DepthInfo");
     EntryPtr * entries = new(mm) EntryPtr[hashTableSize];
     for(uint32 i = 0; i< hashTableSize; i++)
         entries[i] = NULL;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackLayout.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackLayout.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackLayout.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackLayout.cpp Fri Jun  1 02:22:28 2007
@@ -162,7 +162,7 @@
 #ifdef _EM64T_
     stackCorrection(0),
 #endif
-    memoryManager(0x100, "StackLayouter")
+    memoryManager("StackLayouter")
 {
 };
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32WebMaker.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32WebMaker.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32WebMaker.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32WebMaker.cpp Fri Jun  1 02:22:28 2007
@@ -99,7 +99,7 @@
     unsigned globcount;
 
 
-    WebMaker ()                     :mm(1000, "WebMaker"), opndxs(mm), nodexs(mm) {}
+    WebMaker ()                     :mm("WebMaker"), opndxs(mm), nodexs(mm) {}
 
     uint32 getNeedInfo () const     {return NeedInfo_LivenessInfo;}
     uint32 getSideEffects () const  {return splitcount == 0 ? 0 : SideEffect_InvalidatesLivenessInfo;}

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/EdgeProfiler.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/EdgeProfiler.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/EdgeProfiler.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/EdgeProfiler.cpp Fri Jun  1 02:22:28 2007
@@ -52,7 +52,7 @@
 void EdgeProfilerInstrumentationPass::_run(IRManager& irm)
 {
     ControlFlowGraph& flowGraph = irm.getFlowGraph();
-    MemoryManager mm( 1024, "Edge InstrumentationPass");
+    MemoryManager mm("Edge InstrumentationPass");
     MethodDesc& md = irm.getMethodDesc();
     InstFactory& instFactory = irm.getInstFactory();
     OptPass::computeDominatorsAndLoops(irm);
@@ -125,7 +125,7 @@
 void EdgeProfilerAnnotationPass::_run(IRManager& irm) {
     ControlFlowGraph& flowGraph = irm.getFlowGraph();
     MethodDesc& md = irm.getMethodDesc();
-    MemoryManager mm( 1024, "Edge AnnotationPass");
+    MemoryManager mm("Edge AnnotationPass");
     bool debug = Log::isEnabled();
     // Create the edge profile structure for the compiled method in 'irm'.
     ProfilingInterface* pi = irm.getProfilingInterface();

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/ValueProfiler.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/ValueProfiler.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/ValueProfiler.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/ValueProfiler.cpp Fri Jun  1 02:22:28 2007
@@ -39,7 +39,7 @@
     // Currently value profile is used by interface devirtualization only
 
     ControlFlowGraph& flowGraph = irm.getFlowGraph();
-    MemoryManager mm( 1024, "Value Profiler Instrumentation Pass");
+    MemoryManager mm("Value Profiler Instrumentation Pass");
     MethodDesc& md = irm.getMethodDesc();
     InstFactory& instFactory = irm.getInstFactory();
     OpndManager& opndManager = irm.getOpndManager();

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/CompilationContext.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/CompilationContext.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/CompilationContext.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/CompilationContext.cpp Fri Jun  1 02:22:28 2007
@@ -100,7 +100,7 @@
     Jit2Logs jit2logs;
 
     TlsLogStreams ()   
-        :threadnb(thread_nb), mm(0, "TlsLogStreams"), jit2logs(mm) {}
+        :threadnb(thread_nb), mm("TlsLogStreams"), jit2logs(mm) {}
 
     ~TlsLogStreams ();
 };

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/Jitrino.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/Jitrino.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/Jitrino.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/Jitrino.cpp Fri Jun  1 02:22:28 2007
@@ -25,7 +25,6 @@
 #include "IRBuilder.h"
 #include "irmanager.h"
 #include "FlowGraph.h"
-#include "MemoryEstimates.h"
 #include "TranslatorIntfc.h"
 #include "CodeGenIntfc.h"
 #include "Log.h"
@@ -134,7 +133,7 @@
             }
         }
     }else {
-        global_mm = new MemoryManager(0,"Jitrino::Init.global_mm"); 
+        global_mm = new MemoryManager("Jitrino::Init.global_mm"); 
 #if defined(_IPF_)
         runtimeInterface = new IPF::RuntimeInterface;
         flags.codegen = CG_IPF;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp Fri Jun  1 02:22:28 2007
@@ -2391,7 +2391,7 @@
 
 
 PMF::PipelineIterator::PipelineIterator (PMF& p, const char* cn, const char* mn, const char* sig)
-:pmf(p), mm(0, "PMF::PipelineIterator"), smm(0), session(0), first(true)
+:pmf(p), mm("PMF::PipelineIterator"), smm(0), session(0), first(true)
 {
     if (pmf.pipelines.empty())
         crash("PMF: No pipelines defined\n");
@@ -2402,7 +2402,7 @@
 
 
 PMF::PipelineIterator::PipelineIterator (HPipeline hpipe)
-:pmf(hpipe->pmf), pipeline(hpipe), mm(0, "PMF::PipelineIterator"), smm(0), session(0), first(true)
+:pmf(hpipe->pmf), pipeline(hpipe), mm("PMF::PipelineIterator"), smm(0), session(0), first(true)
 {
     pipeline->init();
 }
@@ -2438,7 +2438,7 @@
 
     if (it != end)
     {// open new session
-        smm = new MemoryManager(0, it->factory->getName());
+        smm = new MemoryManager(it->factory->getName());
         session = it->factory->createSessionAction(*smm);
         assert(session != 0);
         session->step = &*it;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeSelectors.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeSelectors.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeSelectors.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeSelectors.cpp Fri Jun  1 02:22:28 2007
@@ -2303,8 +2303,7 @@
 }
 
 void _MethodCodeSelector::selectCode(Callback& callback) {
-    MemoryManager localMemManager(1024,
-        "_MethodCodeSelector::genCode.localMemManager"); 
+    MemoryManager localMemManager("_MethodCodeSelector::genCode.localMemManager"); 
 
     callback.setMethodDesc(methodDesc);
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FastArrayFilling.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FastArrayFilling.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FastArrayFilling.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FastArrayFilling.cpp Fri Jun  1 02:22:28 2007
@@ -98,7 +98,7 @@
         return;
     }
 
-    MemoryManager tmm(1024,"FastArrayInitPass::insertFastArrayInit");
+    MemoryManager tmm("FastArrayInitPass::insertFastArrayInit");
     Edges loopEdges(tmm);
     StlMap<Node *, LoopEdges> loopInfo(tmm);
         

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.cpp Fri Jun  1 02:22:28 2007
@@ -117,7 +117,7 @@
 
 Node* 
 FlowGraph::tailDuplicate(IRManager& irm, Node* pred, Node* tail, DefUseBuilder& defUses) {
-    MemoryManager mm(1024,"FlowGraph::tailDuplicate.mm");
+    MemoryManager mm("FlowGraph::tailDuplicate.mm");
     ControlFlowGraph& fg = irm.getFlowGraph();
 
     // Set region containing only node.
@@ -244,7 +244,7 @@
                     }
                     Inst* patchdef = NULL;
                     if(ci != NULL) {
-                        MemoryManager mm(0,"FlowGraph::duplicateNode.mm");
+                        MemoryManager mm("FlowGraph::duplicateNode.mm");
                         OpndRenameTable table(mm,1);
                         patchdef = instFactory.clone(ci, opndManager, &table)->asConstInst();
                         assert(patchdef != NULL);
@@ -350,7 +350,7 @@
 
 
 Node* FlowGraph::duplicateRegion(IRManager& irm, Node* entry, StlBitVector& nodesInRegion, DefUseBuilder& defUses, double newEntryFreq) {
-    MemoryManager dupMemManager(1024, "FlowGraph::duplicateRegion.dupMemManager");
+    MemoryManager dupMemManager("FlowGraph::duplicateRegion.dupMemManager");
     // prepare the hashtable for the operand rename translation
     OpndRenameTable    *opndRenameTable = new (dupMemManager) OpndRenameTable(dupMemManager,10);
     NodeRenameTable *nodeRenameTable = new (dupMemManager) NodeRenameTable(dupMemManager,10);
@@ -573,7 +573,7 @@
         //
         // Duplicate and inline the JSR.
         //
-        MemoryManager inlineManager(0,"FlowGraph::inlineJSR.inlineManager"); 
+        MemoryManager inlineManager("FlowGraph::inlineJSR.inlineManager"); 
 
         // Find the nodes in the JSR.
         StlBitVector nodesInJSR(inlineManager, fg.getMaxNodeId());
@@ -652,7 +652,7 @@
 
 
 static void inlineJSRs(IRManager* irManager) {
-    MemoryManager jsrMemoryManager(0, "FlowGraph::inlineJSRs.jsrMemoryManager");
+    MemoryManager jsrMemoryManager("FlowGraph::inlineJSRs.jsrMemoryManager");
     static CountTime inlineJSRTimer("ptra::fg::inlineJSRs");
     AutoTimer tm(inlineJSRTimer);
 
@@ -821,7 +821,7 @@
         fg.removeEdge(block,retTarget);
         _fixFinally(fg, entryFinally,retTarget);
     } else {
-        MemoryManager inlineManager(0,"FlowGraph::inlineFinally.inlineManager");
+        MemoryManager inlineManager("FlowGraph::inlineFinally.inlineManager");
         // prepare the hashtable for the operand rename translation
         OpndRenameTable    *opndRenameTable =
             new (inlineManager) OpndRenameTable(inlineManager,10);
@@ -834,28 +834,6 @@
     return true;
 }
 
-/*
-static void renumberLabels(ControlFlowGraph& fg) {
-    uint32 minLabelId = 0x7fffffff;
-    for(Nodes::const_iterator i = fg.getNodes().begin(), end = fg.getNodes().end(); i != end; ++i) {
-        Node* node = *i;
-        assert(node->getFirstInst()->isLabel());
-        LabelInst *label = (LabelInst*)node->getFirstInst();
-        uint32 n = label->getLabelId();
-        if (n < minLabelId) {
-            minLabelId = n;
-        }
-    }
-    if (!fg.hasValidOrdering()) {
-        fg.orderNodes();
-    }
-    for(Nodes::const_iterator i = fg.getNodes().begin(), end = fg.getNodes().end(); i != end; ++i) {
-        Node* node = *i;
-        LabelInst *label = (LabelInst*)node->getFirstInst();
-        label->setLabelId(node->getPreNum() + minLabelId);
-    }
-}
-*/
 
 void FlowGraph::doTranslatorCleanupPhase(IRManager& irm) {
     ControlFlowGraph& fg = irm.getFlowGraph();
@@ -1030,7 +1008,6 @@
     //
     fg.purgeUnreachableNodes();
     fg.purgeEmptyNodes(false);
-//    renumberLabels(fg);
 }
 
 
@@ -1039,7 +1016,7 @@
     const char* methodName = methodDesc.getName();
     os << std::endl << "--------  irDump: " << methodDesc.getParentType()->getName() << "::" << methodName << "  --------" << std::endl;
 
-    MemoryManager mm(fg.getMaxNodeId(), "ControlFlowGraph::print.mm");
+    MemoryManager mm("ControlFlowGraph::print.mm");
     Nodes nodes(mm);
     fg.getNodesPostOrder(nodes);
     Nodes::reverse_iterator iter = nodes.rbegin(), end = nodes.rend();

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Loop.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Loop.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Loop.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Loop.cpp Fri Jun  1 02:22:28 2007
@@ -139,7 +139,7 @@
                                Node* tail) {
     static IDFun getId;
     uint32 maxSize = ::std::max(getId(header), getId(tail));
-    MemoryManager tmm(maxSize >> 3, "LoopBuilder::markNodesOfLoop.tmm");
+    MemoryManager tmm("LoopBuilder::markNodesOfLoop.tmm");
     StlBitVector visited(tmm, maxSize);
 
     // mark header is visited
@@ -389,7 +389,7 @@
     globalOpndAnalyzer.doAnalysis();
 
     // Set def-use chains
-    MemoryManager peelmem(1000, "LoopBuilder::peelLoops.peelmem");
+    MemoryManager peelmem("LoopBuilder::peelLoops.peelmem");
     DefUseBuilder defUses(peelmem);
     defUses.initialize(irManager.getFlowGraph());
 
@@ -436,7 +436,7 @@
 
         // Temporary memory for peeling
         uint32 maxSize = fg.getMaxNodeId();
-        MemoryManager tmm(maxSize, "LoopBuilder::peelLoops.tmm");
+        MemoryManager tmm("LoopBuilder::peelLoops.tmm");
         
         // Compute nodes in loop
         StlBitVector nodesInLoop(tmm, maxSize);
@@ -898,7 +898,7 @@
         return;
     }
 
-    MemoryManager tmm(1024,"LoopBuilder::peelLoops");
+    MemoryManager tmm("LoopBuilder::peelLoops");
     Edges loopEdges(tmm);
     const Nodes& nodes = irManager.getFlowGraph().getNodes();
     for (Nodes::const_iterator it = nodes.begin(), end = nodes.end(); it!=end; ++it) {

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/abcd.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/abcd.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/abcd.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/abcd.cpp Fri Jun  1 02:22:28 2007
@@ -209,8 +209,7 @@
 {
     MethodDesc &methodDesc= irManager.getMethodDesc();
     uint32 byteCodeSize = methodDesc.getByteCodeSize();
-    MemoryManager localMemManager(byteCodeSize*16,
-                                  "Abcd::renamePiNodes");
+    MemoryManager localMemManager("Abcd::renamePiNodes");
 
     RenamePiWalker theWalker(this, localMemManager, piMap, byteCodeSize);
     DomTreeWalk<true, RenamePiWalker>(dominators, theWalker,

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/codelowerer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/codelowerer.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/codelowerer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/codelowerer.cpp Fri Jun  1 02:22:28 2007
@@ -46,7 +46,7 @@
     GlobalOpndAnalyzer globalOpndAnalyzer(_irm);
     globalOpndAnalyzer.doAnalysis();
 
-    MemoryManager mm(1000, "CodeLowerer.doLower");
+    MemoryManager mm("CodeLowerer.doLower");
 
     Nodes nodes(mm);
     _irm.getFlowGraph().getNodesPostOrder(nodes);

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp Fri Jun  1 02:22:28 2007
@@ -761,7 +761,7 @@
 //
 bool
 DeadCodeEliminator::eliminateUnreachableCode() {
-    MemoryManager memManager(1000,"DeadCodeEliminator::eliminateUnreachableCode");
+    MemoryManager memManager("DeadCodeEliminator::eliminateUnreachableCode");
 
     // Purge unreachable nodes from CFG.
     Nodes unreachableNodes(memManager);
@@ -852,8 +852,7 @@
     uint32 maxInstId = irManager.getInstFactory().getNumInsts();
     uint32 numInsts = maxInstId - minInstId;
     uint32 numOpnds = irManager.getOpndManager().getNumVarOpnds();
-    MemoryManager memManager(numInsts*20,
-                             "DeadCodeEliminator::eliminateDeadCode");
+    MemoryManager memManager("DeadCodeEliminator::eliminateDeadCode");
     InstDeque workSet(memManager);
     Nodes nodes(memManager);
     flowGraph.getNodesPostOrder(nodes);
@@ -1068,7 +1067,7 @@
 //
 void
 DeadCodeEliminator::removeExtraPseudoThrow() {
-    MemoryManager memManager(flowGraph.getMaxNodeId(),"DeadCodeEliminator::removeExtraPseudoThrow");
+    MemoryManager memManager("DeadCodeEliminator::removeExtraPseudoThrow");
 
     OptPass::computeLoops(irManager);
     LoopTree* loopTree = irManager.getLoopTree();

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/devirtualizer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/devirtualizer.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/devirtualizer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/devirtualizer.cpp Fri Jun  1 02:22:28 2007
@@ -536,7 +536,7 @@
     //
     // Search for previously guarded virtual calls
     //
-    MemoryManager mm(regionFG.getMaxNodeId()*sizeof(Node*), "Devirtualizer::unguardCallsInRegion.mm");
+    MemoryManager mm("Devirtualizer::unguardCallsInRegion.mm");
     Nodes nodes(mm);
     regionFG.getNodesPostOrder(nodes);
     StlVector<Node*>::reverse_iterator i;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp Fri Jun  1 02:22:28 2007
@@ -74,7 +74,7 @@
 void
 EscapeAnalysisPass::_run(IRManager& irm) {
 
-    MemoryManager escMemManager(1024, "EscapeAnalyzer:tmp_mm");
+    MemoryManager escMemManager("EscapeAnalyzer:tmp_mm");
     EscAnalyzer ea(escMemManager, this, irm);
 
     if (Log::isEnabled() && (ea.allProps!=0)) {

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escapeanalyzer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escapeanalyzer.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escapeanalyzer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escapeanalyzer.cpp Fri Jun  1 02:22:28 2007
@@ -209,7 +209,7 @@
 
 uint32
 EscapeAnalyzer::doAnalysis() {
-    MemoryManager memManager(1000,"EscapeAnalyzer::doAnalysis");
+    MemoryManager memManager("EscapeAnalyzer::doAnalysis");
     StlDeque<Inst*> candidateSet(memManager);
     BitSet escapingInsts(memManager,irManager.getInstFactory().getNumInsts());
 
@@ -409,7 +409,7 @@
     // (6) Refs that are stored through free ptrs or refs are free
     // (7) Refs loaded through free ptrs or refs are free
     //
-    MemoryManager memManager(1000,"EscapeAnalyzer::doAggressiveAnalysis");
+    MemoryManager memManager("EscapeAnalyzer::doAggressiveAnalysis");
     //
     // work list of instructions that define free refs & ptrs
     //

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/gcmanagedpointeranalyzer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/gcmanagedpointeranalyzer.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/gcmanagedpointeranalyzer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/gcmanagedpointeranalyzer.cpp Fri Jun  1 02:22:28 2007
@@ -73,7 +73,7 @@
 {
     assert(_mapsComputed == false);
     ControlFlowGraph& fg = _irManager.getFlowGraph();
-    MemoryManager mm(fg.getNodes().size()*sizeof(Node*), "GCManagedPointerAnalyzer::computeBaseMaps.mm");
+    MemoryManager mm("GCManagedPointerAnalyzer::computeBaseMaps.mm");
     
     // List of nodes in RPO
     StlVector<Node*> nodes(mm);
@@ -290,7 +290,7 @@
         addBaseVarDefs();
     } else {
         ControlFlowGraph& fg = _irManager.getFlowGraph();
-        MemoryManager mm(fg.getNodes().size()*sizeof(Node*), "GCManagedPointerAnalyzer::analyzeManagedPointers.mm");
+        MemoryManager mm("GCManagedPointerAnalyzer::analyzeManagedPointers.mm");
         
         StlVector<Node*> nodes(mm);
         fg.getNodesPostOrder(nodes);

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/globalopndanalyzer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/globalopndanalyzer.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/globalopndanalyzer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/globalopndanalyzer.cpp Fri Jun  1 02:22:28 2007
@@ -76,7 +76,7 @@
     // visited as global.
     //
     uint32 numInsts = irManager.getInstFactory().getNumInsts();
-    MemoryManager memManager(numInsts/8+4,"GlobalOpndAnalyzer::doAnalysis()");
+    MemoryManager memManager("GlobalOpndAnalyzer::doAnalysis()");
     BitSet markedInstSet(memManager,numInsts);
     Nodes::iterator niter;
     for (niter = nodes.begin(); niter != nodes.end(); ++niter) {
@@ -241,8 +241,7 @@
     
 void
 AdvancedGlobalOpndAnalyzer::unmarkFalseGlobals() {
-    MemoryManager localMemManager(1024,
-       "RefinedGlobalOpndAnalyzer::doAnalysis.localMemManager");
+    MemoryManager localMemManager("RefinedGlobalOpndAnalyzer::doAnalysis.localMemManager");
     opndTable = new (localMemManager) OpndTable(localMemManager, 16);
     uint32 timeStamp = 0;
     //

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/hashvaluenumberer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/hashvaluenumberer.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/hashvaluenumberer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/hashvaluenumberer.cpp Fri Jun  1 02:22:28 2007
@@ -2668,8 +2668,7 @@
 
 void 
 HashValueNumberer::doGlobalValueNumbering(MemoryOpt *mopt) {
-    MemoryManager localMM(sizeof(InstValueNumberer)+10000, 
-                          "HashValueNumberer::doGlobalValueNumbering");
+    MemoryManager localMM("HashValueNumberer::doGlobalValueNumbering");
 
     if (Log::isEnabled()) {
         Log::out() << "Starting unscoped value numbering pass" << ::std::endl;
@@ -2714,8 +2713,7 @@
 
 void 
 HashValueNumberer::doValueNumbering(MemoryOpt *mopt) {
-    MemoryManager localMM(sizeof(InstValueNumberer)+10000, 
-                          "HashValueNumberer::doValueNumbering");
+    MemoryManager localMM("HashValueNumberer::doValueNumbering");
 
     if (Log::isEnabled()) {
         Log::out() << "Starting scoped value numbering pass" << ::std::endl;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/helper_inliner.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/helper_inliner.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/helper_inliner.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/helper_inliner.cpp Fri Jun  1 02:22:28 2007
@@ -185,7 +185,7 @@
 
 void HelperInlinerSession::_run(IRManager& irm) {
     CompilationContext* cc = getCompilationContext();
-    MemoryManager tmpMM(1024, "Inline VM helpers");
+    MemoryManager tmpMM("Inline VM helpers");
     HelperInlinerAction* action = (HelperInlinerAction*)getAction();
     HelperInlinerFlags& flags = action->getFlags();
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp Fri Jun  1 02:22:28 2007
@@ -1152,7 +1152,7 @@
     bool connectEarly = getBoolArg("connect_early", true);
     const char* pipeName = getStringArg("pipeline", "inliner_pipeline");
 
-    MemoryManager tmpMM(1024, "Inliner::tmp_mm");
+    MemoryManager tmpMM("Inliner::tmp_mm");
     Inliner inliner(this, tmpMM, irm, irm.getFlowGraph().hasEdgeProfile());
     InlineNode* rootRegionNode = (InlineNode*) inliner.getInlineTree().getRoot();
     inliner.inlineRegion(rootRegionNode);

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/irmanager.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/irmanager.h?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/irmanager.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/irmanager.h Fri Jun  1 02:22:28 2007
@@ -27,7 +27,6 @@
 #include "JavaTranslator.h"
 #include "CompilationContext.h"
 #include "MemoryManager.h"
-#include "MemoryEstimates.h"
 #include "Opnd.h"
 #include "Inst.h"
 #include "VMInterface.h"

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/lazyexceptionopt.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/lazyexceptionopt.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/lazyexceptionopt.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/lazyexceptionopt.cpp Fri Jun  1 02:22:28 2007
@@ -44,7 +44,7 @@
 
 LazyExceptionOpt::LazyExceptionOpt(IRManager &ir_manager) :
     irManager(ir_manager), 
-    leMemManager(1024,"LazyExceptionOpt::doLazyExceptionOpt"),
+    leMemManager("LazyExceptionOpt::doLazyExceptionOpt"),
     compInterface(ir_manager.getCompilationInterface())
 {
     if (compInterface.isBCMapInfoRequired()) {

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/pidgenerator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/pidgenerator.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/pidgenerator.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/pidgenerator.cpp Fri Jun  1 02:22:28 2007
@@ -36,7 +36,7 @@
 
 void
 PersistentInstructionIdGenerator::runPass(IRManager& irm) {
-    MemoryManager mm(0, "PersistentInstructionIdGenerator::runPass");
+    MemoryManager mm("PersistentInstructionIdGenerator::runPass");
     
     MethodDesc& methodDesc = irm.getMethodDesc();
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/simplifier.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/simplifier.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/simplifier.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/simplifier.cpp Fri Jun  1 02:22:28 2007
@@ -3856,7 +3856,7 @@
     }
 
     uint32 numInstOptimized = 0;
-    MemoryManager memManager(1024,"SimplifierWithInstFactory::simplifyControlFlowGraph");
+    MemoryManager memManager("SimplifierWithInstFactory::simplifyControlFlowGraph");
     BitSet* reachableNodes = new (memManager) BitSet(memManager,flowGraph.getMaxNodeId());
     BitSet* unreachableInsts = 
         new (memManager) BitSet(memManager,irManager.getInstFactory().getNumInsts());

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/ssa/SSA.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/ssa/SSA.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/ssa/SSA.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/ssa/SSA.cpp Fri Jun  1 02:22:28 2007
@@ -398,8 +398,7 @@
 // this is the main function which returns true if a PHI node has been inserted
 bool SSABuilder::convertSSA(MethodDesc&    methodDesc) {
     // create structure recording the blocks that define var opnds
-    MemoryManager ssaMemManager(sizeof(VarDefSites)*frontier.getNumNodes(),
-                              "SSABuilder::convertSSA.ssaMemManager");
+    MemoryManager ssaMemManager("SSABuilder::convertSSA.ssaMemManager");
     DefSites allDefSites(ssaMemManager,frontier.getNumNodes());
 
     // find out where vars are defined
@@ -754,9 +753,7 @@
 
 bool SSABuilder::fixupSSA(MethodDesc& methodDesc, bool useBetter) {
     // clear out all Phi args
-    int sizeEstimate = opndManager.getNumVarOpnds()+opndManager.getNumSsaOpnds();
-    MemoryManager localMM(64*sizeEstimate,
-                          "SSABuilder::fixupSSA::memManager");
+    MemoryManager localMM("SSABuilder::fixupSSA::memManager");
 
 #ifdef DEBUG_SSA
     if (Log::isEnabled()) {
@@ -1032,9 +1029,7 @@
 // that var, put into SSA form.
 bool SSABuilder::fixupVars(ControlFlowGraph*fg, MethodDesc& methodDesc) {
     // clear out all Phi args
-    int sizeEstimate = opndManager.getNumVarOpnds()+opndManager.getNumSsaOpnds();
-    MemoryManager localMM(64*sizeEstimate,
-                          "SSABuilder::fixupVars::memManager");
+    MemoryManager localMM("SSABuilder::fixupVars::memManager");
 
 #ifdef DEBUG_SSA
     if (Log::isEnabled()) {
@@ -1144,8 +1139,7 @@
 // different variables.
 void SSABuilder::splitSsaWebs(ControlFlowGraph* fg,OpndManager& opndManager) {
     uint32 numSsaOpnds = opndManager.getNumSsaOpnds();
-    MemoryManager localMM(16*numSsaOpnds,
-                          "SSABuilder::splitSsaWebs::memManager");
+    MemoryManager localMM("SSABuilder::splitSsaWebs::memManager");
     SsaVarClique *cliques = new (localMM) SsaVarClique[numSsaOpnds];
     
     const Nodes& nodes = fg->getNodes();

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/syncopt.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/syncopt.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/syncopt.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/syncopt.cpp Fri Jun  1 02:22:28 2007
@@ -2152,7 +2152,7 @@
 }
 
 void SyncOpt2::runPass() {
-    MemoryManager tmpMM(1024, "SO2MM");
+    MemoryManager tmpMM("SO2MM");
     ControlFlowGraph& flowGraph = irManager.getFlowGraph();
     OptPass::computeDominators(irManager);
     DominatorTree* domTree = flowGraph.getDominatorTree();

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/tailduplicator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/tailduplicator.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/tailduplicator.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/tailduplicator.cpp Fri Jun  1 02:22:28 2007
@@ -122,7 +122,7 @@
 
 void
 TailDuplicator::doTailDuplication() {
-    MemoryManager mm(0, "TailDuplicator::doTailDuplication.mm");
+    MemoryManager mm("TailDuplicator::doTailDuplication.mm");
     ControlFlowGraph& fg = _irm.getFlowGraph();
 
     DefUseBuilder defUses(mm);
@@ -232,7 +232,7 @@
 
 void 
 TailDuplicator::doProfileGuidedTailDuplication(LoopTree* ltree) {
-    MemoryManager mm(0, "TailDuplicator::doProfileGuidedTailDuplication.mm");
+    MemoryManager mm("TailDuplicator::doProfileGuidedTailDuplication.mm");
     ControlFlowGraph& fg = _irm.getFlowGraph();
     if(!fg.hasEdgeProfile())
         return;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Dominator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Dominator.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Dominator.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Dominator.cpp Fri Jun  1 02:22:28 2007
@@ -35,7 +35,7 @@
 DominatorTree*
 DominatorBuilder::computeDominators(MemoryManager& mm, ControlFlowGraph* flowgraph, bool isPost, bool ignoreUnreach) {
     // Temp memory manager
-    MemoryManager tmm(flowgraph->getMaxNodeId()*(sizeof(Node*)*2), "DominatorBuilder::computeDominators");
+    MemoryManager tmm("DominatorBuilder::computeDominators");
     Nodes nodes(tmm);
 
     // Get the nodes of the flowgraph in postorder.

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/LoopTree.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/LoopTree.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/LoopTree.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/LoopTree.cpp Fri Jun  1 02:22:28 2007
@@ -63,7 +63,7 @@
 void LoopTree::findAndCoalesceLoopEdges(const Nodes& headers) { 
     DominatorTree* dom = fg->getDominatorTree();
     assert(dom->isValid());
-    MemoryManager mm(1024, "LoopTree::findAndCoalesceEdges");
+    MemoryManager mm("LoopTree::findAndCoalesceEdges");
     Edges entryEdges(mm);
     Edges loopEdges(mm);
     for (Nodes::const_iterator it = headers.begin(), end = headers.end(); it!=end; ++it) {

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.cpp Fri Jun  1 02:22:28 2007
@@ -67,12 +67,11 @@
 
 static const uint32 mm_default_next_arena_size = 4096-ARENA_HEADER_SIZE;
 
-MemoryManager::MemoryManager(size_t initial_estimate, const char* name)
+MemoryManager::MemoryManager(const char* name)
 {
     _arena = NULL;
     _bytes_allocated = 0;
     _bytes_arena = 0;
-    _next_arena_size = initial_estimate < mm_default_next_arena_size  ? mm_default_next_arena_size : initial_estimate;
     _name = name;
     _numArenas = 0;
 
@@ -80,14 +79,10 @@
     // get start time for this MemoryManager
     _startTraceId = traceId++;
 #ifdef DEBUG_MEMORY_MANAGER
-    traceStream << "### MemoryManager," << _name 
-                << ", START"
-                << ::std::endl;
+    traceStream << "### MemoryManager," << _name  << ", START" << ::std::endl;
 #endif //DEBUG_MEMORY_MANAGER
 
 #endif //USE_TRACE_MEM_MANANGER
-
-//    _alloc_arena(initial_estimate);
 }
 
 #ifdef DEBUG_MEMORY_MANAGER
@@ -214,8 +209,8 @@
         // allocate another arena
         //
         size_t arena_size;
-        if (size < _next_arena_size) {
-            arena_size = _next_arena_size;
+        if (size < mm_default_next_arena_size) {
+            arena_size = mm_default_next_arena_size;
         } else {
             arena_size = size;
         }

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.h?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.h Fri Jun  1 02:22:28 2007
@@ -34,7 +34,7 @@
 
 class MemoryManager {
 public:
-    MemoryManager(size_t initial_estimate, const char* name);
+    MemoryManager(const char* name);
     virtual ~MemoryManager();
     void *alloc(size_t size);
     size_t bytes_allocated() { return _bytes_allocated; }
@@ -59,7 +59,6 @@
     //
     size_t _bytes_allocated;
     size_t _bytes_arena;
-    size_t _next_arena_size;
     //
     // fields for tracing
     //

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/TranslatorIntfc.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/TranslatorIntfc.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/TranslatorIntfc.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/TranslatorIntfc.cpp Fri Jun  1 02:22:28 2007
@@ -63,7 +63,7 @@
     TranslatorAction* myAction = (TranslatorAction*)getAction();
     IRBuilder* irb = (IRBuilder*)myAction->getIRBuilderAction()->createSession(mm);
     irb->setCompilationContext(cc);
-    MemoryManager tmpMM(1024, "IRBuilder::tmpMM");
+    MemoryManager tmpMM("IRBuilder::tmpMM");
     irb->init(irm, &flags, tmpMM);
     JavaTranslator::translateMethod(*cc->getVMCompilationInterface(), methodDesc, *irb);
 }

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaFlowGraphBuilder.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaFlowGraphBuilder.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaFlowGraphBuilder.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaFlowGraphBuilder.cpp Fri Jun  1 02:22:28 2007
@@ -322,7 +322,7 @@
 //
 void JavaFlowGraphBuilder::eliminateUnnestedLoopsOnDispatch()
 {
-    MemoryManager matched_nodes_mm(3*sizeof(Node*), "unnested_loops_mm");
+    MemoryManager matched_nodes_mm("unnested_loops_mm");
     Nodes matched_dispatches(matched_nodes_mm);
     bool found_goto_into_loop_warning = false;
     const Nodes& nodes = fg->getNodes();

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaTranslator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaTranslator.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaTranslator.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaTranslator.cpp Fri Jun  1 02:22:28 2007
@@ -29,7 +29,6 @@
 #include "JavaTranslator.h"
 #include "ByteCodeParser.h"
 #include "JavaByteCodeTranslator.h"
-#include "MemoryEstimates.h"
 #include "Log.h"
 #include "CGSupport.h"
 #include "FlowGraph.h"
@@ -40,8 +39,7 @@
     
     uint32 byteCodeSize = methodDesc.getByteCodeSize();
     const unsigned char* byteCodes = methodDesc.getByteCodes();
-    MemoryManager  translatorMemManager(byteCodeSize*ESTIMATED_TRANSLATOR_MEMORY_PER_BYTECODE,
-                             "JavaTranslator::translateMethod.translatorMemManager");
+    MemoryManager  translatorMemManager("JavaTranslator::translateMethod.translatorMemManager");
 
     JavaFlowGraphBuilder cfgBuilder(irBuilder.getInstFactory()->getMemManager(),irBuilder);
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/drl/DrlJITInterface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/drl/DrlJITInterface.cpp?view=diff&rev=543442&r1=543441&r2=543442
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/drl/DrlJITInterface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/drl/DrlJITInterface.cpp Fri Jun  1 02:22:28 2007
@@ -29,7 +29,6 @@
 #include "Jitrino.h"
 #include "VMInterface.h"
 #include "EMInterface.h"
-#include "MemoryEstimates.h"
 #include "Log.h"
 #include "PMF.h"
 #include "CompilationContext.h"
@@ -235,7 +234,7 @@
                                Method_Handle method_handle,
                                OpenMethodExecutionParams compilation_params)
 {
-    MemoryManager memManager(method_get_byte_code_size(method_handle), "JIT_compile_method.memManager");
+    MemoryManager memManager("JIT_compile_method.memManager");
     JIT_Handle jitHandle = method_get_JIT_id(compilation);
     JITInstanceContext* jitContext = Jitrino::getJITInstanceContext(jitHandle);
     assert(jitContext!= NULL);



Mime
View raw message