Inst as Type

Cargo.toml

@@ -7,5 +7,6 @@ members = [
     "crates/parser",
     "crates/filecheck",
     "crates/triple",
+    "crates/macros",
     "crates/interpreter",
 ]

crates/ir/Cargo.toml

@@ -20,5 +20,6 @@ smallvec = "1.7.0"
 rustc-hash = "2.0.0"
 dyn-clone = "1.0.4"
 sonatina-triple = { path = "../triple", version = "0.0.3-alpha" }
+macros = { package = "sonatina-macros", path = "../macros", version = "0.0.3-alpha" }
 indexmap = "2.0.0"
 dot2 = { git = "https://github.com/sanpii/dot2.rs.git" }

crates/ir/src/inst/arith.rs

@@ -0,0 +1,93 @@
+use macros::Inst;
+
+use crate::Value;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Neg {
+    #[inst(value)]
+    arg: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Add {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Mul {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Sub {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+#[inst(has_side_effect)]
+pub struct Sdiv {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+#[inst(has_side_effect)]
+pub struct Udiv {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+#[inst(has_side_effect)]
+pub struct Umod {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+#[inst(has_side_effect)]
+pub struct Smod {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Shl {
+    #[inst(value)]
+    bits: Value,
+    #[inst(value)]
+    value: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Shr {
+    #[inst(value)]
+    bits: Value,
+    #[inst(value)]
+    value: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Sar {
+    #[inst(value)]
+    bits: Value,
+    #[inst(value)]
+    value: Value,
+}

crates/ir/src/inst/cast.rs

@@ -0,0 +1,31 @@
+use macros::Inst;
+
+use crate::{Type, Value};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Sext {
+    #[inst(value)]
+    from: Value,
+    ty: Type,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Zext {
+    #[inst(value)]
+    from: Value,
+    ty: Type,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Trunc {
+    #[inst(value)]
+    from: Value,
+    ty: Type,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Bitcast {
+    #[inst(value)]
+    from: Value,
+    ty: Type,
+}

crates/ir/src/inst/cmp.rs

@@ -0,0 +1,89 @@
+use macros::Inst;
+
+use crate::Value;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Lt {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Gt {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Slt {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Sgt {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Le {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Ge {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Sle {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Sge {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Eq {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Ne {
+    #[inst(value)]
+    lhs: Value,
+    #[inst(value)]
+    rhs: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct IsZero {
+    #[inst(value)]
+    lhs: Value,
+}

crates/ir/src/inst/control_flow.rs

@@ -0,0 +1,51 @@
+use macros::Inst;
+use smallvec::SmallVec;
+
+use crate::{module::FuncRef, Block, Type, Value};
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Inst)]
+pub struct Jump {
+    dest: Block,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Inst)]
+pub struct Br {
+    #[inst(value)]
+    cond: Value,
+
+    z_dest: Block,
+    nz_dest: Block,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Inst)]
+pub struct BrTable {
+    #[inst(value)]
+    scrutinee: Value,
+    #[inst(value)]
+    table: Vec<(Value, Block)>,
+
+    default: Option<Block>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Inst)]
+pub struct Phi {
+    #[inst(value)]
+    values: Vec<(Value, Block)>,
+    ty: Type,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Inst)]
+#[inst(has_side_effect)]
+pub struct Call {
+    #[inst(value)]
+    args: SmallVec<[Value; 8]>,
+    callee: FuncRef,
+    ret_ty: Type,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Inst)]
+#[inst(has_side_effect)]
+pub struct Return {
+    #[inst(value)]
+    arg: Option<Value>,
+}

crates/ir/src/inst/data.rs

@@ -0,0 +1,25 @@
+use macros::Inst;
+use smallvec::SmallVec;
+
+use crate::Value;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+pub struct Mload {
+    #[inst(value)]
+    addr: Value,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
+#[inst(has_side_effect)]
+pub struct Mstore {
+    #[inst(value)]
+    value: Value,
+    #[inst(value)]
+    addr: Value,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Inst)]
+pub struct Gep {
+    #[inst(value)]
+    values: SmallVec<[Value; 8]>,
+}