Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 59606 invoked from network); 21 Jun 2010 21:20:42 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 21 Jun 2010 21:20:42 -0000 Received: (qmail 1440 invoked by uid 500); 21 Jun 2010 21:20:42 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 1358 invoked by uid 500); 21 Jun 2010 21:20:42 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 1351 invoked by uid 99); 21 Jun 2010 21:20:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jun 2010 21:20:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jun 2010 21:20:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 22B6B23889EA; Mon, 21 Jun 2010 21:19:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r956699 - in /harmony/enhanced/java/branches/mrh: drlvm/ drlvm/make/vm/ drlvm/modules/vm/src/main/native/encoder/unix/ drlvm/modules/vm/src/main/native/hythr/unix/ drlvm/modules/vm/src/main/native/jitrino/ drlvm/modules/vm/src/main/native/j... Date: Mon, 21 Jun 2010 21:19:47 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100621211948.22B6B23889EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hindessm Date: Mon Jun 21 21:19:45 2010 New Revision: 956699 URL: http://svn.apache.org/viewvc?rev=956699&view=rev Log: Convert more of drlvm to classlib-like native structure. Added: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/codegenerator/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/codegenerator/CodeGenIntfc.h - copied unchanged from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/CodeGenIntfc.h harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/codegenerator/RuntimeInterface.cpp - copied unchanged from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/RuntimeInterface.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/codegenerator/RuntimeInterface.h - copied unchanged from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/RuntimeInterface.h harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/dynopt/ - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/dynopt/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/ - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ipf/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/CodeGenerator_arch.cpp - copied, changed from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ipf/IpfCodeGenerator.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/RuntimeInterface_arch.cpp - copied, changed from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/include/CodeGenerator_arch.h - copied unchanged from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ipf/include/IpfCodeGenerator.h harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/include/RuntimeInterface_arch.h - copied unchanged from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeInterface.h harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/jet/ - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/jet/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/main/ - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/main/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/ - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/optimizer/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/shared/ - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/shared/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/translator/ - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/translator/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/vm/ - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/vm/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/ - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ia32/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/CodeGenerator_arch.cpp - copied, changed from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ia32/Ia32CodeGenerator.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/CodeGenerator_arch.h - copied unchanged from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ia32/Ia32CodeGenerator.h harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/RuntimeInterface_arch.cpp - copied, changed from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/RuntimeInterface_arch.h - copied unchanged from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.h harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/windows/ Removed: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/IpfCodeGenerator.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/IpfRuntimeInterface.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/include/IpfCodeGenerator.h harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/include/IpfRuntimeInterface.h harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32CodeGenerator.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32CodeGenerator.h harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32RuntimeInterface.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32RuntimeInterface.h harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/CodeGenIntfc.h harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/RuntimeInterface.cpp harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/RuntimeInterface.h harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ia32/ harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ipf/ harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/dynopt/ harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/jet/ harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/main/ harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/optimizer/ harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/shared/ harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/translator/ harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/vm/ Modified: harmony/enhanced/java/branches/mrh/drlvm/build.xml harmony/enhanced/java/branches/mrh/drlvm/make/vm/jitrino.xml harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/unix/makefile harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/IpfRuntimeSupport.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/include/IpfRuntimeSupport.h harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/main/Jitrino.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/CodeSelectors.h harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32CodeEmitter.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32CodeSelector.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32ComplexAddrFormLoader.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32DCE.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32GCMap.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32IRManager.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32InstCodeSelector.cpp harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32StackInfo.cpp harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/unix/makefile Modified: harmony/enhanced/java/branches/mrh/drlvm/build.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/build.xml?rev=956699&r1=956698&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/build.xml (original) +++ harmony/enhanced/java/branches/mrh/drlvm/build.xml Mon Jun 21 21:19:45 2010 @@ -193,6 +193,7 @@ Usage: + Modified: harmony/enhanced/java/branches/mrh/drlvm/make/vm/jitrino.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/vm/jitrino.xml?rev=956699&r1=956698&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/make/vm/jitrino.xml (original) +++ harmony/enhanced/java/branches/mrh/drlvm/make/vm/jitrino.xml Mon Jun 21 21:19:45 2010 @@ -24,79 +24,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -105,109 +36,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Modified: harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml?rev=956699&r1=956698&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml (original) +++ harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml Mon Jun 21 21:19:45 2010 @@ -69,7 +69,10 @@ - + + Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile?rev=956699&r1=956698&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile Mon Jun 21 21:19:45 2010 @@ -38,12 +38,13 @@ LIBNAME = $(LIBPATH)libencoder.a include $(HY_HDK)/build/make/rules.mk $(HY_BIN)%.o: $(ENCDIR)%.cpp + @mkdir -p $(@D) $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $< $(HY_HDK)/include/%.h: $(SHAREDSUB)$(HY_ARCH)/%.h - mkdir -p $(HY_HDK)/include + mkdir -p $(@D) cp -p $< $@ $(HY_HDK)/include/%.inl: $(SHAREDSUB)$(HY_ARCH)/%.inl - mkdir -p $(HY_HDK)/include + mkdir -p $(@D) cp -p $< $@ Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/unix/makefile URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/unix/makefile?rev=956699&r1=956698&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/unix/makefile (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/hythr/unix/makefile Mon Jun 21 21:19:45 2010 @@ -48,7 +48,7 @@ else EXPNAME = HYTHR_0.2 endif -OSLIBS += -lpthread +OSLIBS += -lpthread -lrt MDLLIBFILES += $(LIBPATH)libapr-1.a $(LIBPATH)libport.a LDFLAGS += -Wl,-init -Wl,hythread_library_init Copied: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/CodeGenerator_arch.cpp (from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ipf/IpfCodeGenerator.cpp) URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/CodeGenerator_arch.cpp?p2=harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/CodeGenerator_arch.cpp&p1=harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ipf/IpfCodeGenerator.cpp&r1=956253&r2=956699&rev=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ipf/IpfCodeGenerator.cpp (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/CodeGenerator_arch.cpp Mon Jun 21 21:19:45 2010 @@ -22,7 +22,7 @@ #include "Jitrino.h" #include "CodeSelectors.h" -#include "IpfCodeGenerator.h" +#include "CodeGenerator_arch.h" #include "IpfCodeSelector.h" #include "IpfCodeLayouter.h" #include "IpfLiveAnalyzer.h" Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/IpfRuntimeSupport.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/IpfRuntimeSupport.cpp?rev=956699&r1=956253&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/IpfRuntimeSupport.cpp (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/IpfRuntimeSupport.cpp Mon Jun 21 21:19:45 2010 @@ -75,7 +75,7 @@ RuntimeSupport::RuntimeSupport(Cfg &cfg, // Root Set info // // Stack info structure -// see struct StackInfo in IpfRuntimeInterface.h +// see struct StackInfo in RuntimeInterface_arch.h // // Root set info structure // +---------------+ Copied: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/RuntimeInterface_arch.cpp (from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp) URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/RuntimeInterface_arch.cpp?p2=harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/RuntimeInterface_arch.cpp&p1=harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp&r1=956253&r2=956699&rev=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/RuntimeInterface_arch.cpp Mon Jun 21 21:19:45 2010 @@ -20,7 +20,7 @@ * */ -#include "IpfRuntimeInterface.h" +#include "RuntimeInterface_arch.h" #include "IpfEncoder.h" #include "IpfType.h" #include "IpfOpndManager.h" Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/include/IpfRuntimeSupport.h URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/include/IpfRuntimeSupport.h?rev=956699&r1=956253&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/include/IpfRuntimeSupport.h (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/ia64/codegenerator/include/IpfRuntimeSupport.h Mon Jun 21 21:19:45 2010 @@ -25,7 +25,7 @@ #include "IpfCfg.h" #include "IpfOpndManager.h" -#include "IpfRuntimeInterface.h" +#include "RuntimeInterface_arch.h" namespace Jitrino { namespace IPF { Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/main/Jitrino.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/main/Jitrino.cpp?rev=956699&r1=956253&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/main/Jitrino.cpp (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/main/Jitrino.cpp Mon Jun 21 21:19:45 2010 @@ -43,11 +43,7 @@ #include "PMF.h" #include "PMFAction.h" -#if defined(_IPF_) - #include "IpfRuntimeInterface.h" -#else - #include "ia32/Ia32RuntimeInterface.h" -#endif +#include "RuntimeInterface_arch.h" #include Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/CodeSelectors.h URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/CodeSelectors.h?rev=956699&r1=956253&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/CodeSelectors.h (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/optimizer/CodeSelectors.h Mon Jun 21 21:19:45 2010 @@ -22,12 +22,7 @@ #ifndef CODESELECTORS_H_ #define CODESELECTORS_H_ - -#if defined(_IPF_) - #include "IpfCodeGenerator.h" -#else - #include "ia32/Ia32CodeGenerator.h" -#endif +#include "CodeGenerator_arch.h" #include "irmanager.h" Copied: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/CodeGenerator_arch.cpp (from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ia32/Ia32CodeGenerator.cpp) URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/CodeGenerator_arch.cpp?p2=harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/CodeGenerator_arch.cpp&p1=harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ia32/Ia32CodeGenerator.cpp&r1=956253&r2=956699&rev=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ia32/Ia32CodeGenerator.cpp (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/CodeGenerator_arch.cpp Mon Jun 21 21:19:45 2010 @@ -22,7 +22,7 @@ #include #include "Stl.h" -#include "Ia32CodeGenerator.h" +#include "CodeGenerator_arch.h" #include "Ia32CodeSelector.h" #include "Log.h" #include "Ia32IRManager.h" Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32CodeEmitter.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32CodeEmitter.cpp?rev=956699&r1=956253&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32CodeEmitter.cpp (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32CodeEmitter.cpp Mon Jun 21 21:19:45 2010 @@ -20,7 +20,7 @@ #include "Ia32IRManager.h" #include "Log.h" -#include "Ia32RuntimeInterface.h" +#include "RuntimeInterface_arch.h" #include "Ia32Printer.h" #include "Ia32RegAllocCheck.h" #include "Ia32GCMap.h" Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32CodeSelector.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32CodeSelector.cpp?rev=956699&r1=956253&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32CodeSelector.cpp (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32CodeSelector.cpp Mon Jun 21 21:19:45 2010 @@ -20,7 +20,7 @@ #include -#include "Ia32CodeGenerator.h" +#include "CodeGenerator_arch.h" #include "Ia32CodeSelector.h" #include "Ia32CFG.h" #include "Ia32InstCodeSelector.h" Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32ComplexAddrFormLoader.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32ComplexAddrFormLoader.cpp?rev=956699&r1=956253&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32ComplexAddrFormLoader.cpp (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32ComplexAddrFormLoader.cpp Mon Jun 21 21:19:45 2010 @@ -19,7 +19,7 @@ */ -#include "Ia32CodeGenerator.h" +#include "CodeGenerator_arch.h" #include "Ia32CFG.h" #include "Ia32IRManager.h" #include "Ia32Inst.h" Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32DCE.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32DCE.cpp?rev=956699&r1=956253&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32DCE.cpp (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32DCE.cpp Mon Jun 21 21:19:45 2010 @@ -19,7 +19,7 @@ */ #include "Ia32IRManager.h" -#include "Ia32CodeGenerator.h" +#include "CodeGenerator_arch.h" namespace Jitrino { Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32GCMap.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32GCMap.cpp?rev=956699&r1=956253&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32GCMap.cpp (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32GCMap.cpp Mon Jun 21 21:19:45 2010 @@ -20,7 +20,7 @@ #include "Ia32GCMap.h" #include "Ia32Inst.h" -#include "Ia32RuntimeInterface.h" +#include "RuntimeInterface_arch.h" #include "Ia32StackInfo.h" #include "Ia32GCSafePoints.h" #include "XTimer.h" Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32IRManager.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32IRManager.cpp?rev=956699&r1=956253&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32IRManager.cpp (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32IRManager.cpp Mon Jun 21 21:19:45 2010 @@ -24,7 +24,7 @@ #include "Log.h" #include "EMInterface.h" #include "Ia32Printer.h" -#include "Ia32CodeGenerator.h" +#include "CodeGenerator_arch.h" #include "Dominator.h" #include Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32InstCodeSelector.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32InstCodeSelector.cpp?rev=956699&r1=956253&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32InstCodeSelector.cpp (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32InstCodeSelector.cpp Mon Jun 21 21:19:45 2010 @@ -20,7 +20,7 @@ #include "Log.h" #include "Ia32InstCodeSelector.h" -#include "Ia32CodeGenerator.h" +#include "CodeGenerator_arch.h" #include "Ia32Printer.h" #include "EMInterface.h" #include "VMInterface.h" Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32StackInfo.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32StackInfo.cpp?rev=956699&r1=956253&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32StackInfo.cpp (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/Ia32StackInfo.cpp Mon Jun 21 21:19:45 2010 @@ -21,7 +21,7 @@ #include "Ia32IRManager.h" #include "Stl.h" #include "Ia32StackInfo.h" -#include "Ia32RuntimeInterface.h" +#include "RuntimeInterface_arch.h" #include "Ia32InternalTrace.h" #include Copied: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/RuntimeInterface_arch.cpp (from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp) URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/RuntimeInterface_arch.cpp?p2=harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/RuntimeInterface_arch.cpp&p1=harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp&r1=956253&r2=956699&rev=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/drlvm/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp (original) +++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/shared/x86_or_x86_64/codegenerator/RuntimeInterface_arch.cpp Mon Jun 21 21:19:45 2010 @@ -19,7 +19,7 @@ */ #include "Ia32IRManager.h" -#include "Ia32RuntimeInterface.h" +#include "RuntimeInterface_arch.h" #include "Ia32StackInfo.h" #include "Ia32GCMap.h" #include "Ia32BCMap.h" Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/unix/makefile URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/unix/makefile?rev=956699&r1=956698&r2=956699&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/unix/makefile (original) +++ harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/unix/makefile Mon Jun 21 21:19:45 2010 @@ -29,4 +29,5 @@ MDLLIBFILES = include $(HY_HDK)/build/make/rules.mk $(HY_BIN)%.o: ../%.c + @mkdir -p ${@D} $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<