X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fppc%2Falloc.lisp;h=07bd3407c9ea2ffa53b0c884839024552392e02b;hb=d319b944d934f3efbb01a2a345c46bafd40857d0;hp=1a4573ee63932084c039c63456293f257f505ee0;hpb=cabcdba7426655e7044f420318a02b7644422b04;p=sbcl.git diff --git a/src/compiler/ppc/alloc.lisp b/src/compiler/ppc/alloc.lisp index 1a4573e..07bd340 100644 --- a/src/compiler/ppc/alloc.lisp +++ b/src/compiler/ppc/alloc.lisp @@ -1,59 +1,76 @@ -;;; -;;; Written by William Lott. -;;; +;;;; allocation VOPs -(in-package "SB!VM") +;;;; This software is part of the SBCL system. See the README file for +;;;; more information. +;;;; +;;;; This software is derived from the CMU CL system, which was +;;;; written at Carnegie Mellon University and released into the +;;;; public domain. The software is in the public domain and is +;;;; provided with absolutely no warranty. See the COPYING and CREDITS +;;;; 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) (: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))) (:variant-vars star) (:policy :safe) + (: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* ((cons-cells (if star (1- num) num)) - (alloc (* (pad-data-block cons-size) cons-cells))) - (pseudo-atomic (pa-flag :extra alloc) - (inst clrrwi res alloc-tn n-lowtag-bits) - (inst ori res res list-pointer-lowtag) - (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)) @@ -66,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) @@ -101,40 +118,44 @@ (:translate make-fdefn) (:generator 37 (with-fixed-allocation (result pa-flag temp fdefn-widetag fdefn-size) - (inst lr temp (make-fixup (extern-alien-name "undefined_tramp") :foreign)) + (inst lr 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) (storew temp result fdefn-raw-addr-slot other-pointer-lowtag)))) - (define-vop (make-closure) (:args (function :to :save :scs (descriptor-reg))) - (:info length) + (:info length stack-allocate-p) (:temporary (:scs (non-descriptor-reg)) temp) (:temporary (:sc non-descriptor-reg :offset nl3-offset) pa-flag) (:results (result :scs (descriptor-reg))) (:generator 10 - (let ((size (+ length closure-info-offset))) - (pseudo-atomic (pa-flag :extra (pad-data-block size)) - (inst clrrwi. result alloc-tn n-lowtag-bits) - (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))) + (let* ((size (+ length closure-info-offset)) + (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))) ;(inst lis temp (ash 18 10)) ;(storew temp result closure-jump-insn-slot function-pointer-type) (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) (:temporary (:sc non-descriptor-reg :offset nl3-offset) pa-flag) (:results (result :scs (descriptor-reg))) (:generator 10 - (with-fixed-allocation - (result pa-flag temp value-cell-header-widetag value-cell-size)) - (storew value result value-cell-value-slot other-pointer-lowtag))) + (with-fixed-allocation (result pa-flag temp value-cell-header-widetag value-cell-size) + (storew value result value-cell-value-slot other-pointer-lowtag)))) @@ -156,13 +177,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))) @@ -180,9 +201,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))))