reduce duplication of parsing code between %0 and %x0 and
add support for modifiers on named references, like %c[foo].
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66532 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp
index 93c4f5b..1aa62e7 100644
--- a/lib/CodeGen/CGStmt.cpp
+++ b/lib/CodeGen/CGStmt.cpp
@@ -739,31 +739,27 @@
continue;
}
+ // Handle %x4 and %x[foo] by capturing x as the modifier character.
+ char Modifier = '\0';
+ if (isalpha(EscapedChar)) {
+ Modifier = EscapedChar;
+ EscapedChar = *StrStart++;
+ }
+
if (isdigit(EscapedChar)) {
// %n - Assembler operand n
char *End;
unsigned long N = strtoul(StrStart-1, &End, 10);
assert(End != StrStart-1 && "We know that EscapedChar is a digit!");
+ StrStart = End;
// FIXME: This should be caught during Sema.
assert(N < NumOperands && "Operand number out of range!");
- Result += '$' + llvm::utostr(N);
- StrStart = End;
- continue;
- }
-
- if (isalpha(EscapedChar)) {
- char *End;
- // Skip the single letter escape and read the number, e.g. "%x4".
- unsigned long N = strtoul(StrStart, &End, 10);
- // FIXME: This should be caught during Sema.
- assert(End != StrStart && "Missing operand!");
- // FIXME: This should be caught during Sema.
- assert(N < NumOperands && "Operand number out of range!");
-
- Result += "${" + llvm::utostr(N) + ':' + EscapedChar + '}';
- StrStart = End;
+ if (Modifier == '\0')
+ Result += '$' + llvm::utostr(N);
+ else
+ Result += "${" + llvm::utostr(N) + ':' + Modifier + '}';
continue;
}
@@ -776,10 +772,13 @@
std::string SymbolicName(StrStart, NameEnd);
StrStart = NameEnd+1;
- int OperandIndex = S.getNamedOperand(SymbolicName);
- assert(OperandIndex != -1 && "FIXME: Catch in Sema.");
+ int N = S.getNamedOperand(SymbolicName);
+ assert(N != -1 && "FIXME: Catch in Sema.");
- Result += '$' + llvm::utostr(unsigned(OperandIndex));
+ if (Modifier == '\0')
+ Result += '$' + llvm::utostr(N);
+ else
+ Result += "${" + llvm::utostr(N) + ':' + Modifier + '}';
continue;
}