From 1cc72a386e12f0c32ac0a22657afbe0cd1adb0b1 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sat, 5 Apr 2008 07:35:36 -0500 Subject: [PATCH] Faster bootstrap --- core/bootstrap/compiler/compiler.factor | 4 +++- core/bootstrap/stage2.factor | 12 ++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/core/bootstrap/compiler/compiler.factor b/core/bootstrap/compiler/compiler.factor index 618c62f332..9e101126e6 100755 --- a/core/bootstrap/compiler/compiler.factor +++ b/core/bootstrap/compiler/compiler.factor @@ -19,7 +19,7 @@ IN: bootstrap.compiler enable-compiler nl -"Compiling some words to speed up bootstrap..." write flush +"Compiling..." write flush ! Compile a set of words ahead of the full compile. ! This set of words was determined semi-empirically @@ -74,4 +74,6 @@ nl malloc calloc free memcpy } compile +vocabs [ words [ compiled? not ] subset compile "." write flush ] each + " done" print flush diff --git a/core/bootstrap/stage2.factor b/core/bootstrap/stage2.factor index c82ebbe9f8..a75b111e78 100755 --- a/core/bootstrap/stage2.factor +++ b/core/bootstrap/stage2.factor @@ -27,9 +27,9 @@ SYMBOL: bootstrap-time seq-diff [ "bootstrap." prepend require ] each ; -: compile-remaining ( -- ) - "Compiling remaining words..." print flush - vocabs [ words [ compiled? not ] subset compile ] each ; +! : compile-remaining ( -- ) +! "Compiling remaining words..." print flush +! vocabs [ words [ compiled? not ] subset compile ] each ; : count-words ( pred -- ) all-words swap subset length number>string write ; @@ -57,7 +57,7 @@ millis >r default-image-name "output-image" set-global -"math help handbook compiler random tools ui ui.tools io" "include" set-global +"math compiler help random tools ui ui.tools io handbook" "include" set-global "" "exclude" set-global parse-command-line @@ -79,10 +79,6 @@ os winnt? [ "windows.nt" require ] when load-components run-bootstrap-init - - "bootstrap.compiler" vocab [ - compile-remaining - ] when ] with-compiler-errors :errors