[llvm-commits] CVS: llvm/lib/ExecutionEngine/Interpreter/Execution.cpp Interpreter.h

[Andrew Lenharth]

Changes in directory llvm/lib/ExecutionEngine/Interpreter:

Execution.cpp updated: 1.137 -> 1.138
Interpreter.h updated: 1.70 -> 1.71
---
Log message:

core changes for varargs

---
Diffs of the changes:  (+3 -13)

 Execution.cpp |   15 +++------------
 Interpreter.h |    1 -
 2 files changed, 3 insertions(+), 13 deletions(-)


Index: llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
diff -u llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.137 llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.138
--- llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.137	Thu Apr 21 17:43:08 2005
+++ llvm/lib/ExecutionEngine/Interpreter/Execution.cpp	Sat Jun 18 13:34:52 2005
@@ -988,18 +988,6 @@
   SetValue(&I, executeCastOperation(I.getOperand(0), I.getType(), SF), SF);
 }
 
-void Interpreter::visitVANextInst(VANextInst &I) {
-  ExecutionContext &SF = ECStack.back();
-
-  // Get the incoming valist parameter.  LLI treats the valist as a
-  // (ec-stack-depth var-arg-index) pair.
-  GenericValue VAList = getOperandValue(I.getOperand(0), SF);
-
-  // Move the pointer to the next vararg.
-  ++VAList.UIntPairVal.second;
-  SetValue(&I, VAList, SF);
-}
-
 #define IMPLEMENT_VAARG(TY) \
    case Type::TY##TyID: Dest.TY##Val = Src.TY##Val; break
 
@@ -1033,6 +1021,9 @@
 
   // Set the Value of this Instruction.
   SetValue(&I, Dest, SF);
+
+  // Move the pointer to the next vararg.
+  ++VAList.UIntPairVal.second;
 }
 
 //===----------------------------------------------------------------------===//


Index: llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
diff -u llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.70 llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.71
--- llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.70	Thu Apr 21 23:06:38 2005
+++ llvm/lib/ExecutionEngine/Interpreter/Interpreter.h	Sat Jun 18 13:34:52 2005
@@ -153,7 +153,6 @@
 
   void visitShl(ShiftInst &I);
   void visitShr(ShiftInst &I);
-  void visitVANextInst(VANextInst &I);
   void visitVAArgInst(VAArgInst &I);
   void visitInstruction(Instruction &I) {
     std::cerr << I;