Skip to content
Snippets Groups Projects
Commit 74f1e309 authored by wlott's avatar wlott
Browse files

Changed function-header-mumble to function-mumble and changed

(code-header-ref code code-debug-info-slot) to (%code-debug-info code).
parent 5a7f1f92
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/disassem.lisp,v 1.17 1992/11/25 10:51:14 wlott Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/disassem.lisp,v 1.18 1992/12/17 09:22:58 wlott Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -2106,20 +2106,17 @@ ...@@ -2106,20 +2106,17 @@
(bytes-to-words (bytes-to-words
(segment-offs-to-code-offs (dstate-cur-offs dstate) seg))) (segment-offs-to-code-offs (dstate-cur-offs dstate) seg)))
(name (name
(kernel:code-header-ref code (kernel:code-header-ref code (+ woffs vm:function-name-slot)))
(+ woffs vm:function-header-name-slot)))
(args (args
(kernel:code-header-ref code (kernel:code-header-ref code (+ woffs vm:function-arglist-slot)))
(+ woffs vm:function-header-arglist-slot)))
(type (type
(kernel:code-header-ref code (kernel:code-header-ref code (+ woffs vm:function-type-slot))))
(+ woffs vm:function-header-type-slot))))
(format stream ".~a ~s~:a" 'entry name args) (format stream ".~a ~s~:a" 'entry name args)
(note #'(lambda (stream) (note #'(lambda (stream)
(format stream "~:s" type)) ; use format to print NIL as () (format stream "~:s" type)) ; use format to print NIL as ()
dstate))) dstate)))
(incf (dstate-next-offs dstate) (incf (dstate-next-offs dstate)
(words-to-bytes vm:function-header-code-offset))) (words-to-bytes vm:function-code-offset)))
;;; ---------------------------------------------------------------- ;;; ----------------------------------------------------------------
...@@ -2624,11 +2621,11 @@ ...@@ -2624,11 +2621,11 @@
fun fun
fun-offset fun-offset
(kernel:code-header-ref (kernel:code-header-ref
code (+ fun-offset vm:function-header-name-slot)) code (+ fun-offset vm:function-name-slot))
(kernel:code-header-ref (kernel:code-header-ref
code (+ fun-offset vm:function-header-arglist-slot)) code (+ fun-offset vm:function-arglist-slot))
(kernel:code-header-ref (kernel:code-header-ref
code (+ fun-offset vm:function-header-type-slot))))))) code (+ fun-offset vm:function-type-slot)))))))
;;; ---------------------------------------------------------------- ;;; ----------------------------------------------------------------
;;; getting at the source code... ;;; getting at the source code...
...@@ -2733,8 +2730,7 @@ ...@@ -2733,8 +2730,7 @@
(defun code-function-map (code) (defun code-function-map (code)
(declare (type kernel:code-component code)) (declare (type kernel:code-component code))
(di::get-debug-info-function-map (di::get-debug-info-function-map (kernel:%code-debug-info code)))
(kernel:code-header-ref code vm:code-debug-info-slot)))
(defstruct location-group (defstruct location-group
(locations #() :type (vector (or list fixnum))) (locations #() :type (vector (or list fixnum)))
...@@ -2974,7 +2970,7 @@ ...@@ -2974,7 +2970,7 @@
(declare (type compiled-function function)) (declare (type compiled-function function))
(let* ((code (fun-code function)) (let* ((code (fun-code function))
(function-map (code-function-map code)) (function-map (code-function-map code))
(fname (kernel:%function-header-name function)) (fname (kernel:%function-name function))
(sfcache (make-source-form-cache))) (sfcache (make-source-form-cache)))
(let ((first-block-seen-p nil) (let ((first-block-seen-p nil)
(nil-block-seen-p nil) (nil-block-seen-p nil)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment