Add notes

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

diff --git a/lib/VMCore/InstrTypes.cpp b/lib/VMCore/InstrTypes.cpp
index 142019b93d2320a5abbd74a16b8d643654f3d099..9e49805d315b23a10aa09f8c29f604675086a9cd 100644 (file)
--- a/lib/VMCore/InstrTypes.cpp
+++ b/lib/VMCore/InstrTypes.cpp
@@ -9,33 +9,31 @@
 #include "llvm/Method.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/Type.h"
-#include <algorithm>
-
-// TODO: Move to getUnaryOperator iUnary.cpp when and if it exists!
-UnaryOperator *UnaryOperator::create(unsigned Op, Value *Source) {
-  switch (Op) {
-  default:
-    cerr << "Don't know how to GetUnaryOperator " << Op << endl;
-    return 0;
-  }
-}
+#include <algorithm>  // find
 
 //===----------------------------------------------------------------------===//
 //                            TerminatorInst Class
 //===----------------------------------------------------------------------===//
 
-TerminatorInst::TerminatorInst(unsigned iType) 
+TerminatorInst::TerminatorInst(Instruction::TermOps iType) 
   : Instruction(Type::VoidTy, iType, "") {
 }
 
+TerminatorInst::TerminatorInst(const Type *Ty, Instruction::TermOps iType,
+                              const string &Name = "")
+  : Instruction(Ty, iType, Name) {
+}
+
 
 //===----------------------------------------------------------------------===//
 //                            MethodArgument Class
 //===----------------------------------------------------------------------===//
 
 // Specialize setName to take care of symbol table majik
-void MethodArgument::setName(const string &name) {
+void MethodArgument::setName(const string &name, SymbolTable *ST) {
   Method *P;
+  assert((ST == 0 || (!getParent() || ST == getParent()->getSymbolTable())) &&
+        "Invalid symtab argument!");
   if ((P = getParent()) && hasName()) P->getSymbolTable()->remove(this);
   Value::setName(name);
   if (P && hasName()) P->getSymbolTable()->insert(this);
@@ -52,50 +50,25 @@ PHINode::PHINode(const Type *Ty, const string &name)
 
 PHINode::PHINode(const PHINode &PN) 
   : Instruction(PN.getType(), Instruction::PHINode) {
-  
-  for (unsigned i = 0; i < PN.IncomingValues.size(); i++)
-    IncomingValues.push_back(
-       make_pair(Use(PN.IncomingValues[i].first, this),
-                 BasicBlockUse(PN.IncomingValues[i].second, this)));
-}
-
-void PHINode::dropAllReferences() {
-  IncomingValues.clear();
-}
-
-bool PHINode::setOperand(unsigned i, Value *Val) {
-  assert(Val && "PHI node must only reference nonnull definitions!");
-  if (i >= IncomingValues.size()*2) return false;
-
-  if (i & 1) {
-    assert(Val->getValueType() == BasicBlockVal && "Not a BB!");
-    IncomingValues[i/2].second = (BasicBlock*)Val;
-  } else {
-    IncomingValues[i/2].first  = Val;
+  Operands.reserve(PN.Operands.size());
+  for (unsigned i = 0; i < PN.Operands.size(); i+=2) {
+    Operands.push_back(Use(PN.Operands[i], this));
+    Operands.push_back(Use(PN.Operands[i+1], this));
   }
-  return true;
 }
 
 void PHINode::addIncoming(Value *D, BasicBlock *BB) {
-  IncomingValues.push_back(make_pair(Use(D, this), BasicBlockUse(BB, this)));
+  Operands.push_back(Use(D, this));
+  Operands.push_back(Use(BB, this));
 }
 
-struct FindBBEntry {
-  const BasicBlock *BB;
-  inline FindBBEntry(const BasicBlock *bb) : BB(bb) {}
-  inline bool operator()(const pair<Use,BasicBlockUse> &Entry) {
-    return Entry.second == BB;
-  }
-};
-
-
 // removeIncomingValue - Remove an incoming value.  This is useful if a
 // predecessor basic block is deleted.
 Value *PHINode::removeIncomingValue(const BasicBlock *BB) {
-  vector<PairTy>::iterator Idx = find_if(IncomingValues.begin(), 
-                                        IncomingValues.end(), FindBBEntry(BB));
-  assert(Idx != IncomingValues.end() && "BB not in PHI node!");
-  Value *Removed = Idx->first;
-  IncomingValues.erase(Idx);
+  op_iterator Idx = find(Operands.begin(), Operands.end(), (const Value*)BB);
+  assert(Idx != Operands.end() && "BB not in PHI node!");
+  --Idx;  // Back up to value prior to Basic block
+  Value *Removed = *Idx;
+  Operands.erase(Idx, Idx+2);  // Erase Value and BasicBlock
   return Removed;
 }