From aff47ce641e7bde41e3e56a5662463b264fc30d4 Mon Sep 17 00:00:00 2001 From: dtc <dtc> Date: Tue, 18 Nov 1997 10:48:01 +0000 Subject: [PATCH] Replace references to the constant old-fp-save-offset by ocfp-save-offset, making the x86 code more consistent with the other ports. --- assembly/x86/assem-rtns.lisp | 4 ++-- code/debug-int.lisp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assembly/x86/assem-rtns.lisp b/assembly/x86/assem-rtns.lisp index 648422106..b7b22eb15 100644 --- a/assembly/x86/assem-rtns.lisp +++ b/assembly/x86/assem-rtns.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/x86/assem-rtns.lisp,v 1.1 1997/01/21 00:30:28 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/x86/assem-rtns.lisp,v 1.2 1997/11/18 10:48:01 dtc Exp $") ;;; ;;; ********************************************************************** ;;; @@ -284,7 +284,7 @@ ;; correct thing gets passed into the various nlx entry points although ;; I think the compiler really ought to do it. - (storew start ebp-tn (- (1+ old-fp-save-offset))) + (storew start ebp-tn (- (1+ ocfp-save-offset))) (inst jmp (make-ea :byte :base block :disp (* unwind-block-entry-pc-slot word-bytes)))) diff --git a/code/debug-int.lisp b/code/debug-int.lisp index 88aa67c1a..d9d753a6d 100644 --- a/code/debug-int.lisp +++ b/code/debug-int.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.75 1997/11/15 07:36:39 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.76 1997/11/18 10:47:56 dtc Exp $") ;;; ;;; ********************************************************************** ;;; @@ -965,7 +965,7 @@ ;; These return hopefully correct ofp ret values at a call site (defun maybe-lisp-from-c(fp) (declare (type system-area-pointer fp)) - (let ((s0 (stack-ref-32 fp vm::old-fp-save-offset)) + (let ((s0 (stack-ref-32 fp vm::ocfp-save-offset)) (s1 (stack-ref-32 fp vm::return-pc-save-offset))) (when (and (kernel:make-lisp-obj s0)(kernel:make-lisp-obj s1)) (let ((lisp-ofp (int-sap s0)) @@ -981,7 +981,7 @@ (defun maybe-lisp-from-lisp(fp) (declare (type system-area-pointer fp)) (when (cstack-pointer-valid-p fp) - (let ((s0 (stack-ref-32 fp vm::old-fp-save-offset)) + (let ((s0 (stack-ref-32 fp vm::ocfp-save-offset)) (s1 (stack-ref-32 fp vm::return-pc-save-offset))) (when (and (kernel:make-lisp-obj s0) (kernel:make-lisp-obj s1)) -- GitLab