From 24ea74eb9a47b81c1557926acd83e0fbe6d7594e Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 22 Aug 2002 22:49:05 +0000 Subject: Load & StoreInst no longer derive from MemAccessInst, so we don't have to handle indexing anymore git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3485 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/Interpreter/Execution.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'lib/ExecutionEngine/Interpreter/Execution.cpp') diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp index 7bf276a760..7b5a63ead0 100644 --- a/lib/ExecutionEngine/Interpreter/Execution.cpp +++ b/lib/ExecutionEngine/Interpreter/Execution.cpp @@ -765,9 +765,9 @@ static void executeFreeInst(FreeInst &I, ExecutionContext &SF) { } -// getElementOffset - The workhorse for getelementptr, load and store. This -// function returns the offset that arguments ArgOff+1 -> NumArgs specify for -// the pointer type specified by argument Arg. +// getElementOffset - The workhorse for getelementptr. This function returns +// the offset that arguments ArgOff+1 -> NumArgs specify for the pointer type +// specified by argument Arg. // static PointerTy getElementOffset(MemAccessInst &I, ExecutionContext &SF) { assert(isa(I.getPointerOperand()->getType()) && @@ -832,11 +832,7 @@ static void executeGEPInst(GetElementPtrInst &I, ExecutionContext &SF) { static void executeLoadInst(LoadInst &I, ExecutionContext &SF) { GenericValue SRC = getOperandValue(I.getPointerOperand(), SF); - PointerTy SrcPtr = SRC.PointerVal; - PointerTy Offset = getElementOffset(I, SF); // Handle any structure indices - SrcPtr += Offset; - - GenericValue *Ptr = (GenericValue*)SrcPtr; + GenericValue *Ptr = (GenericValue*)SRC.PointerVal; GenericValue Result; switch (I.getType()->getPrimitiveID()) { @@ -861,10 +857,7 @@ static void executeLoadInst(LoadInst &I, ExecutionContext &SF) { static void executeStoreInst(StoreInst &I, ExecutionContext &SF) { GenericValue SRC = getOperandValue(I.getPointerOperand(), SF); - PointerTy SrcPtr = SRC.PointerVal; - SrcPtr += getElementOffset(I, SF); // Handle any structure indices - - GenericValue *Ptr = (GenericValue *)SrcPtr; + GenericValue *Ptr = (GenericValue *)SRC.PointerVal; GenericValue Val = getOperandValue(I.getOperand(0), SF); switch (I.getOperand(0)->getType()->getPrimitiveID()) { -- cgit v1.2.3-18-g5258