1.0.24.10: raw slot support for HPPA
[sbcl.git] / src / compiler / hppa / cell.lisp
index a843e2d..7334e4e 100644 (file)
     (loadw value bsp-tn (- binding-value-slot binding-size))
     (storew value symbol symbol-value-slot other-pointer-lowtag)
     (storew zero-tn bsp-tn (- binding-symbol-slot binding-size))
+    (storew zero-tn bsp-tn (- binding-value-slot binding-size))
     (inst addi (- (* binding-size n-word-bytes)) bsp-tn bsp-tn)))
 
 (define-vop (unbind-to-here)
     (storew zero-tn bsp-tn (- binding-symbol-slot binding-size))
 
     SKIP
+    (storew zero-tn bsp-tn (- binding-value-slot binding-size))
     (inst addi (* -2 n-word-bytes) bsp-tn bsp-tn)
     (inst comb :<> where bsp-tn loop :nullify t)
     (loadw symbol bsp-tn (- binding-symbol-slot binding-size))
   funcallable-instance-info-offset fun-pointer-lowtag
   (descriptor-reg any-reg) * %funcallable-instance-info)
 
-(define-vop (funcallable-instance-lexenv cell-ref)
-  (:variant funcallable-instance-lexenv-slot fun-pointer-lowtag))
-
-
 (define-vop (closure-ref slot-ref)
   (:variant closure-info-offset fun-pointer-lowtag))
 
 (define-vop (closure-init slot-set)
   (:variant closure-info-offset fun-pointer-lowtag))
-
-
 \f
 ;;;; Value Cell hackery.
 
     (loadw res struct 0 instance-pointer-lowtag)
     (inst srl res n-widetag-bits res)))
 
-(define-vop (instance-ref slot-ref)
-  (:variant instance-slots-offset instance-pointer-lowtag)
-  (:policy :fast-safe)
-  (:translate %instance-ref)
-  (:arg-types instance (:constant index)))
-
-#+nil ; As per usual (cf sbcl-devel discussion about this VOP which
-      ; appears to return no values)
-(define-vop (instance-set slot-set)
-  (:policy :fast-safe)
-  (:translate %instance-set)
-  (:variant instance-slots-offset instance-pointer-lowtag)
-  (:arg-types instance (:constant index) *))
-
 (define-full-reffer instance-index-ref * instance-slots-offset
   instance-pointer-lowtag (descriptor-reg any-reg) * %instance-ref)
 
 
 (define-full-setter code-header-set * 0 other-pointer-lowtag
   (descriptor-reg any-reg) * code-header-set)
