X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fcell.lisp;h=3220e7d771baee4e83fe05931f3f9ca72a709d33;hb=2546d61e3e230629978781602f82cee66f579d07;hp=e200e3e7f46b85f5bce75ef321c562977baba53d;hpb=63fcb94b875a97e468d9add229e220ecceec2352;p=sbcl.git diff --git a/src/compiler/alpha/cell.lisp b/src/compiler/alpha/cell.lisp index e200e3e..3220e7d 100644 --- a/src/compiler/alpha/cell.lisp +++ b/src/compiler/alpha/cell.lisp @@ -25,22 +25,22 @@ (define-vop (set-slot) (:args (object :scs (descriptor-reg)) (value :scs (descriptor-reg any-reg null zero))) - (:info name offset lowtag #+gengc remember) + (:info name offset lowtag #!+gengc remember) (:ignore name) (:results) (:generator 1 - #+gengc + #!+gengc (if remember (storew-and-remember-slot value object offset lowtag) (storew value object offset lowtag)) - #-gengc + #!-gengc (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-type)) + (:variant symbol-value-slot other-pointer-lowtag)) ;;; Do a cell ref with an error check for being unbound. (define-vop (checked-cell-ref) @@ -58,13 +58,13 @@ (:translate symbol-value) (:generator 9 (move object obj-temp) - (loadw value obj-temp symbol-value-slot other-pointer-type) + (loadw value obj-temp symbol-value-slot other-pointer-lowtag) (let ((err-lab (generate-error-code vop unbound-symbol-error obj-temp))) - (inst xor value unbound-marker-type temp) + (inst xor value unbound-marker-widetag temp) (inst beq temp err-lab)))) -;;; Like CHECKED-CELL-REF, only we are a predicate to see if the cell -;;; is bound. +;;; like CHECKED-CELL-REF, only we are a predicate to see if the cell +;;; is bound (define-vop (boundp-frob) (:args (object :scs (descriptor-reg))) (:conditional) @@ -76,25 +76,37 @@ (define-vop (boundp boundp-frob) (:translate boundp) (:generator 9 - (loadw value object symbol-value-slot other-pointer-type) - (inst xor value unbound-marker-type temp) + (loadw value object symbol-value-slot other-pointer-lowtag) + (inst xor value unbound-marker-widetag temp) (if not-p (inst beq temp target) (inst bne temp target)))) (define-vop (fast-symbol-value cell-ref) - (:variant symbol-value-slot other-pointer-type) + (:variant symbol-value-slot other-pointer-lowtag) (: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 bic res #.(ash lowtag-mask -1) res))) -;;;; FDEFINITION (fdefn) objects +;;;; fdefinition (FDEFN) objects -(define-vop (fdefn-function cell-ref) - (:variant fdefn-function-slot other-pointer-type)) +(define-vop (fdefn-fun cell-ref) + (:variant fdefn-fun-slot other-pointer-lowtag)) -(define-vop (safe-fdefn-function) +(define-vop (safe-fdefn-fun) (:args (object :scs (descriptor-reg) :target obj-temp)) (:results (value :scs (descriptor-reg any-reg))) (:vop-var vop) @@ -103,14 +115,14 @@ (:temporary (:scs (non-descriptor-reg)) temp) (:generator 10 (move object obj-temp) - (loadw value obj-temp fdefn-function-slot other-pointer-type) - (let ((err-lab (generate-error-code vop undefined-symbol-error obj-temp))) + (loadw value obj-temp fdefn-fun-slot other-pointer-lowtag) + (let ((err-lab (generate-error-code vop undefined-fun-error obj-temp))) (inst cmpeq value null-tn temp) (inst bne temp err-lab)))) -(define-vop (set-fdefn-function) +(define-vop (set-fdefn-fun) (:policy :fast-safe) - (:translate (setf fdefn-function)) + (:translate (setf fdefn-fun)) (:args (function :scs (descriptor-reg) :target result) (fdefn :scs (descriptor-reg))) (:temporary (:scs (interior-reg)) lip) @@ -118,16 +130,16 @@ (:results (result :scs (descriptor-reg))) (:generator 38 (let ((normal-fn (gen-label))) - (load-type type function (- function-pointer-type)) - (inst xor type function-header-type type) + (load-type type function (- fun-pointer-lowtag)) + (inst xor type simple-fun-header-widetag type) (inst addq function - (- (ash function-code-offset word-shift) function-pointer-type) + (- (ash simple-fun-code-offset word-shift) fun-pointer-lowtag) lip) (inst beq type normal-fn) (inst li (make-fixup "closure_tramp" :foreign) lip) (emit-label normal-fn) - (storew lip fdefn fdefn-raw-addr-slot other-pointer-type) - (storew function fdefn fdefn-function-slot other-pointer-type) + (storew lip fdefn fdefn-raw-addr-slot other-pointer-lowtag) + (storew function fdefn fdefn-fun-slot other-pointer-lowtag) (move function result)))) @@ -138,10 +150,10 @@ (:temporary (:scs (non-descriptor-reg)) temp) (:results (result :scs (descriptor-reg))) (:generator 38 - (storew null-tn fdefn fdefn-function-slot other-pointer-type) + (storew null-tn fdefn fdefn-fun-slot other-pointer-lowtag) (inst li (make-fixup "undefined_tramp" :foreign) temp) (move fdefn result) - (storew temp fdefn fdefn-raw-addr-slot other-pointer-type))) + (storew temp fdefn fdefn-raw-addr-slot other-pointer-lowtag))) ;;;; binding and Unbinding @@ -152,12 +164,12 @@ (symbol :scs (descriptor-reg))) (:temporary (:scs (descriptor-reg)) temp) (:generator 5 - (loadw temp symbol symbol-value-slot other-pointer-type) - (inst addq bsp-tn (* 2 word-bytes) bsp-tn) + (loadw temp symbol symbol-value-slot other-pointer-lowtag) + (inst addq bsp-tn (* 2 n-word-bytes) bsp-tn) (storew temp bsp-tn (- binding-value-slot binding-size)) (storew symbol bsp-tn (- binding-symbol-slot binding-size)) - (#+gengc storew-and-remember-slot #-gengc storew - val symbol symbol-value-slot other-pointer-type))) + (#!+gengc storew-and-remember-slot #!-gengc storew + val symbol symbol-value-slot other-pointer-lowtag))) (define-vop (unbind) @@ -165,10 +177,10 @@ (:generator 0 (loadw symbol bsp-tn (- binding-symbol-slot binding-size)) (loadw value bsp-tn (- binding-value-slot binding-size)) - (#+gengc storew-and-remember-slot #-gengc storew - value symbol symbol-value-slot other-pointer-type) + (#!+gengc storew-and-remember-slot #!-gengc storew + value symbol symbol-value-slot other-pointer-lowtag) (storew zero-tn bsp-tn (- binding-symbol-slot binding-size)) - (inst subq bsp-tn (* 2 word-bytes) bsp-tn))) + (inst subq bsp-tn (* 2 n-word-bytes) bsp-tn))) (define-vop (unbind-to-here) @@ -188,12 +200,12 @@ (loadw symbol bsp-tn (- binding-symbol-slot binding-size)) (loadw value bsp-tn (- binding-value-slot binding-size)) (inst beq symbol skip) - (#+gengc storew-and-remember-slot #-gengc storew - value symbol symbol-value-slot other-pointer-type) + (#!+gengc storew-and-remember-slot #!-gengc storew + value symbol symbol-value-slot other-pointer-lowtag) (storew zero-tn bsp-tn (- binding-symbol-slot binding-size)) (emit-label skip) - (inst subq bsp-tn (* 2 word-bytes) bsp-tn) + (inst subq bsp-tn (* 2 n-word-bytes) bsp-tn) (inst cmpeq where bsp-tn temp) (inst beq temp loop) @@ -202,33 +214,33 @@ ;;;; closure indexing (define-full-reffer closure-index-ref * - closure-info-offset function-pointer-type + closure-info-offset fun-pointer-lowtag (descriptor-reg any-reg) * %closure-index-ref) (define-full-setter set-funcallable-instance-info * - funcallable-instance-info-offset function-pointer-type + funcallable-instance-info-offset fun-pointer-lowtag (descriptor-reg any-reg null zero) * %set-funcallable-instance-info) (define-full-reffer funcallable-instance-info * - funcallable-instance-info-offset function-pointer-type + 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 function-pointer-type)) + (:variant funcallable-instance-lexenv-slot fun-pointer-lowtag)) (define-vop (closure-ref slot-ref) - (:variant closure-info-offset function-pointer-type)) + (:variant closure-info-offset fun-pointer-lowtag)) (define-vop (closure-init slot-set) - (:variant closure-info-offset function-pointer-type)) + (:variant closure-info-offset fun-pointer-lowtag)) ;;;; value cell hackery (define-vop (value-cell-ref cell-ref) - (:variant value-cell-value-slot other-pointer-type)) + (:variant value-cell-value-slot other-pointer-lowtag)) (define-vop (value-cell-set cell-set) - (:variant value-cell-value-slot other-pointer-type)) + (:variant value-cell-value-slot other-pointer-lowtag)) ;;;; instance hackery @@ -239,11 +251,11 @@ (:results (res :scs (unsigned-reg))) (:result-types positive-fixnum) (:generator 4 - (loadw res struct 0 instance-pointer-type) - (inst srl res type-bits res))) + (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-type) + (:variant instance-slots-offset instance-pointer-lowtag) (:policy :fast-safe) (:translate %instance-ref) (:arg-types instance (:constant index))) @@ -251,26 +263,26 @@ (define-vop (instance-set slot-set) (:policy :fast-safe) (:translate %instance-set) - (:variant instance-slots-offset instance-pointer-type) + (:variant instance-slots-offset instance-pointer-lowtag) (:arg-types instance (:constant index) *)) (define-full-reffer instance-index-ref * instance-slots-offset - instance-pointer-type (descriptor-reg any-reg) * %instance-ref) + instance-pointer-lowtag (descriptor-reg any-reg) * %instance-ref) (define-full-setter instance-index-set * instance-slots-offset - instance-pointer-type (descriptor-reg any-reg null zero) * %instance-set) + instance-pointer-lowtag (descriptor-reg any-reg null zero) * %instance-set) ;;;; code object frobbing -(define-full-reffer code-header-ref * 0 other-pointer-type +(define-full-reffer code-header-ref * 0 other-pointer-lowtag (descriptor-reg any-reg) * code-header-ref) -(define-full-setter code-header-set * 0 other-pointer-type +(define-full-setter code-header-set * 0 other-pointer-lowtag (descriptor-reg any-reg null zero) * code-header-set) ;;;; mutator accessing -#+gengc +#!+gengc (progn (eval-when (:compile-toplevel :load-toplevel :execute) @@ -369,8 +381,6 @@ (define-mutator-accessors binding-stack-end :sap nil) (define-mutator-accessors number-stack-base :sap nil) (define-mutator-accessors number-stack-end :sap nil) - (define-mutator-accessors eval-stack :des t) - (define-mutator-accessors eval-stack-top :ub32 t) (define-mutator-accessors nursery-start :sap nil) (define-mutator-accessors nursery-end :sap nil) (define-mutator-accessors storebuf-start :sap nil)