mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-23 02:29:18 +00:00
MC/AsmParser: Fix .abort and .secure_log_unique to accept arbitrary token
sequences, not just strings. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108655 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
7a570d09ac
commit
6a46d571b4
@ -89,6 +89,11 @@ public:
|
||||
/// and set \arg Res to the identifier contents.
|
||||
virtual bool ParseIdentifier(StringRef &Res) = 0;
|
||||
|
||||
/// \brief Parse up to the end of statement and return the contents from the
|
||||
/// current token until the end of the statement; the current token on exit
|
||||
/// will be either the EndOfStatement or EOF.
|
||||
virtual StringRef ParseStringToEndOfStatement() = 0;
|
||||
|
||||
/// ParseExpression - Parse an arbitrary expression.
|
||||
///
|
||||
/// @param Res - The value of the expression. The result is undefined
|
||||
|
@ -153,7 +153,12 @@ private:
|
||||
void JumpToLoc(SMLoc Loc);
|
||||
|
||||
void EatToEndOfStatement();
|
||||
|
||||
|
||||
/// \brief Parse up to the end of statement and a return the contents from the
|
||||
/// current token until the end of the statement; the current token on exit
|
||||
/// will be either the EndOfStatement or EOF.
|
||||
StringRef ParseStringToEndOfStatement();
|
||||
|
||||
bool ParseAssignment(StringRef Name);
|
||||
|
||||
bool ParsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc);
|
||||
@ -387,6 +392,16 @@ void AsmParser::EatToEndOfStatement() {
|
||||
Lex();
|
||||
}
|
||||
|
||||
StringRef AsmParser::ParseStringToEndOfStatement() {
|
||||
const char *Start = getTok().getLoc().getPointer();
|
||||
|
||||
while (Lexer.isNot(AsmToken::EndOfStatement) &&
|
||||
Lexer.isNot(AsmToken::Eof))
|
||||
Lex();
|
||||
|
||||
const char *End = getTok().getLoc().getPointer();
|
||||
return StringRef(Start, End - Start);
|
||||
}
|
||||
|
||||
/// ParseParenExpr - Parse a paren expression and return it.
|
||||
/// NOTE: This assumes the leading '(' has already been consumed.
|
||||
@ -1561,31 +1576,22 @@ bool AsmParser::ParseDirectiveComm(bool IsLocal) {
|
||||
}
|
||||
|
||||
/// ParseDirectiveAbort
|
||||
/// ::= .abort [ "abort_string" ]
|
||||
/// ::= .abort [... message ...]
|
||||
bool AsmParser::ParseDirectiveAbort() {
|
||||
// FIXME: Use loc from directive.
|
||||
SMLoc Loc = getLexer().getLoc();
|
||||
|
||||
StringRef Str = "";
|
||||
if (getLexer().isNot(AsmToken::EndOfStatement)) {
|
||||
if (getLexer().isNot(AsmToken::String))
|
||||
return TokError("expected string in '.abort' directive");
|
||||
|
||||
Str = getTok().getString();
|
||||
|
||||
Lex();
|
||||
}
|
||||
|
||||
StringRef Str = ParseStringToEndOfStatement();
|
||||
if (getLexer().isNot(AsmToken::EndOfStatement))
|
||||
return TokError("unexpected token in '.abort' directive");
|
||||
|
||||
|
||||
Lex();
|
||||
|
||||
// FIXME: Handle here.
|
||||
if (Str.empty())
|
||||
Error(Loc, ".abort detected. Assembly stopping.");
|
||||
else
|
||||
Error(Loc, ".abort '" + Str + "' detected. Assembly stopping.");
|
||||
// FIXME: Actually abort assembly here.
|
||||
|
||||
return false;
|
||||
}
|
||||
|
@ -537,28 +537,22 @@ bool DarwinAsmParser::ParseDirectiveSection() {
|
||||
}
|
||||
|
||||
/// ParseDirectiveSecureLogUnique
|
||||
/// ::= .secure_log_unique "log message"
|
||||
/// ::= .secure_log_unique ... message ...
|
||||
bool DarwinAsmParser::ParseDirectiveSecureLogUnique(StringRef, SMLoc IDLoc) {
|
||||
std::string LogMessage;
|
||||
|
||||
if (getLexer().isNot(AsmToken::String))
|
||||
LogMessage = "";
|
||||
else{
|
||||
LogMessage = getTok().getString();
|
||||
Lex();
|
||||
}
|
||||
|
||||
StringRef LogMessage = getParser().ParseStringToEndOfStatement();
|
||||
if (getLexer().isNot(AsmToken::EndOfStatement))
|
||||
return TokError("unexpected token in '.secure_log_unique' directive");
|
||||
|
||||
if (getContext().getSecureLogUsed() != false)
|
||||
return Error(IDLoc, ".secure_log_unique specified multiple times");
|
||||
|
||||
char *SecureLogFile = getContext().getSecureLogFile();
|
||||
// Get the secure log path.
|
||||
const char *SecureLogFile = getContext().getSecureLogFile();
|
||||
if (SecureLogFile == NULL)
|
||||
return Error(IDLoc, ".secure_log_unique used but AS_SECURE_LOG_FILE "
|
||||
"environment variable unset.");
|
||||
|
||||
// Open the secure log file if we haven't already.
|
||||
raw_ostream *OS = getContext().getSecureLog();
|
||||
if (OS == NULL) {
|
||||
std::string Err;
|
||||
@ -571,6 +565,7 @@ bool DarwinAsmParser::ParseDirectiveSecureLogUnique(StringRef, SMLoc IDLoc) {
|
||||
getContext().setSecureLog(OS);
|
||||
}
|
||||
|
||||
// Write the message.
|
||||
int CurBuf = getSourceManager().FindBufferContainingLoc(IDLoc);
|
||||
*OS << getSourceManager().getBufferInfo(CurBuf).Buffer->getBufferIdentifier()
|
||||
<< ":" << getSourceManager().FindLineNumber(IDLoc, CurBuf) << ":"
|
||||
|
@ -1,6 +1,6 @@
|
||||
# RUN: llvm-mc -triple i386-unknown-unknown %s 2> %t
|
||||
# RUN: FileCheck -input-file %t %s
|
||||
|
||||
# CHECK: .abort "please stop assembing"
|
||||
TEST0:
|
||||
.abort "please stop assembing"
|
||||
# CHECK: error: .abort 'please stop assembing'
|
||||
TEST0:
|
||||
.abort please stop assembing
|
||||
|
Loading…
Reference in New Issue
Block a user