X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Flow.lisp;h=8a58b8e1f858c22af9feca1bde1039d13b53cd09;hb=f3f677703e37f5a335b3be7fa64f7748ad969517;hp=396446a334acf8af665e7a120f147fe3babc1efa;hpb=2d3cb6dba6461e98744eca2a1df4f770cea468ca;p=sbcl.git diff --git a/src/pcl/low.lisp b/src/pcl/low.lisp index 396446a..8a58b8e 100644 --- a/src/pcl/low.lisp +++ b/src/pcl/low.lisp @@ -58,7 +58,7 @@ ;;; this shouldn't matter, since the only two slots that WRAPPER adds ;;; are meaningless in those cases. (defstruct (wrapper - (:include sb-kernel:layout + (: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 @@ -76,16 +76,16 @@ ;;;; PCL's view of funcallable instances -(sb-kernel:!defstruct-with-alternate-metaclass pcl-funcallable-instance +(!defstruct-with-alternate-metaclass pcl-funcallable-instance ;; KLUDGE: Note that neither of these slots is ever accessed by its ;; accessor name as of sbcl-0.pre7.63. Presumably everything works ;; 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 sb-kernel:funcallable-instance - :metaclass-name sb-kernel:random-pcl-classoid - :metaclass-constructor sb-kernel:make-random-pcl-classoid - :dd-type sb-kernel:funcallable-structure + :superclass-name funcallable-instance + :metaclass-name random-pcl-classoid + :metaclass-constructor make-random-pcl-classoid + :dd-type funcallable-structure ;; Only internal implementation code will access these, and these ;; accesses (slot readers in particular) could easily be a ;; bottleneck, so it seems reasonable to suppress runtime type @@ -97,23 +97,23 @@ (import 'sb-kernel:funcallable-instance-p) -(defun set-funcallable-instance-fun (fin new-value) +(defun set-funcallable-instance-function (fin new-value) (declare (type function new-value)) (aver (funcallable-instance-p fin)) - (setf (sb-kernel:funcallable-instance-fun fin) new-value)) + (setf (funcallable-instance-fun fin) new-value)) (defmacro fsc-instance-p (fin) `(funcallable-instance-p ,fin)) (defmacro fsc-instance-wrapper (fin) - `(sb-kernel:%funcallable-instance-layout ,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) - `(sb-kernel:%funcallable-instance-info ,fin 0)) + `(%funcallable-instance-info ,fin 0)) (defmacro fsc-instance-hash (fin) - `(sb-kernel:%funcallable-instance-info ,fin 3)) + `(%funcallable-instance-info ,fin 3)) (declaim (inline clos-slots-ref (setf clos-slots-ref))) (declaim (ftype (function (simple-vector index) t) clos-slots-ref)) @@ -129,7 +129,7 @@ ;;; few uses of (OR STD-INSTANCE-P FSC-INSTANCE-P) are changed to ;;; PCL-INSTANCE-P. (defmacro std-instance-p (x) - `(sb-kernel:%instancep ,x)) + `(%instancep ,x)) ;; a temporary definition used for debugging the bootstrap #+sb-show @@ -165,13 +165,6 @@ (defmacro std-instance-class (instance) `(wrapper-class* (std-instance-wrapper ,instance))) -;;; When given a function should give this function the name -;;; NEW-NAME. Note that NEW-NAME is sometimes a list. Some lisps -;;; get the upset in the tummy when they start thinking about -;;; functions which have lists as names. To deal with that there is -;;; SET-FUN-NAME-INTERN which takes a list spec for a function -;;; name and turns it into a symbol if need be. -;;; ;;; When given a funcallable instance, SET-FUN-NAME *must* side-effect ;;; that FIN to give it the name. When given any other kind of ;;; function SET-FUN-NAME is allowed to return a new function which is @@ -180,51 +173,25 @@ ;;; In all cases, SET-FUN-NAME must return the new (or same) ;;; function. (Unlike other functions to set stuff, it does not return ;;; the new value.) -(defun set-fun-name (fcn new-name) +(defun set-fun-name (fun new-name) #+sb-doc "Set the name of a compiled function object. Return the function." (declare (special *boot-state* *the-class-standard-generic-function*)) - (cond ((symbolp fcn) - (set-fun-name (symbol-function fcn) new-name)) - ((funcallable-instance-p fcn) - (if (if (eq *boot-state* 'complete) - (typep fcn 'generic-function) - (eq (class-of fcn) *the-class-standard-generic-function*)) - (setf (sb-kernel:%funcallable-instance-info fcn 1) new-name) - (bug "unanticipated function type")) - fcn) - (t - ;; pw-- This seems wrong and causes trouble. Tests show - ;; that loading CL-HTTP resulted in ~5400 closures being - ;; passed through this code of which ~4000 of them pointed - ;; to but 16 closure-functions, including 1015 each of - ;; DEFUN MAKE-OPTIMIZED-STD-WRITER-METHOD-FUNCTION - ;; DEFUN MAKE-OPTIMIZED-STD-READER-METHOD-FUNCTION - ;; DEFUN MAKE-OPTIMIZED-STD-BOUNDP-METHOD-FUNCTION. - ;; Since the actual functions have been moved by PURIFY - ;; to memory not seen by GC, changing a pointer there - ;; not only clobbers the last change but leaves a dangling - ;; pointer invalid after the next GC. Comments in low.lisp - ;; indicate this code need do nothing. Setting the - ;; function-name to NIL loses some info, and not changing - ;; it loses some info of potential hacking value. So, - ;; lets not do this... - #+nil - (let ((header (sb-kernel:%closure-fun fcn))) - (setf (sb-kernel:%simple-fun-name header) new-name)) - - ;; XXX Maybe add better scheme here someday. - fcn))) - -(defun intern-fun-name (name) - (cond ((symbolp name) name) - ((listp name) - (intern (let ((*package* *pcl-package*) - (*print-case* :upcase) - (*print-pretty* nil) - (*print-gensym* t)) - (format nil "~S" name)) - *pcl-package*)))) + (when (valid-function-name-p fun) + (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"))) + ;; 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 + (when (and (consp new-name) + (member (car new-name) '(slow-method fast-method slot-accessor))) + (setf (fdefinition new-name) fun)) + fun) ;;; FIXME: probably no longer needed after init (defmacro precompile-random-code-segments (&optional system) @@ -237,7 +204,7 @@ ;;; This definition is for interpreted code. (defun pcl-instance-p (x) - (typep (sb-kernel:layout-of x) 'wrapper)) + (typep (layout-of x) 'wrapper)) ;;; CMU CL comment: ;;; We define this as STANDARD-INSTANCE, since we're going to @@ -248,27 +215,27 @@ (:predicate nil) (:constructor %%allocate-instance--class ()) (:copier nil) - (:alternate-metaclass sb-kernel:instance + (:alternate-metaclass instance cl:standard-class - sb-kernel:make-standard-class)) + make-standard-class)) (slots nil)) |# -(sb-kernel:!defstruct-with-alternate-metaclass standard-instance +(!defstruct-with-alternate-metaclass standard-instance :slot-names (slots hash-code) :boa-constructor %make-standard-instance - :superclass-name sb-kernel:instance - :metaclass-name sb-kernel:standard-classoid - :metaclass-constructor sb-kernel:make-standard-classoid + :superclass-name instance + :metaclass-name standard-classoid + :metaclass-constructor make-standard-classoid :dd-type structure :runtime-type-checks-p nil) ;;; Both of these operations "work" on structures, which allows the above ;;; weakening of STD-INSTANCE-P. -(defmacro std-instance-slots (x) `(sb-kernel:%instance-ref ,x 1)) -(defmacro std-instance-wrapper (x) `(sb-kernel:%instance-layout ,x)) +(defmacro std-instance-slots (x) `(%instance-ref ,x 1)) +(defmacro std-instance-wrapper (x) `(%instance-layout ,x)) ;;; KLUDGE: This one doesn't "work" on structures. However, we ;;; ensure, in SXHASH and friends, never to call it on structures. -(defmacro std-instance-hash (x) `(sb-kernel:%instance-ref ,x 2)) +(defmacro std-instance-hash (x) `(%instance-ref ,x 2)) ;;; FIXME: These functions are called every place we do a ;;; CALL-NEXT-METHOD, and probably other places too. It's likely worth @@ -289,7 +256,7 @@ (when (pcl-instance-p instance) (get-slots instance))) -(defmacro built-in-or-structure-wrapper (x) `(sb-kernel:layout-of ,x)) +(defmacro built-in-or-structure-wrapper (x) `(layout-of ,x)) (defmacro get-wrapper (inst) (once-only ((wrapper `(wrapper-of ,inst))) @@ -306,12 +273,19 @@ nil))) ;;;; support for useful hashing of PCL instances -(let ((hash-code 0)) - (declare (fixnum hash-code)) - (defun get-instance-hash-code () - (if (< hash-code most-positive-fixnum) - (incf hash-code) - (setq hash-code 0)))) + +(defvar *instance-hash-code-random-state* (make-random-state)) +(defun get-instance-hash-code () + ;; ANSI SXHASH wants us to make a good-faith effort to produce + ;; hash-codes that are well distributed within the range of + ;; non-negative fixnums, and this RANDOM operation does that, unlike + ;; the sbcl<=0.8.16 implementation of this operation as + ;; (INCF COUNTER). + ;; + ;; 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*)) (defun sb-impl::sxhash-instance (x) (cond @@ -328,11 +302,10 @@ ;;; The definition of STRUCTURE-TYPE-P was moved to early-low.lisp. (defun get-structure-dd (type) - (sb-kernel:layout-info (sb-kernel:classoid-layout - (sb-kernel:find-classoid type)))) + (layout-info (classoid-layout (find-classoid type)))) (defun structure-type-included-type-name (type) - (let ((include (sb-kernel::dd-include (get-structure-dd type)))) + (let ((include (dd-include (get-structure-dd type)))) (if (consp include) (car include) include))) @@ -340,24 +313,56 @@ (defun structure-type-slot-description-list (type) (nthcdr (length (let ((include (structure-type-included-type-name type))) (and include - (sb-kernel:dd-slots (get-structure-dd include))))) - (sb-kernel:dd-slots (get-structure-dd type)))) + (dd-slots (get-structure-dd include))))) + (dd-slots (get-structure-dd type)))) (defun structure-slotd-name (slotd) - (sb-kernel:dsd-name slotd)) + (dsd-name slotd)) (defun structure-slotd-accessor-symbol (slotd) - (sb-kernel:dsd-accessor-name slotd)) + (dsd-accessor-name slotd)) (defun structure-slotd-reader-function (slotd) - (fdefinition (sb-kernel:dsd-accessor-name slotd))) + (fdefinition (dsd-accessor-name slotd))) -(defun structure-slotd-writer-function (slotd) - (unless (sb-kernel:dsd-read-only slotd) - (fdefinition `(setf ,(sb-kernel:dsd-accessor-name slotd))))) +(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)) + (fdefinition `(setf ,(dsd-accessor-name slotd))))) (defun structure-slotd-type (slotd) - (sb-kernel:dsd-type slotd)) + (dsd-type slotd)) (defun structure-slotd-init-form (slotd) - (sb-kernel::dsd-default slotd)) + (dsd-default slotd)) + +;;; WITH-PCL-LOCK is used around some forms that were previously +;;; protected by WITHOUT-INTERRUPTS, but in a threaded SBCL we don't +;;; have a useful WITHOUT-INTERRUPTS. In an unthreaded SBCL I'm not +;;; sure what the desired effect is anyway: should we be protecting +;;; against the possibility of recursive calls into these functions +;;; or are we using WITHOUT-INTERRUPTS as WITHOUT-SCHEDULING? +;;; +;;; Users: FORCE-CACHE-FLUSHES, MAKE-INSTANCES-OBSOLETE. Note that +;;; it's not all certain this is sufficent for threadsafety: do we +;;; just have to protect against simultaneous calls to these mutators, +;;; or actually to stop normal slot access etc at the same time as one +;;; of them runs + +#+sb-thread +(progn +(defstruct spinlock (value 0)) +(defvar *pcl-lock* (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 + +#-sb-thread +(defmacro with-pcl-lock (&body body) + `(progn ,@body))