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

Qualify assem:count-instructions now that C doesn't use ASSEM anymore.

parent 03f84f07
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/dyncount.lisp,v 1.4 1992/02/03 18:54:13 ram Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/dyncount.lisp,v 1.5 1992/05/22 15:32:57 wlott Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
vops) vops)
(defun setup-dynamic-count-info (component) (defun setup-dynamic-count-info (component)
(assert (not (backend-featurep :new-assembler)))
(let* ((info (ir2-component-dyncount-info (component-info component))) (let* ((info (ir2-component-dyncount-info (component-info component)))
(vops (dyncount-info-vops info))) (vops (dyncount-info-vops info)))
(when (producing-fasl-file) (when (producing-fasl-file)
...@@ -68,7 +69,7 @@ ...@@ -68,7 +69,7 @@
(setf (svref counts i) vop-name)) (setf (svref counts i) vop-name))
(incf (svref counts (1+ i))))))) (incf (svref counts (1+ i)))))))
(setf (svref vops index) counts))))) (setf (svref vops index) counts)))))
(count-instructions (assem:count-instructions
#'(lambda (vop bytes elsewherep) #'(lambda (vop bytes elsewherep)
(let ((block-number (block-number (ir2-block-block (vop-block vop))))) (let ((block-number (block-number (ir2-block-block (vop-block vop)))))
(when block-number (when block-number
......
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
;;; 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/statcount.lisp,v 1.3 1991/05/24 19:39:59 wlott Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/statcount.lisp,v 1.4 1992/05/22 15:32:46 wlott Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/statcount.lisp,v 1.3 1991/05/24 19:39:59 wlott Exp $ ;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/statcount.lisp,v 1.4 1992/05/22 15:32:46 wlott Exp $
;;; ;;;
;;; Functions and utilities for collecting statistics on static vop usages. ;;; Functions and utilities for collecting statistics on static vop usages.
;;; ;;;
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
;;; component. ;;; component.
;;; ;;;
(defun count-vops (component) (defun count-vops (component)
(assert (not (backend-featurep :new-assembler)))
(flet ((vop-entry (vop) (flet ((vop-entry (vop)
(let* ((name (vop-info-name (vop-info vop))) (let* ((name (vop-info-name (vop-info vop)))
(entry (gethash name *vop-counts*))) (entry (gethash name *vop-counts*)))
...@@ -58,13 +59,14 @@ ...@@ -58,13 +59,14 @@
(do ((vop (ir2-block-start-vop block) (vop-next vop))) (do ((vop (ir2-block-start-vop block) (vop-next vop)))
((null vop)) ((null vop))
(incf (svref (vop-entry vop) 1)))) (incf (svref (vop-entry vop) 1))))
(count-instructions #'(lambda (vop count elsewherep) (assem:count-instructions
(incf (svref (vop-entry vop) #'(lambda (vop count elsewherep)
(if elsewherep 3 2)) (incf (svref (vop-entry vop)
count)) (if elsewherep 3 2))
*code-segment* count))
*elsewhere* *code-segment*
:size)) *elsewhere*
:size))
(undefined-value)) (undefined-value))
......
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