bootstrap.assembler: make temporary vocab name match file location

diff --git a/basis/bootstrap/assembler/arm.32.factor b/basis/bootstrap/assembler/arm.32.factor
index 3f2466267f8ab6b81bf555002ec2afddfc2ac07c..3b4076f0fcafb6d66c38d5ea1d0712cdbe97b787 100644 (file)
--- a/basis/bootstrap/assembler/arm.32.factor
+++ b/basis/bootstrap/assembler/arm.32.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2020 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: layouts namespaces ;
-IN: bootstrap.arm
+IN: bootstrap.assembler.arm
 
 4 \ cell set

diff --git a/basis/bootstrap/assembler/arm.32.unix.factor b/basis/bootstrap/assembler/arm.32.unix.factor
index 3d7b75829fb003458ae3eb0c7bcbf19b75097dc4..e8db0416ee0d0f74e843435d952c40aaae128b9b 100644 (file)
--- a/basis/bootstrap/assembler/arm.32.unix.factor
+++ b/basis/bootstrap/assembler/arm.32.unix.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2020 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel parser sequences ;
-IN: bootstrap.arm
+IN: bootstrap.assembler.arm
 
 << "vocab:bootstrap/assembler/arm.unix.factor" parse-file suffix! >> call
 << "vocab:bootstrap/assembler/arm.32.factor" parse-file suffix! >> call

diff --git a/basis/bootstrap/assembler/arm.32.windows.factor b/basis/bootstrap/assembler/arm.32.windows.factor
index 96ae4b66420d2f99c8f55fa4f791ba2c5dd15871..70f20056ca2265651d3d4c8e200669101cf46c89 100644 (file)
--- a/basis/bootstrap/assembler/arm.32.windows.factor
+++ b/basis/bootstrap/assembler/arm.32.windows.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2020 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel parser sequences ;
-IN: bootstrap.arm
+IN: bootstrap.assembler.arm
 
 << "vocab:bootstrap/assembler/arm.windows.factor" parse-file suffix! >> call
 << "vocab:bootstrap/assembler/arm.32.factor" parse-file suffix! >> call

diff --git a/basis/bootstrap/assembler/arm.64.factor b/basis/bootstrap/assembler/arm.64.factor
index fb1315b2bc8f793ed6d9991e088ed999e20031ab..5249713565ef600d5084c2e3ebae94c15f578671 100644 (file)
--- a/basis/bootstrap/assembler/arm.64.factor
+++ b/basis/bootstrap/assembler/arm.64.factor
@@ -6,7 +6,7 @@ cpu.arm.assembler.opcodes generic.single.private
 kernel kernel.private layouts locals.backend
 math math.private memory namespaces sequences slots.private
 strings.private threads.private vocabs ;
-IN: bootstrap.arm
+IN: bootstrap.assembler.arm
 
 8 \ cell set
 

diff --git a/basis/bootstrap/assembler/arm.64.unix.factor b/basis/bootstrap/assembler/arm.64.unix.factor
index 635d942b658b905b57a9be527a6649fd0bdc5c80..4f4fe7d1b94f80820c9bb0b10016ccd34dff0a72 100644 (file)
--- a/basis/bootstrap/assembler/arm.64.unix.factor
+++ b/basis/bootstrap/assembler/arm.64.unix.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: cpu.arm.assembler cpu.arm.assembler.opcodes kernel layouts
 parser sequences ;
-IN: bootstrap.arm
+IN: bootstrap.assembler.arm
 
 ! Stack frame
 ! https://docs.microsoft.com/en-us/cpp/build/arm64-exception-handling?view=vs-2019

diff --git a/basis/bootstrap/assembler/arm.64.windows.factor b/basis/bootstrap/assembler/arm.64.windows.factor
index e7e0b7335e68c7bb5709beac544bf2796dc84364..5f2938a369d4ceed82ba797c5c0e8025d1675e6f 100644 (file)
--- a/basis/bootstrap/assembler/arm.64.windows.factor
+++ b/basis/bootstrap/assembler/arm.64.windows.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2020 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel parser sequences ;
-IN: bootstrap.arm
+IN: bootstrap.assembler.arm
 
 
 << "vocab:bootstrap/assembler/arm.windows.factor" parse-file suffix! >> call

