Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 18856 invoked from network); 3 Oct 2006 15:03:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Oct 2006 15:03:37 -0000 Received: (qmail 69785 invoked by uid 500); 3 Oct 2006 15:03:37 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 69683 invoked by uid 500); 3 Oct 2006 15:03:37 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 69672 invoked by uid 99); 3 Oct 2006 15:03:37 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Oct 2006 08:03:36 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:56198] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 24/B1-08153-7CB72254 for ; Tue, 03 Oct 2006 08:03:35 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9BE331A981A; Tue, 3 Oct 2006 08:03:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r452523 - in /incubator/harmony/enhanced/drlvm/trunk/vm: jitrino/src/codegenerator/ jitrino/src/codegenerator/ia32/ jitrino/src/jet/ jitrino/src/optimizer/ jitrino/src/shared/ vmcore/include/ Date: Tue, 03 Oct 2006 15:03:33 -0000 To: harmony-commits@incubator.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061003150333.9BE331A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: hindessm Date: Tue Oct 3 08:03:32 2006 New Revision: 452523 URL: http://svn.apache.org/viewvc?view=rev&rev=452523 Log: Applied patch from "[#HARMONY-1594] [DRLVM] fixed compilation errors (gcc 4.*) in jitrino". Tested with gcc version 3.0, 3.2, 3.4, 4.0 and 4.1. Failed with binutils bug (as before) with gcc 3.3. Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/CodeGenIntfc.h incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.cpp incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.h incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.h incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg.h incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_meth.cpp incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/optpass.h incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/reassociate.h incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Dlink.h incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Stl.h incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/CodeGenIntfc.h URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/CodeGenIntfc.h?view=diff&rev=452523&r1=452522&r2=452523 ============================================================================== --- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/CodeGenIntfc.h (original) +++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/CodeGenIntfc.h Tue Oct 3 08:03:32 2006 @@ -537,11 +537,13 @@ class MethodCodeSelector { public: MethodCodeSelector() {} + virtual ~MethodCodeSelector() {} class Callback { public: virtual void genVars(uint32 numLocals,VarCodeSelector&) = 0; virtual void setMethodDesc(MethodDesc * desc) = 0; virtual void genCFG(uint32 numNodes,CFGCodeSelector&,bool useProfile) = 0; + virtual ~Callback() {} }; virtual void selectCode(Callback&) = 0; }; Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp?view=diff&rev=452523&r1=452522&r2=452523 ============================================================================== --- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp (original) +++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp Tue Oct 3 08:03:32 2006 @@ -69,9 +69,9 @@ void registerDirectCall(Inst * inst); void registerInlineInfoOffsets( void ); - void CodeEmitter::orderNodesAndMarkInlinees(StlList& container, + void orderNodesAndMarkInlinees(StlList& container, Node * node, bool isForward); - void CodeEmitter::reportCompiledInlinees(); + void reportCompiledInlinees(); //------------------------------------------------------------------------------------ class ConstantAreaLayout Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.cpp URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.cpp?view=diff&rev=452523&r1=452522&r2=452523 ============================================================================== --- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.cpp (original) +++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.cpp Tue Oct 3 08:03:32 2006 @@ -55,7 +55,7 @@ const Encoder::OpcodeGroup Encoder::dummyOpcodeGroup; const Encoder::MemOpndConstraints Encoder::memOpndConstraints[16]= { - { + {{ #ifdef _EM64T_ Constraint(OpndKind_GPReg, OpndSize_64), Constraint(OpndKind_GPReg, OpndSize_64), @@ -64,7 +64,7 @@ Constraint(OpndKind_GPReg, OpndSize_32), #endif Constraint(OpndKind_Imm, OpndSize_32), - Constraint(OpndKind_Imm, OpndSize_32) }, + Constraint(OpndKind_Imm, OpndSize_32) }}, // others contain null constraints, to be fixed later }; Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.h URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.h?view=diff&rev=452523&r1=452522&r2=452523 ============================================================================== --- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.h (original) +++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.h Tue Oct 3 08:03:32 2006 @@ -71,7 +71,7 @@ static bool matches(Constraint co, Constraint ci, uint32 opndRoles, bool allowAliases); static const OpcodeGroup* findOpcodeGroup(const FindInfo& fi); static bool matches(const OpcodeGroup* og, const FindInfo& fi, bool any); - static bool Encoder::isOpndAllowed(const Encoder::OpcodeGroup * og, uint32 i, Constraint co, bool isExtended, bool any); + static bool isOpndAllowed(const Encoder::OpcodeGroup * og, uint32 i, Constraint co, bool isExtended, bool any); /** * Retunrs an empty opcode group. Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.h URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.h?view=diff&rev=452523&r1=452522&r2=452523 ============================================================================== --- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.h (original) +++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.h Tue Oct 3 08:03:32 2006 @@ -243,7 +243,7 @@ /** Creates an EmptyPseudoInst instruction to fill BB, which shoud not be cosidered as an empty one. */ - Inst* IRManager::newEmptyPseudoInst(); + Inst* newEmptyPseudoInst(); /** Creates an MethodEntryPseudoInst pseudo instruction representing the inlined method entry/end markers. */ Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg.h URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg.h?view=diff&rev=452523&r1=452522&r2=452523 ============================================================================== --- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg.h (original) +++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg.h Tue Oct 3 08:03:32 2006 @@ -195,7 +195,7 @@ * @param jt - field type. * @param fld - field handle. */ - void CodeGen::gen_access_watchpoint(JavaByteCodes opcode, jtype jt, Field_Handle fld); + void gen_access_watchpoint(JavaByteCodes opcode, jtype jt, Field_Handle fld); /** * @brief Restore all scratch registers and operand stack state Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_meth.cpp URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_meth.cpp?view=diff&rev=452523&r1=452522&r2=452523 ============================================================================== --- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_meth.cpp (original) +++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_meth.cpp Tue Oct 3 08:03:32 2006 @@ -443,7 +443,7 @@ Opnd scratch(jt, m_base, voff(m_stack.scratch())); mov(scratch, Opnd(jt, ar)); - jt = jt = flt32 ? i32 : i64; + jt = jt == flt32 ? i32 : i64; var = scratch.as_type(jt); } else { Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp?view=diff&rev=452523&r1=452522&r2=452523 ============================================================================== --- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp (original) +++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp Tue Oct 3 08:03:32 2006 @@ -287,7 +287,7 @@ }, #endif // ~JIT_STATS //------------------------------------------------------------------------- - " \n" +// " \n" // " \n" }; Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/optpass.h URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/optpass.h?view=diff&rev=452523&r1=452522&r2=452523 ============================================================================== --- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/optpass.h (original) +++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/optpass.h Tue Oct 3 08:03:32 2006 @@ -95,8 +95,8 @@ class classname : public OptPass { \ protected: \ void _run(IRManager& irm); \ - const char* classname::getName() { return fullname; } \ - const char* classname::getTagName() { return #tagname; } \ + const char* getName() { return fullname; } \ + const char* getTagName() { return #tagname; } \ }; \ ActionFactory tagname##_(#tagname); Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/reassociate.h URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/reassociate.h?view=diff&rev=452523&r1=452522&r2=452523 ============================================================================== --- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/reassociate.h (original) +++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/reassociate.h Tue Oct 3 08:03:32 2006 @@ -45,6 +45,7 @@ class CSEHashTable; class Type; class LoopTree; +class Simplifier; struct OpndWithPriority { OpndWithPriority(Opnd *op, uint32 priority0, Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Dlink.h URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Dlink.h?view=diff&rev=452523&r1=452522&r2=452523 ============================================================================== --- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Dlink.h (original) +++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Dlink.h Tue Oct 3 08:03:32 2006 @@ -34,6 +34,7 @@ Dlink() { _next = _prev = this; } + virtual ~Dlink() {} // // routines for manipulating double linked list // Modified: incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Stl.h URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Stl.h?view=diff&rev=452523&r1=452522&r2=452523 ============================================================================== --- incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Stl.h (original) +++ incubator/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Stl.h Tue Oct 3 08:03:32 2006 @@ -365,7 +365,7 @@ /** * A MemoryManager-based STL map container. **/ -template, class Allocator = StlMMAllocator > +template, class Allocator = StlMMAllocator > > class StlMap : public ::std::map { typedef ::std::map Map; @@ -379,7 +379,7 @@ /** * A MemoryManager-based STL multimap container. **/ -template, class Allocator = StlMMAllocator > +template, class Allocator = StlMMAllocator > > class StlMultiMap : public ::std::multimap { typedef ::std::multimap MultiMap; @@ -483,7 +483,7 @@ * A MemoryManager-based STL hash_map container. **/ #if !defined (__SGI_STL_PORT) -template, class Allocator = StlMMAllocator > +template, class Allocator = StlMMAllocator > > class StlHashMap : public ::std::map { typedef ::std::map HashMap; @@ -496,7 +496,7 @@ }; #else -template, class Allocator = StlMMAllocator > +template, class Allocator = StlMMAllocator > > class StlHashMap : public ::std::hash_map { typedef ::std::hash_map HashMap; @@ -515,7 +515,7 @@ * A MemoryManager-based STL hash_map container. **/ #if !defined (__SGI_STL_PORT) -template, class Allocator = StlMMAllocator > +template, class Allocator = StlMMAllocator > > class StlHashMultiMap : public ::std::multimap { typedef ::std::multimap HashMultiMap; @@ -527,7 +527,7 @@ bool has(const KeyT& k) const { return (find(k) != StlHashMultiMap::end()); }; }; #else -template, class Allocator = StlMMAllocator > +template, class Allocator = StlMMAllocator > > class StlHashMultiMap : public ::std::hash_multimap { typedef ::std::hash_multimap HashMultiMap; Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h?view=diff&rev=452523&r1=452522&r2=452523 ============================================================================== --- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h (original) +++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h Tue Oct 3 08:03:32 2006 @@ -18,6 +18,6 @@ #ifndef _VERSION_SVN_TAG_ #define _VERSION_SVN_TAG_ -#define VERSION_SVN_TAG "452149" +#define VERSION_SVN_TAG "452436" #endif // _VERSION_SVN_TAG_