diff --git a/compiler/dyncount.lisp b/compiler/dyncount.lisp index f2cb7d8a00656ccc5baf2606fa500a10708cc9c1..5fcf37e9268f3383cb76997aaf1e954e04e57c43 100644 --- a/compiler/dyncount.lisp +++ b/compiler/dyncount.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (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 @@ vops) (defun setup-dynamic-count-info (component) + (assert (not (backend-featurep :new-assembler))) (let* ((info (ir2-component-dyncount-info (component-info component))) (vops (dyncount-info-vops info))) (when (producing-fasl-file) @@ -68,7 +69,7 @@ (setf (svref counts i) vop-name)) (incf (svref counts (1+ i))))))) (setf (svref vops index) counts))))) - (count-instructions + (assem:count-instructions #'(lambda (vop bytes elsewherep) (let ((block-number (block-number (ir2-block-block (vop-block vop))))) (when block-number diff --git a/compiler/statcount.lisp b/compiler/statcount.lisp index db4200eef9a4a09d89151514f153268fdbfe092d..1eeffadb8bb12ccaa1f1a4b61e263b8f36ca6d0d 100644 --- a/compiler/statcount.lisp +++ b/compiler/statcount.lisp @@ -7,11 +7,11 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (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. ;;; @@ -45,6 +45,7 @@ ;;; component. ;;; (defun count-vops (component) + (assert (not (backend-featurep :new-assembler))) (flet ((vop-entry (vop) (let* ((name (vop-info-name (vop-info vop))) (entry (gethash name *vop-counts*))) @@ -58,13 +59,14 @@ (do ((vop (ir2-block-start-vop block) (vop-next vop))) ((null vop)) (incf (svref (vop-entry vop) 1)))) - (count-instructions #'(lambda (vop count elsewherep) - (incf (svref (vop-entry vop) - (if elsewherep 3 2)) - count)) - *code-segment* - *elsewhere* - :size)) + (assem:count-instructions + #'(lambda (vop count elsewherep) + (incf (svref (vop-entry vop) + (if elsewherep 3 2)) + count)) + *code-segment* + *elsewhere* + :size)) (undefined-value))