Commit 621d0be5 authored by Frode Vatvedt Fjeld's avatar Frode Vatvedt Fjeld

Minor adjustments to the assembly read syntax.

parent 99c2dff2
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
;;;; Created at: Mon Jul 31 13:54:27 2000 ;;;; Created at: Mon Jul 31 13:54:27 2000
;;;; Distribution: See the accompanying file COPYING. ;;;; Distribution: See the accompanying file COPYING.
;;;; ;;;;
;;;; $Id: read.lisp,v 1.3 2004/02/10 00:04:08 ffjeld Exp $ ;;;; $Id: read.lisp,v 1.4 2004/02/10 00:13:29 ffjeld Exp $
;;;; ;;;;
;;;;------------------------------------------------------------------ ;;;;------------------------------------------------------------------
...@@ -179,7 +179,7 @@ returns the symbol/label that is referenced." ...@@ -179,7 +179,7 @@ returns the symbol/label that is referenced."
'label label)))) 'label label))))
(:funcall (:funcall
(make-instance 'calculated-operand (make-instance 'calculated-operand
:calculation (car datum) :calculation (coerce (car datum) 'function)
:sub-operands (mapcar #'read-operand (cdr datum))))))) :sub-operands (mapcar #'read-operand (cdr datum)))))))
(integer (integer
(make-instance 'operand-number (make-instance 'operand-number
...@@ -235,7 +235,8 @@ returns the symbol/label that is referenced." ...@@ -235,7 +235,8 @@ returns the symbol/label that is referenced."
(:align (:align
(make-instance 'alignment :type operand-list)) (make-instance 'alignment :type operand-list))
((nil) ((nil)
(mapcar #'read-operand operand-list)) (mapcar #'read-operand operand-list)
nil)
(t (make-instance (or (gethash instr-name *find-instruction-cache*) (t (make-instance (or (gethash instr-name *find-instruction-cache*)
(setf (gethash instr-name *find-instruction-cache*) (setf (gethash instr-name *find-instruction-cache*)
(multiple-value-bind (instr-symbol instr-symbol-status) (multiple-value-bind (instr-symbol instr-symbol-status)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment