[movitz-cvs] CVS update: movitz/losp/muerte/eval.lisp

[Frode Vatvedt Fjeld]

Update of /project/movitz/cvsroot/movitz/losp/muerte
In directory common-lisp.net:/tmp/cvs-serv7822

Modified Files:
	eval.lisp 
Log Message:
Changed read-time-stamp-counter to return two 29-bit fixnums, which
seems more useful for most cases, even if the upper 6 bits are lost.

Date: Fri Apr 23 09:00:30 2004
Author: ffjeld

Index: movitz/losp/muerte/eval.lisp
diff -u movitz/losp/muerte/eval.lisp:1.7 movitz/losp/muerte/eval.lisp:1.8
--- movitz/losp/muerte/eval.lisp:1.7	Fri Apr 16 15:21:51 2004
+++ movitz/losp/muerte/eval.lisp	Fri Apr 23 09:00:30 2004
@@ -10,7 +10,7 @@
 ;;;; Author:        Frode Vatvedt Fjeld <frodef at acm.org>
 ;;;; Created at:    Fri Oct 19 21:15:12 2001
 ;;;;                
-;;;; $Id: eval.lisp,v 1.7 2004/04/16 19:21:51 ffjeld Exp $
+;;;; $Id: eval.lisp,v 1.8 2004/04/23 13:00:30 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -127,22 +127,7 @@
   "Supposed to be the time macro."
   (cond
    ((cpu-featurep :tsc)
-    (let ((start-mem (malloc-cons-pointer)))
-      (multiple-value-bind (start-time-lo start-time-hi)
-	  (read-time-stamp-counter)
-	(multiple-value-prog1
-	    (eval-form form env)
-	  (multiple-value-bind (end-time-lo end-time-hi)
-	      (read-time-stamp-counter)
-	    (let ((clumps (- (malloc-cons-pointer) start-mem))
-		  (delta-hi (- end-time-hi start-time-hi))
-		  (delta-lo (- end-time-lo start-time-lo)))
-	      (format t "~&;; Time report:")
-	      (if (< delta-hi #x1f)
-		  (format t "~&;; CPU cycles: ~D.~%;; Space used: ~D clumps = ~/muerte:pprint-clumps/.~%"
-			  (+ (ash delta-hi 24) delta-lo) clumps clumps)
-		(format t "~&;; CPU cycles: ~D000.~%;; Space used: ~D clumps = ~/muerte:pprint-clumps/.~%"
-			(+ (ash delta-hi 14) (ash delta-lo -10)) clumps clumps))))))))
+    (time (eval-form form env)))
    (t (let ((start-mem (malloc-cons-pointer)))
 	(multiple-value-prog1
 	    (eval-form form env)