[llvm-commits] CVS: llvm/include/llvm/Instruction.def Instructions.h

[Andrew Lenharth]

Changes in directory llvm/include/llvm:

Instruction.def updated: 1.14 -> 1.15
Instructions.h updated: 1.22 -> 1.23
---
Log message:

header file changes for varargs

---
Diffs of the changes:  (+5 -47)

 Instruction.def |    7 ++++---
 Instructions.h  |   45 +--------------------------------------------
 2 files changed, 5 insertions(+), 47 deletions(-)


Index: llvm/include/llvm/Instruction.def
diff -u llvm/include/llvm/Instruction.def:1.14 llvm/include/llvm/Instruction.def:1.15
--- llvm/include/llvm/Instruction.def:1.14	Sat Oct 16 13:05:37 2004
+++ llvm/include/llvm/Instruction.def	Sat Jun 18 13:31:30 2005
@@ -128,13 +128,14 @@
 
 HANDLE_OTHER_INST(30, Shl    , ShiftInst  )  // Shift operations
 HANDLE_OTHER_INST(31, Shr    , ShiftInst  )
-HANDLE_OTHER_INST(32, VANext , VANextInst )  // vanext instruction
-HANDLE_OTHER_INST(33, VAArg  , VAArgInst  )  // vaarg  instruction
+ //HANDLE_OTHER_INST(32, VANext , VANextInst )  // vanext instruction
+ //HANDLE_OTHER_INST(33, VAArg  , VAArgInst  )  // vaarg  instruction
 HANDLE_OTHER_INST(34, Select , SelectInst )  // select instruction
 
 HANDLE_OTHER_INST(35, UserOp1, Instruction)  // May be used internally in a pass
 HANDLE_OTHER_INST(36, UserOp2, Instruction)
-  LAST_OTHER_INST(36)
+HANDLE_OTHER_INST(37, VAArg  , VAArgInst  )  // vaarg  instruction
+  LAST_OTHER_INST(37)
 
 #undef  FIRST_TERM_INST
 #undef HANDLE_TERM_INST


Index: llvm/include/llvm/Instructions.h
diff -u llvm/include/llvm/Instructions.h:1.22 llvm/include/llvm/Instructions.h:1.23
--- llvm/include/llvm/Instructions.h:1.22	Sun May 15 11:13:11 2005
+++ llvm/include/llvm/Instructions.h	Sat Jun 18 13:31:30 2005
@@ -660,55 +660,12 @@
   }
 };
 
-
-//===----------------------------------------------------------------------===//
-//                                VANextInst Class
-//===----------------------------------------------------------------------===//
-
-/// VANextInst - This class represents the va_next llvm instruction, which
-/// advances a vararg list passed an argument of the specified type, returning
-/// the resultant list.
-///
-class VANextInst : public UnaryInstruction {
-  PATypeHolder ArgTy;
-  VANextInst(const VANextInst &VAN)
-    : UnaryInstruction(VAN.getType(), VANext, VAN.getOperand(0)),
-      ArgTy(VAN.getArgType()) {
-  }
-
-public:
-  VANextInst(Value *List, const Type *Ty, const std::string &Name = "",
-             Instruction *InsertBefore = 0)
-    : UnaryInstruction(List->getType(), VANext, List, Name, InsertBefore),
-      ArgTy(Ty) {
-  }
-  VANextInst(Value *List, const Type *Ty, const std::string &Name,
-             BasicBlock *InsertAtEnd)
-    : UnaryInstruction(List->getType(), VANext, List, Name, InsertAtEnd),
-      ArgTy(Ty) {
-  }
-
-  const Type *getArgType() const { return ArgTy; }
-
-  virtual VANextInst *clone() const;
-
-  // Methods for support type inquiry through isa, cast, and dyn_cast:
-  static inline bool classof(const VANextInst *) { return true; }
-  static inline bool classof(const Instruction *I) {
-    return I->getOpcode() == VANext;
-  }
-  static inline bool classof(const Value *V) {
-    return isa<Instruction>(V) && classof(cast<Instruction>(V));
-  }
-};
-
-
 //===----------------------------------------------------------------------===//
 //                                VAArgInst Class
 //===----------------------------------------------------------------------===//
 
 /// VAArgInst - This class represents the va_arg llvm instruction, which returns
-/// an argument of the specified type given a va_list.
+/// an argument of the specified type given a va_list and increments that list
 ///
 class VAArgInst : public UnaryInstruction {
   VAArgInst(const VAArgInst &VAA)