Implement vaarg instruction. This is not quite perfect: 2003-08-11-VaListArg

still causes a crash. But it's better than before.

llvm-svn: 9794

2 files changed, 36 insertions, 0 deletions

diff --git a/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp b/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
index 6a224b97fdd..b04f974911d 100644
--- a/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -820,6 +820,41 @@ void Interpreter::visitVANextInst(VANextInst &I) {
   SetValue(&I, VAList, SF);
 }
 
+#define IMPLEMENT_VAARG(TY) \
+   case Type::TY##TyID: Dest.TY##Val = Src.TY##Val; break
+
+void Interpreter::visitVAArgInst(VAArgInst &I) {
+  ExecutionContext &SF = ECStack.back();
+
+  // Get the incoming valist element.  LLI treats the valist as an integer.
+  GenericValue VAList = getOperandValue(I.getOperand(0), SF);
+  unsigned Argument = VAList.IntVal;
+  assert(Argument < SF.VarArgs.size() &&
+         "Accessing past the last vararg argument!");
+  GenericValue Dest, Src = SF.VarArgs[Argument];
+  const Type *Ty = I.getType();
+  switch (Ty->getPrimitiveID()) {
+    IMPLEMENT_VAARG(UByte);
+    IMPLEMENT_VAARG(SByte);
+    IMPLEMENT_VAARG(UShort);
+    IMPLEMENT_VAARG(Short);
+    IMPLEMENT_VAARG(UInt);
+    IMPLEMENT_VAARG(Int);
+    IMPLEMENT_VAARG(ULong);
+    IMPLEMENT_VAARG(Long);
+    IMPLEMENT_VAARG(Pointer);
+    IMPLEMENT_VAARG(Float);
+    IMPLEMENT_VAARG(Double);
+    IMPLEMENT_VAARG(Bool);
+  default:
+    std::cout << "Unhandled dest type for vaarg instruction: " << *Ty << "\n";
+    abort();
+  }
+  
+  // Set the Value of this Instruction.
+  SetValue(&I, Dest, SF);
+}
+
 //===----------------------------------------------------------------------===//
 //                        Dispatch and Execution Code
 //===----------------------------------------------------------------------===//
diff --git a/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h b/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
index 04baf367747..00784adb714 100644
--- a/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
+++ b/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
@@ -130,6 +130,7 @@ public:
   void visitShl(ShiftInst &I);
   void visitShr(ShiftInst &I);
   void visitVANextInst(VANextInst &I);
+  void visitVAArgInst(VAArgInst &I);
   void visitInstruction(Instruction &I) {
     std::cerr << I;
     assert(0 && "Instruction not interpretable yet!");