Remove debugging info

[oota-llvm.git] / lib / VMCore / Instruction.cpp

diff --git a/lib/VMCore/Instruction.cpp b/lib/VMCore/Instruction.cpp
index 6cb62ea374aac864994b97460f8196f564f375b6..8b37510d354b8d8d2c024a008acad5c5cb5fd9ed 100644 (file)
--- a/lib/VMCore/Instruction.cpp
+++ b/lib/VMCore/Instruction.cpp
@@ -8,55 +8,48 @@
 #include "llvm/BasicBlock.h"
 #include "llvm/Method.h"
 #include "llvm/SymbolTable.h"
-#include "llvm/iBinary.h"
-#include "llvm/iUnary.h"
+#include "llvm/CodeGen/MachineInstr.h"
 
 Instruction::Instruction(const Type *ty, unsigned it, const string &Name) 
-  : User(ty, Value::InstructionVal, Name) {
+  : User(ty, Value::InstructionVal, Name), 
+    machineInstrVec(new MachineCodeForVMInstr) {
   Parent = 0;
   iType = it;
 }
 
 Instruction::~Instruction() {
-  assert(getParent() == 0 && "Instruction still embeded in basic block!");
+  assert(getParent() == 0 && "Instruction still embedded in basic block!");
+  delete machineInstrVec;
 }
 
 // Specialize setName to take care of symbol table majik
-void Instruction::setName(const string &name) {
+void Instruction::setName(const string &name, SymbolTable *ST) {
   BasicBlock *P = 0; Method *PP = 0;
+  assert((ST == 0 || !getParent() || !getParent()->getParent() || 
+         ST == getParent()->getParent()->getSymbolTable()) &&
+        "Invalid symtab argument!");
   if ((P = getParent()) && (PP = P->getParent()) && hasName())
     PP->getSymbolTable()->remove(this);
   Value::setName(name);
   if (PP && hasName()) PP->getSymbolTableSure()->insert(this);
 }
 
-BinaryOperator *BinaryOperator::getBinaryOperator(unsigned Op, 
-                                                 Value *S1, Value *S2) {
-  switch (Op) {
-  case Add:
-    return new AddInst(S1, S2);
-  case Sub:
-    return new SubInst(S1, S2);
-
-  case SetLT:
-  case SetGT:
-  case SetLE:
-  case SetGE:
-  case SetEQ:
-  case SetNE:
-    return new SetCondInst((BinaryOps)Op, S1, S2);
-
-  default:
-    cerr << "Don't know how to GetBinaryOperator " << Op << endl;
-    return 0;
-  }
+void Instruction::addMachineInstruction(MachineInstr* minstr) {
+  machineInstrVec->push_back(minstr);
 }
 
+#if 0
+// Dont make this inline because you would need to include
+// MachineInstr.h in Instruction.h, which creates a circular
+// sequence of forward declarations.  Trying to fix that will
+// cause a serious circularity in link order.
+// 
+const vector<Value*> &Instruction::getTempValuesForMachineCode() const {
+  return machineInstrVec->getTempValues();
+}
+#endif
 
-UnaryOperator *UnaryOperator::getUnaryOperator(unsigned Op, Value *Source) {
-  switch (Op) {
-  default:
-    cerr << "Don't know how to GetUnaryOperator " << Op << endl;
-    return 0;
-  }
+void Instruction::dropAllReferences() {
+  machineInstrVec->dropAllReferences();
+  User::dropAllReferences();
 }