From 528832bd3a2e7b686ee84aef5887df740a6114db Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 21 Sep 2020 18:38:55 -0700 Subject: [PATCH] rename src-self-hosted/ to src/ --- BRANCH_TODO | 2 - CMakeLists.txt | 53 +++++++++--------- build.zig | 4 +- {src-self-hosted => src}/Cache.zig | 0 {src-self-hosted => src}/Compilation.zig | 0 {src-self-hosted => src}/DepTokenizer.zig | 0 {src-self-hosted => src}/Module.zig | 0 {src-self-hosted => src}/Package.zig | 0 {src-self-hosted => src}/TypedValue.zig | 0 {src-self-hosted => src}/astgen.zig | 0 {src-self-hosted => src}/clang.zig | 0 {src-self-hosted => src}/clang_options.zig | 0 .../clang_options_data.zig | 0 {src-self-hosted => src}/codegen.zig | 0 {src-self-hosted => src}/codegen/arm.zig | 0 {src-self-hosted => src}/codegen/c.zig | 0 {src-self-hosted => src}/codegen/llvm.zig | 0 {src-self-hosted => src}/codegen/riscv64.zig | 0 {src-self-hosted => src}/codegen/spu-mk2.zig | 0 .../codegen/spu-mk2/interpreter.zig | 0 {src-self-hosted => src}/codegen/wasm.zig | 0 {src-self-hosted => src}/codegen/x86.zig | 0 {src-self-hosted => src}/codegen/x86_64.zig | 0 {src-self-hosted => src}/glibc.zig | 0 {src-self-hosted => src}/introspect.zig | 0 {src-self-hosted => src}/ir.zig | 0 .../libc_installation.zig | 0 {src-self-hosted => src}/libcxx.zig | 0 {src-self-hosted => src}/libunwind.zig | 0 {src-self-hosted => src}/link.zig | 0 {src-self-hosted => src}/link/C.zig | 0 {src-self-hosted => src}/link/Coff.zig | 0 {src-self-hosted => src}/link/Elf.zig | 0 {src-self-hosted => src}/link/MachO.zig | 0 {src-self-hosted => src}/link/Wasm.zig | 0 {src-self-hosted => src}/link/cbe.h | 0 {src-self-hosted => src}/link/msdos-stub.bin | Bin {src-self-hosted => src}/liveness.zig | 0 {src-self-hosted => src}/llvm.zig | 0 {src-self-hosted => src}/main.zig | 0 {src-self-hosted => src}/musl.zig | 0 {src-self-hosted => src}/print_env.zig | 0 {src-self-hosted => src}/print_targets.zig | 0 {src-self-hosted => src}/stage1.zig | 0 src/{ => stage1}/all_types.hpp | 0 src/{ => stage1}/analyze.cpp | 0 src/{ => stage1}/analyze.hpp | 0 src/{ => stage1}/ast_render.cpp | 0 src/{ => stage1}/ast_render.hpp | 0 src/{ => stage1}/bigfloat.cpp | 0 src/{ => stage1}/bigfloat.hpp | 0 src/{ => stage1}/bigint.cpp | 0 src/{ => stage1}/bigint.hpp | 0 src/{ => stage1}/buffer.cpp | 0 src/{ => stage1}/buffer.hpp | 0 src/{ => stage1}/codegen.cpp | 0 src/{ => stage1}/codegen.hpp | 0 src/{ => stage1}/config.h.in | 0 src/{ => stage1}/dump_analysis.cpp | 0 src/{ => stage1}/dump_analysis.hpp | 0 src/{ => stage1}/empty.cpp | 0 src/{ => stage1}/errmsg.cpp | 0 src/{ => stage1}/errmsg.hpp | 0 src/{ => stage1}/error.cpp | 0 src/{ => stage1}/error.hpp | 0 src/{ => stage1}/hash_map.hpp | 0 src/{ => stage1}/heap.cpp | 0 src/{ => stage1}/heap.hpp | 0 src/{ => stage1}/ir.cpp | 0 src/{ => stage1}/ir.hpp | 0 src/{ => stage1}/ir_print.cpp | 0 src/{ => stage1}/ir_print.hpp | 0 src/{ => stage1}/list.hpp | 0 src/{ => stage1}/mem.cpp | 0 src/{ => stage1}/mem.hpp | 0 src/{ => stage1}/mem_hash_map.hpp | 0 src/{ => stage1}/mem_list.hpp | 0 src/{ => stage1}/mem_type_info.hpp | 0 src/{ => stage1}/os.cpp | 0 src/{ => stage1}/os.hpp | 0 src/{ => stage1}/parse_f128.c | 0 src/{ => stage1}/parse_f128.h | 0 src/{ => stage1}/parser.cpp | 0 src/{ => stage1}/parser.hpp | 0 src/{ => stage1}/range_set.cpp | 0 src/{ => stage1}/range_set.hpp | 0 src/{ => stage1}/softfloat.hpp | 0 src/{ => stage1}/softfloat_ext.cpp | 0 src/{ => stage1}/softfloat_ext.hpp | 0 src/{ => stage1}/stage1.cpp | 0 src/{ => stage1}/stage1.h | 0 src/{ => stage1}/stage2.h | 0 src/{ => stage1}/target.cpp | 0 src/{ => stage1}/target.hpp | 0 src/{ => stage1}/tokenizer.cpp | 0 src/{ => stage1}/tokenizer.hpp | 0 src/{ => stage1}/util.cpp | 0 src/{ => stage1}/util.hpp | 0 src/{ => stage1}/util_base.hpp | 0 src/{ => stage1}/zig0.cpp | 0 {src-self-hosted => src}/target.zig | 0 {src-self-hosted => src}/test.zig | 0 {src-self-hosted => src}/tracy.zig | 0 {src-self-hosted => src}/translate_c.zig | 0 {src-self-hosted => src}/type.zig | 0 {src-self-hosted => src}/value.zig | 0 {src-self-hosted => src}/windows_sdk.zig | 0 {src-self-hosted => src}/zir.zig | 0 {src-self-hosted => src}/zir_sema.zig | 0 109 files changed, 29 insertions(+), 30 deletions(-) rename {src-self-hosted => src}/Cache.zig (100%) rename {src-self-hosted => src}/Compilation.zig (100%) rename {src-self-hosted => src}/DepTokenizer.zig (100%) rename {src-self-hosted => src}/Module.zig (100%) rename {src-self-hosted => src}/Package.zig (100%) rename {src-self-hosted => src}/TypedValue.zig (100%) rename {src-self-hosted => src}/astgen.zig (100%) rename {src-self-hosted => src}/clang.zig (100%) rename {src-self-hosted => src}/clang_options.zig (100%) rename {src-self-hosted => src}/clang_options_data.zig (100%) rename {src-self-hosted => src}/codegen.zig (100%) rename {src-self-hosted => src}/codegen/arm.zig (100%) rename {src-self-hosted => src}/codegen/c.zig (100%) rename {src-self-hosted => src}/codegen/llvm.zig (100%) rename {src-self-hosted => src}/codegen/riscv64.zig (100%) rename {src-self-hosted => src}/codegen/spu-mk2.zig (100%) rename {src-self-hosted => src}/codegen/spu-mk2/interpreter.zig (100%) rename {src-self-hosted => src}/codegen/wasm.zig (100%) rename {src-self-hosted => src}/codegen/x86.zig (100%) rename {src-self-hosted => src}/codegen/x86_64.zig (100%) rename {src-self-hosted => src}/glibc.zig (100%) rename {src-self-hosted => src}/introspect.zig (100%) rename {src-self-hosted => src}/ir.zig (100%) rename {src-self-hosted => src}/libc_installation.zig (100%) rename {src-self-hosted => src}/libcxx.zig (100%) rename {src-self-hosted => src}/libunwind.zig (100%) rename {src-self-hosted => src}/link.zig (100%) rename {src-self-hosted => src}/link/C.zig (100%) rename {src-self-hosted => src}/link/Coff.zig (100%) rename {src-self-hosted => src}/link/Elf.zig (100%) rename {src-self-hosted => src}/link/MachO.zig (100%) rename {src-self-hosted => src}/link/Wasm.zig (100%) rename {src-self-hosted => src}/link/cbe.h (100%) rename {src-self-hosted => src}/link/msdos-stub.bin (100%) rename {src-self-hosted => src}/liveness.zig (100%) rename {src-self-hosted => src}/llvm.zig (100%) rename {src-self-hosted => src}/main.zig (100%) rename {src-self-hosted => src}/musl.zig (100%) rename {src-self-hosted => src}/print_env.zig (100%) rename {src-self-hosted => src}/print_targets.zig (100%) rename {src-self-hosted => src}/stage1.zig (100%) rename src/{ => stage1}/all_types.hpp (100%) rename src/{ => stage1}/analyze.cpp (100%) rename src/{ => stage1}/analyze.hpp (100%) rename src/{ => stage1}/ast_render.cpp (100%) rename src/{ => stage1}/ast_render.hpp (100%) rename src/{ => stage1}/bigfloat.cpp (100%) rename src/{ => stage1}/bigfloat.hpp (100%) rename src/{ => stage1}/bigint.cpp (100%) rename src/{ => stage1}/bigint.hpp (100%) rename src/{ => stage1}/buffer.cpp (100%) rename src/{ => stage1}/buffer.hpp (100%) rename src/{ => stage1}/codegen.cpp (100%) rename src/{ => stage1}/codegen.hpp (100%) rename src/{ => stage1}/config.h.in (100%) rename src/{ => stage1}/dump_analysis.cpp (100%) rename src/{ => stage1}/dump_analysis.hpp (100%) rename src/{ => stage1}/empty.cpp (100%) rename src/{ => stage1}/errmsg.cpp (100%) rename src/{ => stage1}/errmsg.hpp (100%) rename src/{ => stage1}/error.cpp (100%) rename src/{ => stage1}/error.hpp (100%) rename src/{ => stage1}/hash_map.hpp (100%) rename src/{ => stage1}/heap.cpp (100%) rename src/{ => stage1}/heap.hpp (100%) rename src/{ => stage1}/ir.cpp (100%) rename src/{ => stage1}/ir.hpp (100%) rename src/{ => stage1}/ir_print.cpp (100%) rename src/{ => stage1}/ir_print.hpp (100%) rename src/{ => stage1}/list.hpp (100%) rename src/{ => stage1}/mem.cpp (100%) rename src/{ => stage1}/mem.hpp (100%) rename src/{ => stage1}/mem_hash_map.hpp (100%) rename src/{ => stage1}/mem_list.hpp (100%) rename src/{ => stage1}/mem_type_info.hpp (100%) rename src/{ => stage1}/os.cpp (100%) rename src/{ => stage1}/os.hpp (100%) rename src/{ => stage1}/parse_f128.c (100%) rename src/{ => stage1}/parse_f128.h (100%) rename src/{ => stage1}/parser.cpp (100%) rename src/{ => stage1}/parser.hpp (100%) rename src/{ => stage1}/range_set.cpp (100%) rename src/{ => stage1}/range_set.hpp (100%) rename src/{ => stage1}/softfloat.hpp (100%) rename src/{ => stage1}/softfloat_ext.cpp (100%) rename src/{ => stage1}/softfloat_ext.hpp (100%) rename src/{ => stage1}/stage1.cpp (100%) rename src/{ => stage1}/stage1.h (100%) rename src/{ => stage1}/stage2.h (100%) rename src/{ => stage1}/target.cpp (100%) rename src/{ => stage1}/target.hpp (100%) rename src/{ => stage1}/tokenizer.cpp (100%) rename src/{ => stage1}/tokenizer.hpp (100%) rename src/{ => stage1}/util.cpp (100%) rename src/{ => stage1}/util.hpp (100%) rename src/{ => stage1}/util_base.hpp (100%) rename src/{ => stage1}/zig0.cpp (100%) rename {src-self-hosted => src}/target.zig (100%) rename {src-self-hosted => src}/test.zig (100%) rename {src-self-hosted => src}/tracy.zig (100%) rename {src-self-hosted => src}/translate_c.zig (100%) rename {src-self-hosted => src}/type.zig (100%) rename {src-self-hosted => src}/value.zig (100%) rename {src-self-hosted => src}/windows_sdk.zig (100%) rename {src-self-hosted => src}/zir.zig (100%) rename {src-self-hosted => src}/zir_sema.zig (100%) diff --git a/BRANCH_TODO b/BRANCH_TODO index ae725e118a..56868a8f8f 100644 --- a/BRANCH_TODO +++ b/BRANCH_TODO @@ -37,8 +37,6 @@ * implement proper compile errors for failing to build glibc crt files and shared libs * implement -fno-emit-bin * improve the stage2 tests to support testing with LLVM extensions enabled - * rename src/ to src/stage1/ - * rename src-self-hosted/ to src/ * implement emit-h in stage2 * multi-thread building C objects * implement serialization/deserialization of incremental compilation metadata diff --git a/CMakeLists.txt b/CMakeLists.txt index 6389ec7dbe..e3035213a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,34 +257,34 @@ find_package(Threads) # This is our shim which will be replaced by stage1.zig. set(ZIG0_SOURCES - "${CMAKE_SOURCE_DIR}/src/zig0.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/zig0.cpp" ) set(ZIG_SOURCES - "${CMAKE_SOURCE_DIR}/src/analyze.cpp" - "${CMAKE_SOURCE_DIR}/src/ast_render.cpp" - "${CMAKE_SOURCE_DIR}/src/bigfloat.cpp" - "${CMAKE_SOURCE_DIR}/src/bigint.cpp" - "${CMAKE_SOURCE_DIR}/src/buffer.cpp" - "${CMAKE_SOURCE_DIR}/src/codegen.cpp" - "${CMAKE_SOURCE_DIR}/src/dump_analysis.cpp" - "${CMAKE_SOURCE_DIR}/src/errmsg.cpp" - "${CMAKE_SOURCE_DIR}/src/error.cpp" - "${CMAKE_SOURCE_DIR}/src/heap.cpp" - "${CMAKE_SOURCE_DIR}/src/ir.cpp" - "${CMAKE_SOURCE_DIR}/src/ir_print.cpp" - "${CMAKE_SOURCE_DIR}/src/mem.cpp" - "${CMAKE_SOURCE_DIR}/src/os.cpp" - "${CMAKE_SOURCE_DIR}/src/parser.cpp" - "${CMAKE_SOURCE_DIR}/src/range_set.cpp" - "${CMAKE_SOURCE_DIR}/src/stage1.cpp" - "${CMAKE_SOURCE_DIR}/src/target.cpp" - "${CMAKE_SOURCE_DIR}/src/tokenizer.cpp" - "${CMAKE_SOURCE_DIR}/src/util.cpp" - "${CMAKE_SOURCE_DIR}/src/softfloat_ext.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/analyze.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/ast_render.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/bigfloat.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/bigint.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/buffer.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/codegen.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/dump_analysis.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/errmsg.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/error.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/heap.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/ir.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/ir_print.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/mem.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/os.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/parser.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/range_set.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/stage1.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/target.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/tokenizer.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/util.cpp" + "${CMAKE_SOURCE_DIR}/src/stage1/softfloat_ext.cpp" ) set(OPTIMIZED_C_SOURCES - "${CMAKE_SOURCE_DIR}/src/parse_f128.c" + "${CMAKE_SOURCE_DIR}/src/stage1/parse_f128.c" ) set(ZIG_CPP_SOURCES # These are planned to stay even when we are self-hosted. @@ -314,7 +314,7 @@ set(ZIG_STD_DEST "${ZIG_LIB_DIR}/std") set(ZIG_CONFIG_H_OUT "${CMAKE_BINARY_DIR}/config.h") set(ZIG_CONFIG_ZIG_OUT "${CMAKE_BINARY_DIR}/config.zig") configure_file ( - "${CMAKE_SOURCE_DIR}/src/config.h.in" + "${CMAKE_SOURCE_DIR}/src/stage1/config.h.in" "${ZIG_CONFIG_H_OUT}" ) configure_file ( @@ -326,6 +326,7 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/src" + "${CMAKE_SOURCE_DIR}/src/stage1" ) # These have to go before the -Wno- flags @@ -444,7 +445,7 @@ else() endif() set(BUILD_ZIG1_ARGS - "src-self-hosted/stage1.zig" + "src/stage1.zig" -target "${ZIG_TARGET_TRIPLE}" "-mcpu=${ZIG_TARGET_MCPU}" --name zig1 @@ -480,7 +481,7 @@ else() endif() # cmake won't let us configure an executable without C sources. -add_executable(zig "${CMAKE_SOURCE_DIR}/src/empty.cpp") +add_executable(zig "${CMAKE_SOURCE_DIR}/src/stage1/empty.cpp") set_target_properties(zig PROPERTIES COMPILE_FLAGS ${EXE_CFLAGS} diff --git a/build.zig b/build.zig index 9e5f2425c2..331af1204c 100644 --- a/build.zig +++ b/build.zig @@ -38,7 +38,7 @@ pub fn build(b: *Builder) !void { const test_step = b.step("test", "Run all the tests"); - var test_stage2 = b.addTest("src-self-hosted/test.zig"); + var test_stage2 = b.addTest("src/test.zig"); test_stage2.setBuildMode(mode); test_stage2.addPackagePath("stage2_tests", "test/stage2/test.zig"); @@ -76,7 +76,7 @@ pub fn build(b: *Builder) !void { const tracy = b.option([]const u8, "tracy", "Enable Tracy integration. Supply path to Tracy source"); const link_libc = b.option(bool, "force-link-libc", "Force self-hosted compiler to link libc") orelse enable_llvm; - var exe = b.addExecutable("zig", "src-self-hosted/main.zig"); + var exe = b.addExecutable("zig", "src/main.zig"); exe.install(); exe.setBuildMode(mode); exe.setTarget(target); diff --git a/src-self-hosted/Cache.zig b/src/Cache.zig similarity index 100% rename from src-self-hosted/Cache.zig rename to src/Cache.zig diff --git a/src-self-hosted/Compilation.zig b/src/Compilation.zig similarity index 100% rename from src-self-hosted/Compilation.zig rename to src/Compilation.zig diff --git a/src-self-hosted/DepTokenizer.zig b/src/DepTokenizer.zig similarity index 100% rename from src-self-hosted/DepTokenizer.zig rename to src/DepTokenizer.zig diff --git a/src-self-hosted/Module.zig b/src/Module.zig similarity index 100% rename from src-self-hosted/Module.zig rename to src/Module.zig diff --git a/src-self-hosted/Package.zig b/src/Package.zig similarity index 100% rename from src-self-hosted/Package.zig rename to src/Package.zig diff --git a/src-self-hosted/TypedValue.zig b/src/TypedValue.zig similarity index 100% rename from src-self-hosted/TypedValue.zig rename to src/TypedValue.zig diff --git a/src-self-hosted/astgen.zig b/src/astgen.zig similarity index 100% rename from src-self-hosted/astgen.zig rename to src/astgen.zig diff --git a/src-self-hosted/clang.zig b/src/clang.zig similarity index 100% rename from src-self-hosted/clang.zig rename to src/clang.zig diff --git a/src-self-hosted/clang_options.zig b/src/clang_options.zig similarity index 100% rename from src-self-hosted/clang_options.zig rename to src/clang_options.zig diff --git a/src-self-hosted/clang_options_data.zig b/src/clang_options_data.zig similarity index 100% rename from src-self-hosted/clang_options_data.zig rename to src/clang_options_data.zig diff --git a/src-self-hosted/codegen.zig b/src/codegen.zig similarity index 100% rename from src-self-hosted/codegen.zig rename to src/codegen.zig diff --git a/src-self-hosted/codegen/arm.zig b/src/codegen/arm.zig similarity index 100% rename from src-self-hosted/codegen/arm.zig rename to src/codegen/arm.zig diff --git a/src-self-hosted/codegen/c.zig b/src/codegen/c.zig similarity index 100% rename from src-self-hosted/codegen/c.zig rename to src/codegen/c.zig diff --git a/src-self-hosted/codegen/llvm.zig b/src/codegen/llvm.zig similarity index 100% rename from src-self-hosted/codegen/llvm.zig rename to src/codegen/llvm.zig diff --git a/src-self-hosted/codegen/riscv64.zig b/src/codegen/riscv64.zig similarity index 100% rename from src-self-hosted/codegen/riscv64.zig rename to src/codegen/riscv64.zig diff --git a/src-self-hosted/codegen/spu-mk2.zig b/src/codegen/spu-mk2.zig similarity index 100% rename from src-self-hosted/codegen/spu-mk2.zig rename to src/codegen/spu-mk2.zig diff --git a/src-self-hosted/codegen/spu-mk2/interpreter.zig b/src/codegen/spu-mk2/interpreter.zig similarity index 100% rename from src-self-hosted/codegen/spu-mk2/interpreter.zig rename to src/codegen/spu-mk2/interpreter.zig diff --git a/src-self-hosted/codegen/wasm.zig b/src/codegen/wasm.zig similarity index 100% rename from src-self-hosted/codegen/wasm.zig rename to src/codegen/wasm.zig diff --git a/src-self-hosted/codegen/x86.zig b/src/codegen/x86.zig similarity index 100% rename from src-self-hosted/codegen/x86.zig rename to src/codegen/x86.zig diff --git a/src-self-hosted/codegen/x86_64.zig b/src/codegen/x86_64.zig similarity index 100% rename from src-self-hosted/codegen/x86_64.zig rename to src/codegen/x86_64.zig diff --git a/src-self-hosted/glibc.zig b/src/glibc.zig similarity index 100% rename from src-self-hosted/glibc.zig rename to src/glibc.zig diff --git a/src-self-hosted/introspect.zig b/src/introspect.zig similarity index 100% rename from src-self-hosted/introspect.zig rename to src/introspect.zig diff --git a/src-self-hosted/ir.zig b/src/ir.zig similarity index 100% rename from src-self-hosted/ir.zig rename to src/ir.zig diff --git a/src-self-hosted/libc_installation.zig b/src/libc_installation.zig similarity index 100% rename from src-self-hosted/libc_installation.zig rename to src/libc_installation.zig diff --git a/src-self-hosted/libcxx.zig b/src/libcxx.zig similarity index 100% rename from src-self-hosted/libcxx.zig rename to src/libcxx.zig diff --git a/src-self-hosted/libunwind.zig b/src/libunwind.zig similarity index 100% rename from src-self-hosted/libunwind.zig rename to src/libunwind.zig diff --git a/src-self-hosted/link.zig b/src/link.zig similarity index 100% rename from src-self-hosted/link.zig rename to src/link.zig diff --git a/src-self-hosted/link/C.zig b/src/link/C.zig similarity index 100% rename from src-self-hosted/link/C.zig rename to src/link/C.zig diff --git a/src-self-hosted/link/Coff.zig b/src/link/Coff.zig similarity index 100% rename from src-self-hosted/link/Coff.zig rename to src/link/Coff.zig diff --git a/src-self-hosted/link/Elf.zig b/src/link/Elf.zig similarity index 100% rename from src-self-hosted/link/Elf.zig rename to src/link/Elf.zig diff --git a/src-self-hosted/link/MachO.zig b/src/link/MachO.zig similarity index 100% rename from src-self-hosted/link/MachO.zig rename to src/link/MachO.zig diff --git a/src-self-hosted/link/Wasm.zig b/src/link/Wasm.zig similarity index 100% rename from src-self-hosted/link/Wasm.zig rename to src/link/Wasm.zig diff --git a/src-self-hosted/link/cbe.h b/src/link/cbe.h similarity index 100% rename from src-self-hosted/link/cbe.h rename to src/link/cbe.h diff --git a/src-self-hosted/link/msdos-stub.bin b/src/link/msdos-stub.bin similarity index 100% rename from src-self-hosted/link/msdos-stub.bin rename to src/link/msdos-stub.bin diff --git a/src-self-hosted/liveness.zig b/src/liveness.zig similarity index 100% rename from src-self-hosted/liveness.zig rename to src/liveness.zig diff --git a/src-self-hosted/llvm.zig b/src/llvm.zig similarity index 100% rename from src-self-hosted/llvm.zig rename to src/llvm.zig diff --git a/src-self-hosted/main.zig b/src/main.zig similarity index 100% rename from src-self-hosted/main.zig rename to src/main.zig diff --git a/src-self-hosted/musl.zig b/src/musl.zig similarity index 100% rename from src-self-hosted/musl.zig rename to src/musl.zig diff --git a/src-self-hosted/print_env.zig b/src/print_env.zig similarity index 100% rename from src-self-hosted/print_env.zig rename to src/print_env.zig diff --git a/src-self-hosted/print_targets.zig b/src/print_targets.zig similarity index 100% rename from src-self-hosted/print_targets.zig rename to src/print_targets.zig diff --git a/src-self-hosted/stage1.zig b/src/stage1.zig similarity index 100% rename from src-self-hosted/stage1.zig rename to src/stage1.zig diff --git a/src/all_types.hpp b/src/stage1/all_types.hpp similarity index 100% rename from src/all_types.hpp rename to src/stage1/all_types.hpp diff --git a/src/analyze.cpp b/src/stage1/analyze.cpp similarity index 100% rename from src/analyze.cpp rename to src/stage1/analyze.cpp diff --git a/src/analyze.hpp b/src/stage1/analyze.hpp similarity index 100% rename from src/analyze.hpp rename to src/stage1/analyze.hpp diff --git a/src/ast_render.cpp b/src/stage1/ast_render.cpp similarity index 100% rename from src/ast_render.cpp rename to src/stage1/ast_render.cpp diff --git a/src/ast_render.hpp b/src/stage1/ast_render.hpp similarity index 100% rename from src/ast_render.hpp rename to src/stage1/ast_render.hpp diff --git a/src/bigfloat.cpp b/src/stage1/bigfloat.cpp similarity index 100% rename from src/bigfloat.cpp rename to src/stage1/bigfloat.cpp diff --git a/src/bigfloat.hpp b/src/stage1/bigfloat.hpp similarity index 100% rename from src/bigfloat.hpp rename to src/stage1/bigfloat.hpp diff --git a/src/bigint.cpp b/src/stage1/bigint.cpp similarity index 100% rename from src/bigint.cpp rename to src/stage1/bigint.cpp diff --git a/src/bigint.hpp b/src/stage1/bigint.hpp similarity index 100% rename from src/bigint.hpp rename to src/stage1/bigint.hpp diff --git a/src/buffer.cpp b/src/stage1/buffer.cpp similarity index 100% rename from src/buffer.cpp rename to src/stage1/buffer.cpp diff --git a/src/buffer.hpp b/src/stage1/buffer.hpp similarity index 100% rename from src/buffer.hpp rename to src/stage1/buffer.hpp diff --git a/src/codegen.cpp b/src/stage1/codegen.cpp similarity index 100% rename from src/codegen.cpp rename to src/stage1/codegen.cpp diff --git a/src/codegen.hpp b/src/stage1/codegen.hpp similarity index 100% rename from src/codegen.hpp rename to src/stage1/codegen.hpp diff --git a/src/config.h.in b/src/stage1/config.h.in similarity index 100% rename from src/config.h.in rename to src/stage1/config.h.in diff --git a/src/dump_analysis.cpp b/src/stage1/dump_analysis.cpp similarity index 100% rename from src/dump_analysis.cpp rename to src/stage1/dump_analysis.cpp diff --git a/src/dump_analysis.hpp b/src/stage1/dump_analysis.hpp similarity index 100% rename from src/dump_analysis.hpp rename to src/stage1/dump_analysis.hpp diff --git a/src/empty.cpp b/src/stage1/empty.cpp similarity index 100% rename from src/empty.cpp rename to src/stage1/empty.cpp diff --git a/src/errmsg.cpp b/src/stage1/errmsg.cpp similarity index 100% rename from src/errmsg.cpp rename to src/stage1/errmsg.cpp diff --git a/src/errmsg.hpp b/src/stage1/errmsg.hpp similarity index 100% rename from src/errmsg.hpp rename to src/stage1/errmsg.hpp diff --git a/src/error.cpp b/src/stage1/error.cpp similarity index 100% rename from src/error.cpp rename to src/stage1/error.cpp diff --git a/src/error.hpp b/src/stage1/error.hpp similarity index 100% rename from src/error.hpp rename to src/stage1/error.hpp diff --git a/src/hash_map.hpp b/src/stage1/hash_map.hpp similarity index 100% rename from src/hash_map.hpp rename to src/stage1/hash_map.hpp diff --git a/src/heap.cpp b/src/stage1/heap.cpp similarity index 100% rename from src/heap.cpp rename to src/stage1/heap.cpp diff --git a/src/heap.hpp b/src/stage1/heap.hpp similarity index 100% rename from src/heap.hpp rename to src/stage1/heap.hpp diff --git a/src/ir.cpp b/src/stage1/ir.cpp similarity index 100% rename from src/ir.cpp rename to src/stage1/ir.cpp diff --git a/src/ir.hpp b/src/stage1/ir.hpp similarity index 100% rename from src/ir.hpp rename to src/stage1/ir.hpp diff --git a/src/ir_print.cpp b/src/stage1/ir_print.cpp similarity index 100% rename from src/ir_print.cpp rename to src/stage1/ir_print.cpp diff --git a/src/ir_print.hpp b/src/stage1/ir_print.hpp similarity index 100% rename from src/ir_print.hpp rename to src/stage1/ir_print.hpp diff --git a/src/list.hpp b/src/stage1/list.hpp similarity index 100% rename from src/list.hpp rename to src/stage1/list.hpp diff --git a/src/mem.cpp b/src/stage1/mem.cpp similarity index 100% rename from src/mem.cpp rename to src/stage1/mem.cpp diff --git a/src/mem.hpp b/src/stage1/mem.hpp similarity index 100% rename from src/mem.hpp rename to src/stage1/mem.hpp diff --git a/src/mem_hash_map.hpp b/src/stage1/mem_hash_map.hpp similarity index 100% rename from src/mem_hash_map.hpp rename to src/stage1/mem_hash_map.hpp diff --git a/src/mem_list.hpp b/src/stage1/mem_list.hpp similarity index 100% rename from src/mem_list.hpp rename to src/stage1/mem_list.hpp diff --git a/src/mem_type_info.hpp b/src/stage1/mem_type_info.hpp similarity index 100% rename from src/mem_type_info.hpp rename to src/stage1/mem_type_info.hpp diff --git a/src/os.cpp b/src/stage1/os.cpp similarity index 100% rename from src/os.cpp rename to src/stage1/os.cpp diff --git a/src/os.hpp b/src/stage1/os.hpp similarity index 100% rename from src/os.hpp rename to src/stage1/os.hpp diff --git a/src/parse_f128.c b/src/stage1/parse_f128.c similarity index 100% rename from src/parse_f128.c rename to src/stage1/parse_f128.c diff --git a/src/parse_f128.h b/src/stage1/parse_f128.h similarity index 100% rename from src/parse_f128.h rename to src/stage1/parse_f128.h diff --git a/src/parser.cpp b/src/stage1/parser.cpp similarity index 100% rename from src/parser.cpp rename to src/stage1/parser.cpp diff --git a/src/parser.hpp b/src/stage1/parser.hpp similarity index 100% rename from src/parser.hpp rename to src/stage1/parser.hpp diff --git a/src/range_set.cpp b/src/stage1/range_set.cpp similarity index 100% rename from src/range_set.cpp rename to src/stage1/range_set.cpp diff --git a/src/range_set.hpp b/src/stage1/range_set.hpp similarity index 100% rename from src/range_set.hpp rename to src/stage1/range_set.hpp diff --git a/src/softfloat.hpp b/src/stage1/softfloat.hpp similarity index 100% rename from src/softfloat.hpp rename to src/stage1/softfloat.hpp diff --git a/src/softfloat_ext.cpp b/src/stage1/softfloat_ext.cpp similarity index 100% rename from src/softfloat_ext.cpp rename to src/stage1/softfloat_ext.cpp diff --git a/src/softfloat_ext.hpp b/src/stage1/softfloat_ext.hpp similarity index 100% rename from src/softfloat_ext.hpp rename to src/stage1/softfloat_ext.hpp diff --git a/src/stage1.cpp b/src/stage1/stage1.cpp similarity index 100% rename from src/stage1.cpp rename to src/stage1/stage1.cpp diff --git a/src/stage1.h b/src/stage1/stage1.h similarity index 100% rename from src/stage1.h rename to src/stage1/stage1.h diff --git a/src/stage2.h b/src/stage1/stage2.h similarity index 100% rename from src/stage2.h rename to src/stage1/stage2.h diff --git a/src/target.cpp b/src/stage1/target.cpp similarity index 100% rename from src/target.cpp rename to src/stage1/target.cpp diff --git a/src/target.hpp b/src/stage1/target.hpp similarity index 100% rename from src/target.hpp rename to src/stage1/target.hpp diff --git a/src/tokenizer.cpp b/src/stage1/tokenizer.cpp similarity index 100% rename from src/tokenizer.cpp rename to src/stage1/tokenizer.cpp diff --git a/src/tokenizer.hpp b/src/stage1/tokenizer.hpp similarity index 100% rename from src/tokenizer.hpp rename to src/stage1/tokenizer.hpp diff --git a/src/util.cpp b/src/stage1/util.cpp similarity index 100% rename from src/util.cpp rename to src/stage1/util.cpp diff --git a/src/util.hpp b/src/stage1/util.hpp similarity index 100% rename from src/util.hpp rename to src/stage1/util.hpp diff --git a/src/util_base.hpp b/src/stage1/util_base.hpp similarity index 100% rename from src/util_base.hpp rename to src/stage1/util_base.hpp diff --git a/src/zig0.cpp b/src/stage1/zig0.cpp similarity index 100% rename from src/zig0.cpp rename to src/stage1/zig0.cpp diff --git a/src-self-hosted/target.zig b/src/target.zig similarity index 100% rename from src-self-hosted/target.zig rename to src/target.zig diff --git a/src-self-hosted/test.zig b/src/test.zig similarity index 100% rename from src-self-hosted/test.zig rename to src/test.zig diff --git a/src-self-hosted/tracy.zig b/src/tracy.zig similarity index 100% rename from src-self-hosted/tracy.zig rename to src/tracy.zig diff --git a/src-self-hosted/translate_c.zig b/src/translate_c.zig similarity index 100% rename from src-self-hosted/translate_c.zig rename to src/translate_c.zig diff --git a/src-self-hosted/type.zig b/src/type.zig similarity index 100% rename from src-self-hosted/type.zig rename to src/type.zig diff --git a/src-self-hosted/value.zig b/src/value.zig similarity index 100% rename from src-self-hosted/value.zig rename to src/value.zig diff --git a/src-self-hosted/windows_sdk.zig b/src/windows_sdk.zig similarity index 100% rename from src-self-hosted/windows_sdk.zig rename to src/windows_sdk.zig diff --git a/src-self-hosted/zir.zig b/src/zir.zig similarity index 100% rename from src-self-hosted/zir.zig rename to src/zir.zig diff --git a/src-self-hosted/zir_sema.zig b/src/zir_sema.zig similarity index 100% rename from src-self-hosted/zir_sema.zig rename to src/zir_sema.zig