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

[Brian Gaeke]

Changes in directory llvm/lib/ExecutionEngine/Interpreter:

Execution.cpp updated: 1.112 -> 1.113
Interpreter.h updated: 1.51 -> 1.52

---
Log message:

Implement vaarg instruction. This is not quite perfect: 2003-08-11-VaListArg
still causes a crash. But it's better than before.


---
Diffs of the changes:  (+36 -0)

Index: llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
diff -u llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.112 llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.113
--- llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.112	Fri Nov  7 14:44:58 2003
+++ llvm/lib/ExecutionEngine/Interpreter/Execution.cpp	Fri Nov  7 15:20:46 2003
@@ -820,6 +820,41 @@
   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
 //===----------------------------------------------------------------------===//


Index: llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
diff -u llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.51 llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.52
--- llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.51	Fri Nov  7 14:07:06 2003
+++ llvm/lib/ExecutionEngine/Interpreter/Interpreter.h	Fri Nov  7 15:20:47 2003
@@ -130,6 +130,7 @@
   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!");