diff --git a/basis/bootstrap/assembler/arm.factor b/basis/bootstrap/assembler/arm.factor
index 01ab19fbcb226d6c63639e0042a742a590c7d075..c0fe5b9c1e9d8fe5ff3f90f697f4016695f2100d 100644 (file)
--- a/basis/bootstrap/assembler/arm.factor
+++ b/basis/bootstrap/assembler/arm.factor
@@ -3,8 +3,8 @@
 USING: bootstrap.image.private cpu.arm.assembler kernel
 kernel.private layouts locals.backend math.private namespaces
 slots.private strings.private ;
-IN: bootstrap.arm
+IN: bootstrap.assembler.arm
 
 big-endian off
 
-! [ "bootstrap.arm" forget-vocab ] with-compilation-unit
\ No newline at end of file
+! [ "bootstrap.assembler.arm" forget-vocab ] with-compilation-unit
\ No newline at end of file

diff --git a/basis/bootstrap/assembler/arm.unix.factor b/basis/bootstrap/assembler/arm.unix.factor
index 566604abac81f3f135ddb2f593949443ec27bf93..8d2474364bbff069ae357d0c58cce9aaf6d9a4bb 100644 (file)
--- a/basis/bootstrap/assembler/arm.unix.factor
+++ b/basis/bootstrap/assembler/arm.unix.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2020 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel ;
-IN: bootstrap.arm
+IN: bootstrap.assembler.arm
 
 DEFER: stack-reg
 

diff --git a/basis/bootstrap/assembler/arm.windows.factor b/basis/bootstrap/assembler/arm.windows.factor
index 8cc7575aa8882dbe5f56be665d0839bfc15f3fb8..db32d8e94e3aa61d690a290014bf287606b2b2ea 100644 (file)
--- a/basis/bootstrap/assembler/arm.windows.factor
+++ b/basis/bootstrap/assembler/arm.windows.factor
@@ -1,3 +1,3 @@
 ! Copyright (C) 2020 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-IN: bootstrap.arm
+IN: bootstrap.assembler.arm

diff --git a/basis/bootstrap/assembler/ppc.32.linux.factor b/basis/bootstrap/assembler/ppc.32.linux.factor
index 07e7055636e85ad3f01c9acffdec0237792c8bc5..1f019587a276316ae035fd7a55e0d22b99f14a86 100644 (file)
--- a/basis/bootstrap/assembler/ppc.32.linux.factor
+++ b/basis/bootstrap/assembler/ppc.32.linux.factor
@@ -3,7 +3,7 @@
 USING: parser system kernel sequences math ranges
 cpu.ppc.assembler combinators compiler.constants
 bootstrap.image.private layouts namespaces ;
-IN: bootstrap.ppc
+IN: bootstrap.assembler.ppc
 
 4 \ cell set
 big-endian on

diff --git a/basis/bootstrap/assembler/ppc.64.linux.factor b/basis/bootstrap/assembler/ppc.64.linux.factor
index 670389fa696dc3e6a2bb640160d71c363722049f..bb1d661ca1aabed965fde3671468a0e4c9f5c3dd 100644 (file)
--- a/basis/bootstrap/assembler/ppc.64.linux.factor
+++ b/basis/bootstrap/assembler/ppc.64.linux.factor
@@ -3,7 +3,7 @@
 USING: parser system kernel sequences math ranges
 cpu.ppc.assembler combinators compiler.constants
 bootstrap.image.private layouts namespaces ;
-IN: bootstrap.ppc
+IN: bootstrap.assembler.ppc
 
 8 \ cell set
 big-endian on

