maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix escaping in asm string literals correctly by having tblgen unescape 

them, then the asmprinter emitter reescape them.

llvm-svn: 66958
This commit is contained in:
Chris Lattner 2009-03-13 21:33:17 +00:00
parent a614ef2000
commit 8bd06d8e1b
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
llvm/utils/TableGen/AsmWriterEmitter.cpp
View File

@ -130,11 +130,20 @@ AsmWriterInst::AsmWriterInst(const CodeGenInstruction &CGI, unsigned Variant) {
// Emit a constant string fragment.
if (DollarPos != LastEmitted) {
// TODO: this should eventually handle escaping.
if (CurVariant == Variant || CurVariant == ~0U)
AddLiteralString(std::string(AsmString.begin()+LastEmitted,
AsmString.begin()+DollarPos));
LastEmitted = DollarPos;
if (CurVariant == Variant || CurVariant == ~0U) {
for (; LastEmitted != DollarPos; ++LastEmitted)
switch (AsmString[LastEmitted]) {
case '\n': AddLiteralString("\\n"); break;
case '\t': AddLiteralString("\\t"); break;
case '"': AddLiteralString("\\\""); break;
case '\\': AddLiteralString("\\\\"); break;
default:
AddLiteralString(std::string(1, AsmString[LastEmitted]));
break;
}
} else {
LastEmitted = DollarPos;
}
} else if (AsmString[DollarPos] == '\\') {
if (DollarPos+1 != AsmString.size() &&
(CurVariant == Variant || CurVariant == ~0U)) {

4
llvm/utils/TableGen/TGLexer.cpp
View File

@ -174,11 +174,11 @@ tgtok::TokKind TGLexer::LexString() {
CurStrVal += *CurPtr++;
break;
case 't':
CurStrVal += "\\t";
CurStrVal += '\t';
++CurPtr;
break;
case 'n':
CurStrVal += "\\n";
CurStrVal += '\n';
++CurPtr;
break;