6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-20 10:30:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix PR4040: APInt's string constructor is too strict

Browse Source 
patch by Jeff Yasskin!


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@70058 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2009-04-25 18:34:04 +00:00
parent bc58322d6a
commit 38300e91f5
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Support/APInt.cpp
View File

@ -1918,9 +1918,9 @@ void APInt::fromString(unsigned numbits, const char *str, unsigned slen,
if (isNeg)
str++, slen--;
assert((slen <= numbits || radix != 2) && "Insufficient bit width");
assert((slen*3 <= numbits || radix != 8) && "Insufficient bit width");
assert((slen*4 <= numbits || radix != 16) && "Insufficient bit width");
assert(((slen*64)/22 <= numbits || radix != 10) && "Insufficient bit width");
assert(((slen-1)*3 <= numbits || radix != 8) && "Insufficient bit width");
assert(((slen-1)*4 <= numbits || radix != 16) && "Insufficient bit width");
assert((((slen-1)*64)/22 <= numbits || radix != 10) && "Insufficient bit width");
// Allocate memory
if (!isSingleWord())
@ -1961,10 +1961,12 @@ void APInt::fromString(unsigned numbits, const char *str, unsigned slen,
}
// Shift or multiply the value by the radix
if (shift)
*this <<= shift;
else
*this *= apradix;
if (slen > 1) {
if (shift)
*this <<= shift;
else
*this *= apradix;
}
// Add in the digit we just interpreted
if (apdigit.isSingleWord())

9
unittests/ADT/APIntTest.cpp
View File

@ -176,4 +176,13 @@ TEST(APIntTest, i1) {
EXPECT_EQ(zero, one.srem(neg_one));
}
TEST(APIntTest, fromString) {
EXPECT_EQ(APInt(1, 0), APInt(1, "0", 1, 10));
EXPECT_EQ(APInt(1, 1), APInt(1, "1", 1, 10));
EXPECT_EQ(APInt(1, 1), APInt(1, "-1", 2, 10));
EXPECT_EQ(APInt(1, 1), APInt(1, "1", 1, 2));
EXPECT_EQ(APInt(1, 1), APInt(1, "1", 1, 8));
EXPECT_EQ(APInt(1, 1), APInt(1, "1", 1, 16));
}
}