bootstrap: rename layouts/layouts.factor to layouts.factor.

diff --git a/core/bootstrap/layouts.factor b/core/bootstrap/layouts.factor
new file mode 100644 (file)
index 0000000..6ff54d4
--- /dev/null
+++ b/core/bootstrap/layouts.factor
@@ -0,0 +1,34 @@
+! Copyright (C) 2007, 2009 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: alien arrays byte-arrays kernel layouts math namespaces
+quotations strings words ;
+
+16 data-alignment set
+
+0b1111 tag-mask set
+4 tag-bits set
+
+32 mega-cache-size set
+
+! Type tags, should be kept in sync with:
+!   vm/layouts.hpp
+H{
+    { fixnum 0 }
+    { POSTPONE: f 1 }
+    { array 2 }
+    { float 3 }
+    { quotation 4 }
+    { bignum 5 }
+    { alien 6 }
+    { tuple 7 }
+    { wrapper 8 }
+    { byte-array 9 }
+    { callstack 10 }
+    { string 11 }
+    { word 12 }
+    { dll 13 }
+} type-numbers set
+
+14 num-types set
+
+2 header-bits set

diff --git a/core/bootstrap/layouts/authors.txt b/core/bootstrap/layouts/authors.txt
deleted file mode 100644 (file)
index 1901f27..0000000
--- a/core/bootstrap/layouts/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Slava Pestov

diff --git a/core/bootstrap/layouts/layouts.factor b/core/bootstrap/layouts/layouts.factor
deleted file mode 100644 (file)
index 6ff54d4..0000000
--- a/core/bootstrap/layouts/layouts.factor
+++ /dev/null
@@ -1,34 +0,0 @@
-! Copyright (C) 2007, 2009 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-USING: alien arrays byte-arrays kernel layouts math namespaces
-quotations strings words ;
-
-16 data-alignment set
-
-0b1111 tag-mask set
-4 tag-bits set
-
-32 mega-cache-size set
-
-! Type tags, should be kept in sync with:
-!   vm/layouts.hpp
-H{
-    { fixnum 0 }
-    { POSTPONE: f 1 }
-    { array 2 }
-    { float 3 }
-    { quotation 4 }
-    { bignum 5 }
-    { alien 6 }
-    { tuple 7 }
-    { wrapper 8 }
-    { byte-array 9 }
-    { callstack 10 }
-    { string 11 }
-    { word 12 }
-    { dll 13 }
-} type-numbers set
-
-14 num-types set
-
-2 header-bits set

diff --git a/core/bootstrap/layouts/summary.txt b/core/bootstrap/layouts/summary.txt
deleted file mode 100644 (file)
index 8f4f749..0000000
--- a/core/bootstrap/layouts/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Description of low-level object layout for image generation

diff --git a/core/bootstrap/primitives-docs.factor b/core/bootstrap/primitives-docs.factor
deleted file mode 100644 (file)
index cc051e3..0000000
--- a/core/bootstrap/primitives-docs.factor
+++ /dev/null
@@ -1,7 +0,0 @@
-USING: bootstrap.image.private effects help.markup help.syntax strings ;
-IN: bootstrap.primitives
-
-ARTICLE: "bootstrap.primitives" "Bootstrap primitives"
-"A script file run to create the bootstrap image. Also see the vocab " { $link "bootstrap.image.primitives" } "." ;
-
-ABOUT: "bootstrap.primitives"

diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor
index c6bb5fd3e145f93c3defca1174764ca81102313a..3707a112dc18beca7a2d977e2b4000f36318b422 100644 (file)
--- a/core/bootstrap/primitives.factor
+++ b/core/bootstrap/primitives.factor
@@ -21,7 +21,7 @@ H{ } clone sub-primitives set
 
 architecture get asm-file parse-file
 
-"vocab:bootstrap/layouts/layouts.factor" parse-file
+"vocab:bootstrap/layouts.factor" parse-file
 
 ! Now we have ( syntax-quot arch-quot layouts-quot ) on the stack
 

diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor
index 7fe5515cfe8f4d8d8caf6994b1cbd25e2c69bf40..d7b3c9cb13762561437d867ac6971d763503fd56 100644 (file)
--- a/core/bootstrap/stage1.factor
+++ b/core/bootstrap/stage1.factor
@@ -35,7 +35,8 @@ load-help? off
     "vocabs.loader" require
 
     "syntax" require
-    "bootstrap.layouts" require
+
+    "vocab:bootstrap/layouts.factor" parse-file %
 
     [
         f parser-quiet? set-global

diff --git a/vm/layouts.hpp b/vm/layouts.hpp
index e60201ed5dd7a9b3f98fbaf73d6daead50231c44..a5fdbcc64fdeb60b9baf7f2d5de0672231ca12fd 100644 (file)
--- 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/layouts/layouts.factor
+// Must match leaf-stack-frame-size in core/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/layouts.factor
+//   core/bootstrap/layouts.factor
 #define FIXNUM_TYPE 0
 #define F_TYPE 1
 #define ARRAY_TYPE 2