From 0cfd47d5a8815fe62977f754d09e813f65137e10 Mon Sep 17 00:00:00 2001 From: wlott <wlott> Date: Tue, 8 Sep 1992 20:26:29 +0000 Subject: [PATCH] Changed arch_get_bad_addr to take the signal and code in addition to the sigcontext. Hence interrupt_maybe_gc need to take them as arguments. --- lisp/interrupt.c | 10 +++++----- lisp/interrupt.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/interrupt.c b/lisp/interrupt.c index 67efb693a..dc698c1cf 100644 --- a/lisp/interrupt.c +++ b/lisp/interrupt.c @@ -1,4 +1,4 @@ -/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/interrupt.c,v 1.1 1992/07/28 20:14:35 wlott Exp $ */ +/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/interrupt.c,v 1.2 1992/09/08 20:25:46 wlott Exp $ */ /* Interrupt handing magic. */ @@ -231,12 +231,12 @@ static void maybe_now_maybe_later(int signal, int code, \****************************************************************/ #ifndef INTERNAL_GC_TRIGGER -static boolean gc_trigger_hit(struct sigcontext *context) +static boolean gc_trigger_hit(int signal, int code, struct sigcontext *context) { if (current_auto_gc_trigger == NULL) return FALSE; else{ - lispobj *badaddr=(lispobj *)arch_get_bad_addr(context); + lispobj *badaddr=(lispobj *)arch_get_bad_addr(signal, code, context); return (badaddr >= current_auto_gc_trigger && badaddr < current_dynamic_space + DYNAMIC_SPACE_SIZE); @@ -245,11 +245,11 @@ static boolean gc_trigger_hit(struct sigcontext *context) #endif -boolean interrupt_maybe_gc(struct sigcontext *context) +boolean interrupt_maybe_gc(int signal, int code, struct sigcontext *context) { if (!foreign_function_call_active #ifndef INTERNAL_GC_TRIGGER - && gc_trigger_hit(context) + && gc_trigger_hit(signal, code, context) #endif ) { #ifndef INTERNAL_GC_TRIGGER diff --git a/lisp/interrupt.h b/lisp/interrupt.h index df36b3d7e..22347878c 100644 --- a/lisp/interrupt.h +++ b/lisp/interrupt.h @@ -1,4 +1,4 @@ -/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/interrupt.h,v 1.1 1992/07/28 20:14:37 wlott Exp $ */ +/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/interrupt.h,v 1.2 1992/09/08 20:26:29 wlott Exp $ */ #if !defined(_INCLUDE_INTERRUPT_H_) #define _INCLUDE_INTERRUPT_H_ @@ -22,10 +22,10 @@ extern void interrupt_handle_pending(struct sigcontext *scp); extern void interrupt_internal_error(int signal, int code, struct sigcontext *scp, boolean continuable); -extern boolean interrupt_maybe_gc(struct sigcontext *context); +extern boolean interrupt_maybe_gc(int sig, int code, struct sigcontext *scp); extern void interrupt_install_low_level_handler (int signal, - void handler(int signal, int code, struct sigcontext *handler)); + void handler(int signal, int code, struct sigcontext *scp)); extern unsigned long install_handler(int signal, void handler(int signal, int code, struct sigcontext *handler)); -- GitLab