harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r965789 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/build/platform/ classlib/depends/libs/ classlib/depends/manifests/xalan-j_2.7.0/ classlib/depends/manifests/xerces_2.10.0/ classlib/make/ classlib/modules/lun...
Date Tue, 20 Jul 2010 10:36:57 GMT
Author: hindessm
Date: Tue Jul 20 10:36:56 2010
New Revision: 965789

URL: http://svn.apache.org/viewvc?rev=965789&view=rev
Log:
Merge changes from trunk@965757.

Added:
    harmony/enhanced/java/branches/java6/classlib/modules/xml/
      - copied from r965757, harmony/enhanced/java/trunk/classlib/modules/xml/
    harmony/enhanced/java/branches/java6/classlib/modules/xml/build.xml
      - copied unchanged from r965757, harmony/enhanced/java/trunk/classlib/modules/xml/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/
      - copied from r965757, harmony/enhanced/java/trunk/classlib/modules/xml/depends/
    harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/
      - copied from r965757, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/
    harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/
      - copied from r965757, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/
    harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/META-INF/
      - copied from r965757, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/META-INF/
    harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF
      - copied unchanged from r965757, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF
    harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xerces_2.10.0/
      - copied from r965757, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xerces_2.10.0/
    harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xerces_2.10.0/META-INF/
      - copied from r965757, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xerces_2.10.0/META-INF/
    harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xerces_2.10.0/META-INF/MANIFEST.MF
      - copied unchanged from r965757, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xerces_2.10.0/META-INF/MANIFEST.MF
    harmony/enhanced/java/branches/java6/classlib/modules/xml/make/
      - copied from r965757, harmony/enhanced/java/trunk/classlib/modules/xml/make/
    harmony/enhanced/java/branches/java6/classlib/modules/xml/make/depends.properties
      - copied unchanged from r965757, harmony/enhanced/java/trunk/classlib/modules/xml/make/depends.properties
Removed:
    harmony/enhanced/java/branches/java6/classlib/depends/manifests/xalan-j_2.7.0/
    harmony/enhanced/java/branches/java6/classlib/depends/manifests/xerces_2.10.0/
Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/build.xml
    harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk
    harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/make/depends.xml
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/Date.java
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/luniglob.c
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/DateTest.java
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/include/compile.h
    harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp
    harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/lil/ia32/m2n_ia32.cpp
    harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/thread/helpers/thread_helpers_ia32.cpp
    harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/ia32/base/jit_lock_rt_support_ia32.cpp
    harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c
    harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/unix/makefile

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 20 10:36:56 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-964765
+/harmony/enhanced/java/trunk:929253-965757
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 20 10:36:56 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-964765
+/harmony/enhanced/java/trunk/classlib:929253-965757
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/build.xml?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/build.xml Tue Jul 20 10:36:56 2010
@@ -201,8 +201,6 @@ module:
         <copy todir="${hy.jdk}/jre/lib/boot">
             <fileset dir="${depends.jars}">
                 <patternset includes="icu4j_4.2.1/*.jar" />
-                <patternset includes="xalan-j_2.7.0/xalan.jar" />
-                <patternset includes="xerces_2.10.0/*.jar" />
             </fileset>
             <fileset dir="${depends.manifests}"/>
         </copy>

Modified: harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk (original)
+++ harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk Tue Jul
20 10:36:56 2010
@@ -19,7 +19,7 @@ AS = cc
 # Use cxx/c++ for c++ compiles on z/OS
 CXX = cxx
 
-DEFINES += -DZOS -DZOS_S390 -DHYS390 -DHY_ATOE -DIPv6_FUNCTION_SUPPORT
+DEFINES += -DZOS -DZOS_S390 -DHYS390 -DHY_ATOE -D_OPEN_SYS_IF_EXT=1 -DIPv6_FUNCTION_SUPPORT
 PLATFORM = -Wc,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) -Wa,goff \
            -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
 

Modified: harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk (original)
+++ harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk Tue
Jul 20 10:36:56 2010
@@ -19,7 +19,7 @@ AS = cc
 # Use cxx/c++ for c++ compiles on z/OS
 CXX = cxx
 
