From 475792b9d96b16e220fbc71941646d7707f1c24a Mon Sep 17 00:00:00 2001 From: wlott <wlott> Date: Thu, 21 May 1992 22:35:27 +0000 Subject: [PATCH] Moved the :single-value-return code location to where backtrace expects to find it. --- compiler/mips/call.lisp | 11 +++++++---- compiler/sparc/call.lisp | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/compiler/mips/call.lisp b/compiler/mips/call.lisp index 10f66bc10..b382cf20c 100644 --- a/compiler/mips/call.lisp +++ b/compiler/mips/call.lisp @@ -7,11 +7,11 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/call.lisp,v 1.47 1992/05/21 14:36:14 wlott Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/call.lisp,v 1.48 1992/05/21 22:34:26 wlott Exp $") ;;; ;;; ********************************************************************** ;;; -;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/call.lisp,v 1.47 1992/05/21 14:36:14 wlott Exp $ +;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/call.lisp,v 1.48 1992/05/21 22:34:26 wlott Exp $ ;;; ;;; This file contains the VM definition of function call for the MIPS. ;;; @@ -299,11 +299,14 @@ default-value-8 (type unsigned-byte nvals) (type tn move-temp temp)) (if (<= nvals 1) (progn + ;; Note that this is a single-value return point. This is actually + ;; the multiple-value entry point for a single desired value, but + ;; the code location has to be here, or the debugger backtrace + ;; gets confused. + (note-this-location vop :single-value-return) (move csp-tn old-fp-tn) (inst nop) (inst entry-point) - ;; Note that this is a single-value return point. - (note-this-location vop :single-value-return) (inst compute-code-from-lra code-tn code-tn lra-label temp)) (let ((regs-defaulted (gen-label)) (defaulting-done (gen-label)) diff --git a/compiler/sparc/call.lisp b/compiler/sparc/call.lisp index e82df2a37..ea529cde6 100644 --- a/compiler/sparc/call.lisp +++ b/compiler/sparc/call.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/call.lisp,v 1.16 1992/05/21 14:36:32 wlott Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/call.lisp,v 1.17 1992/05/21 22:35:27 wlott Exp $") ;;; ;;; ********************************************************************** ;;; @@ -297,9 +297,9 @@ default-value-8 (type unsigned-byte nvals) (type tn move-temp temp)) (if (<= nvals 1) (progn + (note-this-location vop :single-value-return) (move csp-tn ocfp-tn) (inst nop) - (note-this-location vop :single-value-return) (inst compute-code-from-lra code-tn code-tn lra-label temp)) (let ((regs-defaulted (gen-label)) (defaulting-done (gen-label)) -- GitLab