X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Flow.lisp;h=ed2d9b883658ea531ba9ad20e7305f88bc728dac;hb=e204f990b868f03fa6aef17860ce86c854c30fe8;hp=8a58b8e1f858c22af9feca1bde1039d13b53cd09;hpb=9d36021d86b7db7561b2edc40324c8e5229f88b3;p=sbcl.git diff --git a/src/pcl/low.lisp b/src/pcl/low.lisp index 8a58b8e..ed2d9b8 100644 --- a/src/pcl/low.lisp +++ b/src/pcl/low.lisp @@ -58,18 +58,18 @@ ;;; this shouldn't matter, since the only two slots that WRAPPER adds ;;; are meaningless in those cases. (defstruct (wrapper - (:include layout - ;; KLUDGE: In CMU CL, the initialization default - ;; for LAYOUT-INVALID was NIL. In SBCL, that has - ;; changed to :UNINITIALIZED, but PCL code might - ;; still expect NIL for the initialization - ;; default of WRAPPER-INVALID. Instead of trying - ;; to find out, I just overrode the LAYOUT - ;; default here. -- WHN 19991204 - (invalid nil)) - (:conc-name %wrapper-) - (:constructor make-wrapper-internal) - (:copier nil)) + (:include layout + ;; KLUDGE: In CMU CL, the initialization default + ;; for LAYOUT-INVALID was NIL. In SBCL, that has + ;; changed to :UNINITIALIZED, but PCL code might + ;; still expect NIL for the initialization + ;; default of WRAPPER-INVALID. Instead of trying + ;; to find out, I just overrode the LAYOUT + ;; default here. -- WHN 19991204 + (invalid nil)) + (:conc-name %wrapper-) + (:constructor make-wrapper-internal) + (:copier nil)) (instance-slots-layout nil :type list) (class-slots nil :type list)) #-sb-fluid (declaim (sb-ext:freeze-type wrapper)) @@ -82,7 +82,7 @@ ;; by puns based on absolute locations. Fun fun fun.. -- WHN 2001-10-30 :slot-names (clos-slots name hash-code) :boa-constructor %make-pcl-funcallable-instance - :superclass-name funcallable-instance + :superclass-name function :metaclass-name random-pcl-classoid :metaclass-constructor make-random-pcl-classoid :dd-type funcallable-structure @@ -101,17 +101,16 @@ (declare (type function new-value)) (aver (funcallable-instance-p fin)) (setf (funcallable-instance-fun fin) new-value)) +;;; FIXME: these macros should just go away. It's not clear whether +;;; the inline functions defined by +;;; !DEFSTRUCT-WITH-ALTERNATE-METACLASS are as efficient as they could +;;; be; ordinary defstruct accessors are defined as source transforms. (defmacro fsc-instance-p (fin) `(funcallable-instance-p ,fin)) (defmacro fsc-instance-wrapper (fin) `(%funcallable-instance-layout ,fin)) -;;; FIXME: This seems to bear no relation at all to the CLOS-SLOTS -;;; slot in the FUNCALLABLE-INSTANCE structure, above, which -;;; (bizarrely) seems to be set to the NAME of the -;;; FUNCALLABLE-INSTANCE. At least, the index 1 seems to return the -;;; NAME, and the index 2 NIL. Weird. -- CSR, 2002-11-07 (defmacro fsc-instance-slots (fin) - `(%funcallable-instance-info ,fin 0)) + `(%funcallable-instance-info ,fin 1)) (defmacro fsc-instance-hash (fin) `(%funcallable-instance-info ,fin 3)) @@ -134,13 +133,13 @@ ;; a temporary definition used for debugging the bootstrap #+sb-show (defun print-std-instance (instance stream depth) - (declare (ignore depth)) + (declare (ignore depth)) (print-unreadable-object (instance stream :type t :identity t) (let ((class (class-of instance))) (when (or (eq class (find-class 'standard-class nil)) - (eq class (find-class 'funcallable-standard-class nil)) - (eq class (find-class 'built-in-class nil))) - (princ (early-class-name instance) stream))))) + (eq class (find-class 'funcallable-standard-class nil)) + (eq class (find-class 'built-in-class nil))) + (princ (early-class-name instance) stream))))) ;;; This is the value that we stick into a slot to tell us that it is ;;; unbound. It may seem gross, but for performance reasons, we make @@ -181,10 +180,10 @@ (setq fun (fdefinition fun))) (when (funcallable-instance-p fun) (if (if (eq *boot-state* 'complete) - (typep fun 'generic-function) - (eq (class-of fun) *the-class-standard-generic-function*)) - (setf (%funcallable-instance-info fun 1) new-name) - (bug "unanticipated function type"))) + (typep fun 'generic-function) + (eq (class-of fun) *the-class-standard-generic-function*)) + (setf (%funcallable-instance-info fun 2) new-name) + (bug "unanticipated function type"))) ;; Fixup name-to-function mappings in cases where the function ;; hasn't been defined by DEFUN. (FIXME: is this right? This logic ;; comes from CMUCL). -- CSR, 2004-12-31 @@ -212,18 +211,18 @@ ;;; we make it, and we want the accessor to still be type-correct. #| (defstruct (standard-instance - (:predicate nil) - (:constructor %%allocate-instance--class ()) - (:copier nil) - (:alternate-metaclass instance - cl:standard-class - make-standard-class)) + (:predicate nil) + (:constructor %%allocate-instance--class ()) + (:copier nil) + (:alternate-metaclass instance + cl:standard-class + make-standard-class)) (slots nil)) |# (!defstruct-with-alternate-metaclass standard-instance :slot-names (slots hash-code) :boa-constructor %make-standard-instance - :superclass-name instance + :superclass-name t :metaclass-name standard-classoid :metaclass-constructor make-standard-classoid :dd-type structure @@ -269,8 +268,8 @@ (defmacro get-instance-wrapper-or-nil (inst) (once-only ((wrapper `(wrapper-of ,inst))) `(if (typep ,wrapper 'wrapper) - ,wrapper - nil))) + ,wrapper + nil))) ;;;; support for useful hashing of PCL instances @@ -285,7 +284,7 @@ ;; Hopefully there was no virtue to the old counter implementation ;; that I am insufficiently insightful to insee. -- WHN 2004-10-28 (random most-positive-fixnum - *instance-hash-code-random-state*)) + *instance-hash-code-random-state*)) (defun sb-impl::sxhash-instance (x) (cond @@ -307,14 +306,14 @@ (defun structure-type-included-type-name (type) (let ((include (dd-include (get-structure-dd type)))) (if (consp include) - (car include) - include))) + (car include) + include))) (defun structure-type-slot-description-list (type) (nthcdr (length (let ((include (structure-type-included-type-name type))) - (and include - (dd-slots (get-structure-dd include))))) - (dd-slots (get-structure-dd type)))) + (and include + (dd-slots (get-structure-dd include))))) + (dd-slots (get-structure-dd type)))) (defun structure-slotd-name (slotd) (dsd-name slotd)) @@ -328,7 +327,7 @@ (defun structure-slotd-writer-function (type slotd) (if (dsd-read-only slotd) (let ((dd (get-structure-dd type))) - (coerce (slot-setter-lambda-form dd slotd) 'function)) + (coerce (slot-setter-lambda-form dd slotd) 'function)) (fdefinition `(setf ,(dsd-accessor-name slotd))))) (defun structure-slotd-type (slotd) @@ -352,16 +351,11 @@ #+sb-thread (progn -(defstruct spinlock (value 0)) -(defvar *pcl-lock* (make-spinlock)) + (defvar *pcl-lock* (sb-thread::make-spinlock)) -(defmacro with-pcl-lock (&body body) - `(progn - (sb-thread::get-spinlock *pcl-lock* 1 (sb-thread::current-thread-id)) - (unwind-protect - (progn ,@body) - (setf (spinlock-value *pcl-lock*) 0)))) -);progn + (defmacro with-pcl-lock (&body body) + `(sb-thread::with-spinlock (*pcl-lock*) + ,@body))) #-sb-thread (defmacro with-pcl-lock (&body body)