-DEFINES += -DZOS -DZOS_S390X -DHYS390X -DHY_ATOE -DIPv6_FUNCTION_SUPPORT
+DEFINES += -DZOS -DZOS_S390X -DHYS390X -DHY_ATOE -D_OPEN_SYS_IF_EXT=1 -DIPv6_FUNCTION_SUPPORT
 PLATFORM = -Wc,lp64,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) \
            -Wa,goff -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
 

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 20 10:36:56 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-964765
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-965757
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/depends.xml?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/depends.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/depends.xml Tue Jul 20 10:36:56 2010
@@ -34,8 +34,6 @@
             depends="-check,-check-win,-extract" />
 
     <target name="-check">
-        <check-one-file src="${xalan.url}" dest="${xalan.orig.jar}" />
-        <check-one-file src="${xerces.url}" dest="${xerces.zip}" />
         <check-one-file src="${junit.url}" dest="${junit.jar}" />
         <check-one-file src="${hamcrest-library.url}" dest="${hamcrest-library.jar}" />
         <check-one-file src="${findbugs.url}" dest="${findbugs.zip}" />
@@ -54,45 +52,14 @@
         <check-one-file src="${msvcp.url}" dest="${msvcp.dll}" />
     </target>
 
-    <target name="-extract"
-         depends="-extract-props,-extract-xerces,-fix-xalan-manifest,-extract-findbugs" />
+    <target name="-extract" depends="-extract-props,-extract-findbugs" />
 
     <target name="-extract-props">
-        <uptodate property="xerces.uptodate"
-                  srcfile="${xerces.zip}"
-                  targetfile="${xerces.dir}/xercesImpl.jar" />
-        <uptodate property="xalan.uptodate"
-                  srcfile="${xalan.orig.jar}"
-                  targetfile="${xalan.jar}" />
         <uptodate property="findbugs.uptodate"
                   srcfile="${findbugs.zip}"
                   targetfile="${findbugs.dir}/uptodate" />
     </target>
 
-    <target name="-extract-xerces" unless="xerces.uptodate">
-        <unzip src="${xerces.zip}" dest="${xerces.dir}.tmp" />
-        <copy todir="${xerces.dir}" flatten="yes">
-            <fileset dir="${xerces.dir}.tmp/xerces-2_10_0">
-                <include name="resolver.jar" />
-		<include name="xercesImpl.jar" />
-		<include name="xml-apis.jar" />
-            </fileset>
-        </copy>
-        <delete dir="${xerces.dir}.tmp" />
-	<touch file="${xerces.dir}/xercesImpl.jar" />
-    </target>
-
-    <target name="-fix-xalan-manifest" unless="xalan.uptodate">
-        <unjar src="${xalan.orig.jar}" dest="${xalan.dir}.tmp" />
-        <delete file="${xalan.jar}" />
-        <replace file="${xalan.dir}.tmp/META-INF/MANIFEST.MF"
-                 token="Class-Path: xercesImpl.jar xml-apis.jar serializer.jar"
-                 value="" />
-        <jar destfile="${xalan.jar}" basedir="${xalan.dir}.tmp"
-             manifest="${xalan.dir}.tmp/META-INF/MANIFEST.MF" />
-        <delete dir="${xalan.dir}.tmp" />
-    </target>
-
     <target name="-extract-findbugs" unless="findbugs.uptodate">
         <!-- Note that FindBugs contains a top level dir name -->
         <unzip src="${findbugs.zip}" dest="${findbugs.dir}/.." />
@@ -104,14 +71,6 @@
 
     <target name="-download">
 
-        <mkdir dir="${xalan.dir}" />
-        <download-one-file src="${xalan.url}" dest="${xalan.orig.jar}"
-                           md5="${xalan.md5}" />
-
-        <mkdir dir="${xerces.dir}" />
-        <download-one-file src="${xerces.url}" dest="${xerces.zip}"
-                           md5="${xerces.md5}" />
-
         <mkdir dir="${junit.dir}" />
         <download-one-file src="${junit.url}" dest="${junit.jar}"
                            md5="${junit.md5}" />

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/Date.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/Date.java?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/Date.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/util/Date.java
Tue Jul 20 10:36:56 2010
@@ -45,12 +45,13 @@ public class Date implements Serializabl
 
     private transient long milliseconds;
     
