Change restart sequence so that bands dumped from Emacs will restore

correctly.

diff --git a/v7/src/runtime/gc.scm b/v7/src/runtime/gc.scm
index 642779edb0364d1f7728f721c8c133e8ca07f4b7..836a466e9074704ddf0aa8301890fca778a4f069 100644 (file)
--- a/v7/src/runtime/gc.scm
+++ b/v7/src/runtime/gc.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/gc.scm,v 14.4 1989/08/15 13:19:40 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/gc.scm,v 14.5 1990/07/16 17:12:23 cph Rel $
 
-Copyright (c) 1988, 1989 Massachusetts Institute of Technology
+Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -54,6 +54,13 @@ MIT in each case. |#
     (vector-set! fixed-objects #x0C condition-handler/hardware-trap)
     ((ucode-primitive set-fixed-objects-vector!) fixed-objects)))
 
+(define (reset-gc-after-restore!)
+  ;; This will be overridden by the Emacs-interface installation code
+  ;; after the rest of the runtime system is restored.
+  (set! hook/gc-start default/gc-start)
+  (set! hook/gc-finish default/gc-finish)
+  unspecific)
+
 (define (condition-handler/gc interrupt-code interrupt-enables)
   interrupt-code interrupt-enables
   (hook/gc-flip default-safety-margin))

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 42152bff96f88eb47b26f381c0ae5113a54f9d7e..90509d556c13e4843424711fe92c8d382a48835c 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/runtime.pkg,v 14.70 1990/06/28 18:09:44 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/runtime.pkg,v 14.71 1990/07/16 17:12:12 cph Exp $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -587,6 +587,8 @@ MIT in each case. |#
          hook/gc-start)
   (export (runtime error-handler)
          hook/hardware-trap)
+  (export (runtime save/restore)
+         reset-gc-after-restore!)
   (initialization (initialize-package!)))
 
 (define-package (runtime gc-daemons)

diff --git a/v7/src/runtime/savres.scm b/v7/src/runtime/savres.scm
index 811e1d9ad699c57e8cbd79af2624fcd2b56f5485..8a31b05f5b04c3c63f490c031e50fbf536d27471 100644 (file)
--- a/v7/src/runtime/savres.scm
+++ b/v7/src/runtime/savres.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/savres.scm,v 14.11 1990/01/24 16:45:07 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/savres.scm,v 14.12 1990/07/16 17:11:58 cph Exp $
 
-Copyright (c) 1988, 1989 Massachusetts Institute of Technology
+Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -110,6 +110,7 @@ MIT in each case. |#
             ;; This instruction is a noop, so I flushed it -- cph.
             ;; (enable-interrupts! interrupt-mask/none)
             (read-microcode-tables!)
+            (reset-gc-after-restore!)
             after-restore))))))))
 
 (define (dump-world/kernel filename after-suspend after-restore)

diff --git a/v7/src/runtime/version.scm b/v7/src/runtime/version.scm
index 9ec9cf1031435036724e5f5c116373a977dcb070..924912d8942ad64b3df7e0c4e29c85b3ca697a40 100644 (file)
--- a/v7/src/runtime/version.scm
+++ b/v7/src/runtime/version.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/version.scm,v 14.87 1990/07/03 19:49:24 markf Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/version.scm,v 14.88 1990/07/16 17:12:56 cph Exp $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -45,7 +45,7 @@ MIT in each case. |#
                     '()))
   (add-system! microcode-system)
   (add-event-receiver! event:after-restore snarf-microcode-version!)
-  (add-identification! "Runtime" 14 87))
+  (add-identification! "Runtime" 14 88))
 
 (define microcode-system)
 

diff --git a/v8/src/runtime/runtime.pkg b/v8/src/runtime/runtime.pkg
index 1ee3f609f34e77ae10aeff7d9782147994b44b57..53a489d0b2a792cfd8c1e3dda29778a21946df09 100644 (file)
--- a/v8/src/runtime/runtime.pkg
+++ b/v8/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/runtime.pkg,v 14.70 1990/06/28 18:09:44 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/runtime.pkg,v 14.71 1990/07/16 17:12:12 cph Exp $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -587,6 +587,8 @@ MIT in each case. |#
          hook/gc-start)
   (export (runtime error-handler)
          hook/hardware-trap)
+  (export (runtime save/restore)
+         reset-gc-after-restore!)
   (initialization (initialize-package!)))
 
 (define-package (runtime gc-daemons)