From e5fac6e8afab10ba1175fee18e3f6f5d6f3857ae Mon Sep 17 00:00:00 2001 From: wlott <wlott> Date: Thu, 9 Jul 1992 19:27:05 +0000 Subject: [PATCH] Changed to use sigcontext-program-counter instead of assuming there is an sc-pc slot in the sigcontext. --- code/debug-int.lisp | 5 +++-- code/signal.lisp | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/debug-int.lisp b/code/debug-int.lisp index 244b4f1b8..960fde37a 100644 --- a/code/debug-int.lisp +++ b/code/debug-int.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.50 1992/06/22 13:51:30 wlott Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.51 1992/07/09 19:26:13 wlott Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1076,7 +1076,8 @@ (let* ((code-header-len (* (kernel:get-header-data code) vm:word-bytes)) (pc-offset - (- (system:sap-int (alien:slot scp 'unix:sc-pc)) + (- (system:sap-int + (vm:sigcontext-program-counter scp)) (- (kernel:get-lisp-obj-address code) vm:other-pointer-type) code-header-len))) diff --git a/code/signal.lisp b/code/signal.lisp index aaa08dc11..1ba22cb09 100644 --- a/code/signal.lisp +++ b/code/signal.lisp @@ -7,11 +7,11 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/signal.lisp,v 1.16 1992/07/08 17:19:39 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/signal.lisp,v 1.17 1992/07/09 19:27:05 wlott Exp $") ;;; ;;; ********************************************************************** ;;; -;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/signal.lisp,v 1.16 1992/07/08 17:19:39 ram Exp $ +;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/signal.lisp,v 1.17 1992/07/09 19:27:05 wlott Exp $ ;;; ;;; Code for handling UNIX signals. ;;; @@ -233,7 +233,7 @@ (system:without-hemlock (,function ,(concatenate 'simple-string what " at #x~x.") (with-alien ((scp (* sigcontext) scp)) - (sap-int (slot scp 'sc-pc))))))) + (sap-int (vm:sigcontext-program-counter scp))))))) (define-signal-handler sigint-handler "Interrupted" break) (define-signal-handler sigill-handler "Illegal Instruction") -- GitLab