X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-init.lisp;h=dd51ecf17fb559d5c23d105e86651b3645fc189e;hb=119c1bcd2cfff74d2968209207ea34ba0e1739f7;hp=6bb7b33fd4b4db00de1c96c7a0d46bcfda827e8a;hpb=2b90fd1dbad23322258222a2ef4cef7f6a00831d;p=sbcl.git diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp index 6bb7b33..dd51ecf 100644 --- a/src/code/cold-init.lisp +++ b/src/code/cold-init.lisp @@ -96,13 +96,15 @@ *gc-inhibit* t *gc-pending* nil #!+sb-thread *stop-for-gc-pending* #!+sb-thread nil - sb!unix::*interrupts-enabled* t - sb!unix::*interrupt-pending* nil + *allow-with-interrupts* t + *interrupts-enabled* t + *interrupt-pending* nil *break-on-signals* nil *maximum-error-depth* 10 *current-error-depth* 0 *cold-init-complete-p* nil - *type-system-initialized* nil) + *type-system-initialized* nil + sb!vm:*alloc-signal* nil) ;; I'm not sure where eval is first called, so I put this first. #!+sb-eval @@ -116,6 +118,9 @@ ;; this to be initialized, so we initialize it right away. (show-and-call !random-cold-init) + ;; Must be done before any non-opencoded array references are made. + (show-and-call !hairy-data-vector-reffer-init) + (show-and-call !character-database-cold-init) (show-and-call !character-name-database-cold-init) @@ -285,15 +290,15 @@ UNIX-like systems, UNIX-STATUS is used as the status code." (defun reinit () (setf *default-external-format* nil) (setf sb!alien::*default-c-string-external-format* nil) - (without-interrupts - (without-gcing - (os-cold-init-or-reinit) - (thread-init-or-reinit) - (stream-reinit) - #!-win32 - (signal-cold-init-or-reinit) - (setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t) - (float-cold-init-or-reinit))) + ;; WITHOUT-GCING implies WITHOUT-INTERRUPTS. + (without-gcing + (os-cold-init-or-reinit) + (thread-init-or-reinit) + (stream-reinit t) + #!-win32 + (signal-cold-init-or-reinit) + (setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t) + (float-cold-init-or-reinit)) (gc-reinit) (foreign-reinit) (time-reinit)