harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r632167 - in /harmony/enhanced/drlvm/trunk: make/vm/ vm/port/include/ vm/port/src/lil/ vm/port/src/lil/em64t/pim/ vm/port/src/lil/em64t/pim/include/ vm/port/src/lil/ia32/pim/ vm/port/src/lil/ia32/pim/include/ vm/port/src/lil/ipf/pim/ vm/por...
Date Thu, 28 Feb 2008 23:32:15 GMT
Author: gshimansky
Date: Thu Feb 28 15:32:07 2008
New Revision: 632167

URL: http://svn.apache.org/viewvc?rev=632167&view=rev
Log:
Applied patches 0002 and 0003 from HARMONY-5504
[drlvm][port] Restructure DRLVM's sources to extract most of platform dependent code into
portlib

Moved LIL, M2N and stack iteration code into VM and fixed the build to make it work after
the move.


Added:
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/lil.h
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/include/lil.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/lil_code_generator.h
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/include/lil_code_generator.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/lil_code_generator_utils.h
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/include/lil_code_generator_utils.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/m2n.h
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/include/m2n.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/stack_iterator.h
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/include/stack_iterator.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/include/
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/include/lil_code_generator_em64t.h
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/include/lil_code_generator_em64t.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/lil_code_generator_em64t.cpp
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/lil_code_generator_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/m2n_em64t.cpp
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/m2n_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/m2n_em64t_internal.h
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/m2n_em64t_internal.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/stack_iterator_em64t.cpp
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ia32/
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ia32/include/
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ia32/include/lil_code_generator_ia32.h
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/ia32/pim/include/lil_code_generator_ia32.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ia32/lil_code_generator_ia32.cpp
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/ia32/pim/lil_code_generator_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ia32/m2n_ia32.cpp
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/ia32/pim/m2n_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ia32/m2n_ia32_internal.h
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/ia32/pim/m2n_ia32_internal.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ia32/stack_iterator_ia32.cpp
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/ia32/pim/stack_iterator_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/include/
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/include/lil_code_generator_ipf.h
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/include/lil_code_generator_ipf.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/lil_code_generator_ipf.cpp
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/lil_code_generator_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/m2n_ipf.cpp
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/m2n_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/m2n_ipf_internal.h
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/m2n_ipf_internal.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/stack_iterator_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/lil.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil_code_generator.cpp
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/lil_code_generator.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil_code_generator_utils.cpp
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/lil_code_generator_utils.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/stack_iterator/
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/stack_iterator/m2n.cpp
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/pim/m2n.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/stack_iterator/stack_iterator.cpp
      - copied unchanged from r631928, harmony/enhanced/drlvm/trunk/vm/port/src/lil/pim/stack_iterator.cpp
Removed:
    harmony/enhanced/drlvm/trunk/vm/port/include/lil.h
    harmony/enhanced/drlvm/trunk/vm/port/include/lil_code_generator.h
    harmony/enhanced/drlvm/trunk/vm/port/include/lil_code_generator_utils.h
    harmony/enhanced/drlvm/trunk/vm/port/include/m2n.h
    harmony/enhanced/drlvm/trunk/vm/port/include/stack_iterator.h
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/include/lil_code_generator_em64t.h
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/lil_code_generator_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/m2n_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/m2n_em64t_internal.h
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/ia32/pim/include/lil_code_generator_ia32.h
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/ia32/pim/lil_code_generator_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/ia32/pim/m2n_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/ia32/pim/m2n_ia32_internal.h
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/ia32/pim/stack_iterator_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/include/lil_code_generator_ipf.h
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/lil_code_generator_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/m2n_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/m2n_ipf_internal.h
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/stack_iterator_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/lil.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/lil_code_generator.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/lil_code_generator_utils.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/pim/m2n.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/pim/stack_iterator.cpp
Modified:
    harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml
    harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml

Modified: harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml?rev=632167&r1=632166&r2=632167&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/interpreter.xml Thu Feb 28 15:32:07 2008
@@ -48,15 +48,15 @@
 
                 <include name="vmcore/src/util/ipf/include" if="is.ia64"/>
                 <include name="vmcore/src/util/ipf/base_natives" if="is.ia64"/>
