(defun %instance-set (instance index new-value)
(setf (%instance-ref instance index) new-value))
-#!-hppa
-(progn
- (defun %raw-instance-ref/word (instance index)
- (declare (type index index))
- (%raw-instance-ref/word instance index))
- (defun %raw-instance-set/word (instance index new-value)
- (declare (type index index)
- (type sb!vm:word new-value))
- (%raw-instance-set/word instance index new-value))
-
- (defun %raw-instance-ref/single (instance index)
- (declare (type index index))
- (%raw-instance-ref/single instance index))
- (defun %raw-instance-set/single (instance index new-value)
- (declare (type index index)
- (type single-float new-value))
- (%raw-instance-set/single instance index new-value))
-
- (defun %raw-instance-ref/double (instance index)
- (declare (type index index))
- (%raw-instance-ref/double instance index))
- (defun %raw-instance-set/double (instance index new-value)
- (declare (type index index)
- (type double-float new-value))
- (%raw-instance-set/double instance index new-value))
-
- (defun %raw-instance-ref/complex-single (instance index)
- (declare (type index index))
- (%raw-instance-ref/complex-single instance index))
- (defun %raw-instance-set/complex-single (instance index new-value)
- (declare (type index index)
- (type (complex single-float) new-value))
- (%raw-instance-set/complex-single instance index new-value))
-
- (defun %raw-instance-ref/complex-double (instance index)
- (declare (type index index))
- (%raw-instance-ref/complex-double instance index))
- (defun %raw-instance-set/complex-double (instance index new-value)
- (declare (type index index)
- (type (complex double-float) new-value))
- (%raw-instance-set/complex-double instance index new-value))
-) ; #!-HPPA
-
-#!+hppa
-(progn
-(defun %raw-ref-single (vec index)
+;;; Normally IR2 converted, definition needed for interpreted structure
+;;; constructors only.
+#!+sb-eval
+(defun %make-structure-instance (dd slot-specs &rest slot-values)
+ (let ((instance (%make-instance (dd-instance-length dd))))
+ (setf (%instance-layout instance) (dd-layout-or-lose dd))
+ (mapc (lambda (spec value)
+ (destructuring-bind (raw-type . index) (cdr spec)
+ (macrolet ((make-case ()
+ `(ecase raw-type
+ ((t)
+ (setf (%instance-ref instance index) value))
+ ,@(mapcar
+ (lambda (rsd)
+ `(,(raw-slot-data-raw-type rsd)
+ (setf (,(raw-slot-data-accessor-name rsd)
+ instance index)
+ value)))
+ *raw-slot-data-list*))))
+ (make-case))))
+ slot-specs slot-values)
+ instance))
+
+(defun %raw-instance-ref/word (instance index)
(declare (type index index))
- (%raw-ref-single vec index))
+ (%raw-instance-ref/word instance index))
+(defun %raw-instance-set/word (instance index new-value)
+ (declare (type index index)
+ (type sb!vm:word new-value))
+ (%raw-instance-set/word instance index new-value))
-(defun %raw-ref-double (vec index)
+(defun %raw-instance-ref/single (instance index)
(declare (type index index))
- (%raw-ref-double vec index))
+ (%raw-instance-ref/single instance index))
+(defun %raw-instance-set/single (instance index new-value)
+ (declare (type index index)
+ (type single-float new-value))
+ (%raw-instance-set/single instance index new-value))
-#!+long-float
-(defun %raw-ref-long (vec index)
+(defun %raw-instance-ref/double (instance index)
(declare (type index index))
- (%raw-ref-long vec index))
+ (%raw-instance-ref/double instance index))
+(defun %raw-instance-set/double (instance index new-value)
+ (declare (type index index)
+ (type double-float new-value))
+ (%raw-instance-set/double instance index new-value))
-(defun %raw-set-single (vec index val)
+(defun %raw-instance-ref/complex-single (instance index)
(declare (type index index))
- (%raw-set-single vec index val))
+ (%raw-instance-ref/complex-single instance index))
+(defun %raw-instance-set/complex-single (instance index new-value)
+ (declare (type index index)
+ (type (complex single-float) new-value))
+ (%raw-instance-set/complex-single instance index new-value))
-(defun %raw-set-double (vec index val)
+(defun %raw-instance-ref/complex-double (instance index)
(declare (type index index))
- (%raw-set-double vec index val))
-
-#!+long-float
-(defun %raw-set-long (vec index val)
- (declare (type index index))
- (%raw-set-long vec index val))
-
-(defun %raw-ref-complex-single (vec index)
- (declare (type index index))
- (%raw-ref-complex-single vec index))
-
-(defun %raw-ref-complex-double (vec index)
- (declare (type index index))
- (%raw-ref-complex-double vec index))
-
-#!+long-float
-(defun %raw-ref-complex-long (vec index)
- (declare (type index index))
- (%raw-ref-complex-long vec index))
-
-(defun %raw-set-complex-single (vec index val)
- (declare (type index index))
- (%raw-set-complex-single vec index val))
-
-(defun %raw-set-complex-double (vec index val)
- (declare (type index index))
- (%raw-set-complex-double vec index val))
-
-#!+long-float
-(defun %raw-set-complex-long (vec index val)
- (declare (type index index))
- (%raw-set-complex-long vec index val))
-) ; #!+HPPA
+ (%raw-instance-ref/complex-double instance index))
+(defun %raw-instance-set/complex-double (instance index new-value)
+ (declare (type index index)
+ (type (complex double-float) new-value))
+ (%raw-instance-set/complex-double instance index new-value))
(defun %instance-layout (instance)
(%instance-layout instance))
(defun (setf funcallable-instance-fun) (new-value fin)
(setf (%funcallable-instance-function fin) new-value))
-
-;;; service function for structure constructors
-(defun %make-instance-with-layout (layout)
- ;; Make sure the object ends at a two-word boundary. Note that this does
- ;; not affect the amount of memory used, since the allocator would add the
- ;; same padding anyway. However, raw slots are indexed from the length of
- ;; the object as indicated in the header, so the pad word needs to be
- ;; included in that length to guarantee proper alignment of raw double float
- ;; slots, necessary for (at least) the SPARC backend.
- (let* ((length (layout-length layout))
- (result (%make-instance (+ length (mod (1+ length) 2)))))
- (setf (%instance-layout result) layout)
- result))
\f
;;;; target-only parts of the DEFSTRUCT top level code
(when (layout-invalid layout)
(error "attempt to copy an obsolete structure:~% ~S" structure))
- ;; Copy ordinary slots.
+ ;; Copy ordinary slots and layout.
(dotimes (i (- len nuntagged))
(declare (type index i))
(setf (%instance-ref res i)
projects / sbcl.git / blobdiff