6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-11-04 05:17:07 +00:00
Code Issues Projects Releases Wiki Activity

[ms-inline asm] Add error handling to the ParseIntelDotOperator() function.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@166698 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chad Rosier
2012-10-25 17:37:43 +00:00
parent a8a0a155de
commit 5e6b37fa3d
1 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/Target/X86/AsmParser/X86AsmParser.cpp
View File

@@ -60,7 +60,8 @@ private:
X86Operand *ParseIntelBracExpression(unsigned SegReg, unsigned Size); X86Operand *ParseIntelBracExpression(unsigned SegReg, unsigned Size);
X86Operand *ParseMemOperand(unsigned SegReg, SMLoc StartLoc); X86Operand *ParseMemOperand(unsigned SegReg, SMLoc StartLoc);
const MCExpr *ParseIntelDotOperator(const MCExpr *Disp); bool ParseIntelDotOperator(const MCExpr *Disp, const MCExpr **NewDisp,
SmallString<64> &Err);
bool ParseDirectiveWord(unsigned Size, SMLoc L); bool ParseDirectiveWord(unsigned Size, SMLoc L);
bool ParseDirectiveCode(StringRef IDVal, SMLoc L); bool ParseDirectiveCode(StringRef IDVal, SMLoc L);
@@ -744,8 +745,15 @@ X86Operand *X86AsmParser::ParseIntelBracExpression(unsigned SegReg,
Parser.Lex(); Parser.Lex();
End = Tok.getLoc(); End = Tok.getLoc();
if (Tok.getString().startswith(".")) if (Tok.getString().startswith(".")) {
Disp = ParseIntelDotOperator(Disp); SmallString<64> Err;
const MCExpr *NewDisp;
if (ParseIntelDotOperator(Disp, &NewDisp, Err))
return ErrorOperand(Tok.getLoc(), Err);
Parser.Lex(); // Eat the field.
Disp = NewDisp;
}
End = Tok.getLoc(); End = Tok.getLoc();
@@ -809,30 +817,41 @@ X86Operand *X86AsmParser::ParseIntelMemOperand(unsigned SegReg, SMLoc Start) {
} }
/// Parse the '.' operator. /// Parse the '.' operator.
const MCExpr *X86AsmParser::ParseIntelDotOperator(const MCExpr *Disp) { bool X86AsmParser::ParseIntelDotOperator(const MCExpr *Disp,
const MCExpr **NewDisp,
SmallString<64> &Err) {
AsmToken Tok = *&Parser.getTok(); AsmToken Tok = *&Parser.getTok();
uint64_t OrigDispVal, DotDispVal;
// FIXME: Handle non-constant expressions.
if (const MCConstantExpr *OrigDisp = dyn_cast<MCConstantExpr>(Disp)) {
OrigDispVal = OrigDisp->getValue();
} else {
Err = "Non-constant offsets are not supported!";
return true;
}
// Drop the '.'. // Drop the '.'.
StringRef DotDispStr = Tok.getString().drop_front(1); StringRef DotDispStr = Tok.getString().drop_front(1);
Lex(); // Eat .field.
// .Imm gets lexed as a real. // .Imm gets lexed as a real.
if (Tok.is(AsmToken::Real)) { if (Tok.is(AsmToken::Real)) {
APInt DotDisp; APInt DotDisp;
DotDispStr.getAsInteger(10, DotDisp); DotDispStr.getAsInteger(10, DotDisp);
uint64_t DotDispVal = DotDisp.getZExtValue(); DotDispVal = DotDisp.getZExtValue();
} else {
// Special case zero dot displacement. Err = "Unexpected token type!";
if (!DotDispVal) return Disp; return true;
// FIXME: Handle non-constant expressions.
if (const MCConstantExpr *OrigDisp = dyn_cast<MCConstantExpr>(Disp)) {
uint64_t OrigDispVal = OrigDisp->getValue();
return MCConstantExpr::Create(OrigDispVal + DotDispVal, getContext());
}
} }
return Disp;
// Special case zero dot displacement.
if (!DotDispVal) {
*NewDisp = Disp;
return false;
}
*NewDisp = MCConstantExpr::Create(OrigDispVal + DotDispVal, getContext());
return false;
} }
/// Parse the 'offset' operator. This operator is used to specify the /// Parse the 'offset' operator. This operator is used to specify the