[llvm-commits] CVS: llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
Reid Spencer
reid at x10sys.com
Wed Jan 17 18:13:08 PST 2007
Changes in directory llvm/lib/ExecutionEngine/Interpreter:
Execution.cpp updated: 1.161 -> 1.162
---
Log message:
Use the new maskToBitWidth function to ensure that the results of
computations do not overflow the intended bit width.
---
Diffs of the changes: (+15 -10)
Execution.cpp | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
Index: llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
diff -u llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.161 llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.162
--- llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.161 Wed Jan 17 19:32:46 2007
+++ llvm/lib/ExecutionEngine/Interpreter/Execution.cpp Wed Jan 17 20:12:51 2007
@@ -216,6 +216,7 @@
Dest.Int64Val = Src1.Int64Val OP Src2.Int64Val; \
else \
cerr << "Integer types > 64 bits not supported: " << *Ty << "\n"; \
+ maskToBitWidth(Dest, BitWidth); \
break; \
}
@@ -234,6 +235,7 @@
cerr << "Integer types > 64 bits not supported: " << *Ty << "\n"; \
abort(); \
} \
+ maskToBitWidth(Dest, BitWidth); \
} else { \
cerr << "Unhandled type for " #OP " operator: " << *Ty << "\n"; \
abort(); \
@@ -254,6 +256,7 @@
cerr << "Integer types > 64 bits not supported: " << *Ty << "\n"; \
abort(); \
} \
+ maskToBitWidth(Dest, BitWidth); \
} else { \
cerr << "Unhandled type for " #OP " operator: " << *Ty << "\n"; \
abort(); \
@@ -397,6 +400,7 @@
cerr << "Integer types > 64 bits not supported: " << *Ty << "\n"; \
abort(); \
} \
+ maskToBitWidth(Dest, BitWidth); \
break; \
}
@@ -417,6 +421,7 @@
cerr << "Integer types > 64 bits not supported: " << *Ty << "\n"; \
abort(); \
} \
+ maskToBitWidth(Dest, BitWidth); \
break; \
}
@@ -1187,23 +1192,19 @@
GenericValue Dest;
if (const IntegerType *ITy = cast<IntegerType>(Ty)) {
unsigned BitWidth = ITy->getBitWidth();
- uint32_t BitMask = (1ull << BitWidth) - 1;
- if (BitWidth <= 8) {
+ if (BitWidth <= 8)
Dest.Int8Val = ((uint8_t)Src1.Int8Val) << ((uint32_t)Src2.Int8Val);
- Dest.Int8Val &= BitMask;
- } else if (BitWidth <= 16) {
+ else if (BitWidth <= 16)
Dest.Int16Val = ((uint16_t)Src1.Int16Val) << ((uint32_t)Src2.Int8Val);
- Dest.Int16Val &= BitMask;
- } else if (BitWidth <= 32) {
+ else if (BitWidth <= 32)
Dest.Int32Val = ((uint32_t)Src1.Int32Val) << ((uint32_t)Src2.Int8Val);
- Dest.Int32Val &= BitMask;
- } else if (BitWidth <= 64) {
+ else if (BitWidth <= 64)
Dest.Int64Val = ((uint64_t)Src1.Int64Val) << ((uint32_t)Src2.Int8Val);
- Dest.Int64Val &= BitMask;
- } else {
+ else {
cerr << "Integer types > 64 bits not supported: " << *Ty << "\n";
abort();
}
+ maskToBitWidth(Dest, BitWidth);
} else {
cerr << "Unhandled type for Shl instruction: " << *Ty << "\n";
abort();
@@ -1228,6 +1229,7 @@
cerr << "Integer types > 64 bits not supported: " << *Ty << "\n";
abort();
}
+ maskToBitWidth(Dest, BitWidth);
} else {
cerr << "Unhandled type for LShr instruction: " << *Ty << "\n";
abort();
@@ -1252,6 +1254,7 @@
cerr << "Integer types > 64 bits not supported: " << *Ty << "\n"; \
abort();
}
+ maskToBitWidth(Dest, BitWidth);
} else {
cerr << "Unhandled type for AShr instruction: " << *Ty << "\n";
abort();
@@ -1567,6 +1570,7 @@
Dest.Int32Val = Src.Int32Val;
else
Dest.Int64Val = Src.Int64Val;
+ maskToBitWidth(Dest, DBitWidth);
} else
assert(0 && "Invalid BitCast");
} else if (DstTy == Type::FloatTy) {
@@ -1673,6 +1677,7 @@
Dest.Int64Val = Src.Int64Val;
else
assert("Integer types > 64 bits not supported");
+ maskToBitWidth(Dest, BitWidth);
}
IMPLEMENT_VAARG(Pointer);
IMPLEMENT_VAARG(Float);
More information about the llvm-commits
mailing list