0.8.16.18:

[sbcl.git] / src / code / sysmacs.lisp

diff --git a/src/code/sysmacs.lisp b/src/code/sysmacs.lisp
index 558eac1..67e29dd 100644 (file)
--- a/src/code/sysmacs.lisp
+++ b/src/code/sysmacs.lisp
@@ -10,26 +10,29 @@
 ;;;; files for more information.
 
 (in-package "SB!IMPL")
-\f
-
-#!-sb-thread
-(defmacro atomic-incf (symbol-name &optional (delta 1))
-  `(incf ,symbol-name ,delta))
 
-(defmacro atomic-decf (place &optional (delta 1))
-  `(atomic-incf ,place ,(- delta)))
+(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 (&rest body)
   #!+sb-doc
   "Executes the forms in the body without doing a garbage collection."
   `(unwind-protect
     (progn
-      (atomic-incf *gc-inhibit*)
+      (atomic-incf/symbol *gc-inhibit*)
       ,@body)
-    (atomic-decf *gc-inhibit*)
+    (atomic-incf/symbol *gc-inhibit* -1)
     (when (and *need-to-collect-garbage* (zerop *gc-inhibit*))
-      (maybe-gc nil))))
+      (sub-gc))))
 
 \f
 ;;; EOF-OR-LOSE is a useful macro that handles EOF.
@@ -54,7 +57,7 @@
                         :datum ,svar
                         :expected-type '(satisfies input-stream-p)
                         :format-control "~S isn't an input stream"
-                        :format-arguments ,(list  svar)))              
+                        :format-arguments (list ,svar)))
                ,svar)))))
 (defmacro out-synonym-of (stream &optional check-type)
   (let ((svar (gensym)))
@@ -68,7 +71,7 @@
                         :datum ,svar
                         :expected-type '(satisfies output-stream-p)
                         :format-control "~S isn't an output stream."
-                        :format-arguments ,(list  svar)))
+                        :format-arguments (list ,svar)))
                ,svar)))))
 
 ;;; WITH-mumble-STREAM calls the function in the given SLOT of the
@@ -102,7 +105,7 @@
 (defmacro prepare-for-fast-read-char (stream &body forms)
   `(let* ((%frc-stream% ,stream)
          (%frc-method% (ansi-stream-in %frc-stream%))
-         (%frc-buffer% (ansi-stream-in-buffer %frc-stream%))
+         (%frc-buffer% (ansi-stream-cin-buffer %frc-stream%))
          (%frc-index% (ansi-stream-in-index %frc-stream%)))
      (declare (type index %frc-index%)
              (type ansi-stream %frc-stream%))
@@ -123,7 +126,7 @@
      (prog1 (fast-read-char-refill %frc-stream% ,eof-error-p ,eof-value)
            (setq %frc-index% (ansi-stream-in-index %frc-stream%))))
     (t
-     (prog1 (code-char (aref %frc-buffer% %frc-index%))
+     (prog1 (aref %frc-buffer% %frc-index%)
            (incf %frc-index%)))))
 
 ;;;; And these for the fasloader...