-                <include name="port/src/lil/ipf/pim/include" if="is.ia64"/>
+                <include name="vmcore/src/lil/ipf/include" if="is.ia64"/>
 
                 <include name="vmcore/src/util/ia32/base_natives" if="is.x86"/>
                 <include name="port/src/encoder/ia32_em64t" if="is.x86"/>
-                <include name="port/src/lil/ia32/pim/include" if="is.x86"/>
+                <include name="vmcore/src/lil/ia32/include" if="is.x86"/>
 
                 <include name="vmcore/src/util/em64t/base_natives" if="is.x86_64"/>
                 <include name="port/src/encoder/ia32_em64t" if="is.x86_64"/>
-                <include name="port/src/lil/em64t/pim/include" if="is.x86_64"/>
+                <include name="vmcore/src/lil/em64t/include" if="is.x86_64"/>
             </dirset>
         </path>
         <depend-includes paths="int.includes"/>

Modified: harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml?rev=632167&r1=632166&r2=632167&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml Thu Feb 28 15:32:07 2008
@@ -116,15 +116,15 @@
 
                 <include name="vmcore/src/util/ipf/include" if="is.ia64"/>
                 <include name="vmcore/src/util/ipf/base_natives" if="is.ia64"/>
-                <include name="port/src/lil/ipf/pim/include" if="is.ia64"/>
+                <include name="vmcore/src/lil/ipf/include" if="is.ia64"/>
 
                 <include name="vmcore/src/util/ia32/base_natives" if="is.x86"/>
                 <include name="port/src/encoder/ia32_em64t" if="is.x86"/>
-                <include name="port/src/lil/ia32/pim/include" if="is.x86"/>
+                <include name="vmcore/src/lil/ia32/include" if="is.x86"/>
 
                 <include name="vmcore/src/util/em64t/base_natives" if="is.x86_64"/>
                 <include name="port/src/encoder/ia32_em64t" if="is.x86_64"/>
-                <include name="port/src/lil/em64t/pim/include" if="is.x86_64"/>
+                <include name="vmcore/src/lil/em64t/include" if="is.x86_64"/>
             </dirset>
         </path>
         <depend-includes paths="vmcore.includes"/>
@@ -153,6 +153,8 @@
                 <include name="thread/helpers/thread_helpers_em64t.cpp" if="is.x86_64"/>
                 <include name="thread/helpers/thread_helpers_ipf.cpp" if="is.ia64"/>
                 <include name="util/*.cpp" />
+                <include name="lil/*.cpp" />
+                <include name="lil/stack_iterator/*.cpp" />
             </fileset>
 
             <fileset dir="${vm.home}/vmcore/src/kernel_classes/native">
@@ -166,13 +168,7 @@
 
             <fileset dir="${vm.home}">
                 <selector refid="vmcore.depends"/>
-                <include name="port/src/lil/*.cpp" />
-                <include name="port/src/lil/pim/*.cpp" />
                 <include name="vmstart/src/compmgr/*.cpp" />
-
-                <include name="port/src/lil/ipf/pim/*.cpp" if="is.ia64"/>
-                <include name="port/src/lil/ia32/pim/*.cpp" if="is.x86"/>
-                <include name="port/src/lil/em64t/pim/*.cpp" if="is.x86_64"/>
             </fileset>
 
             <fileset dir="${vm.home}/vmcore/src">
@@ -201,6 +197,10 @@
                 <exclude name="util/linux/signals_em64t.cpp" unless="is.unix.x86_64"/>
                 <exclude name="util/linux/signals_ipf.cpp" unless="is.unix.ia64"/>
                 <include name="util/linux/ia32_em64t/*.cpp" if="is.unix" unless="is.ia64"/>
+
+                <include name="lil/ipf/*.cpp" if="is.ia64"/>
+                <include name="lil/ia32/*.cpp" if="is.x86"/>
+                <include name="lil/em64t/*.cpp" if="is.x86_64"/>
             </fileset>
 
             <compilerarg value="/Qwd94" if="is.icl"/>



Mime
View raw message