0.pre7.56:

[sbcl.git] / src / compiler / target-disassem.lisp

diff --git a/src/compiler/target-disassem.lisp b/src/compiler/target-disassem.lisp
index 3f39d3c..d7e60e7 100644 (file)
--- a/src/compiler/target-disassem.lisp
+++ b/src/compiler/target-disassem.lisp
@@ -339,19 +339,19 @@
 
 (defun fun-self (fun)
   (declare (type compiled-function fun))
-  (sb!kernel:%function-self fun))
+  (sb!kernel:%simple-fun-self fun))
 
 (defun fun-code (fun)
   (declare (type compiled-function fun))
-  (sb!kernel:function-code-header (fun-self fun)))
+  (sb!kernel:fun-code-header (fun-self fun)))
 
 (defun fun-next (fun)
   (declare (type compiled-function fun))
-  (sb!kernel:%function-next fun))
+  (sb!kernel:%simple-fun-next fun))
 
 (defun fun-address (function)
   (declare (type compiled-function function))
-  (- (sb!kernel:get-lisp-obj-address function) sb!vm:function-pointer-type))
+  (- (sb!kernel:get-lisp-obj-address function) sb!vm:fun-pointer-lowtag))
 
 ;;; the offset of FUNCTION from the start of its code-component's
 ;;; instruction area
@@ -448,19 +448,22 @@
             (segment-offs-to-code-offs (dstate-cur-offs dstate) seg)))
           (name
            (sb!kernel:code-header-ref code
-                                      (+ woffs sb!vm:function-name-slot)))
+                                      (+ woffs
+                                         sb!vm:simple-fun-name-slot)))
           (args
            (sb!kernel:code-header-ref code
-                                      (+ woffs sb!vm:function-arglist-slot)))
+                                      (+ woffs
+                                         sb!vm:simple-fun-arglist-slot)))
           (type
            (sb!kernel:code-header-ref code
-                                      (+ woffs sb!vm:function-type-slot))))
+                                      (+ woffs
+                                         sb!vm:simple-fun-type-slot))))
       (format stream ".~A ~S~:A" 'entry name args)
       (note (lambda (stream)
              (format stream "~:S" type)) ; use format to print NIL as ()
            dstate)))
   (incf (dstate-next-offs dstate)
-       (words-to-bytes sb!vm:function-code-offset)))
+       (words-to-bytes sb!vm:simple-fun-code-offset)))
 \f
 (defun alignment-hook (chunk stream dstate)
   (declare (type dchunk chunk)
@@ -937,7 +940,7 @@
 (defun print-fun-headers (function)
   (declare (type compiled-function function))
   (let* ((self (fun-self function))
-        (code (sb!kernel:function-code-header self)))
+        (code (sb!kernel:fun-code-header self)))
     (format t "Code-header ~S: size: ~S, trace-table-offset: ~S~%"
            code
            (sb!kernel:code-header-ref code
@@ -954,11 +957,11 @@
                fun
                fun-offset
                (sb!kernel:code-header-ref
-                code (+ fun-offset sb!vm:function-name-slot))
+                code (+ fun-offset sb!vm:simple-fun-name-slot))
                (sb!kernel:code-header-ref
-                code (+ fun-offset sb!vm:function-arglist-slot))
+                code (+ fun-offset sb!vm:simple-fun-arglist-slot))
                (sb!kernel:code-header-ref
-                code (+ fun-offset sb!vm:function-type-slot)))))))
+                code (+ fun-offset sb!vm:simple-fun-type-slot)))))))
 \f
 ;;; getting at the source code...
 
@@ -1068,9 +1071,9 @@
 \f
 ;;;; stuff to use debugging-info to augment the disassembly
 
-(defun code-function-map (code)
+(defun code-fun-map (code)
   (declare (type sb!kernel:code-component code))
-  (sb!di::get-debug-info-function-map (sb!kernel:%code-debug-info code)))
+  (sb!di::get-debug-info-fun-map (sb!kernel:%code-debug-info code)))
 
 (defstruct (location-group (:copier nil))
   (locations #() :type (vector (or list fixnum))))
@@ -1311,8 +1314,8 @@
 (defun get-function-segments (function)
   (declare (type compiled-function function))
   (let* ((code (fun-code function))
-        (function-map (code-function-map code))
-        (fname (sb!kernel:%function-name function))
+        (fun-map (code-fun-map code))
+        (fname (sb!kernel:%simple-fun-name function))
         (sfcache (make-source-form-cache)))
     (let ((first-block-seen-p nil)
          (nil-block-seen-p nil)
@@ -1325,8 +1328,8 @@
                                          :debug-fun df
                                          :source-form-cache sfcache)
                       segments))))
-       (dotimes (fmap-index (length function-map))
-         (let ((fmap-entry (aref function-map fmap-index)))
+       (dotimes (fmap-index (length fun-map))
+         (let ((fmap-entry (aref fun-map fmap-index)))
            (etypecase fmap-entry
              (integer
               (when first-block-seen-p
@@ -1380,7 +1383,7 @@
           (type length length))
   (let ((segments nil))
     (when code
-      (let ((function-map (code-function-map code))
+      (let ((fun-map (code-fun-map code))
            (sfcache (make-source-form-cache)))
        (let ((last-offset 0)
              (last-debug-fun nil))
@@ -1398,18 +1401,18 @@
                                                :debug-fun df
                                                :source-form-cache sfcache)
                             segments)))))
-           (dotimes (fmap-index (length function-map))
-             (let ((fmap-entry (aref function-map fmap-index)))
-               (etypecase fmap-entry
+           (dotimes (fun-map-index (length fun-map))
+             (let ((fun-map-entry (aref fun-map fun-map-index)))
+               (etypecase fun-map-entry
                  (integer
-                  (add-seg last-offset (- fmap-entry last-offset)
+                  (add-seg last-offset (- fun-map-entry last-offset)
                            last-debug-fun)
                   (setf last-debug-fun nil)
-                  (setf last-offset fmap-entry))
+                  (setf last-offset fun-map-entry))
                  (sb!c::compiled-debug-fun
                   (setf last-debug-fun
-                        (sb!di::make-compiled-debug-fun fmap-entry
-                                                             code))))))
+                        (sb!di::make-compiled-debug-fun fun-map-entry
+                                                        code))))))
            (when last-debug-fun
              (add-seg last-offset
                       (- (code-inst-area-length code) last-offset)
@@ -1749,7 +1752,7 @@
               (maybe-symbol-addr (- address slot-offset))
               (maybe-symbol
                (sb!kernel:make-lisp-obj
-                (+ maybe-symbol-addr sb!vm:other-pointer-type))))
+                (+ maybe-symbol-addr sb!vm:other-pointer-lowtag))))
          (when (symbolp maybe-symbol)
            (return (values maybe-symbol (cdr field))))))))
 
@@ -1780,7 +1783,7 @@
        (values
         (sb!kernel:code-header-ref code
                                    (ash (+ byte-offset
-                                           sb!vm:other-pointer-type)
+                                           sb!vm:other-pointer-lowtag)
                                         (- sb!vm:word-shift)))
         t)
        (values nil nil))))
@@ -1794,7 +1797,7 @@
     (let ((code-size (ash (sb!kernel:get-header-data code) sb!vm:word-shift)))
       (sb!sys:without-gcing
        (let ((code-addr (- (sb!kernel:get-lisp-obj-address code)
-                          sb!vm:other-pointer-type)))
+                          sb!vm:other-pointer-lowtag)))
         (if (or (< addr code-addr) (>= addr (+ code-addr code-size)))
            (values nil nil)
            (values (sb!kernel:code-header-ref