6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-07 12:28:24 +00:00
Code Issues Projects Releases Wiki Activity

Asm parser range checking on .<size> <value> directives.

Browse Source 
For example, ".byte 256" would previously assert() when emitting an object
file. Now it generates a diagnostic that the literal value is out of range.

rdar://9686950


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134069 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jim Grosbach
2011-06-29 16:05:14 +00:00
parent 8981bce73f
commit 254cf03a45
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/MC/MCParser/AsmParser.cpp
View File

@@ -28,6 +28,7 @@
#include "llvm/MC/MCSymbol.h" #include "llvm/MC/MCSymbol.h"
#include "llvm/MC/MCDwarf.h" #include "llvm/MC/MCDwarf.h"
#include "llvm/Support/CommandLine.h" #include "llvm/Support/CommandLine.h"
#include "llvm/Support/MathExtras.h"
#include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/SourceMgr.h" #include "llvm/Support/SourceMgr.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
@@ -1612,13 +1613,18 @@ bool AsmParser::ParseDirectiveValue(unsigned Size) {
for (;;) { for (;;) {
const MCExpr *Value; const MCExpr *Value;
SMLoc ExprLoc = getLexer().getLoc();
if (ParseExpression(Value)) if (ParseExpression(Value))
return true; return true;
// Special case constant expressions to match code generator. // Special case constant expressions to match code generator.
if (const MCConstantExpr *MCE = dyn_cast<MCConstantExpr>(Value)) if (const MCConstantExpr *MCE = dyn_cast<MCConstantExpr>(Value)) {
getStreamer().EmitIntValue(MCE->getValue(), Size, DEFAULT_ADDRSPACE); assert(Size <= 8 && "Invalid size");
else uint64_t IntValue = MCE->getValue();
if (!isUIntN(8 * Size, IntValue) && !isIntN(8 * Size, IntValue))
return Error(ExprLoc, "literal value out of range for directive");
getStreamer().EmitIntValue(IntValue, Size, DEFAULT_ADDRSPACE);
} else
getStreamer().EmitValue(Value, Size, DEFAULT_ADDRSPACE); getStreamer().EmitValue(Value, Size, DEFAULT_ADDRSPACE);
if (getLexer().is(AsmToken::EndOfStatement)) if (getLexer().is(AsmToken::EndOfStatement))

6
test/MC/AsmParser/exprs-invalid.s
View File

@@ -6,3 +6,9 @@
// CHECK-ERRORS: error: invalid hexadecimal number // CHECK-ERRORS: error: invalid hexadecimal number
.long 80+0xzz .long 80+0xzz
// CHECK-ERRORS: error: literal value out of range for directive
.byte 256
// CHECK-ERRORS: error: literal value out of range for directive
.long 4e71cf69 // double floating point constant due to missing "0x"