X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fearly-c.lisp;h=754940027e04c7550f48d571cba7b5495288352b;hb=13fb19c3183a0effb7c35a2d453d6c6c91726e26;hp=978284fccaeaeeae89980b0fbde3b4c5ea127cff;hpb=1840d888d2ef13fe0ea5aaa06f1fef3300da682b;p=sbcl.git diff --git a/src/compiler/early-c.lisp b/src/compiler/early-c.lisp index 978284f..7549400 100644 --- a/src/compiler/early-c.lisp +++ b/src/compiler/early-c.lisp @@ -29,20 +29,6 @@ #!+sb-doc "The exclusive upper bound on the number of multiple VALUES that you can return.") - -(defconstant-eqx sb!xc:lambda-list-keywords - '(&allow-other-keys - &aux - &body - &environment - &key - &more - &optional - &rest - &whole) - #'equal - #!+sb-doc - "symbols which are magical in a lambda list") ;;;; cross-compiler-only versions of CL special variables, so that we ;;;; don't have weird interactions with the host compiler @@ -102,7 +88,7 @@ (defvar *compiler-style-warning-count*) (defvar *compiler-note-count*) (defvar *compiler-trace-output*) -(defvar *constraint-number*) +(defvar *constraint-universe*) (defvar *count-vop-usages*) (defvar *current-path*) (defvar *current-component*) @@ -120,14 +106,30 @@ (defvar *info-environment*) (defvar *lexenv*) (defvar *source-info*) +(defvar *source-plist*) (defvar *trace-table*) (defvar *undefined-warnings*) (defvar *warnings-p*) +(defvar *lambda-conversions*) + +(defvar *stack-allocate-dynamic-extent* t + "If true (the default), the compiler respects DYNAMIC-EXTENT declarations +and stack allocates otherwise inaccessible parts of the object whenever +possible. Potentially long (over one page in size) vectors are, however, not +stack allocated except in zero SAFETY code, as such a vector could overflow +the stack without triggering overflow protection.") + +(!begin-collecting-cold-init-forms) +;;; This lock is seized in the compiler, and related areas -- like the +;;; classoid/layout/class system. +(defvar *world-lock*) +(!cold-init-forms + (setf *world-lock* (sb!thread:make-mutex :name "World Lock"))) +(!defun-from-collected-cold-init-forms !world-lock-cold-init) -;;; This lock is seized in the compiler, and related areas: the -;;; compiler is not presently thread-safe -(defvar *big-compiler-lock* - (sb!thread:make-mutex :name "big compiler lock")) +(defmacro with-world-lock (() &body body) + `(sb!thread:with-recursive-lock (*world-lock*) + ,@body)) (declaim (type fixnum *compiler-sset-counter*)) (defvar *compiler-sset-counter* 0) @@ -177,29 +179,78 @@ ;; and then we happen to compile bar.lisp before foo.lisp. (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)) + (style-warn 'sb!kernel:asterisks-around-lexical-variable-name + :format-control + "using the lexical binding of the symbol ~S, not the~@ + dynamic binding" + :format-arguments (list symbol))) (values)) -(defvar *debug-name-level* 6) +(def!struct (debug-name-marker (:make-load-form-fun dump-debug-name-marker) + (:print-function print-debug-name-marker))) + +(defvar *debug-name-level* 4) +(defvar *debug-name-length* 12) +(defvar *debug-name-punt*) +(defvar *debug-name-sharp*) +(defvar *debug-name-ellipsis*) + +(eval-when (#-sb-xc :compile-toplevel :load-toplevel :execute) + (defun dump-debug-name-marker (marker &optional env) + (declare (ignore env)) + (cond ((eq marker *debug-name-sharp*) + `(if (boundp '*debug-name-sharp*) + *debug-name-sharp* + (make-debug-name-marker))) + ((eq marker *debug-name-ellipsis*) + `(if (boundp '*debug-name-ellipsis*) + *debug-name-ellipsis* + (make-debug-name-marker))) + (t + (warn "Dumping unknown debug-name marker.") + '(make-debug-name-marker))))) + +(defun print-debug-name-marker (marker stream level) + (declare (ignore level)) + (cond ((eq marker *debug-name-sharp*) + (write-char #\# stream)) + ((eq marker *debug-name-ellipsis*) + (write-string "..." stream)) + (t + (write-string "???" stream)))) + +(setf *debug-name-sharp* (make-debug-name-marker) + *debug-name-ellipsis* (make-debug-name-marker)) (defun debug-name (type thing) - (labels ((walk (x level) - (if (> *debug-name-level* (incf level)) - (typecase x - (cons - (cons (walk (car x) level) (walk (cdr x) level))) - ((or symbol number string) - x) - (t - (list 'of-type (type-of x)))) - "#<...>"))) - ;; FIXME: It might be nice to put markers in the tree instead of - ;; this #<...> business, so that they would evantually be printed - ;; without the quotes. - (let ((name (list type (walk thing 0)))) - (when (legal-fun-name-p name) - (bug "~S is a legal function name, and cannot be used as a ~ - debug name." name)) - name))) + (let ((*debug-name-punt* nil)) + (labels ((walk (x) + (typecase x + (cons + (if (plusp *debug-name-level*) + (let ((*debug-name-level* (1- *debug-name-level*))) + (do ((tail (cdr x) (cdr tail)) + (name (cons (walk (car x)) nil) + (cons (walk (car tail)) name)) + (n (1- *debug-name-length*) (1- n))) + ((or (not (consp tail)) + (not (plusp n)) + *debug-name-punt*) + (cond (*debug-name-punt* + (setf *debug-name-punt* nil) + (nreverse name)) + ((atom tail) + (nconc (nreverse name) (walk tail))) + (t + (setf *debug-name-punt* t) + (nconc (nreverse name) (list *debug-name-ellipsis*))))))) + *debug-name-sharp*)) + ((or symbol number string) + x) + (t + (type-of x))))) + (let ((name (list type (walk thing)))) + (when (legal-fun-name-p name) + (bug "~S is a legal function name, and cannot be used as a ~ + debug name." name)) + name))))