Changeset 13013

Timestamp:

11/08/10 22:34:18 (12 years ago)

Author:

ehuelsmann

Message:

Reduce the impact of the fasl-loader "_0" class's maximum size of 64kB:
this change reduces the size of pprint_0.cls from 23001 to 19380 bytes,
a saving of 18.64%, which is probably much more when counting the size
of the execute() method alone.

File:

• trunk/abcl/src/org/armedbear/lisp/compile-file.lisp (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/compile-file.lisp

@@ -680 +680 @@
   (let* ((basename (base-classname))
    (expr `(lambda (fasl-loader fn-index)
-      (identity fasl-loader) ;;to avoid unused arg
+                  (declare (type (integer 0 256000) fn-index))
+                  (identity fasl-loader) ;;to avoid unused arg
+                  (jvm::with-inline-code ()
+                    (jvm::emit 'jvm::aload 1)
+                    (jvm::emit-invokevirtual jvm::+lisp-object+ "javaInstance"
+                                             nil jvm::+java-object+)
+                    (jvm::emit-checkcast +fasl-classloader+)
+                    (jvm::emit 'jvm::iload 2))
       (ncase fn-index 0 ,(1- *class-number*)
         ,@(loop
@@ -688 +695 @@
                                                 basename i))
                                 (class-name (jvm::make-class-name class)))
-         `(,(1- i)
-            (jvm::with-inline-code ()
-        (jvm::emit 'jvm::aload 1)
-        (jvm::emit-invokevirtual jvm::+lisp-object+ "javaInstance"
-               nil jvm::+java-object+)
-        (jvm::emit-checkcast +fasl-classloader+)
-        (jvm::emit 'jvm::dup)
-        (jvm::emit-push-constant-int ,(1- i))
-        (jvm::emit-new ,class-name)
-        (jvm::emit 'jvm::dup)
-        (jvm::emit-invokespecial-init ,class-name '())
-        (jvm::emit-invokevirtual +fasl-classloader+
+                           `(,(1- i)
+                              (jvm::with-inline-code ()
+                                (jvm::emit-new ,class-name)
+                                (jvm::emit 'jvm::dup)
+                                (jvm::emit-invokespecial-init ,class-name '())
+                                (jvm::emit-invokevirtual +fasl-classloader+
                                                          "putFunction"
-               (list :int jvm::+lisp-object+) jvm::+lisp-object+)
+                                                         (list :int jvm::+lisp-object+) jvm::+lisp-object+)
         (jvm::emit 'jvm::pop))
             t))))))