-    private static String[] dayOfWeekNames = { "Sun", "Mon", "Tue", //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$
-        "Wed", "Thu", "Fri", "Sat" }; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    
-    private static String[] monthNames = { "Jan", "Feb", "Mar", //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$
-        "Apr", "May", "Jun", "Jul", //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-        "Aug", "Sep", "Oct", "Nov", "Dec"};  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
//$NON-NLS-5$
+    @SuppressWarnings("nls")
+    private static String[] dayOfWeekNames = { "Sun", "Mon", "Tue", "Wed",
+            "Thu", "Fri", "Sat" };
+
+    @SuppressWarnings("nls")
+    private static String[] monthNames = { "Jan", "Feb", "Mar", "Apr", "May",
+            "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
 
     /**
      * Initializes this {@code Date} instance to the current date and time.
@@ -708,10 +709,28 @@ public class Date implements Serializabl
     @Override
     public String toString() {
         Calendar cal = new GregorianCalendar(milliseconds);
-        return dayOfWeekNames[cal.get(Calendar.DAY_OF_WEEK) - 1] + " " + monthNames[cal.get(Calendar.MONTH)]//$NON-NLS-1$
-                + " " + toTwoDigits(cal.get(Calendar.DAY_OF_MONTH)) + " " + toTwoDigits(cal.get(Calendar.HOUR_OF_DAY))//$NON-NLS-1$
//$NON-NLS-2$
-                + ":" + toTwoDigits(cal.get(Calendar.MINUTE)) + ":" + toTwoDigits(cal.get(Calendar.SECOND))//$NON-NLS-1$
//$NON-NLS-2$
-                + " " + cal.getTimeZone().getID() + " " + cal.get(Calendar.YEAR);//$NON-NLS-1$
//$NON-NLS-2$
+        TimeZone zone = cal.getTimeZone();
+        String zoneName = zone.getDisplayName(zone.inDaylightTime(this),
+                TimeZone.SHORT, Locale.getDefault());
+
+        StringBuilder sb = new StringBuilder(34);
+        sb.append(dayOfWeekNames[cal.get(Calendar.DAY_OF_WEEK) - 1]);
+        sb.append(' ');
+        sb.append(monthNames[cal.get(Calendar.MONTH)]);
+        sb.append(' ');
+        sb.append(toTwoDigits(cal.get(Calendar.DAY_OF_MONTH)));
+        sb.append(' ');
+        sb.append(toTwoDigits(cal.get(Calendar.HOUR_OF_DAY)));
+        sb.append(':');
+        sb.append(toTwoDigits(cal.get(Calendar.MINUTE)));
+        sb.append(':');
+        sb.append(toTwoDigits(cal.get(Calendar.SECOND)));
+        sb.append(' ');
+        sb.append(zoneName);
+        sb.append(' ');
+        sb.append(cal.get(Calendar.YEAR));
+
+        return sb.toString();
     }
 
     private String toTwoDigits(int digit) {

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/luniglob.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/luniglob.c?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/luniglob.c
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/luniglob.c
Tue Jul 20 10:36:56 2010
@@ -131,7 +131,6 @@ JNI_OnLoad (JavaVM * vm, void *reserved)
        /* set other (not required by api specification) properties */
        (*vmInterface)->GetSystemProperty (vmInterface, "user.language", &propVal);
        if (propVal == NULL) {
-            /* FIXME provide appropriate non-dummy value */
            propRes = (*vmInterface)->SetSystemProperty (vmInterface, "user.language",
(char *)hynls_get_language());
            if (VMI_ERROR_NONE != propRes) {
                /* goto fail2; */
@@ -139,7 +138,6 @@ JNI_OnLoad (JavaVM * vm, void *reserved)
        }
        (*vmInterface)->GetSystemProperty (vmInterface, "user.country", &propVal);
        if (propVal == NULL) {
-           /* FIXME provide appropriate non-dummy value */
            propRes = (*vmInterface)->SetSystemProperty (vmInterface, "user.country", (char
*)hynls_get_region());
            if (VMI_ERROR_NONE != propRes) {
                /* goto fail2; */

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/DateTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/DateTest.java?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/DateTest.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/DateTest.java
Tue Jul 20 10:36:56 2010
@@ -471,7 +471,7 @@ public class DateTest extends junit.fram
         TimeZone.setDefault(TimeZone.getTimeZone("MST"));
         Date d2 = new Date(108, 7, 27);
         assertTrue("Returned incorrect string: " + d2, d2.toString()
-                .startsWith("Wed Aug 27 00:00:00 MST")
+                .startsWith("Wed Aug 27 00:00:00")
                 && d2.toString().endsWith("2008"));
 	}
 

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 20 10:36:56 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-964765
+/harmony/enhanced/java/trunk/drlvm:929253-965757
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/include/compile.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/include/compile.h?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/include/compile.h (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/include/compile.h Tue Jul 20 10:36:56
2010
@@ -104,9 +104,9 @@ typedef void (Override_Generator)(Emitte
 typedef unsigned (Override_Size)(Method *);
 
 typedef struct Stub_Override_Entry {
-    char *class_name;
-    char *method_name;
-    char *descriptor;
+    const char *class_name;
+    const char *method_name;
+    const char *descriptor;
     Override_Generator *override_generator;
     Override_Size *override_size;
 } Stub_Override_Entry;

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp
(original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp
Tue Jul 20 10:36:56 2010
@@ -86,6 +86,7 @@ void JNICALL Java_java_lang_Runtime_0002
      int lenargv = 0;
      lenargv = env->GetArrayLength(cmdarray);
      char *argv[lenargv+1];
+     char *newArgv[lenargv+2];
      for ( i = 0; i < lenargv; i++ ) {
          jo = env->GetObjectArrayElement((jobjectArray)((jobject)cmdarray), (jsize) i);
          strChain = env->GetStringUTFChars((jstring) jo, 0);
@@ -182,11 +183,37 @@ void JNICALL Java_java_lang_Runtime_0002
              }
              free(cmdDir);
          }
-         
+
+         char *newArgv[lenargv+2];
          if (lenEnvp == 0) {
              execvp(argv[0], argv);
+             if (errno == ENOEXEC) {
+               // give another try
+               for (i=0; i<lenargv; i++) {
+                 strCmd = (char *)malloc(1+strlen(argv[i])); // + NUL symbol
+                 *strCmd = '\0';
+                 strcat(strCmd, argv[i]);
+                 newArgv[i+1] = strCmd;
+               }
+               newArgv[0] = strdup("/bin/sh");
+               newArgv[lenargv+1] = (char *)0;
+               execvp(newArgv[0], newArgv);
+             }
          } else {
              execve(argv[0], argv, strEnvpBeginAA);
+             if (errno == ENOEXEC) {
+               // give another try
+               for (i=0; i<lenargv; i++) {
+                 strCmd = (char *)malloc(1+strlen(argv[i])); // + NUL symbol
+                 *strCmd = '\0';
+                 strcat(strCmd, argv[i]);
+                 newArgv[i+1] = strCmd;
+               }
+               newArgv[0] = strdup("/bin/sh");
+               newArgv[lenargv+1] = (char *)0;
+               execve(newArgv[0], newArgv, strEnvpBeginAA);
+             }
+
              if(strchr(argv[0], '/') == NULL) {
                  char* curDir = NULL;
                  char* cmdPath = NULL;
@@ -212,6 +239,11 @@ void JNICALL Java_java_lang_Runtime_0002
          }
          write(fildesInfo[1], &errno, sizeof(int));
          INFO("Process initiation failed: " << strerror(errno));
+         for (i=0; i<lenargv+1; i++) {
+           if (newArgv[i] != NULL) {
+             free(newArgv[i]);
+           }
+         }
          // kill self
          kill(getpid(), 9);
      }
@@ -221,8 +253,18 @@ void JNICALL Java_java_lang_Runtime_0002
      close(fildesI[0]);
      close(fildesE[1]);
      close(fildesInfo[1]);
-     free(cmdDir);
-     free(strCmd);
+
+     for (i=0; i<lenargv; i++) {
+       if (argv[i] != NULL) {
+         free(argv[i]);
+       }
+     }
+
+     for (i=0; i<lenEnvp; i++) {
+       if (strEnvpBeginAA[i] != NULL) {
+         free(strEnvpBeginAA[i]);
+       }
+     }
 
      // get execution status from child
      int errno_child;

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/lil/ia32/m2n_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/lil/ia32/m2n_ia32.cpp?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/lil/ia32/m2n_ia32.cpp (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/lil/ia32/m2n_ia32.cpp Tue Jul
20 10:36:56 2010
@@ -164,7 +164,7 @@ U_32* m2n_get_args(M2nFrame* m2nf)
 
 unsigned m2n_ts_to_register_size()
 {
-    return 22;
+    return 22 + 2;
 }
 
 char* m2n_gen_ts_to_register(char* buf, R_Opnd* reg)

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/thread/helpers/thread_helpers_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/thread/helpers/thread_helpers_ia32.cpp?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/thread/helpers/thread_helpers_ia32.cpp
(original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/thread/helpers/thread_helpers_ia32.cpp
Tue Jul 20 10:36:56 2010
@@ -65,7 +65,9 @@ char* gen_hythread_self_helper(char *ss)
         ss = mov(ss,  eax_opnd,  M_Base_Opnd(eax_reg, offset));
 #   endif
 #else
+    ss = push(ss, ecx_opnd); // Preserve caller-saved ECX
     ss = call(ss, (char *)hythread_self);
+    ss = pop (ss, ecx_opnd);
 #endif
     return ss;
 }
@@ -204,7 +206,7 @@ char* gen_monitorenter_slow_path_helper(
   *  @param[in] ss buffer to put the assembly code to
   *  @param[in] input_param1 register should point to the lockword in object header.
   *  If input_param1 == ecx it reduce one register mov.
-  *  The code use and do not restore eax registers.
+  *  The code use and do not restore eax, ecx registers.
   *  @return 0 if success in eax register
   */
 char* gen_monitor_exit_helper(char *ss, const R_Opnd & input_param1) {
@@ -280,7 +282,7 @@ fast_tls_func* get_tls_helper(hythread_t
     unsigned key_offset =
         (unsigned) &(((HyThread_public *) (0))->thread_local_storage[key]);
 
-    const int stub_size = 126;
+    const int stub_size = 128;
     char *stub = (char *)malloc(stub_size);
     memset(stub, 0xcc /*int 3*/, stub_size);
 

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/ia32/base/jit_lock_rt_support_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/ia32/base/jit_lock_rt_support_ia32.cpp?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/ia32/base/jit_lock_rt_support_ia32.cpp
(original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/ia32/base/jit_lock_rt_support_ia32.cpp
Tue Jul 20 10:36:56 2010
@@ -169,7 +169,7 @@ void * getaddress__vm_monitor_enter_nake
         return addr;
     }
 
-    const int stub_size = 226;
+    const int stub_size = 228;
     char *stub = (char *)malloc_fixed_code_for_jit(stub_size, DEFAULT_CODE_ALIGNMENT, CODE_BLOCK_HEAT_MAX/2,
CAA_Allocate);
 #ifdef _DEBUG
     memset(stub, 0xcc /*int 3*/, stub_size);

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
(original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
Tue Jul 20 10:36:56 2010
@@ -301,7 +301,7 @@ static void *getaddress__vm_initialize_c
 
 static void *generate_object_allocation_stub_with_thread_pointer(char *fast_obj_alloc_proc,
                                                                  char *slow_obj_alloc_proc,
-                                                                 char *stub_name)
+                                                                 const char *stub_name)
 {
     const int stub_size = 52+26;
     char *stub = (char *)malloc_fixed_code_for_jit(stub_size, DEFAULT_CODE_ALIGNMENT, CODE_BLOCK_HEAT_MAX/2,
CAA_Allocate);
@@ -617,7 +617,7 @@ static void *getaddress__vm_aastore()
 
 
 
-static void * gen_new_vector_stub(char *stub_name, char *fast_new_vector_proc, char *slow_new_vector_proc)
+static void * gen_new_vector_stub(const char *stub_name, char *fast_new_vector_proc, char
*slow_new_vector_proc)
 {
     const int stub_size = 52;
     char *stub = (char *)malloc_fixed_code_for_jit(stub_size, DEFAULT_CODE_ALIGNMENT, CODE_BLOCK_HEAT_MAX/2,
CAA_Allocate);

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 20 10:36:56 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-964765
+/harmony/enhanced/java/trunk/jdktools:929253-965757
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c
(original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c
Tue Jul 20 10:36:56 2010
@@ -83,6 +83,12 @@
 #define EXE_SUFFIX          ""
 #endif
 
+#if defined(ZOS)
+#if !defined(PATH_MAX)
+#define PATH_MAX 1024
+#endif
+#endif
+
 typedef struct ToolData {
     int numJars; 
     char **jarList;

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/unix/makefile?rev=965789&r1=965788&r2=965789&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/unix/makefile
(original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/unix/makefile
Tue Jul 20 10:36:56 2010
@@ -23,6 +23,4 @@ BUILDFILES = ../samsa.o
 
 EXENAME = $(LIBPATH)samsa
 
-MDLLIBFILES = 
-
 include $(HY_HDK)/build/make/rules.mk



Mime
View raw message