[movitz-cvs] CVS update: movitz/image.lisp

[Frode Vatvedt Fjeld]

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

Modified Files:
	image.lisp 
Log Message:
Slightly improved disassembly of primitive-functions.

Date: Wed Aug  4 05:58:46 2004
Author: ffjeld

Index: movitz/image.lisp
diff -u movitz/image.lisp:1.60 movitz/image.lisp:1.61
--- movitz/image.lisp:1.60	Sat Jul 31 17:37:22 2004
+++ movitz/image.lisp	Wed Aug  4 05:58:45 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.60 2004/08/01 00:37:22 ffjeld Exp $
+;;;; $Id: image.lisp,v 1.61 2004/08/04 12:58:45 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -1288,12 +1288,12 @@
 						 (slot-offset 'movitz-funobj 'constant0))
 					      4)
 				    (movitz-funobj-const-list funobj)))
-      when (and funobj (typep operand 'ia-x86::operand-rel-pointer))
+      when (typep operand 'ia-x86::operand-rel-pointer)
       collect (let* ((x (+ pc
 			   (imagpart (ia-x86::instruction-original-datum instruction))
 			   (length (ia-x86:instruction-prefixes instruction))
 			   (ia-x86::operand-offset operand)))
-		     (label (car (find x (movitz-funobj-symtab funobj) :key #'cdr))))
+		     (label (and funobj (car (find x (movitz-funobj-symtab funobj) :key #'cdr)))))
 		(if label
 		    (format nil "branch to ~S at ~D" label x)
 		  (format nil "branch to ~D" x)))