Build VMString into zip, pull into OpenJDK build for string interning.

(OpenJDK now builds again, seems to work as well as before)

git-svn-id: https://llvm.org/svn/llvm-project/vmkit/trunk@145763 91177308-0d34-0410-b5e6-96231b3b80d8

Author: dtzWill

Makefile.config.in

@@ -17,6 +17,8 @@ MMTK_PLAN = @MMTK_PLAN@
 MMTK_PLAN_HEADER = @MMTK_PLAN_HEADER@
 WITH_64 = @WITH_64@
 ANT = @ANT@
+JAVAC= @JAVAC@
+ZIP =@ZIP@
 
 CLASSPATH_IMPL = @classpathimpl@
 

Makefile.rules

@@ -145,3 +145,26 @@ clean-local::
 	-$(Verb) $(RM) -f FrametablesExterns.inc FrametablesSymbols.inc
 
 endif
+
+###############################################################################
+# COMPILE_OPENJDK_ZIP: Build the specified java sources and zip them up
+###############################################################################
+ifeq ($(COMPILE_OPENJDK_ZIP), 1)
+
+# Some variables
+VMKIT_OPENJDK_ZIP=$(PROJ_OBJ_DIR)/vmkit-openjdk.zip
+CLASSES_DIR=$(PROJ_OBJ_DIR)/classes
+
+all-local:: $(VMKIT_OPENJDK_ZIP)
+clean-local::
+	-$(Verb) $(RM) -f $(CLASSES_DIR) $(VMKIT_OPENJDK_ZIP)
+
+
+$(VMKIT_OPENJDK_ZIP): $(addprefix $(PROJ_SRC_DIR)/,$(OPENJDK_JAVA_SOURCES))
+	$(Echo) "Building OpenJDK java sources into zip"
+	-$(Verb) $(RM) -rf $@ $(CLASSES_DIR)
+	$(Verb) $(MKDIR) $(CLASSES_DIR)
+	$(Verb) $(JAVAC) $^ -d $(CLASSES_DIR)
+	cd $(CLASSES_DIR) && $(ZIP) -qr $(VMKIT_OPENJDK_ZIP) .
+
+endif

autoconf/configure.ac

@@ -304,6 +304,8 @@ AC_PATH_PROG(CAT,[cat],  [cat])
 AC_PATH_PROG(LLVMAS, [llvm-as],  [llvm-as])
 AC_PATH_PROG(LLC, [llc],  [llc])
 AC_PATH_PROG(ANT, [ant])
+AC_PATH_PROG(JAVAC, [javac], [javac])
+AC_PATH_PROG(ZIP, [zip], [zip])
 
 dnl Find the install program
 AC_PROG_INSTALL

lib/j3/ClassLib/Classpath.h.in

@@ -27,12 +27,7 @@
 #define OpenJDKArch "@openjdkarchdir@"
 
 // OpenJDK Bootstrap classpath
-#define OpenJDKBootPath \
-      OpenJDKJRE "/lib/rt.jar" \
-  ":" OpenJDKJRE "/lib/resources.jar" \
-  ":" OpenJDKJRE "/lib/jsse.jar" \
-  ":" OpenJDKJRE "/lib/jce.jar" \
-  ":" OpenJDKJRE "/lib/charsets.jar"
+extern const char * OpenJDKBootPath;
 
 // Location of OpenJDK's libjava.so
 #define OpenJDKLibJava OpenJDKArch "/libjava.so"

lib/j3/ClassLib/OpenJDK/JavaUpcalls.cpp

@@ -47,6 +47,7 @@ JavaField*  Classpath::group;
 Class*      Classpath::threadGroup;
 JavaMethod* Classpath::getUncaughtExceptionHandler;
 JavaMethod* Classpath::uncaughtException;
+JavaMethod* Classpath::internString;
 
 JavaMethod* Classpath::setContextClassLoader;
 JavaMethod* Classpath::getSystemClassLoader;
@@ -228,6 +229,14 @@ Class*      Classpath::RefHandlerClass;
 JavaMethod* Classpath::initRefHandler;
 JavaMethod* Classpath::threadStart;
 
+const char * OpenJDKBootPath =
+      OpenJDKJRE "/lib/rt.jar"
+  ":" OpenJDKJRE "/lib/resources.jar"
+  ":" OpenJDKJRE "/lib/jsse.jar"
+  ":" OpenJDKJRE "/lib/jce.jar"
+  ":" OpenJDKJRE "/lib/charsets.jar"
+  ":" VMKitOpenJDKZip ;
+
 void Classpath::CreateJavaThread(Jnjvm* vm, JavaThread* myth,
                                  const char* thName, JavaObject* Group) {
   JavaObject* th = NULL;
@@ -947,6 +956,12 @@ void Classpath::initialiseClasspath(JnjvmClassLoader* loader) {
     UPCALL_METHOD(loader, "java/lang/ref/Reference", "<clinit>",
                   "()V", ACC_STATIC);
   ReferenceClassInit->setNative();
+
+  // String support
+
+  internString =
+    UPCALL_METHOD(loader, "java/lang/VMString", "intern",
+        "(Ljava/lang/String;)Ljava/lang/String;", ACC_STATIC);
 }
 
 void Classpath::InitializeSystem(Jnjvm * jvm) {

lib/j3/ClassLib/OpenJDK/JavaUpcalls.h

@@ -144,6 +144,7 @@ class Classpath : public vmkit::PermanentObject {
   ISOLATE_STATIC UserClass* threadGroup;
   ISOLATE_STATIC JavaMethod* getUncaughtExceptionHandler;
   ISOLATE_STATIC JavaMethod* uncaughtException;
+  ISOLATE_STATIC JavaMethod* internString;
 
 
   ISOLATE_STATIC UserClass* InvocationTargetException;

lib/j3/ClassLib/OpenJDK/Makefile

@@ -14,9 +14,13 @@ include $(LEVEL)/Makefile.config
 
 MODULE_WITH_GC = Classpath
 
+COMPILE_OPENJDK_ZIP=1
+OPENJDK_JAVA_SOURCES=java/lang/VMString.java
+
 include $(LEVEL)/Makefile.common
 
 CXX.Flags += -I$(PROJ_SRC_DIR)/../../VMCore
 CXX.Flags += -I$(PROJ_SRC_ROOT)/include/j3
 CXX.Flags += -I$(PROJ_SRC_DIR)/.. -I$(PROJ_OBJ_DIR)/..
 CXX.Flags += -I$(PROJ_SRC_ROOT)/include/j3/openjdk
+CXX.Flags += -DVMKitOpenJDKZip=\"$(VMKIT_OPENJDK_ZIP)\"

lib/j3/ClassLib/OpenJDK/OpenJDK.inc

@@ -175,10 +175,6 @@ JVM_InternString(JNIEnv *env, jstring _str) {
   llvm_gcroot(array, 0);
   llvm_gcroot(res, 0);
 
-  // If already intern'd, just return.
-  if(str->getVirtualTable() == JavaString::internStringVT)
-    return _str;
-
   BEGIN_JNI_EXCEPTION
 
   Jnjvm* vm = JavaThread::get()->getJVM();