Changeset 4999

Timestamp:

Aug 22, 2006, 12:53:44 AM (18 years ago)

Author:

Gary Byers

Message:

Dump concatenated functions from xfunctions when cross-compiling to x86 from x86.

File:

• trunk/ccl/lib/nfcomp.lisp (modified) (2 diffs)

trunk/ccl/lib/nfcomp.lisp

@@ -1392 +1392 @@
            (typep f 'function))
     (break "Dumping a native function constant ~s during cross-compilation." f))
-  (let* ((code-size (%function-code-words f))
-         (function-vector (%function-to-function-vector f))
-         (function-size (uvsize function-vector)))
-    (fasl-out-opcode $fasl-clfun f)
-    (fasl-out-count function-size)
-    (fasl-out-count code-size)
-    (fasl-out-ivect function-vector 0 (ash code-size 3))
-    (do* ((k code-size (1+ k)))
-         ((= k function-size))
-      (declare (fixnum k))
-      (fasl-dump-form (uvref function-vector k)))))
+  (if (and (= (typecode f) target::subtag-xfunction)
+           (= (typecode (uvref f 0)) target::subtag-u8-vector))
+    (fasl-xdump-clfun f)
+    (let* ((code-size (%function-code-words f))
+           (function-vector (%function-to-function-vector f))
+           (function-size (uvsize function-vector)))
+      (fasl-out-opcode $fasl-clfun f)
+      (fasl-out-count function-size)
+      (fasl-out-count code-size)
+      (fasl-out-ivect function-vector 0 (ash code-size 3))
+      (do* ((k code-size (1+ k)))
+           ((= k function-size))
+        (declare (fixnum k))
+        (fasl-dump-form (uvref function-vector k))))))
         
 
@@ -1408 +1411 @@
 
 ;;; Write a "concatenated function"; for now, assume that the target
-;;; is x8664 and the host is a PPC.
-#-x86-target
+;;; is x8664.
 (defun fasl-xdump-clfun (f)
   (let* ((code (uvref f 0))