X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmips%2Falloc.lisp;h=0567e305879b69e081eab6134b474ad1d6ffc824;hb=01cc13c8dab7399f6d7ef10e01add5edbbc03e31;hp=44d523ac04a78b7838ace02ea9bd832c6df3dbb8;hpb=ec2e02db335d1545b3c18233bf440ca4160f780d;p=sbcl.git diff --git a/src/compiler/mips/alloc.lisp b/src/compiler/mips/alloc.lisp index 44d523a..0567e30 100644 --- a/src/compiler/mips/alloc.lisp +++ b/src/compiler/mips/alloc.lisp @@ -10,14 +10,8 @@ ;;;; files for more information. (in-package "SB!VM") - ;;;; LIST and LIST* -(defoptimizer (list stack-allocate-result) ((&rest args)) - (not (null args))) -(defoptimizer (list* stack-allocate-result) ((&rest args)) - (not (null (rest args)))) - (define-vop (list-or-list*) (:args (things :more t)) (:temporary (:scs (descriptor-reg) :type list) ptr) @@ -80,10 +74,64 @@ (define-vop (list* list-or-list*) (:variant t)) - ;;;; Special purpose inline allocators. +;;; ALLOCATE-VECTOR +(define-vop (allocate-vector-on-heap) + (:args (type :scs (unsigned-reg)) + (length :scs (any-reg)) + (words :scs (any-reg))) + (:arg-types positive-fixnum + positive-fixnum + positive-fixnum) + (:temporary (:sc non-descriptor-reg) bytes) + (:temporary (:sc non-descriptor-reg :offset nl4-offset) pa-flag) + (:results (result :scs (descriptor-reg) :from :load)) + (:policy :fast-safe) + (:generator 100 + (inst addu bytes words (+ lowtag-mask + (* vector-data-offset n-word-bytes))) + (inst srl bytes n-lowtag-bits) + (inst sll bytes n-lowtag-bits) + (pseudo-atomic (pa-flag) + (inst or result alloc-tn other-pointer-lowtag) + (inst addu alloc-tn bytes) + (storew type result 0 other-pointer-lowtag) + (storew length result vector-length-slot other-pointer-lowtag)))) + +(define-vop (allocate-vector-on-stack) + (:args (type :scs (unsigned-reg)) + (length :scs (any-reg)) + (words :scs (any-reg))) + (:arg-types positive-fixnum + positive-fixnum + positive-fixnum) + (:temporary (:sc non-descriptor-reg) bytes) + (:temporary (:sc non-descriptor-reg) temp) + (:temporary (:sc non-descriptor-reg :offset nl4-offset) pa-flag) + (:results (result :scs (descriptor-reg) :from :load)) + (:policy :fast-safe) + (:generator 100 + (inst addu bytes words (+ lowtag-mask + (* vector-data-offset n-word-bytes))) + (inst srl bytes n-lowtag-bits) + (inst sll bytes n-lowtag-bits) + ;; FIXME: It would be good to check for stack overflow here. + (pseudo-atomic (pa-flag) + (align-csp temp) + (inst or result csp-tn other-pointer-lowtag) + (inst addu temp csp-tn (* vector-data-offset n-word-bytes)) + (inst addu csp-tn bytes) + (storew type result 0 other-pointer-lowtag) + (storew length result vector-length-slot other-pointer-lowtag) + (let ((loop (gen-label))) + (emit-label loop) + (storew zero-tn temp 0) + (inst bne temp csp-tn loop) + (inst addu temp n-word-bytes)) + (align-csp temp)))) + (define-vop (allocate-code-object) (:args (boxed-arg :scs (any-reg)) (unboxed-arg :scs (any-reg))) @@ -120,7 +168,7 @@ (:temporary (:sc non-descriptor-reg :offset nl4-offset) pa-flag) (:results (result :scs (descriptor-reg) :from :argument)) (:generator 37 - (with-fixed-allocation (result pa-flag temp fdefn-widetag fdefn-size) + (with-fixed-allocation (result pa-flag temp fdefn-widetag fdefn-size nil) (inst li temp (make-fixup "undefined_tramp" :foreign)) (storew name result fdefn-name-slot other-pointer-lowtag) (storew null-tn result fdefn-fun-slot other-pointer-lowtag) @@ -146,8 +194,8 @@ (inst or result fun-pointer-lowtag) (inst li temp (logior (ash (1- size) n-widetag-bits) closure-header-widetag)) - (storew temp result 0 fun-pointer-lowtag)) - (storew function result closure-fun-slot fun-pointer-lowtag)))) + (storew temp result 0 fun-pointer-lowtag) + (storew function result closure-fun-slot fun-pointer-lowtag))))) ;;; The compiler likes to be able to directly make value cells. (define-vop (make-value-cell) @@ -155,18 +203,17 @@ (:temporary (:scs (non-descriptor-reg)) temp) (:temporary (:sc non-descriptor-reg :offset nl4-offset) pa-flag) (:info stack-allocate-p) - (:ignore stack-allocate-p) (:results (result :scs (descriptor-reg))) (:generator 10 - (with-fixed-allocation (result pa-flag temp value-cell-header-widetag value-cell-size) + (with-fixed-allocation (result pa-flag temp value-cell-header-widetag + value-cell-size stack-allocate-p) (storew value result value-cell-value-slot other-pointer-lowtag)))) - ;;;; Automatic allocators for primitive objects. (define-vop (make-unbound-marker) (:args) - (:results (result :scs (any-reg))) + (:results (result :scs (descriptor-reg any-reg))) (:generator 1 (inst li result unbound-marker-widetag))) @@ -178,14 +225,26 @@ (define-vop (fixed-alloc) (:args) - (:info name words type lowtag) + (:info name words type lowtag stack-allocate-p) (:ignore name) (:results (result :scs (descriptor-reg))) (:temporary (:scs (non-descriptor-reg)) temp) (:temporary (:sc non-descriptor-reg :offset nl4-offset) pa-flag) (:generator 4 - (pseudo-atomic (pa-flag :extra (pad-data-block words)) - (inst or result alloc-tn lowtag) + (pseudo-atomic (pa-flag :extra (if stack-allocate-p + 0 + (pad-data-block words))) + (cond (stack-allocate-p + (align-csp result) + (inst or result csp-tn lowtag) + (inst addu csp-tn (pad-data-block words))) + (t + ;; The pseudo-atomic bit in alloc-tn is set. If the + ;; lowtag also has a 1 bit in the same position, we're all + ;; set. Otherwise, we need to subtract the pseudo-atomic + ;; bit. + (inst or result alloc-tn (if (logbitp 0 lowtag) lowtag + (1- lowtag))))) (when type (inst li temp (logior (ash (1- words) n-widetag-bits) type)) (storew temp result 0 lowtag))))) @@ -201,7 +260,7 @@ (:temporary (:sc non-descriptor-reg :offset nl4-offset) pa-flag) (:generator 6 (inst addu bytes extra (* (1+ words) n-word-bytes)) - (inst sll header bytes (- n-widetag-bits 2)) + (inst sll header bytes (- n-widetag-bits n-fixnum-tag-bits)) (inst addu header header (+ (ash -2 n-widetag-bits) type)) (inst srl bytes bytes n-lowtag-bits) (inst sll bytes bytes n-lowtag-bits)