From 79dee75b1ccd8f3f595aad0d4150851cff58f691 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 22 May 2021 14:27:56 -0700 Subject: [PATCH] stage2: rename ir.zig to air.zig We've settled on the nomenclature for the artifacts the compiler pipeline produces: 1. Tokens 2. AST (Abstract Syntax Tree) 3. ZIR (Zig Intermediate Representation) 4. AIR (Analyzed Intermediate Representation) 5. Machine Code Renaming `ir` identifiers to `air` will come with the inevitable air-memory-layout branch that I plan to start after the 0.8.0 release. --- CMakeLists.txt | 2 +- src/Module.zig | 2 +- src/Sema.zig | 2 +- src/Zir.zig | 2 +- src/{ir.zig => air.zig} | 0 src/codegen.zig | 2 +- src/codegen/c.zig | 2 +- src/codegen/llvm.zig | 2 +- src/codegen/spirv.zig | 2 +- src/codegen/wasm.zig | 2 +- src/link/Elf.zig | 2 +- src/liveness.zig | 2 +- src/register_manager.zig | 2 +- src/value.zig | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) rename src/{ir.zig => air.zig} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c4fc666f030a507c5855a1f6bf060973812a19a..024a06b4253602963fdf78f2f163d6bab3d7f329 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -554,7 +554,7 @@ set(ZIG_STAGE2_SOURCES "${CMAKE_SOURCE_DIR}/src/codegen/x86_64.zig" "${CMAKE_SOURCE_DIR}/src/glibc.zig" "${CMAKE_SOURCE_DIR}/src/introspect.zig" - "${CMAKE_SOURCE_DIR}/src/ir.zig" + "${CMAKE_SOURCE_DIR}/src/air.zig" "${CMAKE_SOURCE_DIR}/src/libc_installation.zig" "${CMAKE_SOURCE_DIR}/src/libcxx.zig" "${CMAKE_SOURCE_DIR}/src/libtsan.zig" diff --git a/src/Module.zig b/src/Module.zig index e18987186619e309c2384e11e3540fd80a2c0e8a..6f0fd7bfb0df439a02d5541a55790d07d680dfbd 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -21,7 +21,7 @@ const Type = @import("type.zig").Type; const TypedValue = @import("TypedValue.zig"); const Package = @import("Package.zig"); const link = @import("link.zig"); -const ir = @import("ir.zig"); +const ir = @import("air.zig"); const Zir = @import("Zir.zig"); const trace = @import("tracy.zig").trace; const AstGen = @import("AstGen.zig"); diff --git a/src/Sema.zig b/src/Sema.zig index 920a615d6b190380e01bd8dea6902bd514ae21e6..bf0158b37a850c16df2e780e4ada80b284e21f9f 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -52,7 +52,7 @@ const Sema = @This(); const Value = @import("value.zig").Value; const Type = @import("type.zig").Type; const TypedValue = @import("TypedValue.zig"); -const ir = @import("ir.zig"); +const ir = @import("air.zig"); const Zir = @import("Zir.zig"); const Module = @import("Module.zig"); const Inst = ir.Inst; diff --git a/src/Zir.zig b/src/Zir.zig index 73f8e3e43bfc75df591e6bbfeb907e7e6c042280..94894281c6a895f433ea90609cee2ffc4c0d3b61 100644 --- a/src/Zir.zig +++ b/src/Zir.zig @@ -22,7 +22,7 @@ const Zir = @This(); const Type = @import("type.zig").Type; const Value = @import("value.zig").Value; const TypedValue = @import("TypedValue.zig"); -const ir = @import("ir.zig"); +const ir = @import("air.zig"); const Module = @import("Module.zig"); const LazySrcLoc = Module.LazySrcLoc; diff --git a/src/ir.zig b/src/air.zig similarity index 100% rename from src/ir.zig rename to src/air.zig diff --git a/src/codegen.zig b/src/codegen.zig index 0e55f4fb7ddc2b1e08b7642edbc3845701133ebd..8c157270a2d4f77378ce184d6b0646330ccdc3bd 100644 --- a/src/codegen.zig +++ b/src/codegen.zig @@ -2,7 +2,7 @@ const std = @import("std"); const mem = std.mem; const math = std.math; const assert = std.debug.assert; -const ir = @import("ir.zig"); +const ir = @import("air.zig"); const Type = @import("type.zig").Type; const Value = @import("value.zig").Value; const TypedValue = @import("TypedValue.zig"); diff --git a/src/codegen/c.zig b/src/codegen/c.zig index c66490426b5fa9b8747a2f3a336fd75127cdf9c9..cc73b6cad93f9358dd5da498426652ff707c1934 100644 --- a/src/codegen/c.zig +++ b/src/codegen/c.zig @@ -6,7 +6,7 @@ const log = std.log.scoped(.c); const link = @import("../link.zig"); const Module = @import("../Module.zig"); const Compilation = @import("../Compilation.zig"); -const ir = @import("../ir.zig"); +const ir = @import("../air.zig"); const Inst = ir.Inst; const Value = @import("../value.zig").Value; const Type = @import("../type.zig").Type; diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index 7a069bca571559cf2c5b8b9cc2f443131a92dae1..a7e61f6baac9b1ded10a92de2e3eafbeee0d5b57 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -9,7 +9,7 @@ const math = std.math; const Module = @import("../Module.zig"); const TypedValue = @import("../TypedValue.zig"); -const ir = @import("../ir.zig"); +const ir = @import("../air.zig"); const Inst = ir.Inst; const Value = @import("../value.zig").Value; diff --git a/src/codegen/spirv.zig b/src/codegen/spirv.zig index 52b2884255ce0194e9b793118e91c881b33fa980..1127cd94d82d42262a54e0be4b86c749a05c7900 100644 --- a/src/codegen/spirv.zig +++ b/src/codegen/spirv.zig @@ -11,7 +11,7 @@ const Decl = Module.Decl; const Type = @import("../type.zig").Type; const Value = @import("../value.zig").Value; const LazySrcLoc = Module.LazySrcLoc; -const ir = @import("../ir.zig"); +const ir = @import("../air.zig"); const Inst = ir.Inst; pub const TypeMap = std.HashMap(Type, u32, Type.hash, Type.eql, std.hash_map.default_max_load_percentage); diff --git a/src/codegen/wasm.zig b/src/codegen/wasm.zig index efaaebadb1dd0ad17e00912c9a14f4ead6822455..40be7bc61863f003b2c98485fcdfb7f1fdcc341a 100644 --- a/src/codegen/wasm.zig +++ b/src/codegen/wasm.zig @@ -9,7 +9,7 @@ const wasm = std.wasm; const Module = @import("../Module.zig"); const Decl = Module.Decl; -const ir = @import("../ir.zig"); +const ir = @import("../air.zig"); const Inst = ir.Inst; const Type = @import("../type.zig").Type; const Value = @import("../value.zig").Value; diff --git a/src/link/Elf.zig b/src/link/Elf.zig index c998cb0b75cb0d59f95a0471052651cafde0dd2a..ae301788b4b55679aa6a901b8c24e829ad392153 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -10,7 +10,7 @@ const log = std.log.scoped(.link); const DW = std.dwarf; const leb128 = std.leb; -const ir = @import("../ir.zig"); +const ir = @import("../air.zig"); const Module = @import("../Module.zig"); const Compilation = @import("../Compilation.zig"); const codegen = @import("../codegen.zig"); diff --git a/src/liveness.zig b/src/liveness.zig index d652e7e954cb8dd36f22988308d9ef3fe85fcec0..2dc04be4ef7a9cfa3821622acaaf1352154aed95 100644 --- a/src/liveness.zig +++ b/src/liveness.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const ir = @import("ir.zig"); +const ir = @import("air.zig"); const trace = @import("tracy.zig").trace; const log = std.log.scoped(.liveness); diff --git a/src/register_manager.zig b/src/register_manager.zig index 5f7cccd60fd2358063830b30cb9b46e9907915c0..9f47526f13a27243d78dbce896b1b4c7413a43a5 100644 --- a/src/register_manager.zig +++ b/src/register_manager.zig @@ -3,7 +3,7 @@ const math = std.math; const mem = std.mem; const assert = std.debug.assert; const Allocator = std.mem.Allocator; -const ir = @import("ir.zig"); +const ir = @import("air.zig"); const Type = @import("type.zig").Type; const Module = @import("Module.zig"); const LazySrcLoc = Module.LazySrcLoc; diff --git a/src/value.zig b/src/value.zig index 86da01a7bb311f1405879dbf6925caf0f72b5c25..d8256315da38c337527c8633a6e35d257a05f79d 100644 --- a/src/value.zig +++ b/src/value.zig @@ -7,7 +7,7 @@ const BigIntMutable = std.math.big.int.Mutable; const Target = std.Target; const Allocator = std.mem.Allocator; const Module = @import("Module.zig"); -const ir = @import("ir.zig"); +const ir = @import("air.zig"); /// This is the raw data, with no bookkeeping, no memory awareness, /// no de-duplication, and no type system awareness. -- 2.54.0