Fix various dependency problems in cold-load sequence.

diff --git a/v7/src/runtime/global.scm b/v7/src/runtime/global.scm
index 8fce1b40ab94ea5d90420b03c5d66e47dfe2baa8..257dac448b7b9cc92543b45cde73e5f58242a2a9 100644 (file)
--- a/v7/src/runtime/global.scm
+++ b/v7/src/runtime/global.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/global.scm,v 14.22 1991/04/18 22:34:31 markf Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/global.scm,v 14.23 1991/05/06 03:19:29 cph Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -37,9 +37,6 @@ MIT in each case. |#
 
 (declare (usual-integrations))
 \f
-(define (initialize-package!)
-  (set! hook/scode-eval default/scode-eval))
-
 ;;;; Primitive Operators
 
 (define-primitives
@@ -104,12 +101,12 @@ MIT in each case. |#
   (extended-scode-eval (syntax expression system-global-syntax-table)
                       environment))
 
-(define hook/scode-eval)
-(define default/scode-eval (ucode-primitive scode-eval))
-
 (define (scode-eval scode environment)
   (hook/scode-eval scode environment))
 
+(define hook/scode-eval
+  (ucode-primitive scode-eval))
+
 (define-integrable (system-hunk3-cons type cxr0 cxr1 cxr2)
   (object-new-type type (hunk3-cons cxr0 cxr1 cxr2)))
 

diff --git a/v7/src/runtime/make.scm b/v7/src/runtime/make.scm
index 610d791719d3e674a5942bad726042246ee24d12..0c4af14a609184b21d47245a7ef3b7d6deb043f7 100644 (file)
--- a/v7/src/runtime/make.scm
+++ b/v7/src/runtime/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/make.scm,v 14.28 1991/02/22 21:16:31 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/make.scm,v 14.29 1991/05/06 03:19:35 cph Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -283,15 +283,17 @@ MIT in each case. |#
  `((SORT-TYPE . MERGE-SORT)
    (OS-TYPE . ,(intern os-name-string))
    (OPTIONS . NO-LOAD)))
+
+(package-initialize '(RUNTIME MICROCODE-TABLES) 'READ-MICROCODE-TABLES!)
 \f
 ;; Funny stuff is done.  Rest of sequence is standardized.
 (package-initialization-sequence
  '(
    ;; Microcode interface
+   (RUNTIME STATE-SPACE)
    (RUNTIME MICROCODE-TABLES)
    (RUNTIME PRIMITIVE-IO)
    (RUNTIME SAVE/RESTORE)
-   (RUNTIME STATE-SPACE)
    (RUNTIME SYSTEM-CLOCK)
    ;; Basic data structures
    (RUNTIME NUMBER)

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 6106573938f8ab85664afdd0696fdd1fc416a571..c72284485d5b8d3ee48c9c5b3877cf5b6d4d930f 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.102 1991/04/18 22:36:11 markf Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/runtime.pkg,v 14.103 1991/05/06 03:19:42 cph Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -49,14 +49,13 @@ MIT in each case. |#
         "vector")
   (file-case sort-type
     ((merge-sort) "msort")
-    ((quick-sort) "qsort")
+    ;;((quick-sort) "qsort")
     (else))
   (file-case os-type
     ((unix) "unxpth" "unxprm")
     ;;((vms) "vmspth")
     ;;(else "unkpth")
-    (else))
-  (initialization (initialize-package!)))
+    (else)))
 
 (define-package (package)
   ;; The information appearing here must be duplicated in the cold load

diff --git a/v7/src/runtime/utabs.scm b/v7/src/runtime/utabs.scm
index 4ac813ce46c23effc80710a987e0412a9c635a66..577c0d7c80a0d3abda621f1870cec8f4fe2fdd5a 100644 (file)
--- a/v7/src/runtime/utabs.scm
+++ b/v7/src/runtime/utabs.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/utabs.scm,v 14.5 1991/01/26 03:23:56 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/utabs.scm,v 14.6 1991/05/06 03:19:52 cph Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -38,7 +38,6 @@ MIT in each case. |#
 (declare (usual-integrations))
 \f
 (define (initialize-package!)
-  (read-microcode-tables!)
   (add-event-receiver! event:after-restore read-microcode-tables!))
 
 (define (read-microcode-tables! #!optional filename)

diff --git a/v7/src/runtime/version.scm b/v7/src/runtime/version.scm
index 65bf14a4531150792046c4f0c5f24c1c48e2b589..f608b95f898f693c2bc8f20e2cf63c6858f9ff35 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.116 1991/04/15 20:47:59 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/version.scm,v 14.117 1991/05/06 03:19:59 cph Exp $
 
 Copyright (c) 1988-91 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 116))
+  (add-identification! "Runtime" 14 117))
 
 (define microcode-system)
 

diff --git a/v8/src/runtime/global.scm b/v8/src/runtime/global.scm
index 7df355b7c191ba597f6ddda28230d8f2d1d7647e..1cae48656034d8e49ae0c5511cabed49ee2d7734 100644 (file)
--- a/v8/src/runtime/global.scm
+++ b/v8/src/runtime/global.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/global.scm,v 14.22 1991/04/18 22:34:31 markf Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/global.scm,v 14.23 1991/05/06 03:19:29 cph Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -37,9 +37,6 @@ MIT in each case. |#
 
 (declare (usual-integrations))
 \f
-(define (initialize-package!)
-  (set! hook/scode-eval default/scode-eval))
-
 ;;;; Primitive Operators
 
 (define-primitives
@@ -104,12 +101,12 @@ MIT in each case. |#
   (extended-scode-eval (syntax expression system-global-syntax-table)
                       environment))
 
-(define hook/scode-eval)
-(define default/scode-eval (ucode-primitive scode-eval))
-
 (define (scode-eval scode environment)
   (hook/scode-eval scode environment))
 
+(define hook/scode-eval
+  (ucode-primitive scode-eval))
+
 (define-integrable (system-hunk3-cons type cxr0 cxr1 cxr2)
   (object-new-type type (hunk3-cons cxr0 cxr1 cxr2)))
 

diff --git a/v8/src/runtime/make.scm b/v8/src/runtime/make.scm
index f5db2b68eddfbfa71626c13ba6960237ac56654d..b48830e95b1e2cc3df7da251f8c68a4314335182 100644 (file)
--- a/v8/src/runtime/make.scm
+++ b/v8/src/runtime/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/make.scm,v 14.28 1991/02/22 21:16:31 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/make.scm,v 14.29 1991/05/06 03:19:35 cph Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -283,15 +283,17 @@ MIT in each case. |#
  `((SORT-TYPE . MERGE-SORT)
    (OS-TYPE . ,(intern os-name-string))
    (OPTIONS . NO-LOAD)))
