X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Flow.lisp;h=0fd9df546f212b9a48a9d70d04b6db54547b9433;hb=dec94b039e8ec90baf21463df839a6181de606f6;hp=50f71d9164952c7c1272db5850bc245333074829;hpb=d5aafdd8ab6387e12bac187048ed322bc96fb79a;p=sbcl.git diff --git a/src/pcl/low.lisp b/src/pcl/low.lisp index 50f71d9..0fd9df5 100644 --- a/src/pcl/low.lisp +++ b/src/pcl/low.lisp @@ -46,6 +46,52 @@ (declare (fixnum ,var)) ,@body)) +;;;; PCL's view of funcallable instances + +(defstruct (pcl-funcallable-instance + (:alternate-metaclass sb-kernel:funcallable-instance + sb-kernel:random-pcl-class + sb-kernel:make-random-pcl-class) + (:type sb-kernel:funcallable-structure) + (:constructor allocate-funcallable-instance-1 ()) + (:copier nil) + (:conc-name nil)) + ;; Note: The PCL wrapper is in the layout slot. + + ;; PCL data vector. + (pcl-funcallable-instance-slots nil) + ;; The debug-name for this function. + (funcallable-instance-name nil)) + +(import 'sb-kernel:funcallable-instance-p) + +;;; This "works" on non-PCL FINs, which allows us to weaken +;;; FUNCALLABLE-INSTANCE-P to return true for all FINs. This is also +;;; necessary for bootstrapping to work, since the layouts for early +;;; GFs are not initially initialized. +(defmacro funcallable-instance-data-1 (fin slot) + (ecase (eval slot) + (wrapper `(sb-kernel:%funcallable-instance-layout ,fin)) + (slots `(sb-kernel:%funcallable-instance-info ,fin 0)))) + +;;; FIXME: Now that we no longer try to make our CLOS implementation +;;; portable to other implementations of Common Lisp, all the +;;; funcallable instance wrapper logic here can go away in favor +;;; of direct calls to native SBCL funcallable instance operations. +(defun set-funcallable-instance-function (fin new-value) + (declare (type function new-value)) + (aver (funcallable-instance-p fin)) + (setf (sb-kernel:funcallable-instance-function fin) new-value)) +(defmacro fsc-instance-p (fin) + `(funcallable-instance-p ,fin)) +(defmacro fsc-instance-class (fin) + `(wrapper-class (funcallable-instance-data-1 ,fin 'wrapper))) +(defmacro fsc-instance-wrapper (fin) + `(funcallable-instance-data-1 ,fin 'wrapper)) +(defmacro fsc-instance-slots (fin) + `(funcallable-instance-data-1 ,fin 'slots)) + +(declaim (inline clos-slots-ref (setf clos-slots-ref))) (declaim (ftype (function (simple-vector index) t) clos-slots-ref)) (defun clos-slots-ref (slots index) (svref slots index)) @@ -61,11 +107,6 @@ (defmacro std-instance-p (x) `(sb-kernel:%instancep ,x)) -(defmacro get-slots (inst) - `(cond ((std-instance-p ,inst) (std-instance-slots ,inst)) - ((fsc-instance-p ,inst) (fsc-instance-slots ,inst)) - (t (error "What kind of instance is this?")))) - ;; a temporary definition used for debugging the bootstrap #+sb-show (defun print-std-instance (instance stream depth) @@ -77,16 +118,21 @@ (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 this an interned -;;; symbol. That means that the fast check to see whether a slot is unbound is -;;; to say (EQ '..SLOT-UNBOUND..). That is considerably faster than -;;; looking at the value of a special variable. Be careful, there are places in -;;; the code which actually use ..slot-unbound.. rather than this variable. So -;;; much for modularity.. +;;; 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 +;;; this an interned symbol. That means that the fast check to see +;;; whether a slot is unbound is to say (EQ '..SLOT-UNBOUND..). +;;; That is considerably faster than looking at the value of a special +;;; variable. Be careful, there are places in the code which actually +;;; use ..SLOT-UNBOUND.. rather than this variable. So much for +;;; modularity.. ;;; -;;; FIXME: Now that we're tightly integrated into SBCL, we could use the -;;; SBCL built-in unbound value token instead. +;;; FIXME: Now that we're tightly integrated into SBCL, we could use +;;; the SBCL built-in unbound value token instead. Perhaps if we did +;;; so it would be a good idea to define collections of CLOS slots as +;;; a new type of heap object, instead of using bare SIMPLE-VECTOR, in +;;; order to avoid problems (in the debugger if nowhere else) with +;;; SIMPLE-VECTORs some of whose elements are unbound tokens. (defconstant +slot-unbound+ '..slot-unbound..) (defmacro %allocate-static-slot-storage--class (no-of-slots) @@ -95,23 +141,21 @@ (defmacro std-instance-class (instance) `(wrapper-class* (std-instance-wrapper ,instance))) - -;;; SET-FUNCTION-NAME -;;; -;;; When given a function should give this function the name . -;;; Note that 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-function-name-intern -;;; which takes a list spec for a function name and turns it into a symbol -;;; if need be. +;;; 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-FUNCTION-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-function-name MUST side-effect -;;; that FIN to give it the name. When given any other kind of function -;;; set-function-name is allowed to return new function which is the 'same' -;;; except that it has the name. +;;; When given a funcallable instance, SET-FUNCTION-NAME *must* +;;; side-effect that FIN to give it the name. When given any other +;;; kind of function SET-FUNCTION-NAME is allowed to return a new +;;; function which is "the same" except that it has the name. ;;; -;;; In all cases, set-function-name must return the new (or same) function. -;;; (Unlike other functions to set stuff, it does not return the new value.) +;;; In all cases, SET-FUNCTION-NAME must return the new (or same) +;;; function. (Unlike other functions to set stuff, it does not return +;;; the new value.) (defun set-function-name (fcn new-name) #+sb-doc "Set the name of a compiled function object. Return the function." @@ -123,14 +167,10 @@ (typep fcn 'generic-function) (eq (class-of fcn) *the-class-standard-generic-function*)) (setf (sb-kernel:%funcallable-instance-info fcn 1) new-name) - (typecase fcn - (sb-kernel:byte-closure - (set-function-name (sb-kernel:byte-closure-function fcn) - new-name)) - (sb-kernel:byte-function - (setf (sb-kernel:byte-function-name fcn) new-name)) - (sb-eval:interpreted-function - (setf (sb-eval:interpreted-function-name fcn) new-name)))) + (error 'simple-type-error + :datum fcn + :expected-type 'generic-function + :format-control "internal error: bad function type")) fcn) (t ;; pw-- This seems wrong and causes trouble. Tests show @@ -150,9 +190,9 @@ ;; lets not do this... #+nil (let ((header (sb-kernel:%closure-function fcn))) - (setf (sb-c::%function-name header) new-name)) + (setf (sb-kernel:%function-name header) new-name)) - ;; Maybe add better scheme here someday. + ;; XXX Maybe add better scheme here someday. fcn))) (defun intern-function-name (name) @@ -177,12 +217,6 @@ (eval-when (:load-toplevel) (compile-iis-functions t)))) -(defun record-definition (type spec &rest args) - (declare (ignore type spec args)) - ()) - -(defun doctor-dfun-for-the-debugger (gf dfun) (declare (ignore gf)) dfun) - ;;; This definition is for interpreted code. (defun pcl-instance-p (x) (typep (sb-kernel:layout-of x) 'wrapper)) @@ -203,30 +237,43 @@ (defmacro std-instance-slots (x) `(sb-kernel:%instance-ref ,x 1)) (defmacro std-instance-wrapper (x) `(sb-kernel:%instance-layout ,x)) +;;; FIXME: These functions are called every place we do a +;;; CALL-NEXT-METHOD, and probably other places too. It's likely worth +;;; selectively optimizing them with DEFTRANSFORMs and stuff, rather +;;; than just indiscriminately expanding them inline everywhere. +(declaim (inline get-slots get-slots-or-nil)) +(declaim (ftype (function (t) simple-vector) get-slots)) +(declaim (ftype (function (t) (or simple-vector null)) get-slots-or-nil)) +(defun get-slots (instance) + (if (std-instance-p instance) + (std-instance-slots instance) + (fsc-instance-slots instance))) +(defun get-slots-or-nil (instance) + (when (pcl-instance-p instance) + (get-slots instance))) + (defmacro built-in-or-structure-wrapper (x) `(sb-kernel:layout-of ,x)) (defmacro get-wrapper (inst) - (sb-int:once-only ((wrapper `(wrapper-of ,inst))) + (once-only ((wrapper `(wrapper-of ,inst))) `(progn - (assert (typep ,wrapper 'wrapper) () "What kind of instance is this?") + (aver (typep ,wrapper 'wrapper)) ,wrapper))) -;;; FIXME: could be an inline function (like many other things around -;;; here) +;;; FIXME: could be an inline function or ordinary function (like many +;;; other things around here) (defmacro get-instance-wrapper-or-nil (inst) - (sb-int:once-only ((wrapper `(wrapper-of ,inst))) + (once-only ((wrapper `(wrapper-of ,inst))) `(if (typep ,wrapper 'wrapper) ,wrapper nil))) - -(defmacro get-slots-or-nil (inst) - (sb-int:once-only ((n-inst inst)) - `(when (pcl-instance-p ,n-inst) - (if (std-instance-p ,n-inst) - (std-instance-slots ,n-inst) - (fsc-instance-slots ,n-inst))))) ;;;; structure-instance stuff +;;;; +;;;; FIXME: Now that the code is SBCL-only, this extra layer of +;;;; abstraction around our native structure representation doesn't +;;;; seem to add anything useful, and could probably go away. + ;;; The definition of STRUCTURE-TYPE-P was moved to early-low.lisp. (defun get-structure-dd (type) @@ -248,14 +295,14 @@ (sb-kernel:dsd-name slotd)) (defun structure-slotd-accessor-symbol (slotd) - (sb-kernel:dsd-accessor slotd)) + (sb-kernel:dsd-accessor-name slotd)) (defun structure-slotd-reader-function (slotd) - (fdefinition (sb-kernel:dsd-accessor slotd))) + (fdefinition (sb-kernel:dsd-accessor-name slotd))) (defun structure-slotd-writer-function (slotd) (unless (sb-kernel:dsd-read-only slotd) - (fdefinition `(setf ,(sb-kernel:dsd-accessor slotd))))) + (fdefinition `(setf ,(sb-kernel:dsd-accessor-name slotd))))) (defun structure-slotd-type (slotd) (sb-kernel:dsd-type slotd))