diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2007-02-08 00:29:31 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2007-02-08 00:29:31 +0000 |
| commit | 0690d442ab9ddb78e3d72ba6ec252e48fbd659eb (patch) | |
| tree | e1ed6eb2c406b4189ea44671541dc7215991856c /llvm/lib/ExecutionEngine | |
| parent | 709750c3d36ee98b71d90832a916c767b57553a2 (diff) | |
| download | bcm5719-llvm-0690d442ab9ddb78e3d72ba6ec252e48fbd659eb.tar.gz bcm5719-llvm-0690d442ab9ddb78e3d72ba6ec252e48fbd659eb.zip | |
For PR1188:
Compute BitMask correctly.
Patch by Leo (wenwenti@hotmail.com).
llvm-svn: 34026
Diffstat (limited to 'llvm/lib/ExecutionEngine')
| -rw-r--r-- | llvm/lib/ExecutionEngine/Interpreter/Execution.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/ExecutionEngine/Interpreter/Interpreter.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp b/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp index 565915bb5a4..fe80dfddd63 100644 --- a/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp +++ b/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp @@ -1307,7 +1307,7 @@ void Interpreter::visitAShr(BinaryOperator &I) { #define INTEGER_ASSIGN(DEST, BITWIDTH, VAL) \ { \ - uint64_t Mask = (1ull << BITWIDTH) - 1; \ + uint64_t Mask = ~(uint64_t)(0ull) >> (64-BITWIDTH); \ if (BITWIDTH == 1) { \ Dest.Int1Val = (bool) (VAL & Mask); \ } else if (BITWIDTH <= 8) { \ diff --git a/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h b/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h index a8deb01b21c..aef4cb23b13 100644 --- a/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h +++ b/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h @@ -236,7 +236,7 @@ private: // Helper functions }; inline void maskToBitWidth(GenericValue& GV, unsigned BitWidth) { - uint64_t BitMask = (1ull << BitWidth) - 1; + uint64_t BitMask = ~(uint64_t)(0ull) >> (64-BitWidth); if (BitWidth <= 8) GV.Int8Val &= BitMask; else if (BitWidth <= 16) |
