-;;; FIXME: should be shared
-(eval-when (:compile-toplevel :load-toplevel :execute)
- (defvar *raw-type->rawref-fun-name*
- '(;; The compiler thinks that the raw data vector is a vector of
- ;; unsigned bytes, so if the slot we want to access actually *is*
- ;; an unsigned byte, it'll access the slot for us even if we don't
- ;; lie to it at all.
- (unsigned-byte . aref)
- ;; "A lie can travel halfway round the world while the truth is
- ;; putting on its shoes." -- Mark Twain
- (single-float . %raw-ref-single)
- (double-float . %raw-ref-double)
- #!+long-float (long-float . %raw-ref-long)
- (complex-single-float . %raw-ref-complex-single)
- (complex-double-float . %raw-ref-complex-double)
- #!+long-float (complex-long-float . %raw-ref-complex-long))))
-\f
-;;;; generating out-of-line slot accessor functions
-
-;;; FIXME: Ideally, the presence of the type checks in the functions
-;;; here would be conditional on the optimization policy at the point
-;;; of expansion of DEFSTRUCT. (For now we're just doing the simpler
-;;; thing, putting in the type checks unconditionally.)
-
-;;; Return (VALUES SLOT-READER-FUN SLOT-WRITER-FUN).
-(defun slot-accessor-funs (dd dsd)
-
- #+sb-xc (/show0 "entering SLOT-ACCESSOR-FUNS")
-
- ;; various code generators
- ;;
- ;; Note: They're only minimally parameterized, and cavalierly grab
- ;; things like INSTANCE and DSD-INDEX from the namespace they're
- ;; expanded in.
- (macrolet (;; code shared between funcallable instance case and the
- ;; ordinary STRUCTURE-OBJECT case: Handle native
- ;; structures with LAYOUTs and (possibly) raw slots.
- (%native-slot-accessor-funs (dd-ref-fun-name)
- (let ((instance-type-check-form
- '(%check-structure-type-from-layout instance layout)))
- (/show "macroexpanding %NATIVE-SLOT-ACCESSOR-FUNS" dd-ref-fun-name instance-type-check-form)
- `(let ((layout (dd-layout-or-lose dd))
- (dsd-raw-type (dsd-raw-type dsd)))
- #+sb-xc (/show0 "in %NATIVE-SLOT-ACCESSOR-FUNS macroexpanded code")
- ;; Map over all the possible RAW-TYPEs, compiling
- ;; a different closure-function for each one, so
- ;; that once the COND over RAW-TYPEs happens (at
- ;; the time closure is allocated) there are no
- ;; more decisions to be made and things execute
- ;; reasonably efficiently.
- (cond
- ;; nonraw slot case
- ((eql dsd-raw-type t)
- #+sb-xc (/show0 "in nonraw slot case")
- (%slotplace-accessor-funs
- (,dd-ref-fun-name instance dsd-index)
- ,instance-type-check-form))
- ;; raw slot cases
- ,@(mapcar (lambda (raw-type-and-rawref-fun-name)
- (destructuring-bind (raw-type
- . rawref-fun-name)
- raw-type-and-rawref-fun-name
- `((equal dsd-raw-type ',raw-type)
- #+sb-xc (/show0 "in raw slot case")
- (let ((raw-index (dd-raw-index dd)))
- (%slotplace-accessor-funs
- (,rawref-fun-name (,dd-ref-fun-name
- instance
- raw-index)
- dsd-index)
- ,instance-type-check-form)))))
- *raw-type->rawref-fun-name*)
- ;; oops
- (t
- (error "internal error: unexpected DSD-RAW-TYPE ~S"
- dsd-raw-type))))))
- ;; code shared between DEFSTRUCT :TYPE LIST and
- ;; DEFSTRUCT :TYPE VECTOR cases: Handle the "typed
- ;; structure" case, with no LAYOUTs and no raw slots.
- (%colontyped-slot-accessor-funs () (error "stub"))
- ;; the common structure of the raw-slot and not-raw-slot
- ;; cases, defined in terms of the writable SLOTPLACE. All
- ;; possible flavors of slot access should be able to pass
- ;; through here.
- (%slotplace-accessor-funs (slotplace instance-type-check-form)
- (/show "macroexpanding %SLOTPLACE-ACCESSOR-FUNS" slotplace instance-type-check-form)
- `(values (lambda (instance)
- (/noshow0 "in %SLOTPLACE-ACCESSOR-FUNS-defined reader")
- ,instance-type-check-form
- (/noshow0 "back from INSTANCE-TYPE-CHECK-FORM")
- ,slotplace)
- (let ((typecheckfun (typespec-typecheckfun dsd-type)))
- (lambda (new-value instance)
- (/noshow0 "in %SLOTPLACE-ACCESSOR-FUNS-defined writer")
- ,instance-type-check-form
- (/noshow0 "back from INSTANCE-TYPE-CHECK-FORM")
- (funcall typecheckfun new-value)
- (/noshow0 "back from TYPECHECKFUN")
- (setf ,slotplace new-value))))))
-
- (let ((dsd-index (dsd-index dsd))
- (dsd-type (dsd-type dsd)))
-
- #+sb-xc (/show0 "got DSD-TYPE=..")
- #+sb-xc (/hexstr dsd-type)
- (ecase (dd-type dd)
-
- ;; native structures
- (structure
- #+sb-xc (/show0 "case of DSD-TYPE = STRUCTURE")
- (%native-slot-accessor-funs %instance-ref))
-
- ;; structures with the :TYPE option
-
- ;; FIXME: Worry about these later..
- #|
- ;; In :TYPE LIST and :TYPE VECTOR structures, ANSI specifies the
- ;; layout completely, so that raw slots are impossible.
- (list
- (dd-type-slot-accessor-funs nth-but-with-sane-arg-order
- `(%check-structure-type-from-dd
- :maybe-raw-p nil))
- (vector
- (dd-type-slot-accessor-funs aref
- :maybe-raw-p nil)))
- |#
- ))))
-\f
-;;;; baby steps for the new out-of-line slot accessor functions
-;;;;
-;;;; REMOVEME after new structure code works
-
-#|
-(in-package :sb-kernel)
-
-(defstruct foo
- ;; vanilla slots
- a
- (b 5 :type package :read-only t)
- ;; raw slots
- (x 5 :type (unsigned-byte 32))
- (y 5.0 :type single-float :read-only t))
-
-(load "/usr/stuff/sbcl/src/cold/chill")
-(cl-user:fasl "/usr/stuff/sbcl/src/code/typecheckfuns")
-(cl-user:fasl "/usr/stuff/outsacc")
-
-(let* ((foo-layout (compiler-layout-or-lose 'foo))
- (foo-dd (layout-info foo-layout))
- (foo-dsds (dd-slots foo-dd))
- (foo-a-dsd (find "A" foo-dsds :test #'string= :key #'dsd-%name))
- (foo-b-dsd (find "B" foo-dsds :test #'string= :key #'dsd-%name))
- (foo-x-dsd (find "X" foo-dsds :test #'string= :key #'dsd-%name))
- (foo-y-dsd (find "X" foo-dsds :test #'string= :key #'dsd-%name))
- (foo (make-foo :a 'avalue
- :b (find-package :cl)
- :x 50)))
- (declare (type layout foo-layout))
- (declare (type defstruct-description foo-dd))
- (declare (type defstruct-slot-description foo-a-dsd))
-
- (cl-user:/show foo)
-
- (multiple-value-bind (foo-a-reader foo-a-writer)
- (slot-accessor-funs foo-dd foo-a-dsd)
-
- ;; basic functionality
- (cl-user:/show foo-a-reader)
- (cl-user:/show (funcall foo-a-reader foo))
- (aver (eql (funcall foo-a-reader foo) 'avalue))
- (cl-user:/show foo-a-writer)
- (cl-user:/show (funcall foo-a-writer 'replacedavalue foo))
- (cl-user:/show "new" (funcall foo-a-reader foo))
- (aver (eql (funcall foo-a-reader foo) 'replacedavalue))
-
- ;; type checks on FOO-ness of instance argument
- (cl-user:/show (nth-value 1 (ignore-errors (funcall foo-a-reader 3))))
- (aver (typep (nth-value 1 (ignore-errors (funcall foo-a-reader 3)))
- 'type-error))
- (aver (typep (nth-value 1 (ignore-errors (funcall foo-a-writer 3 4)))
- 'type-error)))
-
- ;; type checks on written slot value
- (multiple-value-bind (foo-b-reader foo-b-writer)
- (slot-accessor-funs foo-dd foo-b-dsd)
- (cl-user:/show "old" (funcall foo-b-reader foo))
- (aver (not (eql (funcall foo-b-reader foo) (find-package :cl-user))))
- (funcall foo-b-writer (find-package :cl-user) foo)
- (cl-user:/show "new" (funcall foo-b-reader foo))
- (aver (eql (funcall foo-b-reader foo) (find-package :cl-user)))
- (aver (typep (nth-value 1 (ignore-errors (funcall foo-b-writer 5 foo)))
- 'type-error))
- (aver (eql (funcall foo-b-reader foo) (find-package :cl-user))))
-
- ;; raw slots
- (cl-user:/describe foo-x-dsd)
- (cl-user:/describe foo-y-dsd)
- (multiple-value-bind (foo-x-reader foo-x-writer)
- (slot-accessor-funs foo-dd foo-x-dsd)
- (multiple-value-bind (foo-y-reader foo-y-writer)
- (slot-accessor-funs foo-dd foo-y-dsd)
-
- ;; basic functionality for (UNSIGNED-BYTE 32) slot
- (cl-user:/show foo-x-reader)
- (cl-user:/show (funcall foo-x-reader foo))
- (aver (eql (funcall foo-x-reader foo) 50))
- (cl-user:/show foo-x-writer)
- (cl-user:/show (funcall foo-x-writer 14 foo))
- (cl-user:/show "new" (funcall foo-x-reader foo))
- (aver (eql (funcall foo-x-reader foo) 14)))
-
- ;; type check for (UNSIGNED-BYTE 32) slot
- (/show "to do: type check X")
-
- ;; SINGLE-FLOAT slot
- (/show "to do: Y")))
-|#
+;;; "A lie can travel halfway round the world while the truth is
+;;; putting on its shoes." -- Mark Twain
+
+(eval-when (#-sb-xc :compile-toplevel :load-toplevel :execute)
+
+ ;; information about how a slot of a given DSD-RAW-TYPE is to be accessed
+ (defstruct raw-slot-data
+ ;; the raw slot type, or T for a non-raw slot
+ ;;
+ ;; (Non-raw slots are in the ordinary place you'd expect, directly
+ ;; indexed off the instance pointer. Raw slots are indexed from the end
+ ;; of the instance and skipped by GC.)
+ (raw-type (missing-arg) :type (or symbol cons) :read-only t)
+ ;; What operator is used to access a slot of this type?
+ (accessor-name (missing-arg) :type symbol :read-only t)
+ (init-vop (missing-arg) :type symbol :read-only t)
+ ;; How many words are each value of this type?
+ (n-words (missing-arg) :type (and index (integer 1)) :read-only t)
+ ;; Necessary alignment in units of words. Note that instances
+ ;; themselves are aligned by exactly two words, so specifying more
+ ;; than two words here would not work.
+ (alignment 1 :type (integer 1 2) :read-only t))
+
+ (defvar *raw-slot-data-list*
+ #!+hppa
+ nil
+ #!-hppa
+ (let ((double-float-alignment
+ ;; white list of architectures that can load unaligned doubles:
+ #!+(or x86 x86-64 ppc) 1
+ ;; at least sparc, mips and alpha can't:
+ #!-(or x86 x86-64 ppc) 2))
+ (list
+ (make-raw-slot-data :raw-type 'sb!vm:word
+ :accessor-name '%raw-instance-ref/word
+ :init-vop 'sb!vm::raw-instance-init/word
+ :n-words 1)
+ (make-raw-slot-data :raw-type 'single-float
+ :accessor-name '%raw-instance-ref/single
+ :init-vop 'sb!vm::raw-instance-init/single
+ ;; KLUDGE: On 64 bit architectures, we
+ ;; could pack two SINGLE-FLOATs into the
+ ;; same word if raw slots were indexed
+ ;; using bytes instead of words. However,
+ ;; I don't personally find optimizing
+ ;; SINGLE-FLOAT memory usage worthwile
+ ;; enough. And the other datatype that
+ ;; would really benefit is (UNSIGNED-BYTE
+ ;; 32), but that is a subtype of FIXNUM, so
+ ;; we store it unraw anyway. :-( -- DFL
+ :n-words 1)
+ (make-raw-slot-data :raw-type 'double-float
+ :accessor-name '%raw-instance-ref/double
+ :init-vop 'sb!vm::raw-instance-init/double
+ :alignment double-float-alignment
+ :n-words (/ 8 sb!vm:n-word-bytes))
+ (make-raw-slot-data :raw-type 'complex-single-float
+ :accessor-name '%raw-instance-ref/complex-single
+ :init-vop 'sb!vm::raw-instance-init/complex-single
+ :n-words (/ 8 sb!vm:n-word-bytes))
+ (make-raw-slot-data :raw-type 'complex-double-float
+ :accessor-name '%raw-instance-ref/complex-double
+ :init-vop 'sb!vm::raw-instance-init/complex-double
+ :alignment double-float-alignment
+ :n-words (/ 16 sb!vm:n-word-bytes))
+ #!+long-float
+ (make-raw-slot-data :raw-type long-float
+ :accessor-name '%raw-instance-ref/long
+ :init-vop 'sb!vm::raw-instance-init/long
+ :n-words #!+x86 3 #!+sparc 4)
+ #!+long-float
+ (make-raw-slot-data :raw-type complex-long-float
+ :accessor-name '%raw-instance-ref/complex-long
+ :init-vop 'sb!vm::raw-instance-init/complex-long
+ :n-words #!+x86 6 #!+sparc 8)))))