6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-11-05 13:09:10 +00:00
Code Issues Projects Releases Wiki Activity

stop using strtoll, it gives windows heartburn.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94167 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2010-01-22 07:34:12 +00:00
parent 86e2211d0a
commit d5a7e357a2
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/MC/MCParser/AsmLexer.cpp
View File

@ -136,8 +136,13 @@ AsmToken AsmLexer::LexDigit() {
if (CurPtr[-1] != '0') {
while (isdigit(*CurPtr))
++CurPtr;
return AsmToken(AsmToken::Integer, StringRef(TokStart, CurPtr - TokStart),
strtoll(TokStart, 0, 10));
StringRef Result(TokStart, CurPtr - TokStart);
long long Value;
if (Result.getAsInteger(10, Value))
return ReturnError(TokStart, "Invalid decimal number");
return AsmToken(AsmToken::Integer, Result, Value);
}
if (*CurPtr == 'b') {
@ -148,9 +153,15 @@ AsmToken AsmLexer::LexDigit() {
// Requires at least one binary digit.
if (CurPtr == NumStart)
return ReturnError(CurPtr-2, "Invalid binary number");
return AsmToken(AsmToken::Integer, StringRef(TokStart, CurPtr - TokStart),
strtoll(NumStart, 0, 2));
return ReturnError(TokStart, "Invalid binary number");
StringRef Result(TokStart, CurPtr - TokStart);
long long Value;
if (Result.getAsInteger(2, Value))
return ReturnError(TokStart, "Invalid binary number");
return AsmToken(AsmToken::Integer, Result, Value);
}
if (*CurPtr == 'x') {
@ -165,7 +176,7 @@ AsmToken AsmLexer::LexDigit() {
unsigned long long Result;
if (StringRef(TokStart, CurPtr - TokStart).getAsInteger(0, Result))
return ReturnError(CurPtr-2, "Invalid hexadecimal number");
return ReturnError(TokStart, "Invalid hexadecimal number");
return AsmToken(AsmToken::Integer, StringRef(TokStart, CurPtr - TokStart),
(int64_t)Result);
@ -174,8 +185,13 @@ AsmToken AsmLexer::LexDigit() {
// Must be an octal number, it starts with 0.
while (*CurPtr >= '0' && *CurPtr <= '7')
++CurPtr;
return AsmToken(AsmToken::Integer, StringRef(TokStart, CurPtr - TokStart),
strtoll(TokStart, 0, 8));
StringRef Result(TokStart, CurPtr - TokStart);
long long Value;
if (Result.getAsInteger(8, Value))
return ReturnError(TokStart, "Invalid octal number");
return AsmToken(AsmToken::Integer, Result, Value);
}
/// LexQuote: String: "..."