From 0db7f91050aeb2dc2f98946eefa251ffd6b96402 Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Wed, 20 Aug 2003 12:28:58 +0000 Subject: [PATCH] 0.8.2.48: IRC as a substitute for cvs diff | mail sbcl-devel ... purportedly fix the return-from-sigint problem on Darwin/PPC, from Patrik Nordebo (KingNato) --- src/compiler/ppc/arith.lisp | 15 ++++++++++----- src/compiler/ppc/c-call.lisp | 35 +++++++++++++++++++++++------------ src/compiler/sparc/arith.lisp | 2 +- version.lisp-expr | 2 +- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/src/compiler/ppc/arith.lisp b/src/compiler/ppc/arith.lisp index b6559cc..56910ac 100644 --- a/src/compiler/ppc/arith.lisp +++ b/src/compiler/ppc/arith.lisp @@ -1,10 +1,15 @@ -;;; -;;; Converted by William Lott. -;;; - -(in-package "SB!VM") +;;;; the VM definition arithmetic VOPs for the PPC +;;;; 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") ;;;; Unary operations. diff --git a/src/compiler/ppc/c-call.lisp b/src/compiler/ppc/c-call.lisp index def38fe..d848a7a 100644 --- a/src/compiler/ppc/c-call.lisp +++ b/src/compiler/ppc/c-call.lisp @@ -1,15 +1,21 @@ -;;; routines for call-out to C. -;;; -;;; Written by William Lott. -;;; +;;;; VOPs and other machine-specific support routines for call-out to C + +;;;; 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") -;;; Return the number of bytes needed for the current non-descriptor stack -;;; frame. Non-descriptor stack frames must be multiples of 16 bytes under -;;; the PPC SVr4 ABI (though the EABI may be less restrictive.) Two words -;;; are reserved for the stack backlink and saved LR (see SB!VM::NUMBER-STACK- -;;; DISPLACEMENT.) -;;; +;;; Return the number of bytes needed for the current non-descriptor +;;; stack frame. Non-descriptor stack frames must be multiples of 16 +;;; bytes under the PPC SVr4 ABI (though the EABI may be less +;;; restrictive). On linux, two words are reserved for the stack +;;; backlink and saved LR (see SB!VM::NUMBER-STACK-DISPLACEMENT). (defconstant +stack-alignment-bytes+ ;; Duh. PPC Linux (and VxWorks) adhere to the EABI. @@ -333,7 +339,11 @@ (:temporary (:scs (unsigned-reg) :to (:result 0)) temp) (:generator 0 (unless (zerop amount) - (let ((delta (- (logandc2 (+ amount 8 +stack-alignment-bytes+) + ;; FIXME: I don't understand why we seem to be adding + ;; NUMBER-STACK-DISPLACEMENT twice here. Weird. -- CSR, + ;; 2003-08-20 + (let ((delta (- (logandc2 (+ amount number-stack-displacement + +stack-alignment-bytes+) +stack-alignment-bytes+)))) (cond ((>= delta (ash -1 16)) (inst stwu nsp-tn nsp-tn delta)) @@ -351,7 +361,8 @@ (:policy :fast-safe) (:generator 0 (unless (zerop amount) - (let ((delta (logandc2 (+ amount 8 +stack-alignment-bytes+) + (let ((delta (logandc2 (+ amount number-stack-displacement + +stack-alignment-bytes+) +stack-alignment-bytes+))) (cond ((< delta (ash 1 16)) (inst addi nsp-tn nsp-tn delta)) diff --git a/src/compiler/sparc/arith.lisp b/src/compiler/sparc/arith.lisp index 7f6faad..307977c 100644 --- a/src/compiler/sparc/arith.lisp +++ b/src/compiler/sparc/arith.lisp @@ -1,4 +1,4 @@ -;;;; the VM definition arithmetic VOPs for the Alpha +;;;; the VM definition arithmetic VOPs for the SPARC ;;;; This software is part of the SBCL system. See the README file for ;;;; more information. diff --git a/version.lisp-expr b/version.lisp-expr index 957c649..4671358 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.2.47" +"0.8.2.48" -- 1.7.10.4