Fix bugs

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

diff --git a/lib/VMCore/Instruction.cpp b/lib/VMCore/Instruction.cpp
index 6cb62ea374aac864994b97460f8196f564f375b6..e6ff3d28d2d1321bb42bf575493364fb528ed705 100644 (file)
--- a/lib/VMCore/Instruction.cpp
+++ b/lib/VMCore/Instruction.cpp
@@ -4,59 +4,74 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Instruction.h"
-#include "llvm/BasicBlock.h"
-#include "llvm/Method.h"
+#include "llvm/Function.h"
 #include "llvm/SymbolTable.h"
-#include "llvm/iBinary.h"
-#include "llvm/iUnary.h"
+#include "llvm/Type.h"
 
-Instruction::Instruction(const Type *ty, unsigned it, const string &Name) 
+Instruction::Instruction(const Type *ty, unsigned it, const std::string &Name) 
   : User(ty, Value::InstructionVal, Name) {
   Parent = 0;
   iType = it;
 }
 
-Instruction::~Instruction() {
-  assert(getParent() == 0 && "Instruction still embeded in basic block!");
-}
-
 // Specialize setName to take care of symbol table majik
-void Instruction::setName(const string &name) {
-  BasicBlock *P = 0; Method *PP = 0;
+void Instruction::setName(const std::string &name, SymbolTable *ST) {
+  BasicBlock *P = 0; Function *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;
-  }
-}
+const char *Instruction::getOpcodeName(unsigned OpCode) {
+  switch (OpCode) {
+  // Terminators
+  case Ret:    return "ret";
+  case Br:     return "br";
+  case Switch: return "switch";
+  case Invoke: return "invoke";
+    
+  // Standard binary operators...
+  case Add: return "add";
+  case Sub: return "sub";
+  case Mul: return "mul";
+  case Div: return "div";
+  case Rem: return "rem";
 
+  // Logical operators...
+  case And: return "and";
+  case Or : return "or";
+  case Xor: return "xor";
 
-UnaryOperator *UnaryOperator::getUnaryOperator(unsigned Op, Value *Source) {
-  switch (Op) {
-  default:
-    cerr << "Don't know how to GetUnaryOperator " << Op << endl;
-    return 0;
+  // SetCC operators...
+  case SetLE:  return "setle";
+  case SetGE:  return "setge";
+  case SetLT:  return "setlt";
+  case SetGT:  return "setgt";
+  case SetEQ:  return "seteq";
+  case SetNE:  return "setne";
+    
+  // Memory instructions...
+  case Malloc:        return "malloc";
+  case Free:          return "free";
+  case Alloca:        return "alloca";
+  case Load:          return "load";
+  case Store:         return "store";
+  case GetElementPtr: return "getelementptr";
+    
+  // Other instructions...
+  case PHINode: return "phi";
+  case Cast:    return "cast";
+  case Call:    return "call";
+  case Shl:     return "shl";
+  case Shr:     return "shr";
+    
+  default: return "<Invalid operator> ";
   }
+  
+  return 0;
 }