X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fppc%2Falloc.lisp;h=0f8f20df242b3049c5b170c8b68e2a068a260360;hb=ec2e02db335d1545b3c18233bf440ca4160f780d;hp=5bb91bf28009fe4d3b2cfcc3383ca55ca80b6bb8;hpb=a2ff6543c79752bfe42578f794bda1c28167fd10;p=sbcl.git diff --git a/src/compiler/ppc/alloc.lisp b/src/compiler/ppc/alloc.lisp index 5bb91bf..0f8f20d 100644 --- a/src/compiler/ppc/alloc.lisp +++ b/src/compiler/ppc/alloc.lisp @@ -1,59 +1,79 @@ -;;; -;;; Written by William Lott. -;;; +;;;; allocation VOPs for the PPC -(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) + (:temporary (:scs (non-descriptor-reg)) alloc-temp) (:info num) (:results (result :scs (descriptor-reg))) (:variant-vars star) (:policy :safe) + (:node-var node) + #!-gencgc (:ignore alloc-temp) (: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) + (if dx-p + (progn + (align-csp res) + (inst clrrwi res csp-tn n-lowtag-bits) + (inst ori res res list-pointer-lowtag) + (inst addi csp-tn csp-tn alloc)) + (allocation res alloc list-pointer-lowtag :temp-tn alloc-temp + :flag-tn pa-flag)) + (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,9 +86,10 @@ (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 (non-descriptor-reg)) size) (:temporary (:scs (any-reg) :from (:argument 0)) boxed) (:temporary (:scs (non-descriptor-reg) :from (:argument 1)) unboxed) (:temporary (:sc non-descriptor-reg :offset nl3-offset) pa-flag) @@ -82,9 +103,8 @@ ;; Note: we don't have to subtract off the 4 that was added by ;; pseudo-atomic, because oring in other-pointer-lowtag just adds ;; it right back. - (inst ori result alloc-tn other-pointer-lowtag) - (inst add alloc-tn alloc-tn boxed) - (inst add alloc-tn alloc-tn unboxed) + (inst add size boxed unboxed) + (allocation result size other-pointer-lowtag :temp-tn ndescr :flag-tn pa-flag) (inst slwi ndescr boxed (- n-widetag-bits word-shift)) (inst ori ndescr ndescr code-header-widetag) (storew ndescr result 0 other-pointer-lowtag) @@ -106,36 +126,43 @@ (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 stack-allocate-p) - (:ignore 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))) - ;(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))) + (let* ((size (+ length closure-info-offset)) + (alloc-size (pad-data-block size))) + (pseudo-atomic (pa-flag) + (if stack-allocate-p + (progn + (align-csp result) + (inst clrrwi. result csp-tn n-lowtag-bits) + (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))) + (progn + (allocation result (pad-data-block size) + fun-pointer-lowtag :temp-tn temp :flag-tn pa-flag) + (inst lr temp (logior (ash (1- size) n-widetag-bits) closure-header-widetag)))) + ;;; should this be closure-fun-slot instead of 0? + (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) (: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) + (: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)) - (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)))) @@ -147,6 +174,12 @@ (:generator 1 (inst li result unbound-marker-widetag))) +(define-vop (make-funcallable-instance-tramp) + (:args) + (:results (result :scs (any-reg))) + (:generator 1 + (inst lr result (make-fixup "funcallable_instance_tramp" :foreign)))) + (define-vop (fixed-alloc) (:args) (:info name words type lowtag) @@ -155,24 +188,18 @@ (:temporary (:scs (non-descriptor-reg)) temp) (:temporary (:sc non-descriptor-reg :offset nl3-offset) pa-flag) (: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))) - (when type - (inst lr temp (logior (ash (1- words) n-widetag-bits) type)) - (storew temp result 0 lowtag))))) + (with-fixed-allocation (result pa-flag temp type words :lowtag lowtag) + ))) (define-vop (var-alloc) (:args (extra :scs (any-reg))) (:arg-types positive-fixnum) (:info name words type lowtag) - (:ignore name) + (:ignore name #!-gencgc temp) (:results (result :scs (descriptor-reg))) (:temporary (:scs (any-reg)) bytes) (:temporary (:scs (non-descriptor-reg)) header) + (:temporary (:scs (non-descriptor-reg)) temp) (:temporary (:sc non-descriptor-reg :offset nl3-offset) pa-flag) (:generator 6 (inst addi bytes extra (* (1+ words) n-word-bytes)) @@ -180,10 +207,5 @@ (inst addi header header (+ (ash -2 n-widetag-bits) type)) (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))) - (storew header result 0 lowtag) - (inst add alloc-tn alloc-tn bytes)))) + (allocation result bytes lowtag :temp-tn temp :flag-tn pa-flag) + (storew header result 0 lowtag))))