commit 79dee75b1ccd8f3f595aad0d4150851cff58f691 (tree)
parent 9d311e9960952838edb19a422e5023c670f9995d
Author: Andrew Kelley <andrew@ziglang.org>
Date: Sat, 22 May 2021 14:27:56 -0700
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.
Diffstat:
14 files changed, 13 insertions(+), 13 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.