5 files changed, 26 insertions, 57 deletions
diff --git a/include/llvm/CodeGen/Passes.h b/include/llvm/CodeGen/Passes.h
index 8868de13a4..3aee4ce694 100644
--- a/include/llvm/CodeGen/Passes.h
+++ b/include/llvm/CodeGen/Passes.h
@@ -28,6 +28,11 @@ class TargetMachine;
 //
 extern const PassInfo *PHIEliminationID;
 
+// TwoAddressInstruction pass - This pass reduces two-address
+// instructions to use two operands. This destroys SSA information but
+// it is desired by register allocators.
+extern const PassInfo *TwoAddressInstructionPassID;
+
 /// Creates a register allocator as the user specified on the command
 /// line.
 FunctionPass *createRegisterAllocator();
diff --git a/include/llvm/CodeGen/TwoAddressInstructionPass.h b/include/llvm/CodeGen/TwoAddressInstructionPass.h
deleted file mode 100644
index b268154d8e..0000000000
--- a/include/llvm/CodeGen/TwoAddressInstructionPass.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//===-- llvm/CodeGen/TwoAddressInstructionPass.h - Two-Address instruction pass  -*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the Two-Address instruction rewriter pass. In
-// some architectures instructions have a combined source/destination
-// operand. In those cases the instruction cannot have three operands
-// as the destination is implicit (for example ADD %EAX, %EBX on the
-// IA-32). After code generation this restrictions are not handled and
-// instructions may have three operands. This pass remedies this and
-// reduces all two-address instructions to two operands.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CODEGEN_TWOADDRESSINSTRUCTIONPASS_H
-#define LLVM_CODEGEN_TWOADDRESSINSTRUCTIONPASS_H
-
-#include "llvm/CodeGen/MachineFunctionPass.h"
-#include "llvm/CodeGen/MachineBasicBlock.h"
-#include <iostream>
-#include <map>
-
-namespace llvm {
-
-    class LiveVariables;
-    class MRegisterInfo;
-
-    class TwoAddressInstructionPass : public MachineFunctionPass
-    {
-    private:
-        MachineFunction* mf_;
-        const TargetMachine* tm_;
-        const MRegisterInfo* mri_;
-        LiveVariables* lv_;
-
-    public:
-        virtual void getAnalysisUsage(AnalysisUsage &AU) const;
-
-    private:
-        /// runOnMachineFunction - pass entry point
-        bool runOnMachineFunction(MachineFunction&);
-    };
-
-} // End llvm namespace
-
-#endif
diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp
index d818d0b7b0..74426d5aad 100644
--- a/lib/CodeGen/LiveIntervalAnalysis.cpp
+++ b/lib/CodeGen/LiveIntervalAnalysis.cpp
@@ -24,7 +24,6 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/CodeGen/SSARegMap.h"
-#include "llvm/CodeGen/TwoAddressInstructionPass.h"
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
@@ -50,7 +49,7 @@ void LiveIntervals::getAnalysisUsage(AnalysisUsage &AU) const
     AU.addRequired<LiveVariables>();
     AU.addPreservedID(PHIEliminationID);
     AU.addRequiredID(PHIEliminationID);
-    AU.addRequired<TwoAddressInstructionPass>();
+    AU.addRequiredID(TwoAddressInstructionPassID);
     MachineFunctionPass::getAnalysisUsage(AU);
 }
 
diff --git a/lib/CodeGen/RegAllocLocal.cpp b/lib/CodeGen/RegAllocLocal.cpp
index d3e80e08e8..88699d0bcb 100644
--- a/lib/CodeGen/RegAllocLocal.cpp
+++ b/lib/CodeGen/RegAllocLocal.cpp
@@ -19,7 +19,6 @@
 #include "llvm/CodeGen/SSARegMap.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/LiveVariables.h"
-#include "llvm/CodeGen/TwoAddressInstructionPass.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "Support/CommandLine.h"
@@ -113,7 +112,7 @@ namespace {
       if (!DisableKill)
 	AU.addRequired<LiveVariables>();
       AU.addRequiredID(PHIEliminationID);
-      AU.addRequired<TwoAddressInstructionPass>();
+      AU.addRequiredID(TwoAddressInstructionPassID);
       MachineFunctionPass::getAnalysisUsage(AU);
     }
 
diff --git a/lib/CodeGen/TwoAddressInstructionPass.cpp b/lib/CodeGen/TwoAddressInstructionPass.cpp
index 0716ca92a3..7bd3f04bee 100644
--- a/lib/CodeGen/TwoAddressInstructionPass.cpp
+++ b/lib/CodeGen/TwoAddressInstructionPass.cpp
@@ -16,7 +16,6 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "twoaddrinstr"
-#include "llvm/CodeGen/TwoAddressInstructionPass.h"
 #include "llvm/Function.h"
 #include "llvm/CodeGen/LiveVariables.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
@@ -36,7 +35,23 @@
 using namespace llvm;
 
 namespace {
-    RegisterAnalysis<TwoAddressInstructionPass> X(
+    class TwoAddressInstructionPass : public MachineFunctionPass
+    {
+    private:
+        MachineFunction* mf_;
+        const TargetMachine* tm_;
+        const MRegisterInfo* mri_;
+        LiveVariables* lv_;
+
+    public:
+        virtual void getAnalysisUsage(AnalysisUsage &AU) const;
+
+    private:
+        /// runOnMachineFunction - pass entry point
+        bool runOnMachineFunction(MachineFunction&);
+    };
+
+    RegisterPass<TwoAddressInstructionPass> X(
         "twoaddressinstruction", "Two-Address instruction pass");
 
     Statistic<> numTwoAddressInstrs("twoaddressinstruction",
@@ -45,6 +60,8 @@ namespace {
                                "Number of instructions added");
 };
 
+const PassInfo *llvm::TwoAddressInstructionPassID = X.getPassInfo();
+
 void TwoAddressInstructionPass::getAnalysisUsage(AnalysisUsage &AU) const
 {
     AU.addPreserved<LiveVariables>();