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

Modified Files: image.lisp Log Message: Fixed the atomically stuff to mostly working.

Date: Tue Jun 1 08:16:49 2004 Author: ffjeld

Index: movitz/image.lisp diff -u movitz/image.lisp:1.32 movitz/image.lisp:1.33 --- movitz/image.lisp:1.32 Tue Jun 1 06:42:06 2004 +++ movitz/image.lisp Tue Jun 1 08:16:49 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Sun Oct 22 00:22:43 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: image.lisp,v 1.32 2004/06/01 13:42:06 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.33 2004/06/01 15:16:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------

@@ -455,11 +455,11 @@ (((:enum :byte (2 3)) :inactive 0 :restart-primitive-function 1) ; data = slot-offset of pf. - ((:bits) :reset-status-p 7 - :eax 8 - :ebx 9 - :ecx 10 - :edx 11) + ((:bits) :reset-status-p 8 + :eax 9 + :ebx 10 + :ecx 11 + :edx 12) ((:numeric :data 16 16)))) :initform '(:inactive)) (atomically-registers @@ -477,11 +477,13 @@ (cons :reset-status-p (if reset-status-p 1 0)) (cons :data - (truncate (+ (tag :null) - (bt:slot-offset 'movitz-constant-block - (intern (symbol-name pf-name) - :movitz))) - 4)) + (if (not pf-name) + 0 + (truncate (+ (tag :null) + (bt:slot-offset 'movitz-constant-block + (intern (symbol-name pf-name) + :movitz))) + 4))) registers)))

(defmethod movitz-object-offset ((obj movitz-constant-block)) 0)