Changeset 9543

Timestamp:

May 17, 2008, 2:53:19 AM (12 years ago)

Author:

rme

Message:

fasl-scan-dispatch: Call fasl-scan-clfun on x8632 functions.

fasl-scan-clfun: use archmacro function-to-function-vector.

File:

• branches/ia32/lib/nfcomp.lisp (modified) (5 diffs)

branches/ia32/lib/nfcomp.lisp

@@ -997 +997 @@
              ((#.target::subtag-pool #.target::subtag-weak #.target::subtag-lock) (fasl-unknown exp))
              (#+ppc-target #.target::subtag-symbol
-                           #+x8632-target #.target::subtag-symbol
-                           #+x8664-target #.target::tag-symbol (fasl-scan-symbol exp))
+              #+x8632-target #.target::subtag-symbol
+              #+x8664-target #.target::tag-symbol (fasl-scan-symbol exp))
              ((#.target::subtag-instance #.target::subtag-struct)
               (fasl-scan-user-form exp))
@@ -1009 +1009 @@
                   (fasl-scan-user-form exp))
                 (fasl-scan-gvector exp)))
+             #+x8632-target
+             (#.target::subtag-function (fasl-scan-clfun exp))
              #+x8664-target
              (#.target::tag-function (fasl-scan-clfun exp))
@@ -1036 +1038 @@
     (fasl-scan-form (%svref vec i))))
 
-;;; xxx x8664-target?
 #+x86-target
 (defun fasl-scan-clfun (f)
-  (let* ((fv (%function-to-function-vector f))
+  (let* ((fv (function-to-function-vector f))
          (size (uvsize fv))
          (ncode-words (%function-code-words f)))
@@ -1406 +1407 @@
     (fasl-xdump-clfun f)
     (let* ((code-size (%function-code-words f))
-           (function-vector (%function-to-function-vector f))
+           (function-vector (function-to-function-vector f))
            (function-size (uvsize function-vector)))
       (fasl-out-opcode $fasl-clfun f)
@@ -1420 +1421 @@
   
 
-;;; Write a "concatenated function"; for now, assume that the target
-;;; is x8664.
-;;; xxx add ia-32 support here
+;;; Write a "concatenated function".
 (defun fasl-xdump-clfun (f)
   (target-arch-case