Changeset 12771

Timestamp:

06/27/10 21:38:09 (13 years ago)

Author:

astalla

Message:

Fixed the handling of disassemble: functions store the *load-truename* they were loaded from, and use that to try to load bytecode for disassembly. If the loading fails, NIL is returned (it crashed hard before this fix).

File:

• trunk/abcl/src/org/armedbear/lisp/Function.java (modified) (7 diffs)

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

@@ -41 +41 @@
     private int callCount;
     private int hotCount;
-
-    protected Function() {}
+    /**
+     * The value of *load-truename* which was current when this function
+     * was loaded, used for fetching the class bytes in case of disassebly.
+     */
+    private final LispObject loadedFrom;
+
+    protected Function() {
+  LispObject loadTruename = Symbol.LOAD_TRUENAME.symbolValueNoThrow();
+  loadedFrom = loadTruename != null ? loadTruename : NIL;
+    }
 
     public Function(String name)
     {
+  this();
         if (name != null) {
             Symbol symbol = Symbol.addFunction(name.toUpperCase(), this);
@@ -56 +65 @@
     public Function(Symbol symbol, String arglist)
     {
+  this();
         symbol.setSymbolFunction(this);
         if (cold)
@@ -65 +75 @@
     public Function(Symbol symbol, String arglist, String docstring)
     {
+  this();
         symbol.setSymbolFunction(this);
         if (cold)
@@ -101 +112 @@
                     String arglist, String docstring)
     {
+  this();
         if (arglist instanceof String)
             setLambdaList(new SimpleString(arglist));
@@ -121 +133 @@
     public Function(LispObject name)
     {
+  this();
         setLambdaName(name);
     }
@@ -126 +139 @@
     public Function(LispObject name, LispObject lambdaList)
     {
+  this();
         setLambdaName(name);
         setLambdaList(lambdaList);
@@ -183 +197 @@
       ClassLoader c = getClass().getClassLoader();
       if(c instanceof FaslClassLoader) {
-    return new JavaObject(((FaslClassLoader) c).getFunctionClassBytes(this));
+    final LispThread thread = LispThread.currentThread(); 
+    SpecialBindingsMark mark = thread.markSpecialBindings(); 
+    try { 
+        thread.bindSpecial(Symbol.LOAD_TRUENAME, loadedFrom); 
+        return new JavaObject(((FaslClassLoader) c).getFunctionClassBytes(this));
+    } catch(Throwable t) {
+        //This is because unfortunately getFunctionClassBytes uses
+        //Debug.assertTrue(false) to signal errors
+        if(t instanceof ControlTransfer) {
+      throw (ControlTransfer) t;
+        } else {
+      return NIL;
+        }
+    } finally { 
+        thread.resetSpecialBindings(mark); 
+    }   
       } else {
     return NIL;