X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fhppa%2Fcell.lisp;h=7334e4e9f99c81a663be3b191404b5f5dbd26676;hb=edcaad65452eee6bff2017941ef6c33b26a5a2b0;hp=50df91a8bd81c09438d11e3b0d7916bc9301afcf;hpb=8a19c6876412b8ad1cf729297c2a373d63a0d0ec;p=sbcl.git diff --git a/src/compiler/hppa/cell.lisp b/src/compiler/hppa/cell.lisp index 50df91a..7334e4e 100644 --- a/src/compiler/hppa/cell.lisp +++ b/src/compiler/hppa/cell.lisp @@ -1,5 +1,16 @@ -(in-package "SB!VM") +;;;; the VM definition of various primitive memory access VOPs for +;;;; HPPA + +;;;; This software is part of the SBCL system. See the README file for +;;;; more information. +;;;; +;;;; This software is derived from the CMU CL system, which was +;;;; written at Carnegie Mellon University and released into the +;;;; public domain. The software is in the public domain and is +;;;; provided with absolutely no warranty. See the COPYING and CREDITS +;;;; files for more information. +(in-package "SB!VM") ;;;; Data object ref/set stuff. @@ -13,24 +24,20 @@ (define-vop (set-slot) (:args (object :scs (descriptor-reg)) - (value :scs (descriptor-reg any-reg))) + (value :scs (descriptor-reg any-reg))) (:info name offset lowtag) (:ignore name) (:results) (:generator 1 (storew value object offset lowtag))) - - ;;;; Symbol hacking VOPs: ;;; The compiler likes to be able to directly SET symbols. -;;; (define-vop (set cell-set) (:variant symbol-value-slot other-pointer-lowtag)) ;;; Do a cell ref with an error check for being unbound. -;;; (define-vop (checked-cell-ref) (:args (object :scs (descriptor-reg) :target obj-temp)) (:results (value :scs (descriptor-reg any-reg))) @@ -42,7 +49,6 @@ ;;; With Symbol-Value, we check that the value isn't the trap object. So ;;; Symbol-Value of NIL is NIL. -;;; (define-vop (symbol-value checked-cell-ref) (:translate symbol-value) (:generator 9 @@ -73,7 +79,19 @@ (:policy :fast) (:translate symbol-value)) - +(define-vop (symbol-hash) + (:policy :fast-safe) + (:translate symbol-hash) + (:args (symbol :scs (descriptor-reg))) + (:results (res :scs (any-reg))) + (:result-types positive-fixnum) + (:generator 2 + ;; The symbol-hash slot of NIL holds NIL because it is also the + ;; cdr slot, so we have to strip off the two low bits to make sure + ;; it is a fixnum. The lowtag selection magic that is required to + ;; ensure this is explained in the comment in objdef.lisp + (loadw res symbol symbol-hash-slot other-pointer-lowtag) + (inst andcm res #b11 res))) ;;;; Fdefinition (fdefn) objects. @@ -96,7 +114,7 @@ (:policy :fast-safe) (:translate (setf fdefn-fun)) (:args (function :scs (descriptor-reg) :target result) - (fdefn :scs (descriptor-reg))) + (fdefn :scs (descriptor-reg))) (:temporary (:scs (interior-reg)) lip) (:temporary (:scs (non-descriptor-reg)) type) (:results (result :scs (descriptor-reg))) @@ -105,7 +123,7 @@ (inst addi (- simple-fun-header-widetag) type type) (inst comb := type zero-tn normal-fn) (inst addi (- (ash simple-fun-code-offset word-shift) fun-pointer-lowtag) - function lip) + function lip) (inst li (make-fixup "closure_tramp" :foreign) lip) NORMAL-FN (storew function fdefn fdefn-fun-slot other-pointer-lowtag) @@ -134,7 +152,7 @@ (define-vop (bind) (:args (val :scs (any-reg descriptor-reg)) - (symbol :scs (descriptor-reg))) + (symbol :scs (descriptor-reg))) (:temporary (:scs (descriptor-reg)) temp) (:generator 5 (loadw temp symbol symbol-value-slot other-pointer-lowtag) @@ -150,6 +168,7 @@ (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) @@ -166,6 +185,7 @@ (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)) @@ -188,17 +208,11 @@ 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)) - - ;;;; Value Cell hackery. @@ -222,20 +236,6 @@ (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) @@ -251,3 +251,150 @@ (define-full-setter code-header-set * 0 other-pointer-lowtag (descriptor-reg any-reg) * code-header-set) + +;;;; 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)))))