+\f
+;;;; raw instance slot accessors
+
+(macrolet ((fix-storage (inc-offset-by)
+             `(progn
+                (loadw offset object 0 instance-pointer-lowtag)
+                (inst srl offset n-widetag-bits offset)
+                (inst sll offset 2 offset)
+                (inst sub offset index offset)
+                (inst addi ,inc-offset-by offset offset)
+                (inst add offset object lip)))
+           (raw-instance ((type inc-offset-by set &optional complex)
+                          &body body)
+             (let ((name (symbolicate "RAW-INSTANCE-"
+                                      (if set "SET/" "REF/")
+                                      (if (eq type 'unsigned)
+                                        "WORD"
+                                        (or complex type))))
+                   (type-num (cond
+                               ((eq type 'single)
+                                 (if complex 'complex-single-float
+                                             'single-float))
+                               ((eq type 'double)
+                                 (if complex 'complex-double-float
+                                             'double-float))
+                               (t (symbolicate type "-NUM"))))
+                   (type-reg (symbolicate (or complex type) "-REG")))
+             `(define-vop (,name)
+                (:translate ,(symbolicate "%" name))
+                (:policy :fast-safe)
+                (:args (object :scs (descriptor-reg))
+                       (index :scs (any-reg))
+                       ,@(if set
+                           `((value :scs (,type-reg) :target result))))
+                (:arg-types * positive-fixnum ,@(if set `(,type-num)))
+                (:results (,(if set 'result 'value) :scs (,type-reg)))
+                (:temporary (:scs (non-descriptor-reg)) offset)
+                (:temporary (:scs (interior-reg)) lip)
+                (:result-types ,type-num)
+                (:generator 5
+                  (loadw offset object 0 instance-pointer-lowtag)
+                  (inst srl offset n-widetag-bits offset)
+                  (inst sll offset 2 offset)
+                  (inst sub offset index offset)
+                  (inst addi ,(* inc-offset-by n-word-bytes)
+                             offset offset)
+                  (inst add offset object lip)
+                  ,@body)))))
+  (raw-instance (unsigned -1 nil)
+    (inst ldw (- (* instance-slots-offset n-word-bytes)
+              instance-pointer-lowtag) lip value))
+
+  (raw-instance (unsigned -1 t)
+    (inst stw value (- (* instance-slots-offset n-word-bytes)
+                          instance-pointer-lowtag) lip)
+    (move value result))
+
+  (raw-instance (single -1 nil)
+    (inst li (- (* instance-slots-offset n-word-bytes)
+                instance-pointer-lowtag) offset)
+    (inst fldx offset lip value))
+
+  (raw-instance (single -1 t)
+    (inst li (- (* instance-slots-offset n-word-bytes)
+                instance-pointer-lowtag) offset)
+    (inst fstx value offset lip)
+    (unless (location= result value)
+      (inst funop :copy value result)))
+
+  (raw-instance (double -2 nil)
+    (inst fldx object index value)
+    (inst fldx offset lip value))
+
+  (raw-instance (double -2 t)
+    (inst fldx offset lip value)
+    (inst fldx index object value)
+    (inst funop :copy value result))
+
+  (raw-instance (single -2 nil complex-single)
+    (inst li (- (* instance-slots-offset n-word-bytes)
+                instance-pointer-lowtag) offset)
+    (inst fldx offset lip (complex-single-reg-real-tn value))
+    (inst li (- (* (1+ instance-slots-offset) n-word-bytes)
+                instance-pointer-lowtag) offset)
+    (inst fldx offset lip (complex-single-reg-imag-tn value)))
+
+  (raw-instance (single -2 t complex-single)
+    (let ((value-real (complex-single-reg-real-tn value))
+          (result-real (complex-single-reg-real-tn result)))
+      (inst li (- (* instance-slots-offset n-word-bytes)
+                  instance-pointer-lowtag) offset)
+      (inst fstx value-real offset lip)
+      (unless (location= result-real value-real)
+        (inst funop :copy value-real result-real)))
+    (let ((value-imag (complex-single-reg-imag-tn value))
+          (result-imag (complex-single-reg-imag-tn result)))
+      (inst li (- (* (1+ instance-slots-offset) n-word-bytes)
+                  instance-pointer-lowtag) offset)
+      (inst fstx value-imag offset lip)
+      (unless (location= result-imag value-imag)
+        (inst funop :copy value-imag result-imag))))
+
+  (raw-instance (double -4 nil complex-double)
+    (let ((immediate-offset (- (* instance-slots-offset n-word-bytes)
+                               instance-pointer-lowtag)))
+      (inst li immediate-offset offset)
+      (inst fldx offset lip (complex-double-reg-real-tn value)))
+    (let ((immediate-offset (+ 4 (- (* (1+ instance-slots-offset)
+           n-word-bytes) instance-pointer-lowtag))))
+      (inst li immediate-offset offset)
+      (inst fldx offset lip (complex-double-reg-real-tn value)))
+    (let ((immediate-offset (- (* (+ instance-slots-offset 2) n-word-bytes)
+                               instance-pointer-lowtag)))
+      (inst li immediate-offset offset)
+      (inst fldx offset lip (complex-double-reg-imag-tn value)))
+    (let ((immediate-offset (+ 4 (- (* (+ instance-slots-offset 3)
+           n-word-bytes) instance-pointer-lowtag))))
+      (inst li immediate-offset offset)
+      (inst fldx offset lip (complex-double-reg-imag-tn value))))
+
+  (raw-instance (double -4 t complex-double)
+    (let ((value-real (complex-double-reg-real-tn value))
+          (result-real (complex-double-reg-real-tn result)))
+      (let ((immediate-offset (- (* instance-slots-offset n-word-bytes)
+                                 instance-pointer-lowtag)))
+        (inst li immediate-offset offset)
+        (inst fldx offset lip value-real))
+      (let ((immediate-offset (+ 4 (- (* (1+ instance-slots-offset)
+              n-word-bytes) instance-pointer-lowtag))))
+        (inst li immediate-offset offset)
+        (inst fldx offset lip value-real))
+
+      (unless (location= result-real value-real)
+        (inst funop :copy value-real result-real)))
+    (let ((value-imag (complex-double-reg-imag-tn value))
+          (result-imag (complex-double-reg-imag-tn result)))
+      (let ((immediate-offset (- (* (+ instance-slots-offset 2) n-word-bytes)
+                                 instance-pointer-lowtag)))
+        (inst li immediate-offset offset)
+        (inst fldx offset lip value-imag))
+
+      (let ((immediate-offset (+ 4 (- (* (+ instance-slots-offset 3)
+             n-word-bytes) instance-pointer-lowtag))))
+        (inst li immediate-offset offset)
+        (inst fldx offset lip value-imag))
+      (unless (location= result-imag value-imag)
+         (inst funop :copy value-imag result-imag)))))