[movitz-cvs] CVS update: ia-x86/read.lisp

[Frode Vatvedt Fjeld]

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

Modified Files:
	read.lisp 
Log Message:
Minor adjustments to the assembly read syntax.

Date: Mon Jun 21 00:33:50 2004
Author: ffjeld

Index: ia-x86/read.lisp
diff -u ia-x86/read.lisp:1.4 ia-x86/read.lisp:1.5
--- ia-x86/read.lisp:1.4	Mon Feb  9 16:13:29 2004
+++ ia-x86/read.lisp	Mon Jun 21 00:33:50 2004
@@ -9,7 +9,7 @@
 ;;;; Created at:    Mon Jul 31 13:54:27 2000
 ;;;; Distribution:  See the accompanying file COPYING.
 ;;;;                
-;;;; $Id: read.lisp,v 1.4 2004/02/10 00:13:29 ffjeld Exp $
+;;;; $Id: read.lisp,v 1.5 2004/06/21 07:33:50 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -179,7 +179,7 @@
 		'label label))))
 	 (:funcall
 	  (make-instance 'calculated-operand
-	    :calculation (car datum)
+	    :calculation (coerce (car datum) 'function)
 	    :sub-operands (mapcar #'read-operand (cdr datum)))))))
     (integer
      (make-instance 'operand-number
@@ -235,7 +235,8 @@
       (:align
        (make-instance 'alignment :type operand-list))
       ((nil)
-       (mapcar #'read-operand operand-list))
+       (mapcar #'read-operand operand-list)
+       nil)
       (t (make-instance (or (gethash instr-name *find-instruction-cache*)
 			    (setf (gethash instr-name *find-instruction-cache*)
 			      (multiple-value-bind (instr-symbol instr-symbol-status)