* Implement array indexing in lli
* Add external atoi method as well as floor, and srand
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1355 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp
index 98b352c..524237b 100644
--- a/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -764,34 +764,54 @@
// function returns the offset that arguments ArgOff+1 -> NumArgs specify for
// the pointer type specified by argument Arg.
//
-static PointerTy getElementOffset(Instruction *I, unsigned ArgOff) {
- assert(isa<PointerType>(I->getOperand(ArgOff)->getType()) &&
+static PointerTy getElementOffset(MemAccessInst *I, ExecutionContext &SF) {
+ assert(isa<PointerType>(I->getPointerOperand()->getType()) &&
"Cannot getElementOffset of a nonpointer type!");
PointerTy Total = 0;
const Type *Ty =
- cast<PointerType>(I->getOperand(ArgOff++)->getType())->getValueType();
+ cast<PointerType>(I->getPointerOperand()->getType())->getValueType();
+ unsigned ArgOff = I->getFirstIndexOperandNumber();
while (ArgOff < I->getNumOperands()) {
- const StructType *STy = cast<StructType>(Ty);
- const StructLayout *SLO = TD.getStructLayout(STy);
-
- // Indicies must be ubyte constants...
- const ConstPoolUInt *CPU = cast<ConstPoolUInt>(I->getOperand(ArgOff++));
- assert(CPU->getType() == Type::UByteTy);
- unsigned Index = CPU->getValue();
-
+ if (const StructType *STy = dyn_cast<StructType>(Ty)) {
+ const StructLayout *SLO = TD.getStructLayout(STy);
+
+ // Indicies must be ubyte constants...
+ const ConstPoolUInt *CPU = cast<ConstPoolUInt>(I->getOperand(ArgOff++));
+ assert(CPU->getType() == Type::UByteTy);
+ unsigned Index = CPU->getValue();
+
#ifdef PROFILE_STRUCTURE_FIELDS
- if (ProfileStructureFields) {
- // Do accounting for this field...
- vector<unsigned> &OfC = FieldAccessCounts[STy];
- if (OfC.size() == 0) OfC.resize(STy->getElementTypes().size());
- OfC[Index]++;
- }
+ if (ProfileStructureFields) {
+ // Do accounting for this field...
+ vector<unsigned> &OfC = FieldAccessCounts[STy];
+ if (OfC.size() == 0) OfC.resize(STy->getElementTypes().size());
+ OfC[Index]++;
+ }
#endif
+
+ Total += SLO->MemberOffsets[Index];
+ Ty = STy->getElementTypes()[Index];
+ } else {
+ const ArrayType *AT = cast<ArrayType>(Ty);
- Total += SLO->MemberOffsets[Index];
- Ty = STy->getElementTypes()[Index];
+ // Get the index number for the array... which must be uint type...
+ assert(I->getOperand(ArgOff)->getType() == Type::UIntTy);
+ unsigned Idx = getOperandValue(I->getOperand(ArgOff++), SF).UIntVal;
+ if (AT->isSized() && Idx >= (unsigned)AT->getNumElements()) {
+ cerr << "Out of range memory access to element #" << Idx
+ << " of a " << AT->getNumElements() << " element array."
+ << " Subscript #" << (ArgOff-I->getFirstIndexOperandNumber())
+ << "\n";
+ // Get outta here!!!
+ siglongjmp(SignalRecoverBuffer, -1);
+ }
+
+ Ty = AT->getElementType();
+ unsigned Size = TD.getTypeSize(Ty);
+ Total += Size*Idx;
+ }
}
return Total;
@@ -802,14 +822,14 @@
PointerTy SrcPtr = SRC.PointerVal;
GenericValue Result;
- Result.PointerVal = SrcPtr + getElementOffset(I, 0);
+ Result.PointerVal = SrcPtr + getElementOffset(I, SF);
SetValue(I, Result, SF);
}
static void executeLoadInst(LoadInst *I, ExecutionContext &SF) {
GenericValue SRC = getOperandValue(I->getPointerOperand(), SF);
PointerTy SrcPtr = SRC.PointerVal;
- PointerTy Offset = getElementOffset(I, 0); // Handle any structure indices
+ PointerTy Offset = getElementOffset(I, SF); // Handle any structure indices
SrcPtr += Offset;
GenericValue *Ptr = (GenericValue*)SrcPtr;
@@ -838,7 +858,7 @@
static void executeStoreInst(StoreInst *I, ExecutionContext &SF) {
GenericValue SRC = getOperandValue(I->getPointerOperand(), SF);
PointerTy SrcPtr = SRC.PointerVal;
- SrcPtr += getElementOffset(I, 1); // Handle any structure indices
+ SrcPtr += getElementOffset(I, SF); // Handle any structure indices
GenericValue *Ptr = (GenericValue *)SrcPtr;
GenericValue Val = getOperandValue(I->getOperand(0), SF);
@@ -1117,10 +1137,10 @@
//
if (int SigNo = sigsetjmp(SignalRecoverBuffer, 1)) {
--SF.CurInst; // Back up to erroring instruction
- if (SigNo != SIGINT) {
+ if (SigNo != SIGINT && SigNo != -1) {
cout << "EXCEPTION OCCURRED [" << _sys_siglistp[SigNo] << "]:\n";
printStackTrace();
- } else {
+ } else if (SigNo == SIGINT) {
cout << "CTRL-C Detected, execution halted.\n";
}
InInstruction = false;