Changeset 12921

Timestamp:

09/25/10 00:36:29 (13 years ago)

Author:

astalla

Message:

preliminary test of invokedynamic (Java only, no compiler integration)

Location:

branches/invokedynamic/abcl

Files:

• build.xml (modified) (2 diffs)
• src/org/armedbear/lisp/Function.java (modified) (2 diffs)
• src/org/armedbear/lisp/LispObject.java (modified) (2 diffs)
• src/org/armedbear/lisp/Main.java (modified) (2 diffs)
• src/org/armedbear/lisp/Symbol.java (modified) (4 diffs)

branches/invokedynamic/abcl/build.xml

@@ -176 +176 @@
       <javac destdir="${build.classes.dir}"
        debug="true"
-       target="1.5"
+       target="1.7"
              includeantruntime="false"
        failonerror="true">
@@ -247 +247 @@
       classname="org.armedbear.lisp.Main">
         <jvmarg value="-Dabcl.home=${abcl.home.dir}${file.separator}"/>
+  <jvmarg value="-XX:+UnlockExperimentalVMOptions" />
+  <jvmarg value="-XX:+EnableInvokeDynamic" />
   <arg value="--noinit"/>
         <arg value="--nosystem"/>

branches/invokedynamic/abcl/src/org/armedbear/lisp/Function.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import java.dyn.CallSite;
+import java.dyn.MethodType;
 import static org.armedbear.lisp.Lisp.*;
 
@@ -394 +396 @@
         ++hotCount;
     }
+
+    public static CallSite linkLispFunction(Class caller, String name, MethodType type) {
+        System.out.println("Linking " + name + " " + caller + " " + type);
+        CallSite c = ((Symbol) Lisp.readObjectFromString(name)).addCallSite(type);
+        return c;
+    }
 }

branches/invokedynamic/abcl/src/org/armedbear/lisp/LispObject.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import java.dyn.MethodHandle;
+import java.dyn.MethodHandles;
+import java.dyn.MethodType;
 import static org.armedbear.lisp.Lisp.*;
 import java.util.WeakHashMap;
+import sun.dyn.Access;
 
 public class LispObject //extends Lisp
@@ -839 +843 @@
   }
 
+  public MethodHandle asMethodHandle(MethodType type) {
+    /*Class<?>[] params = new Class<?>[type.parameterCount()];
+    if(params.length == 1 && type.parameterType(0).isArray()) {
+      params[0] = LispObject[].class;
+    } else for(int i = 0; i < params.length; i++) {
+      params[i] = LispObject.class;
+    }*/
+    MethodHandle mh = MethodHandles.lookup().findVirtual(getClass(), "execute", type.changeReturnType(LispObject.class));
+    mh = MethodHandles.insertArguments(mh, 0, this);
+    return mh;//MethodType.methodType(LispObject.class, params));
+  }
+
   // Used by COMPILE-MULTIPLE-VALUE-CALL.
   public LispObject dispatch(LispObject[] args)

branches/invokedynamic/abcl/src/org/armedbear/lisp/Main.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import java.dyn.InvokeDynamic;
+import java.dyn.Linkage;
+
 public final class Main
 {
   public static final long startTimeMillis = System.currentTimeMillis();
+
+  static { Linkage.registerBootstrapMethod(Function.class, "linkLispFunction"); }
 
   public static void main(final String[] args)
@@ -52 +57 @@
       };
     new Thread(null, r, "interpreter", 4194304L).start();
+    try {
+        for(int i = 0; i < 2; i++) {
+          Thread.sleep(5000);
+          InvokeDynamic.<LispObject>#"COMMON-LISP:PRINT"((LispObject) new SimpleString("foo"));
+          InvokeDynamic.<LispObject>#"COMMON-LISP:PRINT"((LispObject) new SimpleString("bar"));
+          InvokeDynamic.<LispObject>#"CL-USER::FOO"((LispObject) new SimpleString("baz"));
+        }
+    } catch(Throwable t) {
+      t.printStackTrace();
+    }
+    //java.dyn.InvokeDynamic.foo(new SimpleString("foo"));
   }
 }

branches/invokedynamic/abcl/src/org/armedbear/lisp/Symbol.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import java.dyn.CallSite;
+import java.dyn.MethodType;
+import java.util.Collections;
+import java.util.Set;
+import java.util.WeakHashMap;
 import static org.armedbear.lisp.Lisp.*;
 
@@ -62 +67 @@
   private transient LispObject propertyList;
   private int flags;
+  private final Set<CallSite> callSites = Collections.newSetFromMap(new WeakHashMap<CallSite, Boolean>()); //Weak, is it correct?
 
   // Construct an uninterned symbol.
@@ -93 +99 @@
     this.hash = hash;
     this.pkg = pkg;
+  }
+
+  public CallSite addCallSite(MethodType type) {
+    LispObject f = getSymbolFunctionOrDie();
+    CallSite c = new CallSite(f.asMethodHandle(type));
+    synchronized(callSites) {
+      callSites.add(c);
+    }
+    return c;
   }
 
@@ -405 +420 @@
   public final void setSymbolFunction(LispObject obj)
   {
-    this.function = obj;
+    synchronized(callSites) {
+      this.function = obj;
+      for(CallSite c : callSites) {
+        c.setTarget(this.function.asMethodHandle(c.getTarget().type()));
+      }
+    }
   }