diff --git a/basis/bootstrap/assembler/ppc.factor b/basis/bootstrap/assembler/ppc.factor
index b4f964fe1f578236cf37c87bff0b99c0fbb68a4d..fedf03587b75e9063b92add9683e8f7045b2d8df 100644 (file)
--- a/basis/bootstrap/assembler/ppc.factor
+++ b/basis/bootstrap/assembler/ppc.factor
@@ -6,7 +6,7 @@ math.private ranges layouts words vocabs slots.private
 locals locals.backend generic.single.private sequences
 threads.private strings.private ;
 FROM: cpu.ppc.assembler => B ;
-IN: bootstrap.ppc
+IN: bootstrap.assembler.ppc
 
 : jit-call ( string -- )
     dup
@@ -815,4 +815,4 @@ IN: bootstrap.ppc
     ] }
 } define-sub-primitives
 
-[ "bootstrap.ppc" forget-vocab ] with-compilation-unit
+[ "bootstrap.assembler.ppc" forget-vocab ] with-compilation-unit

diff --git a/basis/bootstrap/assembler/x86.32.factor b/basis/bootstrap/assembler/x86.32.factor
index e54734f3121c9aadc0d78fdea7357229f1ec848c..c84d913600ebf694134fbdf60927a63d834d3ae5 100644 (file)
--- a/basis/bootstrap/assembler/x86.32.factor
+++ b/basis/bootstrap/assembler/x86.32.factor
@@ -4,7 +4,7 @@ USING: bootstrap.image.private compiler.codegen.relocation
 compiler.constants cpu.x86.assembler cpu.x86.assembler.operands
 generic.single.private kernel kernel.private layouts math
 math.private namespaces threads.private ;
-IN: bootstrap.x86
+IN: bootstrap.assembler.x86
 
 4 \ cell set
 

diff --git a/basis/bootstrap/assembler/x86.32.unix.factor b/basis/bootstrap/assembler/x86.32.unix.factor
index 74ac2516fb37138d1f0c84109d7f2c904606febd..aff19eb7d11290f9e930e9dc444ab4cd48933788 100644 (file)
--- a/basis/bootstrap/assembler/x86.32.unix.factor
+++ b/basis/bootstrap/assembler/x86.32.unix.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel parser sequences ;
-IN: bootstrap.x86
+IN: bootstrap.assembler.x86
 
 << "vocab:bootstrap/assembler/x86.unix.factor" parse-file suffix! >> call
 << "vocab:bootstrap/assembler/x86.32.factor" parse-file suffix! >> call

diff --git a/basis/bootstrap/assembler/x86.32.windows.factor b/basis/bootstrap/assembler/x86.32.windows.factor
index fab75394201521c7ae88f7856a4b6d1ba8fe4aa7..d7e6e58a93ea9f89c793dc29fcccfedf65242861 100644 (file)
--- a/basis/bootstrap/assembler/x86.32.windows.factor
+++ b/basis/bootstrap/assembler/x86.32.windows.factor
@@ -3,7 +3,7 @@
 USING: compiler.codegen.relocation compiler.constants cpu.x86.assembler
 cpu.x86.assembler.operands kernel kernel.private layouts parser
 sequences ;
-IN: bootstrap.x86
+IN: bootstrap.assembler.x86
 
 : tib-segment ( -- ) FS ;
 : tib-temp ( -- reg ) EAX ;

diff --git a/basis/bootstrap/assembler/x86.64.factor b/basis/bootstrap/assembler/x86.64.factor
index c17fb2b89f630fcf2acdf413dcfec2fdf0a91a38..6d112d59b9a62794a37781b2b0cc72974658edd2 100644 (file)
--- a/basis/bootstrap/assembler/x86.64.factor
+++ b/basis/bootstrap/assembler/x86.64.factor
@@ -4,7 +4,7 @@ USING: bootstrap.image.private compiler.codegen.relocation
 compiler.constants cpu.x86.assembler cpu.x86.assembler.operands
 generic.single.private kernel kernel.private layouts math
 math.private namespaces threads.private ;
