From de5e3264e36c0dffa3696ff5cf095a48c161bf43 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Mon, 19 Dec 1994 21:12:45 +0000 Subject: [PATCH] Generalize HARDWARE-TRAP-FRAME/CODE to correctly handle OS/2 exception frames. --- v7/src/runtime/conpar.scm | 8 +++++--- v8/src/runtime/conpar.scm | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/v7/src/runtime/conpar.scm b/v7/src/runtime/conpar.scm index b63d022c0..a6555f25e 100644 --- a/v7/src/runtime/conpar.scm +++ b/v7/src/runtime/conpar.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: conpar.scm,v 14.32 1993/12/15 00:04:45 cph Exp $ +$Id: conpar.scm,v 14.33 1994/12/19 21:12:45 cph Exp $ -Copyright (c) 1988-93 Massachusetts Institute of Technology +Copyright (c) 1988-94 Massachusetts Institute of Technology This material was developed by the Scheme project at the Massachusetts Institute of Technology, Department of Electrical Engineering and @@ -867,7 +867,9 @@ MIT in each case. |# (define (hardware-trap-frame/code frame) (guarantee-hardware-trap-frame frame) (let ((code (stack-frame/ref frame hardware-trap/code-index))) - (and (pair? code) (cdr code)))) + (cond ((pair? code) (cdr code)) + ((string? code) code) + (else #f)))) (define (guarantee-hardware-trap-frame frame) (if (not (hardware-trap-frame? frame)) diff --git a/v8/src/runtime/conpar.scm b/v8/src/runtime/conpar.scm index b63d022c0..a6555f25e 100644 --- a/v8/src/runtime/conpar.scm +++ b/v8/src/runtime/conpar.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: conpar.scm,v 14.32 1993/12/15 00:04:45 cph Exp $ +$Id: conpar.scm,v 14.33 1994/12/19 21:12:45 cph Exp $ -Copyright (c) 1988-93 Massachusetts Institute of Technology +Copyright (c) 1988-94 Massachusetts Institute of Technology This material was developed by the Scheme project at the Massachusetts Institute of Technology, Department of Electrical Engineering and @@ -867,7 +867,9 @@ MIT in each case. |# (define (hardware-trap-frame/code frame) (guarantee-hardware-trap-frame frame) (let ((code (stack-frame/ref frame hardware-trap/code-index))) - (and (pair? code) (cdr code)))) + (cond ((pair? code) (cdr code)) + ((string? code) code) + (else #f)))) (define (guarantee-hardware-trap-frame frame) (if (not (hardware-trap-frame? frame)) -- 2.25.1