+
+(package-initialize '(RUNTIME MICROCODE-TABLES) 'READ-MICROCODE-TABLES!)
 \f
 ;; Funny stuff is done.  Rest of sequence is standardized.
 (package-initialization-sequence
  '(
    ;; Microcode interface
+   (RUNTIME STATE-SPACE)
    (RUNTIME MICROCODE-TABLES)
    (RUNTIME PRIMITIVE-IO)
    (RUNTIME SAVE/RESTORE)
-   (RUNTIME STATE-SPACE)
    (RUNTIME SYSTEM-CLOCK)
    ;; Basic data structures
    (RUNTIME NUMBER)

diff --git a/v8/src/runtime/runtime.pkg b/v8/src/runtime/runtime.pkg
index 91f611374ddc8819e4b8a9f1b76da9eb865923b1..5d232912a77cebbd259bb62cbec512789d55e5df 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.102 1991/04/18 22:36:11 markf Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/runtime.pkg,v 14.103 1991/05/06 03:19:42 cph Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -49,14 +49,13 @@ MIT in each case. |#
         "vector")
   (file-case sort-type
     ((merge-sort) "msort")
-    ((quick-sort) "qsort")
+    ;;((quick-sort) "qsort")
     (else))
   (file-case os-type
     ((unix) "unxpth" "unxprm")
     ;;((vms) "vmspth")
     ;;(else "unkpth")
-    (else))
-  (initialization (initialize-package!)))
+    (else)))
 
 (define-package (package)
   ;; The information appearing here must be duplicated in the cold load