harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
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 GMT
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:
         <ant antfile="make/vm/jitrino.xml" inheritall="false">
             <propertyset refid="module.props" />
         </ant>
+        <make dir="modules/vm/src/main/native/jitrino/${hy.os.family}" />
     </target>
 
     <target name="gc_gen" depends="vmcore,kernel">

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 @@
         <clean-native />
     </target>
  
-    <target name="build" depends="-init-win,-init-unix">
-        <init-native/>
-        
-        <path id="jit.includes">
-            <dirset dir="${vm.home}/jitrino/src">
-                <include name="dynopt" />
-                <include name="main" />
-                <include name="shared" />
-                <include name="optimizer" />
-                <include name="optimizer/ssa" />
-                <include name="optimizer/abcd" />
-                <include name="translator" />
-                <include name="translator/java" />
-                <include name="vm" />
-                <include name="codegenerator" />
-
-                <include name="codegenerator/ia32" unless="is.ia64"/>
-                <include name="jet" unless="is.ia64"/>
-
-                <include name="codegenerator/ipf" if="is.ia64"/>
-                <include name="codegenerator/ipf/include" if="is.ia64"/>
-            </dirset>
-            <dirset dir="${vm.home}">
-                <include name="port/src/encoder/ia32_em64t" unless="is.ia64"/>
-                <include name="vmcore/src/util/win/include" if="is.windows"/>
-                <include name="vmcore/src/util/linux/include" if="is.unix"/>
-            </dirset>
-            <pathelement location="${vm.home}/include" />
-            <pathelement location="${vm.home}/vmcore/include" />
-            <pathelement location="${vm.home}/port/include" />
-            <pathelement location="${drlvm.include.dir}" />
-        </path>
-        <depend-includes paths="jit.includes"/>
-        <depend-selector rebuild-flag="jit.includes.uptodate" id="jit.depends"/>
-
-        <compile-cc>
-            <compiler id="cpp.compiler" extends="plaf.cpp.compiler">
-                <includepath><path refid="jit.includes"/></includepath>
-                <fileset dir="${vm.home}/jitrino/src">
-                    <selector refid="jit.depends"/>
-                    <include name="dynopt/*.cpp" />
-                    <include name="main/*.cpp" />
-                    <include name="shared/*.cpp" />
-                    <include name="optimizer/*.cpp" />
-                    <include name="optimizer/ssa/*.cpp" />
-                    <include name="optimizer/abcd/*.cpp" />
-                    <include name="translator/*.cpp" />
-                    <include name="translator/java/*.cpp" />
-                    <include name="vm/*.cpp" />
-                    <include name="codegenerator/*.cpp"/>
-    
-                    <include name="codegenerator/ipf/*.cpp" if="is.ia64"/>
-                    <include name="codegenerator/ia32/*.cpp" unless="is.ia64"/>
-                    <include name="jet/*.cpp" unless="is.ia64"/>
-                </fileset>
-    
-                <defineset define="PROJECT_JITRINO" />
-                <defineset define="JIT_LOGS,JIT_STATS" if="is.cfg.debug" />
-            </compiler>
-        </compile-cc>
-        <link-lib name="jitrino" type="shared">
-            <linker id="jitrino.linker" extends="common.linker">
-                <libset libs="harmonyvm,encoder,hythr" dir="${drlvm.lib.dir}" if="is.windows"/>
-                <linkerarg value="/OPT:REF" if="is.windows"/>
-        
-                <syslibset type="shared" libs="m" if="is.unix"/>
-                <syslibset type="shared" libs="dl" if="is.linux"/>
-                <linkerarg value="--version-script=${vm.home}/jitrino/build/jitrino.exp"
if="is.unix"/>
-            </linker>
-        </link-lib>
-
+    <target name="build">
         <echo message="Copying configuration files for jitrino..."/> 
         <copy todir="${drlvm.bin.dir}" flatten="true">
+            <!-- TOFIX: move to more appropriate directory -->
               <fileset dir="${vm.home}/jitrino/config">
                   <include name="ia32/*" if="is.x86"/>
                   <include name="em64t/*" if="is.x86_64"/>
@@ -105,109 +36,4 @@
         </copy>
     </target>
 
-            <!-- windows specific -->
-        <target name="-init-win" depends="-common-vm" if="is.windows">
-            <compiler id="plaf.cpp.compiler" extends="common.cpp.compiler">
-                <!-- _CRT_SECURE_NO_DEPRECATE added to suppress a huge amount of complaints
from msvc em64t compiler -->
-                <defineset define="_MBCS,_REENTRANT,__SMP__,_HAS_ITERATOR_DEBUGGING=0,_SECURE_SCL=0"
/>
-
-                <compilerarg value="/TP" />
-                <compilerarg value="/Zc:forScope" />
-                <compilerarg value="/WL" />
-                <compilerarg value="/W4" />
-<!--                <compilerarg value="/WX" /> -->
-
-                <compilerarg value="/Gm" if="is.cfg.debug"/>
-                <compilerarg value="/RTC1" if="is.cfg.debug"/>
-
-                <compilerarg value="/Ot" if="is.cfg.release"/>
-
-                <compilerarg value="/Qvec_report0" if="is.icl" unless="is.cfg.debug"/>
-                <compilerarg value="/Qww1,82,111,172,181,279,280,373,424,593,654,858"
if="is.icl"/>
-                <compilerarg value="/Qwd82,193,271,304,373,383,424,444,654,869,981,1125,1418,1419,1572,1683"
if="is.icl"/>
-                    <!--
-                      # /Qwd[tag,...] Disable the soft diagnostics that corresponds to tag.

