X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fsparc%2Fcell.lisp;h=4cea77ac1f3712e9c7b4b7327cf54b3537856487;hb=7deecae2d959173eda6a153d490c752c32050a9e;hp=0888f327b61297d08b611b00483e5e9114eb4c54;hpb=f3f677703e37f5a335b3be7fa64f7748ad969517;p=sbcl.git diff --git a/src/compiler/sparc/cell.lisp b/src/compiler/sparc/cell.lisp index 0888f32..4cea77a 100644 --- a/src/compiler/sparc/cell.lisp +++ b/src/compiler/sparc/cell.lisp @@ -23,7 +23,7 @@ (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) @@ -92,6 +92,13 @@ ;; ensure this is explained in the comment in objdef.lisp (loadw res symbol symbol-hash-slot other-pointer-lowtag) (inst andn res res fixnum-tag-mask))) + +;;; On unithreaded builds these are just copies of the non-global versions. +(define-vop (%set-symbol-global-value set)) +(define-vop (symbol-global-value symbol-value) + (:translate symbol-global-value)) +(define-vop (fast-symbol-global-value fast-symbol-value) + (:translate symbol-global-value)) ;;;; FDEFINITION (fdefn) objects. (define-vop (fdefn-fun cell-ref) @@ -115,7 +122,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))) @@ -152,7 +159,7 @@ ;;; symbol. (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) @@ -168,6 +175,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 sub bsp-tn bsp-tn (* 2 n-word-bytes)))) (define-vop (unbind-to-here) @@ -176,8 +184,8 @@ (:temporary (:scs (descriptor-reg)) symbol value) (:generator 0 (let ((loop (gen-label)) - (skip (gen-label)) - (done (gen-label))) + (skip (gen-label)) + (done (gen-label))) (move where arg) (inst cmp where bsp-tn) (inst b :eq done) @@ -192,6 +200,7 @@ (storew zero-tn bsp-tn (- binding-symbol-slot binding-size)) (emit-label skip) + (storew zero-tn bsp-tn (- binding-value-slot binding-size)) (inst sub bsp-tn bsp-tn (* 2 n-word-bytes)) (inst cmp where bsp-tn) (inst b :ne loop) @@ -213,10 +222,6 @@ (:variant funcallable-instance-info-offset fun-pointer-lowtag) (:translate %set-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)) @@ -244,33 +249,14 @@ (loadw temp struct 0 instance-pointer-lowtag) (inst srl res temp n-widetag-bits))) -(define-vop (instance-ref slot-ref) - (:variant instance-slots-offset instance-pointer-lowtag) - (:policy :fast-safe) - (:translate %instance-ref) - (:arg-types * (:constant index))) - -;;; This VOP has no :results; however, %instance-set must return a -;;; value. This caused, in the forward port to 0.7.x, an error in -;;; !fdefn-cold-init: "argument X is not a REAL: NIL". This VOP is -;;; commented out for now, pending the addition of checking code to -;;; the define-vop machinery to ascertain that this was indeed the -;;; problem. -- CSR, 2002-02-12 -#+nil -(define-vop (instance-set slot-set) - (:policy :fast-safe) - (:translate %instance-set) - (:variant instance-slots-offset instance-pointer-lowtag) - (:arg-types * (:constant index) *)) - (define-vop (instance-index-ref word-index-ref) - (:policy :fast-safe) + (:policy :fast-safe) (:translate %instance-ref) (:variant instance-slots-offset instance-pointer-lowtag) (:arg-types * positive-fixnum)) (define-vop (instance-index-set word-index-set) - (:policy :fast-safe) + (:policy :fast-safe) (:translate %instance-set) (:variant instance-slots-offset instance-pointer-lowtag) (:arg-types * positive-fixnum *)) @@ -295,7 +281,7 @@ (:translate %raw-instance-ref/word) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg))) + (index :scs (any-reg))) (:arg-types * positive-fixnum) (:results (value :scs (unsigned-reg))) (:temporary (:scs (non-descriptor-reg)) offset) @@ -303,7 +289,7 @@ (:generator 5 (loadw offset object 0 instance-pointer-lowtag) (inst srl offset offset n-widetag-bits) - (inst sll offset offset 2) + (inst sll offset offset n-fixnum-tag-bits) (inst sub offset offset index) (inst add offset @@ -316,7 +302,7 @@ (:translate %raw-instance-set/word) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg)) + (index :scs (any-reg)) (value :scs (unsigned-reg))) (:arg-types * positive-fixnum unsigned-num) (:results (result :scs (unsigned-reg))) @@ -325,7 +311,7 @@ (:generator 5 (loadw offset object 0 instance-pointer-lowtag) (inst srl offset offset n-widetag-bits) - (inst sll offset offset 2) + (inst sll offset offset n-fixnum-tag-bits) (inst sub offset offset index) (inst add offset @@ -339,7 +325,7 @@ (:translate %raw-instance-ref/single) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg))) + (index :scs (any-reg))) (:arg-types * positive-fixnum) (:results (value :scs (single-reg))) (:temporary (:scs (non-descriptor-reg)) offset) @@ -347,7 +333,7 @@ (:generator 5 (loadw offset object 0 instance-pointer-lowtag) (inst srl offset offset n-widetag-bits) - (inst sll offset offset 2) + (inst sll offset offset n-fixnum-tag-bits) (inst sub offset offset index) (inst add offset @@ -360,8 +346,8 @@ (:translate %raw-instance-set/single) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg)) - (value :scs (single-reg) :target result)) + (index :scs (any-reg)) + (value :scs (single-reg) :target result)) (:arg-types * positive-fixnum single-float) (:results (result :scs (single-reg))) (:result-types single-float) @@ -369,7 +355,7 @@ (:generator 5 (loadw offset object 0 instance-pointer-lowtag) (inst srl offset offset n-widetag-bits) - (inst sll offset offset 2) + (inst sll offset offset n-fixnum-tag-bits) (inst sub offset offset index) (inst add offset @@ -384,7 +370,7 @@ (:translate %raw-instance-ref/double) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg))) + (index :scs (any-reg))) (:arg-types * positive-fixnum) (:results (value :scs (double-reg))) (:temporary (:scs (non-descriptor-reg)) offset) @@ -392,7 +378,7 @@ (:generator 5 (loadw offset object 0 instance-pointer-lowtag) (inst srl offset offset n-widetag-bits) - (inst sll offset offset 2) + (inst sll offset offset n-fixnum-tag-bits) (inst sub offset offset index) (inst add offset @@ -405,8 +391,8 @@ (:translate %raw-instance-set/double) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg)) - (value :scs (double-reg) :target result)) + (index :scs (any-reg)) + (value :scs (double-reg) :target result)) (:arg-types * positive-fixnum double-float) (:results (result :scs (double-reg))) (:result-types double-float) @@ -414,7 +400,7 @@ (:generator 5 (loadw offset object 0 instance-pointer-lowtag) (inst srl offset offset n-widetag-bits) - (inst sll offset offset 2) + (inst sll offset offset n-fixnum-tag-bits) (inst sub offset offset index) (inst add offset @@ -429,7 +415,7 @@ (:translate %raw-instance-ref/complex-single) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg))) + (index :scs (any-reg))) (:arg-types * positive-fixnum) (:results (value :scs (complex-single-reg))) (:temporary (:scs (non-descriptor-reg)) offset) @@ -437,7 +423,7 @@ (:generator 5 (loadw offset object 0 instance-pointer-lowtag) (inst srl offset offset n-widetag-bits) - (inst sll offset offset 2) + (inst sll offset offset n-fixnum-tag-bits) (inst sub offset offset index) (inst add offset @@ -452,8 +438,8 @@ (:translate %raw-instance-set/complex-single) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg)) - (value :scs (complex-single-reg) :target result)) + (index :scs (any-reg)) + (value :scs (complex-single-reg) :target result)) (:arg-types * positive-fixnum complex-single-float) (:results (result :scs (complex-single-reg))) (:result-types complex-single-float) @@ -461,7 +447,7 @@ (:generator 5 (loadw offset object 0 instance-pointer-lowtag) (inst srl offset offset n-widetag-bits) - (inst sll offset offset 2) + (inst sll offset offset n-fixnum-tag-bits) (inst sub offset offset index) (inst add offset @@ -469,13 +455,13 @@ (- (* (- instance-slots-offset 2) n-word-bytes) instance-pointer-lowtag)) (let ((value-real (complex-single-reg-real-tn value)) - (result-real (complex-single-reg-real-tn result))) + (result-real (complex-single-reg-real-tn result))) (inst stf value-real object offset) (unless (location= result-real value-real) (inst fmovs result-real value-real))) (inst add offset offset n-word-bytes) (let ((value-imag (complex-single-reg-imag-tn value)) - (result-imag (complex-single-reg-imag-tn result))) + (result-imag (complex-single-reg-imag-tn result))) (inst stf value-imag object offset) (unless (location= result-imag value-imag) (inst fmovs result-imag value-imag))))) @@ -484,7 +470,7 @@ (:translate %raw-instance-ref/complex-double) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg))) + (index :scs (any-reg))) (:arg-types * positive-fixnum) (:results (value :scs (complex-double-reg))) (:temporary (:scs (non-descriptor-reg)) offset) @@ -492,7 +478,7 @@ (:generator 5 (loadw offset object 0 instance-pointer-lowtag) (inst srl offset offset n-widetag-bits) - (inst sll offset offset 2) + (inst sll offset offset n-fixnum-tag-bits) (inst sub offset offset index) (inst add offset @@ -507,8 +493,8 @@ (:translate %raw-instance-set/complex-double) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg)) - (value :scs (complex-double-reg) :target result)) + (index :scs (any-reg)) + (value :scs (complex-double-reg) :target result)) (:arg-types * positive-fixnum complex-double-float) (:results (result :scs (complex-double-reg))) (:result-types complex-double-float) @@ -516,7 +502,7 @@ (:generator 5 (loadw offset object 0 instance-pointer-lowtag) (inst srl offset offset n-widetag-bits) - (inst sll offset offset 2) + (inst sll offset offset n-fixnum-tag-bits) (inst sub offset offset index) (inst add offset @@ -524,13 +510,13 @@ (- (* (- instance-slots-offset 4) n-word-bytes) instance-pointer-lowtag)) (let ((value-real (complex-double-reg-real-tn value)) - (result-real (complex-double-reg-real-tn result))) + (result-real (complex-double-reg-real-tn result))) (inst stdf value-real object offset) (unless (location= result-real value-real) (move-double-reg result-real value-real))) (inst add offset offset (* 2 n-word-bytes)) (let ((value-imag (complex-double-reg-imag-tn value)) - (result-imag (complex-double-reg-imag-tn result))) + (result-imag (complex-double-reg-imag-tn result))) (inst stdf value-imag object offset) (unless (location= result-imag value-imag) (move-double-reg result-imag value-imag)))))