From 24595665a79b4ef9469663d7ece80c2bcd993bab Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Fri, 1 Oct 2004 02:48:06 +0000 Subject: [PATCH] Move WITH-LIMITED-INTERRUPTS from "global.scm" to "boot.scm". --- v7/src/runtime/boot.scm | 6 +++++- v7/src/runtime/global.scm | 6 +----- v7/src/runtime/runtime.pkg | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/v7/src/runtime/boot.scm b/v7/src/runtime/boot.scm index 0b23d5650..596aa8795 100644 --- a/v7/src/runtime/boot.scm +++ b/v7/src/runtime/boot.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: boot.scm,v 14.17 2004/10/01 02:31:51 cph Exp $ +$Id: boot.scm,v 14.18 2004/10/01 02:47:41 cph Exp $ Copyright 1986,1987,1988,1989,1990,1992 Massachusetts Institute of Technology Copyright 1993,1996,2001,2004 Massachusetts Institute of Technology @@ -105,6 +105,10 @@ USA. interrupt-mask (thunk)))) +(define (with-limited-interrupts limit-mask procedure) + (with-interrupt-mask (fix:and limit-mask (get-interrupt-enables)) + procedure)) + (define-primitives (object-pure? pure?) (object-constant? constant?) diff --git a/v7/src/runtime/global.scm b/v7/src/runtime/global.scm index 423722258..0320449fa 100644 --- a/v7/src/runtime/global.scm +++ b/v7/src/runtime/global.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: global.scm,v 14.67 2004/10/01 02:16:36 cph Exp $ +$Id: global.scm,v 14.68 2004/10/01 02:47:51 cph Exp $ Copyright 1988,1989,1991,1992,1993,1995 Massachusetts Institute of Technology Copyright 1998,2000,2001,2003,2004 Massachusetts Institute of Technology @@ -113,10 +113,6 @@ USA. (define-integrable (system-hunk3-cons type cxr0 cxr1 cxr2) (object-new-type type (hunk3-cons cxr0 cxr1 cxr2))) -(define (with-limited-interrupts limit-mask procedure) - (with-interrupt-mask (fix:and limit-mask (get-interrupt-enables)) - procedure)) - (define (limit-interrupts! limit-mask) (set-interrupt-enables! (fix:and limit-mask (get-interrupt-enables)))) diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg index 9db67879a..deaed3b35 100644 --- a/v7/src/runtime/runtime.pkg +++ b/v7/src/runtime/runtime.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: runtime.pkg,v 14.496 2004/10/01 02:32:03 cph Exp $ +$Id: runtime.pkg,v 14.497 2004/10/01 02:48:06 cph Exp $ Copyright 1988,1989,1990,1991,1992,1993 Massachusetts Institute of Technology Copyright 1994,1995,1996,1997,1998,1999 Massachusetts Institute of Technology @@ -158,6 +158,7 @@ USA. unparser-method? unparser/standard-method with-absolutely-no-interrupts + with-limited-interrupts without-interrupts)) (define-package (runtime equality) @@ -356,7 +357,6 @@ USA. wait-interval with-history-disabled with-interrupt-mask - with-limited-interrupts with-values write-to-string) (initialization (initialize-package!))) -- 2.25.1