Update of /cvsroot/sbcl/sbcl/src/compiler
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20088/src/compiler
Modified Files:
meta-vmdef.lisp
Log Message:
0.8.13.13:
Fix the logic in computing symbols for parse-vop-operands
... the count was all wrong. Fix it.
... (bug is detected in make-host-2, so if I've got it wrong
again it'll show up: but this works on the alpha)
Index: meta-vmdef.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/meta-vmdef.lisp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- meta-vmdef.lisp 26 Jul 2004 10:18:00 -0000 1.31
+++ meta-vmdef.lisp 30 Jul 2004 11:25:56 -0000 1.32
@@ -1043,13 +1043,24 @@
:key #'operand-parse-name))))))
(values))
+(defun compute-parse-vop-operand-count (parse)
+ (declare (type vop-parse parse))
+ (labels ((compute-count-aux (parse)
+ (declare (type vop-parse parse))
+ (if (null (vop-parse-inherits parse))
+ (length (vop-parse-operands parse))
+ (+ (length (vop-parse-operands parse))
+ (compute-count-aux
+ (vop-parse-or-lose (vop-parse-inherits parse)))))))
+ (if (null (vop-parse-inherits parse))
+ 0
+ (compute-count-aux (vop-parse-or-lose (vop-parse-inherits parse))))))
+
;;; the top level parse function: clobber PARSE to represent the
;;; specified options.
(defun parse-define-vop (parse specs)
(declare (type vop-parse parse) (list specs))
- (let ((*parse-vop-operand-count* (1- (+ (length (vop-parse-args parse))
- (length (vop-parse-results parse))
- (length (vop-parse-temps parse))))))
+ (let ((*parse-vop-operand-count* (compute-parse-vop-operand-count parse)))
(dolist (spec specs)
(unless (consp spec)
(error "malformed option specification: ~S" spec))
|