Changes in directory llvm/lib/ExecutionEngine/Interpreter:
Execution.cpp updated: 1.159 -> 1.160
---
Log message:
Two changes:
1. Fix logic for executeGEP. Only 32-bit and 64-bit integer types are
acceptable as indices.
2. Ensure that all integer cast operations truncate their result to the
integer size of the operand.
---
Diffs of the changes: (+17 -18)
Execution.cpp | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
Index: llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
diff -u llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.159
llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.160
--- llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.159 Sun Jan 14
20:27:26 2007
+++ llvm/lib/ExecutionEngine/Interpreter/Execution.cpp Wed Jan 17 19:25:42 2007
@@ -1073,16 +1073,12 @@
int64_t Idx;
unsigned BitWidth =
cast<IntegerType>(I.getOperand()->getType())->getBitWidth();
- if (BitWidth <= 8)
- Idx = (int64_t)(int8_t)IdxGV.Int8Val;
- else if (BitWidth <= 16)
- Idx = (int64_t)(int16_t)IdxGV.Int16Val;
- else if (BitWidth <= 32)
+ if (BitWidth == 32)
Idx = (int64_t)(int32_t)IdxGV.Int32Val;
- else if (BitWidth <= 64)
+ else if (BitWidth == 64)
Idx = (int64_t)IdxGV.Int64Val;
else
- assert(0 && "Integer types >64 bits not supported");
+ assert(0 && "Invalid index type for getelementptr");
Total += PointerTy(TD.getTypeSize(ST->getElementType())*Idx);
}
}
@@ -1288,17 +1284,20 @@
SetValue(&I, Dest, SF);
}
-#define INTEGER_ASSIGN(DEST, BITWIDTH, VAL) \
- if (BITWIDTH == 1) { \
- Dest.Int1Val = (bool) VAL; \
- } else if (BITWIDTH <= 8) { \
- Dest.Int8Val = (uint8_t) VAL; \
- } else if (BITWIDTH <= 16) { \
- Dest.Int16Val = (uint16_t) VAL; \
- } else if (BITWIDTH <= 32) { \
- Dest.Int32Val = (uint32_t) VAL; \
- } else \
- Dest.Int64Val = (uint64_t) VAL;
+#define INTEGER_ASSIGN(DEST, BITWIDTH, VAL) \
+ { \
+ uint64_t Mask = (1ull << BITWIDTH) - 1; \
+ if (BITWIDTH == 1) { \
+ Dest.Int1Val = (bool) (VAL & Mask); \
+ } else if (BITWIDTH <= 8) { \
+ Dest.Int8Val = (uint8_t) (VAL & Mask); \
+ } else if (BITWIDTH <= 16) { \
+ Dest.Int16Val = (uint16_t) (VAL & Mask); \
+ } else if (BITWIDTH <= 32) { \
+ Dest.Int32Val = (uint32_t) (VAL & Mask); \
+ } else \
+ Dest.Int64Val = (uint64_t) (VAL & Mask); \
+ }
GenericValue Interpreter::executeTruncInst(Value *SrcVal, const Type *DstTy,
ExecutionContext &SF) {
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
