From d492ebb264e900df38f21c904f5d2f5c46c8b8da Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Fri, 6 May 2005 00:11:02 +0000 Subject: [PATCH] 0.9.0.20: Fix suspicious-looking uses of WITH-FIXED-ALLOCATION in the PPC, SPARC and HPPA backends. --- src/compiler/hppa/float.lisp | 40 +++++++++++------------ src/compiler/ppc/float.lisp | 44 ++++++++++++------------- src/compiler/sparc/float.lisp | 72 ++++++++++++++++++++--------------------- version.lisp-expr | 2 +- 4 files changed, 79 insertions(+), 79 deletions(-) diff --git a/src/compiler/hppa/float.lisp b/src/compiler/hppa/float.lisp index 145e171..9fa88d7 100644 --- a/src/compiler/hppa/float.lisp +++ b/src/compiler/hppa/float.lisp @@ -64,8 +64,8 @@ (:variant-vars size type data) (:note "float to pointer coercion") (:generator 13 - (with-fixed-allocation (y ndescr type size)) - (inst fsts x (- (* data n-word-bytes) other-pointer-lowtag) y))) + (with-fixed-allocation (y ndescr type size) + (inst fsts x (- (* data n-word-bytes) other-pointer-lowtag) y)))) (macrolet ((frob (name sc &rest args) `(progn @@ -211,15 +211,15 @@ (:note "complex single float to pointer coercion") (:generator 13 (with-fixed-allocation (y ndescr complex-single-float-widetag - complex-single-float-size)) - (let ((real-tn (complex-single-reg-real-tn x))) - (inst fsts real-tn (- (* complex-single-float-real-slot n-word-bytes) - other-pointer-lowtag) - y)) - (let ((imag-tn (complex-single-reg-imag-tn x))) - (inst fsts imag-tn (- (* complex-single-float-imag-slot n-word-bytes) - other-pointer-lowtag) - y)))) + complex-single-float-size) + (let ((real-tn (complex-single-reg-real-tn x))) + (inst fsts real-tn (- (* complex-single-float-real-slot n-word-bytes) + other-pointer-lowtag) + y)) + (let ((imag-tn (complex-single-reg-imag-tn x))) + (inst fsts imag-tn (- (* complex-single-float-imag-slot n-word-bytes) + other-pointer-lowtag) + y))))) (define-move-vop move-from-complex-single :move (complex-single-reg) (descriptor-reg)) @@ -230,15 +230,15 @@ (:note "complex double float to pointer coercion") (:generator 13 (with-fixed-allocation (y ndescr complex-double-float-widetag - complex-double-float-size)) - (let ((real-tn (complex-double-reg-real-tn x))) - (inst fsts real-tn (- (* complex-double-float-real-slot n-word-bytes) - other-pointer-lowtag) - y)) - (let ((imag-tn (complex-double-reg-imag-tn x))) - (inst fsts imag-tn (- (* complex-double-float-imag-slot n-word-bytes) - other-pointer-lowtag) - y)))) + complex-double-float-size) + (let ((real-tn (complex-double-reg-real-tn x))) + (inst fsts real-tn (- (* complex-double-float-real-slot n-word-bytes) + other-pointer-lowtag) + y)) + (let ((imag-tn (complex-double-reg-imag-tn x))) + (inst fsts imag-tn (- (* complex-double-float-imag-slot n-word-bytes) + other-pointer-lowtag) + y))))) (define-move-vop move-from-complex-double :move (complex-double-reg) (descriptor-reg)) diff --git a/src/compiler/ppc/float.lisp b/src/compiler/ppc/float.lisp index c8bfcba..21750f9 100644 --- a/src/compiler/ppc/float.lisp +++ b/src/compiler/ppc/float.lisp @@ -63,10 +63,10 @@ (:temporary (:sc non-descriptor-reg :offset nl3-offset) pa-flag) (:variant-vars double-p size type data) (:generator 13 - (with-fixed-allocation (y pa-flag ndescr type size)) - (if double-p - (inst stfd x y (- (* data n-word-bytes) other-pointer-lowtag)) - (inst stfs x y (- (* data n-word-bytes) other-pointer-lowtag))))) + (with-fixed-allocation (y pa-flag ndescr type size) + (if double-p + (inst stfd x y (- (* data n-word-bytes) other-pointer-lowtag)) + (inst stfs x y (- (* data n-word-bytes) other-pointer-lowtag)))))) (macrolet ((frob (name sc &rest args) `(progn @@ -226,15 +226,15 @@ (:note "complex single float to pointer coercion") (:generator 13 (with-fixed-allocation (y pa-flag ndescr complex-single-float-widetag - complex-single-float-size)) - (let ((real-tn (complex-single-reg-real-tn x))) - (inst stfs real-tn y (- (* complex-single-float-real-slot - n-word-bytes) - other-pointer-lowtag))) - (let ((imag-tn (complex-single-reg-imag-tn x))) - (inst stfs imag-tn y (- (* complex-single-float-imag-slot - n-word-bytes) - other-pointer-lowtag))))) + complex-single-float-size) + (let ((real-tn (complex-single-reg-real-tn x))) + (inst stfs real-tn y (- (* complex-single-float-real-slot + n-word-bytes) + other-pointer-lowtag))) + (let ((imag-tn (complex-single-reg-imag-tn x))) + (inst stfs imag-tn y (- (* complex-single-float-imag-slot + n-word-bytes) + other-pointer-lowtag)))))) ;;; (define-move-vop move-from-complex-single :move (complex-single-reg) (descriptor-reg)) @@ -247,15 +247,15 @@ (:note "complex double float to pointer coercion") (:generator 13 (with-fixed-allocation (y pa-flag ndescr complex-double-float-widetag - complex-double-float-size)) - (let ((real-tn (complex-double-reg-real-tn x))) - (inst stfd real-tn y (- (* complex-double-float-real-slot - n-word-bytes) - other-pointer-lowtag))) - (let ((imag-tn (complex-double-reg-imag-tn x))) - (inst stfd imag-tn y (- (* complex-double-float-imag-slot - n-word-bytes) - other-pointer-lowtag))))) + complex-double-float-size) + (let ((real-tn (complex-double-reg-real-tn x))) + (inst stfd real-tn y (- (* complex-double-float-real-slot + n-word-bytes) + other-pointer-lowtag))) + (let ((imag-tn (complex-double-reg-imag-tn x))) + (inst stfd imag-tn y (- (* complex-double-float-imag-slot + n-word-bytes) + other-pointer-lowtag)))))) ;;; (define-move-vop move-from-complex-double :move (complex-double-reg) (descriptor-reg)) diff --git a/src/compiler/sparc/float.lisp b/src/compiler/sparc/float.lisp index 5996928..7751eb5 100644 --- a/src/compiler/sparc/float.lisp +++ b/src/compiler/sparc/float.lisp @@ -158,15 +158,15 @@ (:temporary (:scs (non-descriptor-reg)) ndescr) (:variant-vars format size type data) (:generator 13 - (with-fixed-allocation (y ndescr type size)) - (ecase format - (:single - (inst stf x y (- (* data n-word-bytes) other-pointer-lowtag))) - (:double - (inst stdf x y (- (* data n-word-bytes) other-pointer-lowtag))) - (:long - (store-long-reg x y (- (* data n-word-bytes) - other-pointer-lowtag)))))) + (with-fixed-allocation (y ndescr type size) + (ecase format + (:single + (inst stf x y (- (* data n-word-bytes) other-pointer-lowtag))) + (:double + (inst stdf x y (- (* data n-word-bytes) other-pointer-lowtag))) + (:long + (store-long-reg x y (- (* data n-word-bytes) + other-pointer-lowtag))))))) (macrolet ((frob (name sc &rest args) `(progn @@ -413,15 +413,15 @@ (:note "complex single float to pointer coercion") (:generator 13 (with-fixed-allocation (y ndescr complex-single-float-widetag - complex-single-float-size)) - (let ((real-tn (complex-single-reg-real-tn x))) - (inst stf real-tn y (- (* complex-single-float-real-slot - n-word-bytes) - other-pointer-lowtag))) - (let ((imag-tn (complex-single-reg-imag-tn x))) - (inst stf imag-tn y (- (* complex-single-float-imag-slot - n-word-bytes) - other-pointer-lowtag))))) + complex-single-float-size) + (let ((real-tn (complex-single-reg-real-tn x))) + (inst stf real-tn y (- (* complex-single-float-real-slot + n-word-bytes) + other-pointer-lowtag))) + (let ((imag-tn (complex-single-reg-imag-tn x))) + (inst stf imag-tn y (- (* complex-single-float-imag-slot + n-word-bytes) + other-pointer-lowtag)))))) ;;; (define-move-vop move-from-complex-single :move (complex-single-reg) (descriptor-reg)) @@ -433,15 +433,15 @@ (:note "complex double float to pointer coercion") (:generator 13 (with-fixed-allocation (y ndescr complex-double-float-widetag - complex-double-float-size)) - (let ((real-tn (complex-double-reg-real-tn x))) - (inst stdf real-tn y (- (* complex-double-float-real-slot - n-word-bytes) - other-pointer-lowtag))) - (let ((imag-tn (complex-double-reg-imag-tn x))) - (inst stdf imag-tn y (- (* complex-double-float-imag-slot - n-word-bytes) - other-pointer-lowtag))))) + complex-double-float-size) + (let ((real-tn (complex-double-reg-real-tn x))) + (inst stdf real-tn y (- (* complex-double-float-real-slot + n-word-bytes) + other-pointer-lowtag))) + (let ((imag-tn (complex-double-reg-imag-tn x))) + (inst stdf imag-tn y (- (* complex-double-float-imag-slot + n-word-bytes) + other-pointer-lowtag)))))) ;;; (define-move-vop move-from-complex-double :move (complex-double-reg) (descriptor-reg)) @@ -454,15 +454,15 @@ (:note "complex long float to pointer coercion") (:generator 13 (with-fixed-allocation (y ndescr complex-long-float-widetag - complex-long-float-size)) - (let ((real-tn (complex-long-reg-real-tn x))) - (store-long-reg real-tn y (- (* complex-long-float-real-slot - n-word-bytes) - other-pointer-lowtag))) - (let ((imag-tn (complex-long-reg-imag-tn x))) - (store-long-reg imag-tn y (- (* complex-long-float-imag-slot - n-word-bytes) - other-pointer-lowtag))))) + complex-long-float-size) + (let ((real-tn (complex-long-reg-real-tn x))) + (store-long-reg real-tn y (- (* complex-long-float-real-slot + n-word-bytes) + other-pointer-lowtag))) + (let ((imag-tn (complex-long-reg-imag-tn x))) + (store-long-reg imag-tn y (- (* complex-long-float-imag-slot + n-word-bytes) + other-pointer-lowtag)))))) ;;; #!+long-float (define-move-vop move-from-complex-long :move diff --git a/version.lisp-expr b/version.lisp-expr index 0bae1c6..eb9e940 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.0.19" +"0.9.0.20" -- 1.7.10.4