Changeset 7336

Timestamp:

Oct 1, 2007, 8:15:20 PM (14 years ago)

Author:

rme

Message:

xdump IA-32 clfuns.

File:

• branches/ia32/lib/nfcomp.lisp (modified) (1 diff)

branches/ia32/lib/nfcomp.lisp

@@ -1423 +1423 @@
 ;;; xxx add ia-32 support here
 (defun fasl-xdump-clfun (f)
-  (let* ((code (uvref f 0))
-         (code-size (dpb (uvref code 3)
-                         (byte 8 24)
-                         (dpb (uvref code 2)
-                              (byte 8 16)
-                              (dpb (uvref code 1)
-                                   (byte 8 8)
-                                   (uvref code 0)))))
-         (function-size (ash (uvsize code) -3)))
-    (assert (= (- function-size code-size) (1- (uvsize f))))
-    (fasl-out-opcode $fasl-clfun f)
-    (fasl-out-count function-size)
-    (fasl-out-count code-size)
-    (fasl-out-ivect code 0 (ash code-size 3))
-    (do* ((i 1 (1+ i))
-          (n (uvsize f)))
-         ((= i n))
-      (declare (fixnum i n))
-      (fasl-dump-form (%svref f i)))))
-    
-                         
-
-
+  (target-arch-case
+   (:x8632
+    (let* ((code (uvref f 0))
+           (function-size (ash (uvsize code) -2))
+           (imm-words (dpb (uvref code 1) (byte 8 8) (uvref code 0)))
+           (imm-bytes (ash imm-words 2))
+           (other-words (- function-size imm-words)))
+      (assert (= other-words (1- (uvsize f))))
+      (fasl-out-opcode $fasl-clfun f)
+      (fasl-out-count imm-words)
+      (fasl-out-count function-size)
+      (fasl-out-ivect code 0 imm-bytes)
+      (do ((i 1 (1+ i))
+           (n (uvsize f)))
+          ((= i n))
+        (declare (fixnum i n))
+        (fasl-dump-form (%svref f i)))))
+   (:x8664
+    (let* ((code (uvref f 0))
+           (code-size (dpb (uvref code 3)
+                           (byte 8 24)
+                           (dpb (uvref code 2)
+                                (byte 8 16)
+                                (dpb (uvref code 1)
+                                     (byte 8 8)
+                                     (uvref code 0)))))
+           (function-size (ash (uvsize code) -3)))
+      (assert (= (- function-size code-size) (1- (uvsize f))))
+      (fasl-out-opcode $fasl-clfun f)
+      (fasl-out-count function-size)
+      (fasl-out-count code-size)
+      (fasl-out-ivect code 0 (ash code-size 3))
+      (do* ((i 1 (1+ i))
+            (n (uvsize f)))
+           ((= i n))
+        (declare (fixnum i n))
+        (fasl-dump-form (%svref f i)))))))
 
 (defun fasl-dump-codevector (c)