X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fppc%2Falloc.lisp;h=29be6794f4fa9a90f1ddfb1408b4a03435d05c00;hb=51344a3364f2cd6b14985719a77f697c094ea14d;hp=29d93d58392fbcde5ebfeb7a0584aad214832a3e;hpb=f5413fc1ba97667f829073f4aae2c62377265072;p=sbcl.git diff --git a/src/compiler/ppc/alloc.lisp b/src/compiler/ppc/alloc.lisp index 29d93d5..29be679 100644 --- a/src/compiler/ppc/alloc.lisp +++ b/src/compiler/ppc/alloc.lisp @@ -1,4 +1,4 @@ -;;;; allocation VOPs +;;;; allocation VOPs for the PPC ;;;; This software is part of the SBCL system. See the README file for ;;;; more information. @@ -22,7 +22,7 @@ (:temporary (:scs (descriptor-reg) :type list) ptr) (:temporary (:scs (descriptor-reg)) temp) (:temporary (:scs (descriptor-reg) :type list :to (:result 0) :target result) - res) + res) (:temporary (:sc non-descriptor-reg :offset nl3-offset) pa-flag) (:info num) (:results (result :scs (descriptor-reg))) @@ -31,46 +31,46 @@ (:node-var node) (:generator 0 (cond ((zerop num) - (move result null-tn)) - ((and star (= num 1)) - (move result (tn-ref-tn things))) - (t - (macrolet - ((maybe-load (tn) - (once-only ((tn tn)) - `(sc-case ,tn - ((any-reg descriptor-reg zero null) - ,tn) - (control-stack - (load-stack-tn temp ,tn) - temp))))) - (let* ((dx-p (node-stack-allocate-p node)) - (cons-cells (if star (1- num) num)) - (alloc (* (pad-data-block cons-size) cons-cells))) - (pseudo-atomic (pa-flag :extra (if dx-p 0 alloc)) - (let ((allocation-area-tn (if dx-p csp-tn alloc-tn))) - (when dx-p - (align-csp res)) - (inst clrrwi res allocation-area-tn n-lowtag-bits) - (inst ori res res list-pointer-lowtag) - (when dx-p - (inst addi csp-tn csp-tn alloc))) - (move ptr res) - (dotimes (i (1- cons-cells)) - (storew (maybe-load (tn-ref-tn things)) ptr - cons-car-slot list-pointer-lowtag) - (setf things (tn-ref-across things)) - (inst addi ptr ptr (pad-data-block cons-size)) - (storew ptr ptr - (- cons-cdr-slot cons-size) - list-pointer-lowtag)) - (storew (maybe-load (tn-ref-tn things)) ptr - cons-car-slot list-pointer-lowtag) - (storew (if star - (maybe-load (tn-ref-tn (tn-ref-across things))) - null-tn) - ptr cons-cdr-slot list-pointer-lowtag)) - (move result res))))))) + (move result null-tn)) + ((and star (= num 1)) + (move result (tn-ref-tn things))) + (t + (macrolet + ((maybe-load (tn) + (once-only ((tn tn)) + `(sc-case ,tn + ((any-reg descriptor-reg zero null) + ,tn) + (control-stack + (load-stack-tn temp ,tn) + temp))))) + (let* ((dx-p (node-stack-allocate-p node)) + (cons-cells (if star (1- num) num)) + (alloc (* (pad-data-block cons-size) cons-cells))) + (pseudo-atomic (pa-flag :extra (if dx-p 0 alloc)) + (let ((allocation-area-tn (if dx-p csp-tn alloc-tn))) + (when dx-p + (align-csp res)) + (inst clrrwi res allocation-area-tn n-lowtag-bits) + (inst ori res res list-pointer-lowtag) + (when dx-p + (inst addi csp-tn csp-tn alloc))) + (move ptr res) + (dotimes (i (1- cons-cells)) + (storew (maybe-load (tn-ref-tn things)) ptr + cons-car-slot list-pointer-lowtag) + (setf things (tn-ref-across things)) + (inst addi ptr ptr (pad-data-block cons-size)) + (storew ptr ptr + (- cons-cdr-slot cons-size) + list-pointer-lowtag)) + (storew (maybe-load (tn-ref-tn things)) ptr + cons-car-slot list-pointer-lowtag) + (storew (if star + (maybe-load (tn-ref-tn (tn-ref-across things))) + null-tn) + ptr cons-cdr-slot list-pointer-lowtag)) + (move result res))))))) (define-vop (list list-or-list*) (:variant nil)) @@ -83,7 +83,7 @@ (define-vop (allocate-code-object) (:args (boxed-arg :scs (any-reg)) - (unboxed-arg :scs (any-reg))) + (unboxed-arg :scs (any-reg))) (:results (result :scs (descriptor-reg))) (:temporary (:scs (non-descriptor-reg)) ndescr) (:temporary (:scs (any-reg) :from (:argument 0)) boxed) @@ -131,23 +131,24 @@ (:results (result :scs (descriptor-reg))) (:generator 10 (let* ((size (+ length closure-info-offset)) - (alloc-size (pad-data-block size)) - (allocation-area-tn (if stack-allocate-p csp-tn alloc-tn))) + (alloc-size (pad-data-block size)) + (allocation-area-tn (if stack-allocate-p csp-tn alloc-tn))) (pseudo-atomic (pa-flag :extra (if stack-allocate-p 0 alloc-size)) - (when stack-allocate-p - (align-csp result)) - (inst clrrwi. result allocation-area-tn n-lowtag-bits) - (when stack-allocate-p - (inst addi csp-tn csp-tn alloc-size)) - (inst ori result result fun-pointer-lowtag) - (inst lr temp (logior (ash (1- size) n-widetag-bits) closure-header-widetag)) - (storew temp result 0 fun-pointer-lowtag))) + (when stack-allocate-p + (align-csp result)) + (inst clrrwi. result allocation-area-tn n-lowtag-bits) + (when stack-allocate-p + (inst addi csp-tn csp-tn alloc-size)) + (inst ori result result fun-pointer-lowtag) + (inst lr temp (logior (ash (1- size) n-widetag-bits) closure-header-widetag)) + (storew temp result 0 fun-pointer-lowtag))) ;(inst lis temp (ash 18 10)) ;(storew temp result closure-jump-insn-slot function-pointer-type) + (storew result result closure-self-slot 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) (:args (value :to :save :scs (descriptor-reg any-reg))) (:temporary (:scs (non-descriptor-reg)) temp) @@ -177,13 +178,13 @@ (:generator 4 (pseudo-atomic (pa-flag :extra (pad-data-block words)) (cond ((logbitp 2 lowtag) - (inst ori result alloc-tn lowtag)) - (t - (inst clrrwi result alloc-tn n-lowtag-bits) - (inst ori result result lowtag))) + (inst ori result alloc-tn lowtag)) + (t + (inst clrrwi result alloc-tn n-lowtag-bits) + (inst ori result result lowtag))) (when type - (inst lr temp (logior (ash (1- words) n-widetag-bits) type)) - (storew temp result 0 lowtag))))) + (inst lr temp (logior (ash (1- words) n-widetag-bits) type)) + (storew temp result 0 lowtag))))) (define-vop (var-alloc) (:args (extra :scs (any-reg))) @@ -201,9 +202,9 @@ (inst clrrwi bytes bytes n-lowtag-bits) (pseudo-atomic (pa-flag) (cond ((logbitp 2 lowtag) - (inst ori result alloc-tn lowtag)) - (t - (inst clrrwi result alloc-tn n-lowtag-bits) - (inst ori result result lowtag))) + (inst ori result alloc-tn lowtag)) + (t + (inst clrrwi result alloc-tn n-lowtag-bits) + (inst ori result result lowtag))) (storew header result 0 lowtag) (inst add alloc-tn alloc-tn bytes))))