From d215c108f3fa7918273644980d23107b670f8a81 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 28 Jan 2010 03:02:54 +1300 Subject: [PATCH 1/3] core: fix bad interaction between stage1 bootstrap and manifest update code --- core/bootstrap/primitives.factor | 4 +--- core/compiler/units/units.factor | 26 +++++++++----------------- core/source-files/source-files.factor | 3 ++- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor index 2288b89cf4..7b9f8e9cc8 100644 --- a/core/bootstrap/primitives.factor +++ b/core/bootstrap/primitives.factor @@ -44,7 +44,7 @@ init-caches ! Vocabulary for slot accessors "accessors" create-vocab drop -dummy-compiler compiler-impl set +bootstrapping? on call( -- ) call( -- ) @@ -53,8 +53,6 @@ call( -- ) ! After we execute bootstrap/layouts num-types get f builtins set -bootstrapping? on - [ ! Create some empty vocabs where the below primitives and diff --git a/core/compiler/units/units.factor b/core/compiler/units/units.factor index a64080e510..87a25f2af7 100644 --- a/core/compiler/units/units.factor +++ b/core/compiler/units/units.factor @@ -64,16 +64,6 @@ M: f process-forgotten-words drop ; : without-optimizer ( quot -- ) [ f compiler-impl ] dip with-variable ; inline -! Trivial compiler. We don't want to touch the code heap -! during stage1 bootstrap, it would just waste time. -SINGLETON: dummy-compiler - -M: dummy-compiler to-recompile f ; - -M: dummy-compiler recompile drop { } ; - -M: dummy-compiler process-forgotten-words drop ; - : ( -- pair ) { H{ } H{ } } [ clone ] map ; SYMBOL: definition-observers @@ -143,13 +133,15 @@ M: object bump-effect-counter* drop f ; [ drop ] [ notify-definition-observers notify-error-observers ] if ; : finish-compilation-unit ( -- ) - remake-generics - to-recompile recompile - update-tuples - process-forgotten-definitions - modify-code-heap - bump-effect-counter - notify-observers ; + [ ] [ + remake-generics + to-recompile recompile + update-tuples + process-forgotten-definitions + modify-code-heap + bump-effect-counter + notify-observers + ] if-bootstrapping ; PRIVATE> diff --git a/core/source-files/source-files.factor b/core/source-files/source-files.factor index 4991a0860a..840ed94b96 100644 --- a/core/source-files/source-files.factor +++ b/core/source-files/source-files.factor @@ -16,7 +16,8 @@ checksum definitions ; : record-top-level-form ( quot file -- ) - (>>top-level-form) H{ } notify-definition-observers ; + (>>top-level-form) + [ ] [ H{ } notify-definition-observers ] if-bootstrapping ; : record-checksum ( lines source-file -- ) [ crc32 checksum-lines ] dip (>>checksum) ; From ce60f3c6b68c94b8c72111582a51e45f506a9f14 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 28 Jan 2010 16:46:24 +1300 Subject: [PATCH 2/3] vocabs.prettyprint: fix error when printing auto-use --- basis/vocabs/prettyprint/prettyprint.factor | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/basis/vocabs/prettyprint/prettyprint.factor b/basis/vocabs/prettyprint/prettyprint.factor index 40493e4e99..2cdec0d382 100644 --- a/basis/vocabs/prettyprint/prettyprint.factor +++ b/basis/vocabs/prettyprint/prettyprint.factor @@ -64,12 +64,15 @@ M: rename pprint-qualified ( rename -- ) tri ] with-pprint ; +: filter-interesting ( seq -- seq' ) + [ [ vocab? ] [ extra-words? ] bi or not ] filter ; + PRIVATE> : (pprint-manifest ( manifest -- quots ) [ [ search-vocabs>> [ '[ _ pprint-using ] , ] unless-empty ] - [ qualified-vocabs>> [ extra-words? not ] filter [ '[ _ pprint-qualified ] , ] each ] + [ qualified-vocabs>> filter-interesting [ '[ _ pprint-qualified ] , ] each ] [ current-vocab>> [ '[ _ pprint-in ] , ] when* ] tri ] { } make ; From 6cdf4de4eb699b1b2dedf563325fdfa98e9885c4 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 28 Jan 2010 17:30:35 +1300 Subject: [PATCH 3/3] Fix and clean up stage1 bootstrap --- basis/bootstrap/image/image.factor | 9 ++++++++- core/bootstrap/primitives.factor | 23 ++++++++++++----------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/basis/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor index 90b4c3ae6f..941b4149fa 100644 --- a/basis/bootstrap/image/image.factor +++ b/basis/bootstrap/image/image.factor @@ -554,12 +554,19 @@ M: quotation ' : fixup-header ( -- ) heap-size data-heap-size-offset fixup ; +: build-generics ( -- ) + [ + all-words + [ generic? ] filter + [ make-generic ] each + ] with-compilation-unit ; + : build-image ( -- image ) 800000 image set 20000 objects set emit-image-header t, 0, 1, -1, "Building generic words..." print flush - remake-generics + build-generics "Serializing words..." print flush emit-words "Serializing JIT data..." print flush diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor index 7b9f8e9cc8..67107c8c9a 100644 --- a/core/bootstrap/primitives.factor +++ b/core/bootstrap/primitives.factor @@ -31,30 +31,31 @@ architecture get { ! Now we have ( syntax-quot arch-quot layouts-quot ) on the stack ! Bring up a bare cross-compiling vocabulary. -"syntax" vocab vocab-words bootstrap-syntax set { - dictionary - new-classes - changed-definitions changed-generics changed-effects - outdated-generics forgotten-definitions - root-cache source-files update-map implementors-map -} [ H{ } clone swap set ] each +"syntax" vocab vocab-words bootstrap-syntax set + +H{ } clone dictionary set +H{ } clone root-cache set +H{ } clone source-files set +H{ } clone update-map set +H{ } clone implementors-map set init-caches -! Vocabulary for slot accessors -"accessors" create-vocab drop - bootstrapping? on call( -- ) call( -- ) -call( -- ) + +! Vocabulary for slot accessors +"accessors" create-vocab drop ! After we execute bootstrap/layouts num-types get f builtins set [ +call( -- ) + ! Create some empty vocabs where the below primitives and ! classes will go {