projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.pre7.66:
[sbcl.git]
/
src
/
compiler
/
vmdef.lisp
diff --git
a/src/compiler/vmdef.lisp
b/src/compiler/vmdef.lisp
index
1747e09
..
0d03768
100644
(file)
--- a/
src/compiler/vmdef.lisp
+++ b/
src/compiler/vmdef.lisp
@@
-74,15
+74,15
@@
\f
;;;; primitive type definition
\f
;;;; primitive type definition
-;;; Return the primitive type corresponding to the specified name, or die
-;;; trying.
+;;; Return the primitive type corresponding to the specified name, or
+;;; die trying.
(defun primitive-type-or-lose (name)
(the primitive-type
(or (gethash name *backend-primitive-type-names*)
(error "~S is not a defined primitive type." name))))
(defun primitive-type-or-lose (name)
(the primitive-type
(or (gethash name *backend-primitive-type-names*)
(error "~S is not a defined primitive type." name))))
-;;; Return true if SC is either one of Ptype's SC's, or one of those SC's
-;;; alternate or constant SCs.
+;;; Return true if SC is either one of PTYPE's SC's, or one of those
+;;; SC's alternate or constant SCs.
(defun sc-allowed-by-primitive-type (sc ptype)
(declare (type sc sc) (type primitive-type ptype))
(let ((scn (sc-number sc)))
(defun sc-allowed-by-primitive-type (sc ptype)
(declare (type sc sc) (type primitive-type ptype))
(let ((scn (sc-number sc)))
@@
-96,7
+96,11
@@
\f
;;;; generation of emit functions
\f
;;;; generation of emit functions
-(defconstant max-vop-tn-refs 256)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ ;; We need the EVAL-WHEN because %EMIT-GENERIC-VOP (below)
+ ;; uses #.MAX-VOP-TN-REFS, not just MAX-VOP-TN-REFS.
+ ;; -- AL 20010218
+ (defconstant max-vop-tn-refs 256))
(defvar *vop-tn-refs* (make-array max-vop-tn-refs :initial-element nil))
(defvar *using-vop-tn-refs* nil)
(defvar *vop-tn-refs* (make-array max-vop-tn-refs :initial-element nil))
(defvar *using-vop-tn-refs* nil)
@@
-197,7
+201,7
@@
(flet ((convert (types more-types)
(flet ((frob (x)
(if (eq x '*)
(flet ((convert (types more-types)
(flet ((frob (x)
(if (eq x '*)
- 't
+ t
(ecase (first x)
(:or `(or ,@(mapcar #'(lambda (type)
(type-specifier
(ecase (first x)
(:or `(or ,@(mapcar #'(lambda (type)
(type-specifier