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

[Frode Vatvedt Fjeld]

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

Modified Files:
	inspect.lisp 
Log Message:
Fixed bug in location-in-object-p wrt. vectors of word-sized elements.

Date: Tue Oct 25 21:26:47 2005
Author: ffjeld

Index: movitz/losp/muerte/inspect.lisp
diff -u movitz/losp/muerte/inspect.lisp:1.56 movitz/losp/muerte/inspect.lisp:1.57
--- movitz/losp/muerte/inspect.lisp:1.56	Sat Aug 27 00:38:07 2005
+++ movitz/losp/muerte/inspect.lisp	Tue Oct 25 21:26:47 2005
@@ -10,7 +10,7 @@
 ;;;; Author:        Frode Vatvedt Fjeld <frodef at acm.org>
 ;;;; Created at:    Fri Oct 24 09:50:41 2003
 ;;;;                
-;;;; $Id: inspect.lisp,v 1.56 2005/08/26 22:38:07 ffjeld Exp $
+;;;; $Id: inspect.lisp,v 1.57 2005/10/25 19:26:47 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -402,13 +402,13 @@
 	   location
 	   (+ -1 object-location
 	      (movitz-type-word-size 'movitz-basic-vector)
-	      (* 2 (truncate (+ (array-dimension object 0) 1) 2)))))
+	      (* 4 (truncate (+ (array-dimension object 0) 3) 4)))))
       (structure-object
        (<= object-location
 	   location
 	   (+ -1 object-location
 	      (movitz-type-word-size :movitz-struct)
-	      (* 2 (truncate (+ (structure-object-length object) 1) 2))))))))
+	      (* 4 (truncate (+ (array-dimension object 0) 3) 4))))))))
 
 (defun location-in-code-vector-p%unsafe (code-vector location)
   (and (<= (object-location code-vector) location)