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 | 23cbb1c78a6de399b318f68577469b0a566b0faa (patch) | |
| tree | c31dcc6815834cd53d16888937ea72acab6a4e88 /lib/ExecutionEngine | |
| parent | 785a5ae0cf2a13738ba42f6c91fd42397d20c200 (diff) | |
| download | external_llvm-23cbb1c78a6de399b318f68577469b0a566b0faa.zip external_llvm-23cbb1c78a6de399b318f68577469b0a566b0faa.tar.gz external_llvm-23cbb1c78a6de399b318f68577469b0a566b0faa.tar.bz2 | |
For PR1188:
Compute BitMask correctly.
Patch by Leo (wenwenti@hotmail.com).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@34026 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine')
| -rw-r--r-- | lib/ExecutionEngine/Interpreter/Execution.cpp | 2 | ||||
| -rw-r--r-- | lib/ExecutionEngine/Interpreter/Interpreter.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp index 565915b..fe80dfd 100644 --- a/lib/ExecutionEngine/Interpreter/Execution.cpp +++ b/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/lib/ExecutionEngine/Interpreter/Interpreter.h b/lib/ExecutionEngine/Interpreter/Interpreter.h index a8deb01..aef4cb2 100644 --- a/lib/ExecutionEngine/Interpreter/Interpreter.h +++ b/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) |