Move stage0 into src/parrot/vm/.

The stage0 is inherently platform specific, since it's generated code.

tools/build/Makefile.in

@@ -124,17 +124,17 @@ CORE_SETTING_SOURCES = \
 CORE_SETTING_NQP = NQPCORE.setting
 
 STAGE0_SOURCES = \
-	src/stage0/NQPMO-s0.pir \
-	src/stage0/ModuleLoader-s0.pir \
-	src/stage0/NQPCORE.setting-s0.pir \
-	src/stage0/QASTNode-s0.pir \
-	src/stage0/QRegex-s0.pir \
-	src/stage0/HLL-s0.pir \
-	src/stage0/QAST-s0.pir \
-	src/stage0/P6QRegex-s0.pir \
-	src/stage0/NQP-s0.pir
-
-STAGE0 = src/stage0
+	src/vm/parrot/stage0/NQPMO-s0.pir \
+	src/vm/parrot/stage0/ModuleLoader-s0.pir \
+	src/vm/parrot/stage0/NQPCORE.setting-s0.pir \
+	src/vm/parrot/stage0/QASTNode-s0.pir \
+	src/vm/parrot/stage0/QRegex-s0.pir \
+	src/vm/parrot/stage0/HLL-s0.pir \
+	src/vm/parrot/stage0/QAST-s0.pir \
+	src/vm/parrot/stage0/P6QRegex-s0.pir \
+	src/vm/parrot/stage0/NQP-s0.pir
+
+STAGE0 = src/vm/parrot/stage0
 STAGE1 = src/stage1
 STAGE2 = src/stage2
 
@@ -511,7 +511,7 @@ CLEANUPS = \
   $(PARROT_DLL_COPY) \
   *.c\
   *.o\
-  src/stage0/*.pbc \
+  src/vm/parrot/stage0/*.pbc \
   src/stage1/gen/* \
   src/stage1/*.pbc \
   src/stage2/gen/* \
@@ -580,15 +580,15 @@ stage2: $(STAGE2)
 $(STAGE0): $(STAGE0_PBCS)
 
 $(STAGE0_PBCS): $(DYNEXT_TARGET) $(STAGE0_SOURCES)
-	$(PARROT) -o $(STAGE0)/$(NQP_MO_PBC)       src/stage0/NQPMO-s0.pir
-	$(PARROT) -o $(STAGE0)/$(MODULE_LOADER_PBC) src/stage0/ModuleLoader-s0.pir
-	$(PARROT) -o $(STAGE0)/$(CORE_SETTING_PBC) src/stage0/NQPCORE.setting-s0.pir
-	$(PARROT) -o $(STAGE0)/$(QASTNODE_PBC)     src/stage0/QASTNode-s0.pir
-	$(PARROT) -o $(STAGE0)/$(QREGEX_PBC)       src/stage0/QRegex-s0.pir
-	$(PARROT) -o $(STAGE0)/$(HLL_PBC)          src/stage0/HLL-s0.pir
-	$(PARROT) -o $(STAGE0)/$(QAST_PBC)         src/stage0/QAST-s0.pir
-	$(PARROT) -o $(STAGE0)/$(P6QREGEX_PBC)     src/stage0/P6QRegex-s0.pir
-	$(PARROT) -o $(STAGE0)/$(NQP_PBC)          src/stage0/NQP-s0.pir
+	$(PARROT) -o $(STAGE0)/$(NQP_MO_PBC)       src/vm/parrot/stage0/NQPMO-s0.pir
+	$(PARROT) -o $(STAGE0)/$(MODULE_LOADER_PBC) src/vm/parrot/stage0/ModuleLoader-s0.pir
+	$(PARROT) -o $(STAGE0)/$(CORE_SETTING_PBC) src/vm/parrot/stage0/NQPCORE.setting-s0.pir
+	$(PARROT) -o $(STAGE0)/$(QASTNODE_PBC)     src/vm/parrot/stage0/QASTNode-s0.pir
+	$(PARROT) -o $(STAGE0)/$(QREGEX_PBC)       src/vm/parrot/stage0/QRegex-s0.pir
+	$(PARROT) -o $(STAGE0)/$(HLL_PBC)          src/vm/parrot/stage0/HLL-s0.pir
+	$(PARROT) -o $(STAGE0)/$(QAST_PBC)         src/vm/parrot/stage0/QAST-s0.pir
+	$(PARROT) -o $(STAGE0)/$(P6QREGEX_PBC)     src/vm/parrot/stage0/P6QRegex-s0.pir
+	$(PARROT) -o $(STAGE0)/$(NQP_PBC)          src/vm/parrot/stage0/NQP-s0.pir
 
 $(STAGE1): $(STAGE1_PBCS)
 
@@ -1082,15 +1082,15 @@ $(NQP_CONST_PIR):
 	perl tools/build/generate-constants.pl > $@
 
 bootstrap-files: $(STAGE2_PBCS) src/stage2/$(CORE_SETTING_NQP)
-	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(NQP_MO_PIR) >src/stage0/NQPMO-s0.pir
-	$(PERL) tools/build/gen-bootstrap.pl src/stage2/gen/module_loader.pir >src/stage0/ModuleLoader-s0.pir
-	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(CORE_SETTING_PIR) >src/stage0/NQPCORE.setting-s0.pir
-	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(QASTNODE_PIR) >src/stage0/QASTNode-s0.pir
-	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(QREGEX_PIR) >src/stage0/QRegex-s0.pir
-	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(HLL_COMBINED_PIR) >src/stage0/HLL-s0.pir
-	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(QAST_PIR) >src/stage0/QAST-s0.pir
-	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(P6QREGEX_COMBINED_PIR) >src/stage0/P6QRegex-s0.pir
-	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(NQP_COMBINED_PIR) >src/stage0/NQP-s0.pir
+	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(NQP_MO_PIR) >src/vm/parrot/stage0/NQPMO-s0.pir
+	$(PERL) tools/build/gen-bootstrap.pl src/stage2/gen/module_loader.pir >src/vm/parrot/stage0/ModuleLoader-s0.pir
+	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(CORE_SETTING_PIR) >src/vm/parrot/stage0/NQPCORE.setting-s0.pir
+	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(QASTNODE_PIR) >src/vm/parrot/stage0/QASTNode-s0.pir
+	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(QREGEX_PIR) >src/vm/parrot/stage0/QRegex-s0.pir
+	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(HLL_COMBINED_PIR) >src/vm/parrot/stage0/HLL-s0.pir
+	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(QAST_PIR) >src/vm/parrot/stage0/QAST-s0.pir
+	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(P6QREGEX_COMBINED_PIR) >src/vm/parrot/stage0/P6QRegex-s0.pir
+	$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(NQP_COMBINED_PIR) >src/vm/parrot/stage0/NQP-s0.pir
 
 ## testing