Changeset 11637

Timestamp:

02/06/09 23:22:51 (14 years ago)

Author:

ehuelsmann

Message:

Extend EMIT-DUP to be able to duplicate past the top-most stack value.

File:

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

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

@@ -413 +413 @@
 
 (defknown emit-dup (symbol) t)
-(defun emit-dup (representation)
-  (ecase (representation-size representation)
-    (1 (emit 'dup))
-    (2 (emit 'dup2))))
+(defun emit-dup (representation &key (past nil past-supplied-p))
+  "Emits the 'dup' instruction required to duplicate `representation'.
+
+If `past' is specified, the newly duplicated value is inserted on the
+stack past the top-most value, which is assumed to be of the representation
+passed in `past'."
+  (emit
+   (nth (if past-supplied-p
+            (representation-size past) 0)
+        (ecase (representation-size representation)
+          (1 '(dup  dup_x1  dup_x2))
+          (2 '(dup2 dup2_x1 dup2_x2))))))
 
 (defknown emit-swap (symbol symbol) t)
@@ -4965 +4973 @@
     (compile-form (%cadr args) 'stack nil)
     (when target
-      (emit 'dup_x1))
+      (emit-dup nil :past nil))
     (emit-invokevirtual +lisp-object-class+
                         (if (eq op 'sys:set-car) "setCar" "setCdr")
@@ -5631 +5639 @@
                   position-arg 'stack :int
                   arg3 'stack nil)
-           (emit 'dup_x2)
+           (emit 'dup_x2) ;; use not supported by emit-dup: 3 values involved
            (emit 'pop)
            (emit-invokevirtual +lisp-object-class+ "LDB" '("I" "I") +lisp-object+)
@@ -6768 +6776 @@
                     (emit-dup common-rep)
                     (compile-form arg2 'stack common-rep)
-                    (emit (if (eq common-rep :long)
-                              'dup2_x2 'dup_x1))
+                    (emit-dup common-rep :past common-rep)
                     (emit-numeric-comparison (if (eq op 'max) '<= '>=)
                                              common-rep LABEL1)
@@ -6779 +6786 @@
                  (t
                   (compile-form arg1 'stack nil)
-                  (emit 'dup)
+                  (emit-dup nil)
                   (compile-form arg2 'stack nil)
-                  (emit 'dup_x1)
+                  (emit-dup nil :past nil)
                   (emit-invokevirtual +lisp-object-class+
                                       (if (eq op 'max)