Changeset 13148

Timestamp:

01/14/11 20:24:18 (13 years ago)

Author:

astalla

Message:

Restored disassembly for compiled functions loaded from FASLs by always storing the class bytes greedily.

File:

• trunk/abcl/src/org/armedbear/lisp/FaslClassLoader.java (modified) (4 diffs)

trunk/abcl/src/org/armedbear/lisp/FaslClassLoader.java

@@ -40 +40 @@
 public class FaslClassLoader extends JavaClassLoader {
 
-    private String baseName;
-    private LispObject loader; //The function used to load FASL functions by number
+    private final String baseName;
     private final JavaObject boxedThis = new JavaObject(this);
 
@@ -64 +63 @@
             Class<?> c = this.findLoadedClass(internalName);
 
-            if (c == null)
+            if (c == null) {
                 c = findClass(name);
-
+            }
             if (c != null) {
-                if (resolve)
+                if (resolve) {
                     resolveClass(c);
-
+                }
                 return c;
             }
@@ -95 +94 @@
         return readFunctionBytes(pathname);
     }
-    
+
     public byte[] getFunctionClassBytes(Class<?> functionClass) {
         return getFunctionClassBytes(functionClass.getName());
@@ -109 +108 @@
         try {
             //Function name is fnIndex + 1
-            LispObject o = (LispObject) loadClass(baseName + "_" + (fnNumber + 1)).newInstance();
-            return o;
+            String name = baseName + "_" + (fnNumber + 1);
+            Function f = (Function) loadClass(name).newInstance();
+            f.setClassBytes(getFunctionClassBytes(name));
+            return f;
         } catch(Exception e) {
             if(e instanceof ControlTransfer) { throw (ControlTransfer) e; }