From: Chris Hanson Date: Mon, 6 May 1991 03:19:59 +0000 (+0000) Subject: Fix various dependency problems in cold-load sequence. X-Git-Tag: 20090517-FFI~10670 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=2cb5e380b0be0a4d63f3c8befb825c9d45e4eff8;p=mit-scheme.git Fix various dependency problems in cold-load sequence. --- diff --git a/v7/src/runtime/global.scm b/v7/src/runtime/global.scm index 8fce1b40a..257dac448 100644 --- 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)) -(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 610d79171..0c4af14a6 100644 --- 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!) ;; 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 610657393..c72284485 100644 --- 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 4ac813ce4..577c0d7c8 100644 --- 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)) (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 65bf14a45..f608b95f8 100644 --- 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 7df355b7c..1cae48656 100644 --- 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)) -(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 f5db2b68e..b48830e95 100644 --- 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!) ;; 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 91f611374..5d232912a 100644 --- 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