Changeset 12709

Timestamp:

05/19/10 21:14:03 (13 years ago)

Author:

ehuelsmann

Message:

Merge EMIT-LOAD-SYMBOL into EMIT-LOAD-EXTERNALIZED-OBJECT.

File:

• trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp (modified) (12 diffs)

trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -752 +752 @@
 
 (defun emit-push-variable-name (variable)
-  (emit-load-symbol (variable-name variable)))
+  (emit-load-externalized-object (variable-name variable)))
 
 (defknown generate-instanceof-type-check-for-variable (t t) t)
@@ -2144 +2144 @@
 (defun serialize-symbol (symbol)
   "Generate code to restore a serialized symbol."
-  (cond
-    ((null (symbol-package symbol))
-     ;; we need to read the #?<n> syntax for uninterned symbols
-
-     ;; TODO: we could use the byte code variant of
-     ;; Load._FASL_UNINTERNED_SYMBOLS_.symbolValue(LispThread.currentThread())
-     ;;    .aref(<index)
-     ;; to eliminate the reader dependency
-     (serialize-object symbol)
-     (emit 'checkcast +lisp-symbol-class+))
-    ((keywordp symbol)
-     (emit 'ldc (pool-string (symbol-name symbol)))
-     (emit-invokestatic +lisp-class+ "internKeyword"
-                        (list +java-string+) +lisp-symbol+))
-    (t
-     (emit 'ldc (pool-string (symbol-name symbol)))
-     (emit 'ldc (pool-string (package-name (symbol-package symbol))))
-     (emit-invokestatic +lisp-class+ "internInPackage"
-                        (list +java-string+ +java-string+)
-                        +lisp-symbol+))))
+  (multiple-value-bind
+        (name class)
+      (lookup-known-symbol symbol)
+    (cond
+      (name
+       (emit 'getstatic class name +lisp-symbol+))
+      ((null (symbol-package symbol))
+       ;; we need to read the #?<n> syntax for uninterned symbols
+
+       ;; TODO: we could use the byte code variant of
+       ;; Load._FASL_UNINTERNED_SYMBOLS_.symbolValue(LispThread.currentThread())
+       ;;    .aref(<index)
+       ;; to eliminate the reader dependency
+       (serialize-object symbol)
+       (emit 'checkcast +lisp-symbol-class+))
+      ((keywordp symbol)
+       (emit 'ldc (pool-string (symbol-name symbol)))
+       (emit-invokestatic +lisp-class+ "internKeyword"
+                          (list +java-string+) +lisp-symbol+))
+      (t
+       (emit 'ldc (pool-string (symbol-name symbol)))
+       (emit 'ldc (pool-string (package-name (symbol-package symbol))))
+       (emit-invokestatic +lisp-class+ "internInPackage"
+                          (list +java-string+ +java-string+)
+                          +lisp-symbol+)))))
 
 (defvar serialization-table
@@ -2245 +2250 @@
       field-type)))
 
-(defun emit-load-symbol (symbol)
-  "Loads a symbol, optionally after externalizing it."
-  (multiple-value-bind
-        (name class)
-      (lookup-known-symbol symbol)
-    (if name
-        (emit 'getstatic class name +lisp-symbol+)
-        (emit-load-externalized-object symbol))))
-
 (defknown declare-function (symbol &optional setf) string)
 (defun declare-function (symbol &optional setf)
@@ -2268 +2264 @@
        (lookup-known-symbol symbol)
      ;; This is a work-around for the fact that
-     ;; EMIT-LOAD-SYMBOL can't be used due to the fact that
+     ;; EMIT-LOAD-EXTERNALIZED-OBJECT can't be used due to the fact that
      ;; here we won't know where to send the code yet (the LET
      ;; selects between *code* and *static-code*, while
-     ;; EMIT-LOAD-SYMBOL wants to modify those specials too
+     ;; EMIT-LOAD-EXTERNALIZED-OBJECT wants to modify those specials too
      (unless name
         (setf name (if *file-compilation*
@@ -2971 +2967 @@
       (cond ((eq op (compiland-name *current-compiland*)) ; recursive call
              (if (notinline-p op)
-                 (emit-load-symbol op)
+                 (emit-load-externalized-object op)
                  (aload 0)))
             (t
-             (emit-load-symbol op)))
+             (emit-load-externalized-object op)))
       (process-args args)
       (if (or (<= *speed* *debug*) *require-stack-frame*)
@@ -4937 +4933 @@
            (emit-move-from-stack target representation))
           ((symbolp obj)
-           (emit-load-symbol obj)
+           (emit-load-externalized-object obj)
            (emit-move-from-stack target representation))
           ((listp obj)
@@ -5172 +5168 @@
           (emit-move-from-stack target))
          (t
-          (emit-load-symbol name)
+          (emit-load-externalized-object name)
           (emit-invokevirtual +lisp-object-class+ "getSymbolFunctionOrDie"
                               nil +lisp-object+)
@@ -5210 +5206 @@
           (emit-move-from-stack target))
          (t
-          (emit-load-symbol (cadr name))
+          (emit-load-externalized-object (cadr name))
           (emit-invokevirtual +lisp-symbol-class+
                               "getSymbolSetfFunctionOrDie"
@@ -7423 +7419 @@
                  (not (enclosed-by-runtime-bindings-creating-block-p
                        (variable-block variable))))
-      (emit-load-symbol name))
+      (emit-load-externalized-object name))
     (cond ((constantp name)
            ;; "... a reference to a symbol declared with DEFCONSTANT always
@@ -7526 +7522 @@
 ;;              (format t "compiling pushSpecial~%")
              (emit-push-current-thread)
-             (emit-load-symbol name)
+             (emit-load-externalized-object name)
        (compile-forms-and-maybe-emit-clear-values (second value-form) 'stack nil)
              (emit-invokevirtual +lisp-thread-class+ "pushSpecial"
@@ -7532 +7528 @@
             (t
              (emit-push-current-thread)
-             (emit-load-symbol name)
+             (emit-load-externalized-object name)
        (compile-forms-and-maybe-emit-clear-values value-form 'stack nil)
              (emit-invokevirtual +lisp-thread-class+ "setSpecialVariable"
@@ -8017 +8013 @@
                    (emit 'iconst_1))
                   ((nil)
-                   (emit-load-symbol form)))
+                   (emit-load-externalized-object form)))
                 (emit-move-from-stack target representation))
                (t