harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfur...@apache.org
Subject svn commit: r615193 - in /harmony/enhanced/drlvm/trunk: build/make/ build/make/components/vm/ vm/gc_gen/javasrc/org/apache/harmony/drlvm/gc_gen/ vm/gc_gen/javasrc_uncomp/ vm/gc_gen/src/common/
Date Fri, 25 Jan 2008 11:58:47 GMT
Author: mfursov
Date: Fri Jan 25 03:58:46 2008
New Revision: 615193

URL: http://svn.apache.org/viewvc?rev=615193&view=rev
Log:
fix for HARMONY-5423 [drlvm][gc_gen] Merging JAva sources for both compressed and uncompressed
modes.


Removed:
    harmony/enhanced/drlvm/trunk/vm/gc_gen/javasrc_uncomp/
Modified:
    harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen_uncomp.xml
    harmony/enhanced/drlvm/trunk/build/make/deploy.xml
    harmony/enhanced/drlvm/trunk/build/make/harmonyvm.properties
    harmony/enhanced/drlvm/trunk/vm/gc_gen/javasrc/org/apache/harmony/drlvm/gc_gen/GCHelper.java
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen_uncomp.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen_uncomp.xml?rev=615193&r1=615192&r2=615193&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen_uncomp.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen_uncomp.xml Fri Jan 25 03:58:46
2008
@@ -102,7 +102,7 @@
         <property name="build.java.depends" value=""/>
 
         <property name="java.source.dir"
-                  location="${build.vm.home}/gc_gen/javasrc_uncomp"/>
+                  location="${build.vm.home}/gc_gen/javasrc"/>
 
         <path id="java.class.path">
             <pathelement location="${java.build.dir}"/>
@@ -112,8 +112,8 @@
             <fileset dir="${build.VMMAGIC.home}" includes="vmmagic-20070207.jar" />
         </path>
 
-        <property name="jarname" value="gc_gen_uncomp.jar"/>
-        <property name="srcjarname" value="gc_gen_uncomp-src.jar"/>
+        <property name="jarname" value="gc_gen.jar"/>
+        <property name="srcjarname" value="gc_gen-src.jar"/>
 
     </target>
 </project>

Modified: harmony/enhanced/drlvm/trunk/build/make/deploy.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/deploy.xml?rev=615193&r1=615192&r2=615193&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/deploy.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/deploy.xml Fri Jan 25 03:58:46 2008
@@ -61,7 +61,7 @@
         <select refsmode="REFS_USE_UNCOMPRESSED,REFS_USE_RUNTIME_SWITCH">
         <gc_gen_uncomp>
             <shared>bin/default:gc_gen_uncomp</shared>
-            <jar>bin/default:gc_gen_uncomp</jar>
+            <jar>bin/default:gc_gen</jar>
         </gc_gen_uncomp>
         </select>
 

Modified: harmony/enhanced/drlvm/trunk/build/make/harmonyvm.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/harmonyvm.properties?rev=615193&r1=615192&r2=615193&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/harmonyvm.properties (original)
+++ harmony/enhanced/drlvm/trunk/build/make/harmonyvm.properties Fri Jan 25 03:58:46 2008
@@ -17,9 +17,5 @@
 bootclasspath.kernel.source.4=%LAUNCHER_HOME%/%VM_DIR%/gc_gen-src.jar
 bootclasspath.kernel.source.packageroot.4=/
 
-bootclasspath.kernel.5=%LAUNCHER_HOME%/%VM_DIR%/gc_gen_uncomp.jar
-bootclasspath.kernel.source.5=%LAUNCHER_HOME%/%VM_DIR%/gc_gen_uncomp-src.jar
-bootclasspath.kernel.source.packageroot.5=/
-
 
 # end of file

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/javasrc/org/apache/harmony/drlvm/gc_gen/GCHelper.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/javasrc/org/apache/harmony/drlvm/gc_gen/GCHelper.java?rev=615193&r1=615192&r2=615193&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/javasrc/org/apache/harmony/drlvm/gc_gen/GCHelper.java
(original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/javasrc/org/apache/harmony/drlvm/gc_gen/GCHelper.java
Fri Jan 25 03:58:46 2008
@@ -27,8 +27,12 @@
 public class GCHelper {
 
     static {
-      System.loadLibrary("gc_gen");
-      helperCallback();
+        if (VMHelper.COMPRESSED_REFS_MODE) {
+            System.loadLibrary("gc_gen");
+        } else {
+            System.loadLibrary("gc_gen_uncomp");
+        }
+        helperCallback();
     }
 
     public static final int TLS_GC_OFFSET = TLSGCOffset();

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp?rev=615193&r1=615192&r2=615193&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp Fri Jan 25 03:58:46 2008
@@ -57,11 +57,8 @@
 
 static void init_gc_helpers()
 {
-#ifdef COMPRESS_REFERENCE
     set_property("vm.component.classpath.gc_gen", "gc_gen.jar", VM_PROPERTIES);
-#else
-    set_property("vm.component.classpath.gc_gen_uncomp", "gc_gen_uncomp.jar", VM_PROPERTIES);
-#endif
+
     vm_helper_register_magic_helper(VM_RT_NEW_RESOLVED_USING_VTABLE_AND_SIZE, "org/apache/harmony/drlvm/gc_gen/GCHelper",
"alloc");
     vm_helper_register_magic_helper(VM_RT_NEW_VECTOR_USING_VTABLE,  "org/apache/harmony/drlvm/gc_gen/GCHelper",
"allocArray");
     vm_helper_register_magic_helper(VM_RT_GC_HEAP_WRITE_REF,  "org/apache/harmony/drlvm/gc_gen/GCHelper",
"write_barrier_slot_rem");



Mime
View raw message