3 files changed, 62 insertions, 49 deletions
diff --git a/backend/include/rcc/CodeGen/MachineSSAExit.h b/backend/include/rcc/CodeGen/MachineSSAExit.h
deleted file mode 100644
index 4b6966d..0000000
--- a/backend/include/rcc/CodeGen/MachineSSAExit.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#ifndef RCC_CODEGEN_MACHINESSAEXIT_H
-#define RCC_CODEGEN_MACHINESSAEXIT_H
-
-#include "rcc/CodeGen/MachinePass.h"
-#include "rcc/CodeGen/TargetInstrInfo.h"
-
-namespace rcc {
-
-class PHIEliminationPass final : public MachineFunctionPass {
-public:
-  PHIEliminationPass() noexcept = default;
-  explicit PHIEliminationPass(const TargetInstrInfo &Info) noexcept : Info(&Info) {}
-
-  [[nodiscard]] const MachinePassContract &contract() const noexcept override;
-  [[nodiscard]] Expected<MachinePassResult> run(MachineFunction &Function,
-                                                const TargetDescription &Target,
-                                                MachineAnalysisManager &Analyses) override;
-
-private:
-  [[nodiscard]] Expected<MachinePassResult> runImplementation(MachineFunction &Function,
-                                                              const TargetDescription &Target,
-                                                              MachineActionReplay &Actions);
-
-  const TargetInstrInfo *Info = nullptr;
-};
-
-class TwoAddressRewritePass final : public MachineFunctionPass {
-public:
-  TwoAddressRewritePass() noexcept = default;
-  explicit TwoAddressRewritePass(const TargetInstrInfo &Info) noexcept : Info(&Info) {}
-
-  [[nodiscard]] const MachinePassContract &contract() const noexcept override;
-  [[nodiscard]] Expected<MachinePassResult> run(MachineFunction &Function,
-                                                const TargetDescription &Target,
-                                                MachineAnalysisManager &Analyses) override;
-
-private:
-  [[nodiscard]] Expected<MachinePassResult> runImplementation(MachineFunction &Function,
-                                                              const TargetDescription &Target,
-                                                              MachineActionReplay &Actions);
-
-  const TargetInstrInfo *Info = nullptr;
-};
-
-} // namespace rcc
-
-#endif // RCC_CODEGEN_MACHINESSAEXIT_H
diff --git a/backend/include/rcc/CodeGen/PHIElimination.h b/backend/include/rcc/CodeGen/PHIElimination.h
new file mode 100644
index 0000000..3d69152
--- /dev/null
+++ b/backend/include/rcc/CodeGen/PHIElimination.h
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#ifndef RCC_CODEGEN_PHIELIMINATION_H
+#define RCC_CODEGEN_PHIELIMINATION_H
+
+#include "rcc/CodeGen/MachinePass.h"
+
+namespace rcc {
+
+class TargetInstrInfo;
+
+class PHIEliminationPass final : public MachineFunctionPass {
+public:
+  explicit PHIEliminationPass(const TargetInstrInfo &Info) noexcept : Info(Info) {}
+
+  [[nodiscard]] const MachinePassContract &contract() const noexcept override;
+  [[nodiscard]] Expected<MachinePassResult> run(MachineFunction &Function,
+                                                const TargetDescription &Target,
+                                                MachineAnalysisManager &Analyses) override;
+
+private:
+  [[nodiscard]] Expected<MachinePassResult> runImplementation(MachineFunction &Function,
+                                                              const TargetDescription &Target,
+                                                              MachineActionReplay &Actions);
+
+  const TargetInstrInfo &Info;
+};
+
+} // namespace rcc
+
+#endif // RCC_CODEGEN_PHIELIMINATION_H
diff --git a/backend/include/rcc/CodeGen/TwoAddressInstructionPass.h b/backend/include/rcc/CodeGen/TwoAddressInstructionPass.h
new file mode 100644
index 0000000..696b46c
--- /dev/null
+++ b/backend/include/rcc/CodeGen/TwoAddressInstructionPass.h
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#ifndef RCC_CODEGEN_TWOADDRESSINSTRUCTIONPASS_H
+#define RCC_CODEGEN_TWOADDRESSINSTRUCTIONPASS_H
+
+#include "rcc/CodeGen/MachinePass.h"
+
+namespace rcc {
+
+class TargetInstrInfo;
+
+class TwoAddressInstructionPass final : public MachineFunctionPass {
+public:
+  explicit TwoAddressInstructionPass(const TargetInstrInfo &Info) noexcept : Info(Info) {}
+
+  [[nodiscard]] const MachinePassContract &contract() const noexcept override;
+  [[nodiscard]] Expected<MachinePassResult> run(MachineFunction &Function,
+                                                const TargetDescription &Target,
+                                                MachineAnalysisManager &Analyses) override;
+
+private:
+  [[nodiscard]] Expected<MachinePassResult> runImplementation(MachineFunction &Function,
+                                                              const TargetDescription &Target,
+                                                              MachineActionReplay &Actions);
+
+  const TargetInstrInfo &Info;
+};
+
+} // namespace rcc
+
+#endif // RCC_CODEGEN_TWOADDRESSINSTRUCTIONPASS_H