-                      # /Qwr[tag,...] Override the severity of the soft diagnostics corresponding
to tag and make it a remark. 
-                      # /Qww[tag,...] Override the severity of the soft diagnostics corresponding
to tag and make it a warning. 
-                      # /Qwe[tag,...] Override the severity of the soft diagnostics corresponding
to tag and make it an error.
-                      #
-                      # Following icl warning added to icl command line
-                      #
-                      # remark #1: last line of file ends without a newline      
-                      # remark #82: storage class is not first
-                      # remark #111: statement is unreachable
-                      # remark #181: argument is incompatible with corresponding format string
conversion
-                      # remark #193: zero used for undefined preprocessing identifier
-                      # remark #271: trailing comma is nonstandard   
-                      # remark #279: controlling expression is constant    
-                      # remark #280: selector expression is constant
-                      # remark #304: access control not specified ("private" by default)
    
-                      # remark #373: "xxx" is inaccessible
-                      # remark #383: value copied to temporary, reference to temporary used
-                      # remark #424: extra ";" ignored
-                      # remark #444: destructor for base class "..." is not virtual    
-                      # remark #593: variable "xxx" was set but never used
-                      # remark #654: overloaded virtual function "xxx" is only partially
overridden in class "yyy"
-                      # remark #858: type qualifier on return type is meaningless
-                      # remark #869: parameter "o" was never referenced    
-                      # remark #981: operands are evaluated in unspecified order
-                      # remark #1418: external definition with no prior declaration    
-                      # remark #1419: external declaration in primary source file      
-                      #
-                      # warning #1125: function "xxx" is hidden by "yyy" - virtual function
override intended?
-                      # warning #1572: floating-point equality and inequality comparisons
are unreliable
-                    -->
-
-                <compilerarg value="/wd4201" if="is.msvc"/>
-                <compilerarg value="/wd4244" if="is.msvc"/>
-                <compilerarg value="/wd4512" if="is.msvc"/>
-                <compilerarg value="/wd4702" if="is.msvc"/>
-                <compilerarg value="/wd4100" if="is.msvc"/>
-                <compilerarg value="/wd4127" if="is.msvc"/>
-                <compilerarg value="/wd4718" if="is.msvc" unless="is.cfg.debug"/>
-                    <!--
-                      #4201 - W4, nonstandart extention - nameless struct or union
-                      #4702 - W4, unreachable code (fired in STL's <list>)
-                      #4512 - assigment operator can not be generated
-                      #4100 - unreferenced formal parameter
-                      #4127 - conditional expression is constant
-                      #4718 - release: recursive call has no side effects, deleting
-
-                      # specify where to put the per-compilation unit pdb
-                      # this is needed to make the parallel compilation to work with cl:

-                      # the default name is the same for all input files (vc70.pdb) and 
-                      # thus causes problems during parralel build.
-                    -->
-            </compiler>
-        </target>
-        
-        <target name="-init-unix" depends="-common-vm" if="is.unix">
-            <compiler id="plaf.cpp.compiler" extends="common.cpp.compiler">
-                <compilerarg value="-fmessage-length=0" if="is.gcc"/>
-                <compilerarg value="-Wall" if="is.gcc"/>
-                <compilerarg value="-Werror" if="is.gcc"/>
-                <compilerarg value="-Wno-uninitialized" if="is.gcc"/>
-
-                <compilerarg value="-x" />
-                <compilerarg value="c++" />
-                <compilerarg value="-fPIC" />
-                <compilerarg value="-fno-exceptions" />
-
-                <compilerarg value="-wd68" if="is.icc"/>
-                <compilerarg value="-wd654" if="is.icc"/>
-                <compilerarg value="-wd854" if="is.icc"/>
-                <compilerarg value="-wd470" if="is.icc"/>
-                <compilerarg value="-wd1572" if="is.icc"/>
-                <compilerarg value="-wd1125" if="is.icc"/>
-                    <!--                        
-                      # 470 - 'qualified name is not allowed in member declaration'
-                      # warning #1125: function "xxx" is hidden by "yyy"
-                      - virtual function override intended 
-                      # warning #1572: floating-point equality and inequality comparisons
are unreliable
-                    -->
-
-                <compilerarg value="-O" if="is.unix" unless="is.cfg.debug"/>
-            </compiler>
-        </target>
-
 </project>

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 @@
     <target name="build" depends="setup,stamp-version,-common-vm">
         <echo message="Copying files for internationalization..."/>
         <copy todir="${drlvm.bin.dir}" flatten="true" >
-            <fileset dir="${vm.home}/vmcore/src/init">
+            <!--
+                 TOFIX: move to more appropriate directory or copy in makefile?
+              -->
+            <fileset dir="modules/vm/src/main/native/vmcore/shared/init">
                 <include name="harmony*.properties" />
             </fileset>
         </copy>

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 <ostream>
 

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 <fstream>
 #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 <stdlib.h>
-#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 <math.h>
 

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 <math.h>
 

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 $@ $<



Mime
View raw message