From d1441ffce0db0043ccbcb27fa5ab590e44a85994 Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Sat, 7 Aug 2004 12:20:10 +0000 Subject: [PATCH] 0.8.13.36: NO-WORD-BYTES? Oops: the recent move of N-WORD-BYTES from target/parms.lisp to generic/early-vm.lisp broke build on Sparc, and in all likelihood on PPC as well. Moved NUMBER-STACK-DISPLACEMENT a tad later in the build (from target/parms.lisp to target/vm.lisp) and all is well with Sparc. PPC not tested. --- src/compiler/ppc/parms.lisp | 12 ------------ src/compiler/ppc/vm.lisp | 10 ++++++++++ src/compiler/sparc/parms.lisp | 9 --------- src/compiler/sparc/vm.lisp | 13 ++++++++++++- version.lisp-expr | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/compiler/ppc/parms.lisp b/src/compiler/ppc/parms.lisp index 86a439d..e55c4c0 100644 --- a/src/compiler/ppc/parms.lisp +++ b/src/compiler/ppc/parms.lisp @@ -81,19 +81,7 @@ (def!constant float-fast-bit 2) ; Non-IEEE mode - -;;; NUMBER-STACK-DISPLACEMENT -;;; -;;; The number of bytes reserved above the number stack pointer. These -;;; slots are required by architecture, mostly (?) to make C backtrace -;;; work. This must be a power of 2 - see BYTES-REQUIRED-FOR-NUMBER-STACK. -;;; -(def!constant number-stack-displacement - (* #!-darwin 2 - #!+darwin 8 - n-word-bytes)) - ;;; Where to put the different spaces. (def!constant read-only-space-start #x01000000) diff --git a/src/compiler/ppc/vm.lisp b/src/compiler/ppc/vm.lisp index 12b552c..fa8a2bf 100644 --- a/src/compiler/ppc/vm.lisp +++ b/src/compiler/ppc/vm.lisp @@ -11,6 +11,16 @@ (in-package "SB!VM") +;;; NUMBER-STACK-DISPLACEMENT +;;; +;;; The number of bytes reserved above the number stack pointer. These +;;; slots are required by architecture, mostly (?) to make C backtrace +;;; work. This must be a power of 2 - see BYTES-REQUIRED-FOR-NUMBER-STACK. +;;; +(def!constant number-stack-displacement + (* #!-darwin 2 + #!+darwin 8 + n-word-bytes)) ;;;; Define the registers diff --git a/src/compiler/sparc/parms.lisp b/src/compiler/sparc/parms.lisp index 897048b..666a84f 100644 --- a/src/compiler/sparc/parms.lisp +++ b/src/compiler/sparc/parms.lisp @@ -86,15 +86,6 @@ ); eval-when -;;; NUMBER-STACK-DISPLACEMENT -;;; -;;; The number of bytes reserved above the number stack pointer. These -;;; slots are required by architecture for a place to spill register windows. -;;; -;;; FIXME: Where is this used? -(def!constant number-stack-displacement - (* 16 n-word-bytes)) - ;;;; Description of the target address space. diff --git a/src/compiler/sparc/vm.lisp b/src/compiler/sparc/vm.lisp index e2d549a..5bf1cca 100644 --- a/src/compiler/sparc/vm.lisp +++ b/src/compiler/sparc/vm.lisp @@ -10,7 +10,18 @@ ;;;; files for more information. (in-package "SB!VM") - + +;;;; Additional constants + +;;; NUMBER-STACK-DISPLACEMENT +;;; +;;; The number of bytes reserved above the number stack pointer. These +;;; slots are required by architecture for a place to spill register windows. +;;; +;;; FIXME: Where is this used? +(def!constant number-stack-displacement + (* 16 n-word-bytes)) + ;;;; Define the registers (eval-when (:compile-toplevel :load-toplevel :execute) diff --git a/version.lisp-expr b/version.lisp-expr index 64ed6cb..0e1bd41 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.8.13.35" +"0.8.13.36" -- 1.7.10.4