From db89f2d93f5510ffd7f3c4614081e7411370aeab Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 21 Jan 2022 11:32:34 -0800 Subject: [PATCH] bootstrap: a few more paths --- core/io/pathnames/pathnames-tests.factor | 6 +++--- vm/layouts.hpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/io/pathnames/pathnames-tests.factor b/core/io/pathnames/pathnames-tests.factor index b821f6fbba..ac2ac7c5d9 100644 --- a/core/io/pathnames/pathnames-tests.factor +++ b/core/io/pathnames/pathnames-tests.factor @@ -60,8 +60,8 @@ H{ { current-directory "." } { "resource-path" ".." } } [ - [ "../core/bootstrap/stage2.factor" ] - [ "resource:core/bootstrap/stage2.factor" absolute-path ] + [ "../basis/bootstrap/stage2.factor" ] + [ "resource:basis/bootstrap/stage2.factor" absolute-path ] unit-test ] with-variables @@ -188,4 +188,4 @@ os windows? [ ! Would be a core/ path except the path already exists in basis { "resource:basis/bootstrap/finish-bootstrap.factor" } -[ "bootstrap/finish-bootstrap.factor" vocab-path ] unit-test \ No newline at end of file +[ "bootstrap/finish-bootstrap.factor" vocab-path ] unit-test diff --git a/vm/layouts.hpp b/vm/layouts.hpp index a5fdbcc64f..17c14da458 100644 --- a/vm/layouts.hpp +++ b/vm/layouts.hpp @@ -9,7 +9,7 @@ inline static cell alignment_for(cell a, cell b) { return align(a, b) - a; } static const cell data_alignment = 16; -// Must match leaf-stack-frame-size in core/bootstrap/layouts.factor +// Must match leaf-stack-frame-size in basis/bootstrap/layouts.factor #define LEAF_FRAME_SIZE 16 #define WORD_SIZE (signed)(sizeof(cell) * 8) @@ -21,7 +21,7 @@ static const cell data_alignment = 16; #define RETAG(x, tag) (UNTAG(x) | (tag)) // Type tags, should be kept in sync with: -// core/bootstrap/layouts.factor +// basis/bootstrap/layouts.factor #define FIXNUM_TYPE 0 #define F_TYPE 1 #define ARRAY_TYPE 2 -- 2.34.1