X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fearly-c.lisp;h=c748a0c481041bc8fd0a488aaf9cd85fed783d2f;hb=18d4de696bc5063aad026ba62be613c7b07f5fc8;hp=9f266bb02681ba5a1bf3a775d7f0b6611e1e4c7c;hpb=82e0a78df47685519b12683f495d7ae19e07d3cf;p=sbcl.git diff --git a/src/compiler/early-c.lisp b/src/compiler/early-c.lisp index 9f266bb..c748a0c 100644 --- a/src/compiler/early-c.lisp +++ b/src/compiler/early-c.lisp @@ -38,86 +38,6 @@ ;;; the type of LAYOUT-DEPTHOID slot values (def!type sb!kernel::layout-depthoid () '(or index (integer -1 -1))) - -;;; a value for an optimization declaration -(def!type policy-quality () '(or (rational 0 3) null)) - -;;;; policy stuff - -;;; CMU CL used a special STRUCTURE-OBJECT type POLICY to represent -;;; the state of optimization policy at any point in compilation. This -;;; became a little unwieldy, especially because of cold init issues -;;; for structures and structure accessors, so in SBCL we use an alist -;;; instead. -(deftype policy () 'list) - -;;; names of recognized optimization qualities which don't have -;;; special defaulting behavior -(defvar *policy-basic-qualities*) - -;;; FIXME: I'd like to get rid of DECLAIM OPTIMIZE-INTERFACE in favor -;;; of e.g. (DECLAIM (OPTIMIZE (INTERFACE-SPEED 2) (INTERFACE-SAFETY 3))). -#| -;;; a list of conses (DEFAULTING-QUALITY . DEFAULT-QUALITY) of qualities -;;; which default to other qualities when undefined, e.g. interface -;;; speed defaulting to basic speed -(defvar *policy-defaulting-qualities*) -|# - -(defun optimization-quality-p (name) - (or (member name *policy-basic-qualities*) - ;; FIXME: Uncomment this when OPTIMIZE-INTERFACE goes away. - #|(member name *policy-defaulting-qualities* :key #'car)|#)) - -;;; *DEFAULT-POLICY* holds the current global compiler policy -;;; information, as an alist mapping from optimization quality name to -;;; quality value. Inside the scope of declarations, new entries are -;;; added at the head of the alist. -;;; -;;; *DEFAULT-INTERFACE-POLICY* holds any values specified by an -;;; OPTIMIZE-INTERFACE declaration. -(declaim (type policy *default-policy* *default-interface-policy*)) -(defvar *default-policy*) ; initialized in cold init -(defvar *default-interface-policy*) ; initialized in cold init - -;;; This is to be called early in cold init to set things up, and may -;;; also be called again later in cold init in order to reset default -;;; optimization policy back to default values after toplevel PROCLAIM -;;; OPTIMIZE forms have messed with it. -(defun !policy-cold-init-or-resanify () - (setf *policy-basic-qualities* - '(;; ANSI standard qualities - compilation-speed - debug - safety - space - speed - ;; SBCL extensions - ;; - ;; FIXME: INHIBIT-WARNINGS is a misleading name for this. - ;; Perhaps BREVITY would be better. But the ideal name would - ;; have connotations of suppressing not warnings but only - ;; optimization-related notes, which is already mostly the - ;; behavior, and should probably become the exact behavior. - ;; Perhaps INHIBIT-NOTES? - inhibit-warnings)) - (setf *policy-defaulting-qualities* - '((interface-speed . speed) - (interface-safety . safety))) - (setf *default-policy* - (mapcar (lambda (name) - ;; CMU CL didn't use 1 as the default for everything, - ;; but since ANSI says 1 is the ordinary value, we do. - (cons name 1)) - *policy-basic-qualities*)) - (setf *default-interface-policy* - *default-policy*)) -;;; On the cross-compilation host, we initialize the compiler immediately. -#+sb-xc-host (!policy-cold-init-or-resanify) - -;;; Is X the name of an optimization quality? -(defun policy-quality-p (x) - (memq x *policy-basic-qualities*)) ;;; possible values for the INLINE-ness of a function. (deftype inlinep () @@ -127,7 +47,7 @@ (notinline . :notinline) (maybe-inline . :maybe-inline))) -;;; The lexical environment we are currently converting in. +;;; the lexical environment we are currently converting in (defvar *lexenv*) (declaim (type lexenv *lexenv*)) @@ -136,13 +56,13 @@ ;;; *FREE-VARIABLES*, only it deals with function names. (defvar *free-variables*) (defvar *free-functions*) -(declaim (hash-table *free-variables* *free-functions*)) +(declaim (type hash-table *free-variables* *free-functions*)) -;;; We use the same Constant structure to represent all equal anonymous -;;; constants. This hashtable translates from constants to the Leafs that +;;; We use the same CONSTANT structure to represent all equal anonymous +;;; constants. This hashtable translates from constants to the LEAFs that ;;; represent them. (defvar *constants*) -(declaim (hash-table *constants*)) +(declaim (type hash-table *constants*)) ;;; miscellaneous forward declarations (defvar *code-segment*) @@ -153,12 +73,14 @@ (defvar *compiler-warning-count*) (defvar *compiler-style-warning-count*) (defvar *compiler-note-count*) +(defvar *compiler-trace-output*) +(defvar *constraint-number*) (defvar *converting-for-interpreter*) (defvar *count-vop-usages*) (defvar *current-path*) (defvar *current-component*) -(defvar *default-policy*) -(defvar *default-interface-policy*) +(defvar *delayed-ir1-transforms*) +(defvar *policy*) (defvar *dynamic-counts-tn*) (defvar *elsewhere*) (defvar *event-info*) @@ -194,7 +116,6 @@ ;;; to be called when a variable is lexically bound (declaim (ftype (function (symbol) (values)) note-lexical-binding)) (defun note-lexical-binding (symbol) - (let ((name (symbol-name symbol))) ;; This check is intended to protect us from getting silently ;; burned when we define ;; foo.lisp: @@ -205,10 +126,9 @@ ;; (LET ((*FOO* X)) ;; (FOO 14))) ;; and then we happen to compile bar.lisp before foo.lisp. - (when (and (char= #\* (aref name 0)) - (char= #\* (aref name (1- (length name))))) + (when (looks-like-name-of-special-var-p symbol) ;; FIXME: should be COMPILER-STYLE-WARNING? (style-warn "using the lexical binding of the symbol ~S, not the~@ dynamic binding, even though the symbol name follows the usual naming~@ -convention (names like *FOO*) for special variables" symbol))) +convention (names like *FOO*) for special variables" symbol)) (values))