X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fsysmacs.lisp;h=dc1358edc7c5f63a9703752e84bab162721acc32;hb=860543cc7ba0266e41e1d41ac9b6a208f3795f1a;hp=d485246cae9f3d6662f664f2fd8ef213e3737f5f;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git diff --git a/src/code/sysmacs.lisp b/src/code/sysmacs.lisp index d485246..dc1358e 100644 --- a/src/code/sysmacs.lisp +++ b/src/code/sysmacs.lisp @@ -11,63 +11,39 @@ (in-package "SB!IMPL") -(file-comment - "$Header$") +;;; FIXME Not the most sensible way to do this: we could just use +;;; LOCK ADD, given that we don't need the old version. This will +;;; do until we get around to writing new VOPs +;;; FIXME in fact we're not SMP-safe without LOCK anyway, but +;;; this will do us for UP systems -;;; This checks to see whether the array is simple and the start and -;;; end are in bounds. If so, it proceeds with those values. -;;; Otherwise, it calls %WITH-ARRAY-DATA. Note that there is a -;;; DERIVE-TYPE method for %WITH-ARRAY-DATA. -(defmacro with-array-data (((data-var array &key (offset-var (gensym))) - (start-var &optional (svalue 0)) - (end-var &optional (evalue nil))) - &body forms) - #!+sb-doc - "Given any Array, binds Data-Var to the array's data vector and Start-Var and - End-Var to the start and end of the designated portion of the data vector. - Svalue and Evalue are any start and end specified to the original operation, - and are factored into the bindings of Start-Var and End-Var. Offset-Var is - the cumulative offset of all displacements encountered, and does not - include Svalue." - (once-only ((n-array array) - (n-svalue `(the index ,svalue)) - (n-evalue `(the (or index null) ,evalue))) - `(multiple-value-bind (,data-var ,start-var ,end-var ,offset-var) - (if (not (array-header-p ,n-array)) - (let ((,n-array ,n-array)) - (declare (type (simple-array * (*)) ,n-array)) - ,(once-only ((n-len `(length ,n-array)) - (n-end `(or ,n-evalue ,n-len))) - `(if (<= ,n-svalue ,n-end ,n-len) - (values ,n-array ,n-svalue ,n-end 0) - (%with-array-data ,n-array ,n-svalue ,n-evalue)))) - (%with-array-data ,n-array ,n-svalue ,n-evalue)) - (declare (ignorable ,offset-var)) - ,@forms))) +(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))) -#!-gengc (defmacro without-gcing (&rest 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. +;;; EOF-OR-LOSE is a useful macro that handles EOF. (defmacro eof-or-lose (stream eof-error-p eof-value) `(if ,eof-error-p (error 'end-of-file :stream ,stream) ,eof-value)) -;;; These macros handle the special cases of t and nil for input and +;;; These macros handle the special cases of T and NIL for input and ;;; output streams. ;;; ;;; FIXME: Shouldn't these be functions instead of macros? @@ -76,7 +52,7 @@ `(let ((,svar ,stream)) (cond ((null ,svar) *standard-input*) ((eq ,svar t) *terminal-io*) - (T ,@(if check-type `((check-type ,svar ,check-type))) + (T ,@(when check-type `((enforce-type ,svar ,check-type))) #!+high-security (unless (input-stream-p ,svar) (error 'simple-type-error @@ -90,7 +66,7 @@ `(let ((,svar ,stream)) (cond ((null ,svar) *standard-output*) ((eq ,svar t) *terminal-io*) - (T ,@(if check-type `((check-type ,svar ,check-type))) + (T ,@(when check-type `((check-type ,svar ,check-type))) #!+high-security (unless (output-stream-p ,svar) (error 'simple-type-error @@ -100,13 +76,13 @@ :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 -;;; Args for fundamental-streams. +;;; WITH-mumble-STREAM calls the function in the given SLOT of 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) + `(if (ansi-stream-p stream) (funcall (,slot stream) stream ,@args) ,@(when stream-dispatch `(,(destructuring-bind (function &rest args) stream-dispatch @@ -116,7 +92,7 @@ (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) + `(if (ansi-stream-p stream) (funcall (,slot stream) stream ,@args) ,@(when stream-dispatch `(,(destructuring-bind (function &rest args) stream-dispatch @@ -126,39 +102,39 @@ ;;;; 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. +;;; FAST-READ-CHAR macro within the enclosed lexical scope. The 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-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)) -;;; This macro must be called after one is done with fast-read-char -;;; inside its scope to decache the lisp-stream-in-index. +;;; This macro must be called after one is done with FAST-READ-CHAR +;;; 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 +;;; a macro with the same calling convention as READ-CHAR, to be used +;;; within the scope of a PREPARE-FOR-FAST-READ-CHAR (defmacro fast-read-char (&optional (eof-error-p t) (eof-value ())) `(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%))))) ;;;; 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. +;;; Just like PREPARE-FOR-FAST-READ-CHAR except that we get the BIN +;;; 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 @@ -169,11 +145,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 @@ -182,13 +158,13 @@ (defmacro fast-read-byte (&optional (eof-error-p t) (eof-value ()) any-type) ;; KLUDGE: should use ONCE-ONLY on EOF-ERROR-P and EOF-VALUE -- WHN 19990825 `(truly-the - ,(if (and (eq eof-error-p 't) (not any-type)) '(unsigned-byte 8) 't) + ,(if (and (eq eof-error-p t) (not any-type)) '(unsigned-byte 8) t) (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%))))))