[llvm-commits] [llvm] r77749 - in /llvm/trunk: lib/MC/MCAsmStreamer.cpp test/MC/AsmParser/directive_zerofill.s test/MC/AsmParser/labels.s
Daniel Dunbar
daniel at zuster.org
Fri Jul 31 16:04:32 PDT 2009
Author: ddunbar
Date: Fri Jul 31 18:04:32 2009
New Revision: 77749
URL: http://llvm.org/viewvc/llvm-project?rev=77749&view=rev
Log:
llvm-mc: Fix .s output to quote section & symbol names when necessary.
Modified:
llvm/trunk/lib/MC/MCAsmStreamer.cpp
llvm/trunk/test/MC/AsmParser/directive_zerofill.s
llvm/trunk/test/MC/AsmParser/labels.s
Modified: llvm/trunk/lib/MC/MCAsmStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmStreamer.cpp?rev=77749&r1=77748&r2=77749&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCAsmStreamer.cpp (original)
+++ llvm/trunk/lib/MC/MCAsmStreamer.cpp Fri Jul 31 18:04:32 2009
@@ -75,12 +75,51 @@
}
+/// NeedsQuoting - Return true if the string \arg Str needs quoting, i.e., it
+/// does not match [a-zA-Z_.][a-zA-Z0-9_.]*.
+//
+// FIXME: This could be more permissive, do we care?
+static inline bool NeedsQuoting(const StringRef &Str) {
+ if (Str.empty())
+ return true;
+
+ // Check that first character is in [a-zA-Z_.].
+ if (!((Str[0] >= 'a' && Str[0] <= 'z') ||
+ (Str[0] >= 'A' && Str[0] <= 'Z') ||
+ (Str[0] == '_' || Str[0] == '.')))
+ return true;
+
+ // Check subsequent characters are in [a-zA-Z0-9_.].
+ for (unsigned i = 1, e = Str.size(); i != e; ++i)
+ if (!((Str[i] >= 'a' && Str[i] <= 'z') ||
+ (Str[i] >= 'A' && Str[i] <= 'Z') ||
+ (Str[i] >= '0' && Str[i] <= '9') ||
+ (Str[i] == '_' || Str[i] == '.')))
+ return true;
+
+ return false;
+}
+
+/// Allow printing sections directly to a raw_ostream with proper quoting.
+static inline raw_ostream &operator<<(raw_ostream &os, const MCSection *S) {
+ if (NeedsQuoting(S->getName()))
+ return os << '"' << S->getName() << '"';
+ return os << S->getName();
+}
+
+/// Allow printing symbols directly to a raw_ostream with proper quoting.
+static inline raw_ostream &operator<<(raw_ostream &os, const MCSymbol *S) {
+ if (NeedsQuoting(S->getName()))
+ return os << '"' << S->getName() << '"';
+ return os << S->getName();
+}
+
/// Allow printing values directly to a raw_ostream.
static inline raw_ostream &operator<<(raw_ostream &os, const MCValue &Value) {
if (Value.getSymA()) {
- os << Value.getSymA()->getName();
+ os << Value.getSymA();
if (Value.getSymB())
- os << " - " << Value.getSymB()->getName();
+ os << " - " << Value.getSymB();
if (Value.getConstant())
os << " + " << Value.getConstant();
} else {
@@ -108,7 +147,7 @@
// FIXME: Really we would like the segment, flags, etc. to be separate
// values instead of embedded in the name. Not all assemblers understand all
// this stuff though.
- OS << ".section " << Section->getName() << "\n";
+ OS << ".section " << Section << "\n";
}
}
@@ -118,7 +157,7 @@
assert(!getContext().GetSymbolValue(Symbol) &&
"Cannot emit symbol which was directly assigned to!");
- OS << Symbol->getName() << ":\n";
+ OS << Symbol << ":\n";
Symbol->setSection(CurSection);
Symbol->setExternal(false);
}
@@ -135,9 +174,9 @@
assert(!Symbol->getSection() && "Cannot assign to a label!");
if (MakeAbsolute) {
- OS << ".set " << Symbol->getName() << ", " << Value << '\n';
+ OS << ".set " << Symbol << ", " << Value << '\n';
} else {
- OS << Symbol->getName() << " = " << Value << '\n';
+ OS << Symbol << " = " << Value << '\n';
}
getContext().SetSymbolValue(Symbol, Value);
@@ -160,15 +199,15 @@
case WeakReference: OS << ".weak_reference"; break;
}
- OS << ' ' << Symbol->getName() << '\n';
+ OS << ' ' << Symbol << '\n';
}
void MCAsmStreamer::EmitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) {
- OS << ".desc" << ' ' << Symbol->getName() << ',' << DescValue << '\n';
+ OS << ".desc" << ' ' << Symbol << ',' << DescValue << '\n';
}
void MCAsmStreamer::EmitLocalSymbol(MCSymbol *Symbol, const MCValue &Value) {
- OS << ".lsym" << ' ' << Symbol->getName() << ',' << Value << '\n';
+ OS << ".lsym" << ' ' << Symbol << ',' << Value << '\n';
}
void MCAsmStreamer::EmitCommonSymbol(MCSymbol *Symbol, unsigned Size,
@@ -177,7 +216,7 @@
OS << ".lcomm";
else
OS << ".comm";
- OS << ' ' << Symbol->getName() << ',' << Size;
+ OS << ' ' << Symbol << ',' << Size;
if (Pow2Alignment != 0)
OS << ',' << Pow2Alignment;
OS << '\n';
@@ -189,9 +228,9 @@
// FIXME: Really we would like the segment and section names as well as the
// section type to be separate values instead of embedded in the name. Not
// all assemblers understand all this stuff though.
- OS << ".zerofill " << Section->getName();
+ OS << ".zerofill " << Section;
if (Symbol != NULL) {
- OS << ',' << Symbol->getName() << ',' << Size;
+ OS << ',' << Symbol << ',' << Size;
if (Pow2Alignment != 0)
OS << ',' << Pow2Alignment;
}
Modified: llvm/trunk/test/MC/AsmParser/directive_zerofill.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/directive_zerofill.s?rev=77749&r1=77748&r2=77749&view=diff
==============================================================================
--- llvm/trunk/test/MC/AsmParser/directive_zerofill.s (original)
+++ llvm/trunk/test/MC/AsmParser/directive_zerofill.s Fri Jul 31 18:04:32 2009
@@ -1,9 +1,9 @@
# RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s
# CHECK: TEST0:
-# CHECK: .zerofill __FOO,__bar,x,1
-# CHECK: .zerofill __FOO,__bar,y,8,2
-# CHECK: .zerofill __EMPTY,__NoSymbol
+# CHECK: .zerofill "__FOO,__bar",x,1
+# CHECK: .zerofill "__FOO,__bar",y,8,2
+# CHECK: .zerofill "__EMPTY,__NoSymbol"
TEST0:
.zerofill __FOO, __bar, x, 2-1
.zerofill __FOO, __bar, y , 8 , 1+1
Modified: llvm/trunk/test/MC/AsmParser/labels.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/labels.s?rev=77749&r1=77748&r2=77749&view=diff
==============================================================================
--- llvm/trunk/test/MC/AsmParser/labels.s (original)
+++ llvm/trunk/test/MC/AsmParser/labels.s Fri Jul 31 18:04:32 2009
@@ -7,20 +7,20 @@
// CHECK: b:
"b":
.long 0
-// FIXME(quoting): CHECK: a$b:
+// CHECK: "a$b":
"a$b":
.long 0
.text:
foo:
-// FIXME(quoting): CHECK: val:a$b
+// CHECK: val:"a$b"
addl $24, "a$b"(%eax)
-// FIXME(quoting): CHECK: val:a$b + 10
+// CHECK: val:"a$b" + 10
addl $24, ("a$b" + 10)(%eax)
-// FIXME(quoting): CHECK: b$c = 10
+// CHECK: "b$c" = 10
"b$c" = 10
-// FIXME(quoting): CHECK: val:10
+// CHECK: val:10
addl "b$c", %eax
More information about the llvm-commits
mailing list