-IN: bootstrap.x86
+IN: bootstrap.assembler.x86
 
 8 \ cell set
 

diff --git a/basis/bootstrap/assembler/x86.64.unix.factor b/basis/bootstrap/assembler/x86.64.unix.factor
index 11b1d0c35794600bca809a3e5af9b327d67becad..e21962ed2a1debe22beffc671ed634a3bd7a8773 100644 (file)
--- a/basis/bootstrap/assembler/x86.64.unix.factor
+++ b/basis/bootstrap/assembler/x86.64.unix.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: cpu.x86.assembler.operands kernel layouts parser
 sequences ;
-IN: bootstrap.x86
+IN: bootstrap.assembler.x86
 
 : stack-frame-size ( -- n ) 4 bootstrap-cells ;
 : nv-regs ( -- seq ) { RBX R12 R13 R14 R15 } ;

diff --git a/basis/bootstrap/assembler/x86.64.windows.factor b/basis/bootstrap/assembler/x86.64.windows.factor
index b5479cfc63b7c635e85e9c35ef865f1c82a13c9b..ec2fbf4dcd1f153f3a5abfff57b3202137fb4ab9 100644 (file)
--- a/basis/bootstrap/assembler/x86.64.windows.factor
+++ b/basis/bootstrap/assembler/x86.64.windows.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: cpu.x86.assembler cpu.x86.assembler.operands kernel
 layouts parser sequences ;
-IN: bootstrap.x86
+IN: bootstrap.assembler.x86
 
 DEFER: stack-reg
 

diff --git a/basis/bootstrap/assembler/x86.factor b/basis/bootstrap/assembler/x86.factor
index 32b2bd6e01473789ee790cc027fdfc45f7e5d378..f822771453584946a8d12691fccb2fc95198684f 100644 (file)
--- a/basis/bootstrap/assembler/x86.factor
+++ b/basis/bootstrap/assembler/x86.factor
@@ -5,7 +5,7 @@ compiler.constants compiler.units cpu.x86.assembler
 cpu.x86.assembler.operands kernel kernel.private layouts
 locals.backend math math.private namespaces sequences
 slots.private strings.private vocabs ;
-IN: bootstrap.x86
+IN: bootstrap.assembler.x86
 
 : temp0/32 ( -- reg )
     temp0 32-bit-version-of ;
@@ -619,4 +619,4 @@ big-endian off
     ] }
 } define-sub-primitives
 
-[ "bootstrap.x86" forget-vocab ] with-compilation-unit
+[ "bootstrap.assembler.x86" forget-vocab ] with-compilation-unit

diff --git a/basis/bootstrap/assembler/x86.unix.factor b/basis/bootstrap/assembler/x86.unix.factor
index 20dd738ac6c557b25b58b976ae1ffce1613abbbb..36951c6501b1a840bcc2ddfb9022951c43d886d9 100644 (file)
--- a/basis/bootstrap/assembler/x86.unix.factor
+++ b/basis/bootstrap/assembler/x86.unix.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: cpu.x86.assembler cpu.x86.assembler.operands kernel
 layouts ;
-IN: bootstrap.x86
+IN: bootstrap.assembler.x86
 
 DEFER: stack-reg
 

diff --git a/basis/bootstrap/assembler/x86.windows.factor b/basis/bootstrap/assembler/x86.windows.factor
index 5155b17db728aab5a117d218cb4afd9fd8ba47a6..aebe3ae58f2fca616c346fb3e64e71511e059e03 100644 (file)
--- a/basis/bootstrap/assembler/x86.windows.factor
+++ b/basis/bootstrap/assembler/x86.windows.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: compiler.constants cpu.x86.assembler
 cpu.x86.assembler.operands layouts ;
-IN: bootstrap.x86
+IN: bootstrap.assembler.x86
 
 : tib-exception-list-offset ( -- n ) 0 bootstrap-cells ;
 : tib-stack-base-offset ( -- n ) 1 bootstrap-cells ;