0.8.9.51:

	Ignore appropriate stuff on ppc (Raymond Wiker sbcl-devel 2004-04-18)
	... also add boilerplate to static-fn.lisp

diff --git a/src/compiler/ppc/call.lisp b/src/compiler/ppc/call.lisp
index 7d56b92..0a19d72 100644 (file)
--- a/src/compiler/ppc/call.lisp
+++ b/src/compiler/ppc/call.lisp
@@ -662,9 +662,9 @@ default-value-8
                            :from (:argument ,(if (eq return :tail) 0 1))
                            :to :eval)
                       lexenv))
                            :from (:argument ,(if (eq return :tail) 0 1))
                            :to :eval)
                       lexenv))

-     ;; alpha code suggests that function tn is not needed for named call
-     (:temporary (:scs (descriptor-reg) :from (:argument 0) :to :eval)
-                function)
+     ,@(unless named
+        '((:temporary (:scs (descriptor-reg) :from (:argument 0) :to :eval)
+                      function)))

      (:temporary (:sc any-reg :offset nargs-offset :to :eval)
                 nargs-pass)
 
      (:temporary (:sc any-reg :offset nargs-offset :to :eval)
                 nargs-pass)
 

diff --git a/src/compiler/ppc/insts.lisp b/src/compiler/ppc/insts.lisp
index 2c86cd6..bac1efa 100644 (file)
--- a/src/compiler/ppc/insts.lisp
+++ b/src/compiler/ppc/insts.lisp
@@ -281,12 +281,14 @@
                                     aa-bit lk-bit)))
               t)))
        #'(lambda (segment posn)
                                     aa-bit lk-bit)))
               t)))
        #'(lambda (segment posn)

+          (declare (ignore posn))

           (let ((bo (logxor 8 bo))) ;; invert the test
             (emit-b-form-inst segment 16 bo bi
                               2 ; skip over next instruction
                               0 0)
             (emit-back-patch segment 4
                              #'(lambda (segment posn)
           (let ((bo (logxor 8 bo))) ;; invert the test
             (emit-b-form-inst segment 16 bo bi
                               2 ; skip over next instruction
                               0 0)
             (emit-back-patch segment 4
                              #'(lambda (segment posn)

+                                 (declare (ignore posn))

                                  (emit-i-form-branch segment target lk-p)))))
        ))))
             
                                  (emit-i-form-branch segment target lk-p)))))
        ))))
             

diff --git a/src/compiler/ppc/static-fn.lisp b/src/compiler/ppc/static-fn.lisp
index 820b676..c5adcdf 100644 (file)
--- a/src/compiler/ppc/static-fn.lisp
+++ b/src/compiler/ppc/static-fn.lisp
@@ -1,8 +1,15 @@
-;;; Written by William Lott.
-;;;
-(in-package "SB!VM")
+;;;; VOPs and macro magic for calling static functions

 
 

+;;;; 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")

 
 (define-vop (static-fun-template)
   (:save-p t)
 
 (define-vop (static-fun-template)
   (:save-p t)

@@ -13,7 +20,6 @@
   (:temporary (:scs (descriptor-reg)) move-temp)
   (:temporary (:sc descriptor-reg :offset lra-offset) lra)
   (:temporary (:sc interior-reg :offset lip-offset) entry-point)
   (:temporary (:scs (descriptor-reg)) move-temp)
   (:temporary (:sc descriptor-reg :offset lra-offset) lra)
   (:temporary (:sc interior-reg :offset lip-offset) entry-point)

-  (:temporary (:scs (descriptor-reg)) func)

   (:temporary (:sc any-reg :offset nargs-offset) nargs)
   (:temporary (:sc any-reg :offset ocfp-offset) old-fp)
   (:temporary (:sc control-stack :offset nfp-save-offset) nfp-save))
   (:temporary (:sc any-reg :offset nargs-offset) nargs)
   (:temporary (:sc any-reg :offset ocfp-offset) old-fp)
   (:temporary (:sc control-stack :offset nfp-save-offset) nfp-save))

diff --git a/version.lisp-expr b/version.lisp-expr
index 65c6dd8..184de63 100644 (file)
--- 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".)
 ;;; 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.8.9.50"
+"0.8.9.51"