X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fsystem.lisp;h=f6d33053c4218eedb21b4e655dace4fe93234c94;hb=29a9ccc860532b32c566aec095f570e999a9c52c;hp=539ef59e25d3462cf465590524d170bff7d82a47;hpb=f143939b1dbaf38ebd4f92c851fbc4ecddf37af1;p=sbcl.git diff --git a/src/compiler/alpha/system.lisp b/src/compiler/alpha/system.lisp index 539ef59..f6d3305 100644 --- a/src/compiler/alpha/system.lisp +++ b/src/compiler/alpha/system.lisp @@ -13,8 +13,8 @@ ;;;; type frobbing VOPs -(define-vop (get-lowtag) - (:translate get-lowtag) +(define-vop (lowtag-of) + (:translate lowtag-of) (:policy :fast-safe) (:args (object :scs (any-reg descriptor-reg))) (:results (result :scs (unsigned-reg))) @@ -22,8 +22,8 @@ (:generator 1 (inst and object lowtag-mask result))) -(define-vop (get-type) - (:translate get-type) +(define-vop (widetag-of) + (:translate widetag-of) (:policy :fast-safe) (:args (object :scs (descriptor-reg))) (:temporary (:scs (non-descriptor-reg)) ndescr) @@ -32,9 +32,9 @@ (:generator 6 ;; Pick off objects with headers. (inst and object lowtag-mask result) - (inst cmpeq result other-pointer-type ndescr) + (inst cmpeq result other-pointer-lowtag ndescr) (inst bne ndescr other-ptr) - (inst cmpeq result fun-pointer-type ndescr) + (inst cmpeq result fun-pointer-lowtag ndescr) (inst bne ndescr function-ptr) ;; Pick off structure and list pointers. @@ -45,29 +45,29 @@ (inst beq result done) ;; Must be an other immediate. - (inst and object type-mask result) + (inst and object widetag-mask result) (inst br zero-tn done) FUNCTION-PTR - (load-type result object (- fun-pointer-type)) + (load-type result object (- fun-pointer-lowtag)) (inst br zero-tn done) OTHER-PTR - (load-type result object (- other-pointer-type)) + (load-type result object (- other-pointer-lowtag)) DONE)) -(define-vop (function-subtype) - (:translate function-subtype) +(define-vop (fun-subtype) + (:translate fun-subtype) (:policy :fast-safe) (:args (function :scs (descriptor-reg))) (:results (result :scs (unsigned-reg))) (:result-types positive-fixnum) (:generator 6 - (load-type result function (- fun-pointer-type)))) + (load-type result function (- fun-pointer-lowtag)))) -(define-vop (set-function-subtype) - (:translate (setf function-subtype)) +(define-vop (set-fun-subtype) + (:translate (setf fun-subtype)) (:policy :fast-safe) (:args (type :scs (unsigned-reg) :target result) (function :scs (descriptor-reg))) @@ -76,10 +76,10 @@ (:results (result :scs (unsigned-reg))) (:result-types positive-fixnum) (:generator 6 - (inst ldl temp (- fun-pointer-type) function) + (inst ldl temp (- fun-pointer-lowtag) function) (inst and temp #xff temp) (inst bis type temp temp) - (inst stl temp (- fun-pointer-type) function) + (inst stl temp (- fun-pointer-lowtag) function) (move type result))) @@ -90,8 +90,8 @@ (:results (res :scs (unsigned-reg))) (:result-types positive-fixnum) (:generator 6 - (loadw res x 0 other-pointer-type) - (inst srl res type-bits res))) + (loadw res x 0 other-pointer-lowtag) + (inst srl res n-widetag-bits res))) (define-vop (get-closure-length) (:translate get-closure-length) @@ -100,8 +100,8 @@ (:results (res :scs (unsigned-reg))) (:result-types positive-fixnum) (:generator 6 - (loadw res x 0 fun-pointer-type) - (inst srl res type-bits res))) + (loadw res x 0 fun-pointer-lowtag) + (inst srl res n-widetag-bits res))) (define-vop (set-header-data) (:translate set-header-data) @@ -112,21 +112,21 @@ (:results (res :scs (descriptor-reg))) (:temporary (:scs (non-descriptor-reg)) t1 t2) (:generator 6 - (loadw t1 x 0 other-pointer-type) - (inst and t1 type-mask t1) + (loadw t1 x 0 other-pointer-lowtag) + (inst and t1 widetag-mask t1) (sc-case data (any-reg - (inst sll data (- type-bits 2) t2) + (inst sll data (- n-widetag-bits 2) t2) (inst bis t1 t2 t1)) (immediate - (let ((c (ash (tn-value data) type-bits))) + (let ((c (ash (tn-value data) n-widetag-bits))) (cond ((<= 0 c (1- (ash 1 8))) (inst bis t1 c t1)) (t (inst li c t2) (inst bis t1 t2 t1))))) (zero)) - (storew t1 x 0 other-pointer-type) + (storew t1 x 0 other-pointer-lowtag) (move x res))) (define-vop (make-fixnum) @@ -148,11 +148,11 @@ (:generator 2 (sc-case type ((immediate) - (inst sll val type-bits temp) + (inst sll val n-widetag-bits temp) (inst bis temp (tn-value type) res)) (t (inst sra type 2 temp) - (inst sll val (- type-bits 2) res) + (inst sll val (- n-widetag-bits 2) res) (inst bis res temp res))))) @@ -193,24 +193,24 @@ (:results (sap :scs (sap-reg))) (:result-types system-area-pointer) (:generator 10 - (loadw ndescr code 0 other-pointer-type) - (inst srl ndescr type-bits ndescr) + (loadw ndescr code 0 other-pointer-lowtag) + (inst srl ndescr n-widetag-bits ndescr) (inst sll ndescr word-shift ndescr) - (inst subq ndescr other-pointer-type ndescr) + (inst subq ndescr other-pointer-lowtag ndescr) (inst addq code ndescr sap))) -(define-vop (compute-function) +(define-vop (compute-fun) (:args (code :scs (descriptor-reg)) (offset :scs (signed-reg unsigned-reg))) (:arg-types * positive-fixnum) (:results (func :scs (descriptor-reg))) (:temporary (:scs (non-descriptor-reg)) ndescr) (:generator 10 - (loadw ndescr code 0 other-pointer-type) - (inst srl ndescr type-bits ndescr) + (loadw ndescr code 0 other-pointer-lowtag) + (inst srl ndescr n-widetag-bits ndescr) (inst sll ndescr word-shift ndescr) (inst addq ndescr offset ndescr) - (inst subq ndescr (- other-pointer-type fun-pointer-type) ndescr) + (inst subq ndescr (- other-pointer-lowtag fun-pointer-lowtag) ndescr) (inst addq code ndescr func))) ;;;; other random VOPs. @@ -235,7 +235,8 @@ (:temporary (:scs (non-descriptor-reg)) count) (:generator 1 (let ((offset - (- (* (+ index vector-data-offset) word-bytes) other-pointer-type))) + (- (* (+ index vector-data-offset) n-word-bytes) + other-pointer-lowtag))) (inst ldl count offset count-vector) (inst addq count 1 count) (inst stl count offset count-vector))))