X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fsysmacs.lisp;h=8110d1b8f61f967db334fb0f8db81a5a036907c7;hb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;hp=ab967520c956b268de93909bdf89d4b71e877412;hpb=2f421f0541c1f6bf7fb90ee14fe3b205a57f067b;p=sbcl.git diff --git a/src/code/sysmacs.lisp b/src/code/sysmacs.lisp index ab96752..8110d1b 100644 --- a/src/code/sysmacs.lisp +++ b/src/code/sysmacs.lisp @@ -10,22 +10,30 @@ ;;;; files for more information. (in-package "SB!IMPL") - -#!-gengc -(defmacro without-gcing (&rest body) + +(defmacro atomic-incf/symbol (symbol-name &optional (delta 1)) + #!-sb-thread + `(incf ,symbol-name ,delta) + #!+sb-thread + `(locally + (declare (optimize (safety 0) (speed 3))) + (sb!vm::locked-symbol-global-value-add ',symbol-name ,delta))) + +;;; When >0, inhibits garbage collection. +(declaim (type index *gc-inhibit*)) +(defvar *gc-inhibit*) ; initialized in cold init + +(defmacro without-gcing (&body body) #!+sb-doc "Executes the forms in the body without doing a garbage collection." `(unwind-protect - (let ((*gc-inhibit* t)) - ,@body) - (when (and *need-to-collect-garbage* (not *gc-inhibit*)) - (maybe-gc nil)))) + (progn + (atomic-incf/symbol *gc-inhibit*) + ,@body) + (atomic-incf/symbol *gc-inhibit* -1) + (when (and *need-to-collect-garbage* (zerop *gc-inhibit*)) + (sub-gc)))) -#!+gengc -(defmacro without-gcing (&rest body) - #!+sb-doc - "Executes the forms in the body without doing a garbage collection." - `(without-interrupts ,@body)) ;;; EOF-OR-LOSE is a useful macro that handles EOF. (defmacro eof-or-lose (stream eof-error-p eof-value) @@ -41,72 +49,72 @@ (let ((svar (gensym))) `(let ((,svar ,stream)) (cond ((null ,svar) *standard-input*) - ((eq ,svar t) *terminal-io*) - (T ,@(when check-type `((enforce-type ,svar ,check-type))) - #!+high-security - (unless (input-stream-p ,svar) - (error 'simple-type-error - :datum ,svar - :expected-type '(satisfies input-stream-p) - :format-control "~S isn't an input stream" - :format-arguments ,(list svar))) - ,svar))))) + ((eq ,svar t) *terminal-io*) + (t ,@(when check-type `((enforce-type ,svar ,check-type))) ; + #!+high-security + (unless (input-stream-p ,svar) + (error 'simple-type-error + :datum ,svar + :expected-type '(satisfies input-stream-p) + :format-control "~S isn't an input stream" + :format-arguments (list ,svar))) + ,svar))))) (defmacro out-synonym-of (stream &optional check-type) (let ((svar (gensym))) `(let ((,svar ,stream)) (cond ((null ,svar) *standard-output*) - ((eq ,svar t) *terminal-io*) - (T ,@(when check-type `((check-type ,svar ,check-type))) - #!+high-security - (unless (output-stream-p ,svar) - (error 'simple-type-error - :datum ,svar - :expected-type '(satisfies output-stream-p) - :format-control "~S isn't an output stream." - :format-arguments ,(list svar))) - ,svar))))) + ((eq ,svar t) *terminal-io*) + (t ,@(when check-type `((check-type ,svar ,check-type))) + #!+high-security + (unless (output-stream-p ,svar) + (error 'simple-type-error + :datum ,svar + :expected-type '(satisfies output-stream-p) + :format-control "~S isn't an output stream." + :format-arguments (list ,svar))) + ,svar))))) ;;; WITH-mumble-STREAM calls the function in the given SLOT of the -;;; STREAM with the ARGS for LISP-STREAMs, or the FUNCTION with the +;;; STREAM with the ARGS for ANSI-STREAMs, or the FUNCTION with the ;;; ARGS for FUNDAMENTAL-STREAMs. (defmacro with-in-stream (stream (slot &rest args) &optional stream-dispatch) `(let ((stream (in-synonym-of ,stream))) ,(if stream-dispatch - `(if (lisp-stream-p stream) - (funcall (,slot stream) stream ,@args) - ,@(when stream-dispatch - `(,(destructuring-bind (function &rest args) stream-dispatch - `(,function stream ,@args))))) - `(funcall (,slot stream) stream ,@args)))) + `(if (ansi-stream-p stream) + (funcall (,slot stream) stream ,@args) + ,@(when stream-dispatch + `(,(destructuring-bind (function &rest args) stream-dispatch + `(,function stream ,@args))))) + `(funcall (,slot stream) stream ,@args)))) (defmacro with-out-stream (stream (slot &rest args) &optional stream-dispatch) `(let ((stream (out-synonym-of ,stream))) ,(if stream-dispatch - `(if (lisp-stream-p stream) - (funcall (,slot stream) stream ,@args) - ,@(when stream-dispatch - `(,(destructuring-bind (function &rest args) stream-dispatch - `(,function stream ,@args))))) - `(funcall (,slot stream) stream ,@args)))) + `(if (ansi-stream-p stream) + (funcall (,slot stream) stream ,@args) + ,@(when stream-dispatch + `(,(destructuring-bind (function &rest args) stream-dispatch + `(,function stream ,@args))))) + `(funcall (,slot stream) stream ,@args)))) ;;;; These are hacks to make the reader win. ;;; This macro sets up some local vars for use by the ;;; FAST-READ-CHAR macro within the enclosed lexical scope. The stream -;;; is assumed to be a LISP-STREAM. +;;; is assumed to be a ANSI-STREAM. (defmacro prepare-for-fast-read-char (stream &body forms) `(let* ((%frc-stream% ,stream) - (%frc-method% (lisp-stream-in %frc-stream%)) - (%frc-buffer% (lisp-stream-in-buffer %frc-stream%)) - (%frc-index% (lisp-stream-in-index %frc-stream%))) + (%frc-method% (ansi-stream-in %frc-stream%)) + (%frc-buffer% (ansi-stream-cin-buffer %frc-stream%)) + (%frc-index% (ansi-stream-in-index %frc-stream%))) (declare (type index %frc-index%) - (type lisp-stream %frc-stream%)) + (type ansi-stream %frc-stream%)) ,@forms)) ;;; This macro must be called after one is done with FAST-READ-CHAR -;;; inside its scope to decache the lisp-stream-in-index. +;;; inside its scope to decache the ANSI-STREAM-IN-INDEX. (defmacro done-with-fast-read-char () - `(setf (lisp-stream-in-index %frc-stream%) %frc-index%)) + `(setf (ansi-stream-in-index %frc-stream%) %frc-index%)) ;;; a macro with the same calling convention as READ-CHAR, to be used ;;; within the scope of a PREPARE-FOR-FAST-READ-CHAR @@ -114,17 +122,17 @@ `(cond ((not %frc-buffer%) (funcall %frc-method% %frc-stream% ,eof-error-p ,eof-value)) - ((= %frc-index% +in-buffer-length+) + ((= %frc-index% +ansi-stream-in-buffer-length+) (prog1 (fast-read-char-refill %frc-stream% ,eof-error-p ,eof-value) - (setq %frc-index% (lisp-stream-in-index %frc-stream%)))) + (setq %frc-index% (ansi-stream-in-index %frc-stream%)))) (t - (prog1 (code-char (aref %frc-buffer% %frc-index%)) - (incf %frc-index%))))) + (prog1 (aref %frc-buffer% %frc-index%) + (incf %frc-index%))))) ;;;; And these for the fasloader... ;;; Just like PREPARE-FOR-FAST-READ-CHAR except that we get the BIN -;;; method. The stream is assumed to be a LISP-STREAM. +;;; method. The stream is assumed to be a ANSI-STREAM. ;;; ;;; KLUDGE: It seems weird to have to remember to explicitly call ;;; DONE-WITH-FAST-READ-BYTE at the end of this, given that we're @@ -135,11 +143,11 @@ ;;; for the FAST-READ-CHAR stuff) -- WHN 19990825 (defmacro prepare-for-fast-read-byte (stream &body forms) `(let* ((%frc-stream% ,stream) - (%frc-method% (lisp-stream-bin %frc-stream%)) - (%frc-buffer% (lisp-stream-in-buffer %frc-stream%)) - (%frc-index% (lisp-stream-in-index %frc-stream%))) + (%frc-method% (ansi-stream-bin %frc-stream%)) + (%frc-buffer% (ansi-stream-in-buffer %frc-stream%)) + (%frc-index% (ansi-stream-in-index %frc-stream%))) (declare (type index %frc-index%) - (type lisp-stream %frc-stream%)) + (type ansi-stream %frc-stream%)) ,@forms)) ;;; Similar to fast-read-char, but we use a different refill routine & don't @@ -152,11 +160,11 @@ (cond ((not %frc-buffer%) (funcall %frc-method% %frc-stream% ,eof-error-p ,eof-value)) - ((= %frc-index% +in-buffer-length+) + ((= %frc-index% +ansi-stream-in-buffer-length+) (prog1 (fast-read-byte-refill %frc-stream% ,eof-error-p ,eof-value) - (setq %frc-index% (lisp-stream-in-index %frc-stream%)))) + (setq %frc-index% (ansi-stream-in-index %frc-stream%)))) (t (prog1 (aref %frc-buffer% %frc-index%) - (incf %frc-index%)))))) + (incf %frc-index%)))))) (defmacro done-with-fast-read-byte () `(done-with-fast-read-char))