mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-13 20:32:21 +00:00
MC: Better handling of tricky symbol and section names
Because of win32 mangling, we produce symbol and section names with funny characters in them, most notably @ characters. MC would choke on trying to parse its own assembly output. This patch addresses that by: - Making @ trigger quoting of symbol names - Also quote section names in the same way - Just parse section names like other identifiers (to allow for quotes) - Don't assume @ signifies a symbol variant if it is in a string. Differential Revision: http://llvm-reviews.chandlerc.com/D1945 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192758 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
c7ce3e4f42
commit
508d7b7330
@ -792,19 +792,25 @@ bool AsmParser::parsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc) {
|
||||
EndLoc = SMLoc::getFromPointer(Identifier.end());
|
||||
|
||||
// This is a symbol reference.
|
||||
std::pair<StringRef, StringRef> Split = Identifier.split('@');
|
||||
MCSymbol *Sym = getContext().GetOrCreateSymbol(Split.first);
|
||||
|
||||
// Lookup the symbol variant if used.
|
||||
StringRef SymbolName = Identifier;
|
||||
MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None;
|
||||
if (Split.first.size() != Identifier.size()) {
|
||||
Variant = MCSymbolRefExpr::getVariantKindForName(Split.second);
|
||||
std::pair<StringRef, StringRef> Split = Identifier.split('@');
|
||||
|
||||
if (Split.first.size() != Identifier.size() &&
|
||||
FirstTokenKind != AsmToken::String) {
|
||||
SymbolName = Split.first;
|
||||
StringRef VariantName = Split.second;
|
||||
|
||||
// Lookup the symbol variant.
|
||||
Variant = MCSymbolRefExpr::getVariantKindForName(VariantName);
|
||||
if (Variant == MCSymbolRefExpr::VK_Invalid) {
|
||||
Variant = MCSymbolRefExpr::VK_None;
|
||||
return TokError("invalid variant '" + Split.second + "'");
|
||||
return TokError("invalid variant '" + VariantName + "'");
|
||||
}
|
||||
}
|
||||
|
||||
MCSymbol *Sym = getContext().GetOrCreateSymbol(SymbolName);
|
||||
|
||||
// If this is an absolute variable reference, substitute it now to preserve
|
||||
// semantics in the face of reassignment.
|
||||
if (Sym->isVariable() && isa<MCConstantExpr>(Sym->getVariableValue())) {
|
||||
|
@ -295,12 +295,7 @@ bool COFFAsmParser::ParseSectionSwitch(StringRef Section,
|
||||
}
|
||||
|
||||
bool COFFAsmParser::ParseSectionName(StringRef &SectionName) {
|
||||
if (!getLexer().is(AsmToken::Identifier))
|
||||
return true;
|
||||
|
||||
SectionName = getTok().getIdentifier();
|
||||
Lex();
|
||||
return false;
|
||||
return getParser().parseIdentifier(SectionName);
|
||||
}
|
||||
|
||||
// .section name [, "flags"]
|
||||
|
@ -39,6 +39,22 @@ void MCSectionCOFF::setSelection(int Selection,
|
||||
Characteristics |= COFF::IMAGE_SCN_LNK_COMDAT;
|
||||
}
|
||||
|
||||
static bool isAcceptableSectionNameChar(char C) {
|
||||
return (C >= 'a' && C <= 'z') ||
|
||||
(C >= 'A' && C <= 'Z') ||
|
||||
(C >= '0' && C <= '9') ||
|
||||
C == '_' || C == '$' || C == '.';
|
||||
}
|
||||
|
||||
/// NameNeedsQuoting - Return true if the identifier \p Str needs quotes to be
|
||||
/// syntactically correct.
|
||||
static bool sectionNameNeedsQuoting(StringRef Name) {
|
||||
for (unsigned i = 0, e = Name.size(); i != e; ++i)
|
||||
if (!isAcceptableSectionNameChar(Name[i]))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
void MCSectionCOFF::PrintSwitchToSection(const MCAsmInfo &MAI,
|
||||
raw_ostream &OS,
|
||||
const MCExpr *Subsection) const {
|
||||
@ -49,7 +65,10 @@ void MCSectionCOFF::PrintSwitchToSection(const MCAsmInfo &MAI,
|
||||
return;
|
||||
}
|
||||
|
||||
OS << "\t.section\t" << getSectionName() << ",\"";
|
||||
if (sectionNameNeedsQuoting(getSectionName()))
|
||||
OS << "\t.section\t" << '"' << getSectionName() << '"' << ",\"";
|
||||
else
|
||||
OS << "\t.section\t" << getSectionName() << ",\"";
|
||||
if (getKind().isText())
|
||||
OS << 'x';
|
||||
if (getKind().isWriteable())
|
||||
|
@ -18,12 +18,10 @@ const MCSection *MCSymbol::AbsolutePseudoSection =
|
||||
reinterpret_cast<const MCSection *>(1);
|
||||
|
||||
static bool isAcceptableChar(char C) {
|
||||
if ((C < 'a' || C > 'z') &&
|
||||
(C < 'A' || C > 'Z') &&
|
||||
(C < '0' || C > '9') &&
|
||||
C != '_' && C != '$' && C != '.' && C != '@')
|
||||
return false;
|
||||
return true;
|
||||
return (C >= 'a' && C <= 'z') ||
|
||||
(C >= 'A' && C <= 'Z') ||
|
||||
(C >= '0' && C <= '9') ||
|
||||
C == '_' || C == '$' || C == '.';
|
||||
}
|
||||
|
||||
/// NameNeedsQuoting - Return true if the identifier \p Str needs quotes to be
|
||||
|
@ -4,4 +4,4 @@ define i32 @foo() {
|
||||
ret i32 0
|
||||
}
|
||||
|
||||
; CHECK: @feat.00 = 1
|
||||
; CHECK: "@feat.00" = 1
|
||||
|
@ -3,7 +3,7 @@
|
||||
; Check that a fastcall function gets correct mangling
|
||||
|
||||
define x86_fastcallcc void @func(i64 %X, i8 %Y, i8 %G, i16 %Z) {
|
||||
; CHECK: @func@20:
|
||||
; CHECK: "@func@20":
|
||||
ret void
|
||||
}
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
define internal x86_stdcallcc void @MyFunc() nounwind {
|
||||
entry:
|
||||
; CHECK: MyFunc@0:
|
||||
; CHECK: "_MyFunc@0":
|
||||
; CHECK: ret
|
||||
ret void
|
||||
}
|
||||
@ -20,5 +20,5 @@ entry:
|
||||
|
||||
@B = global %0 { void (...)* bitcast (void ()* @MyFunc to void (...)*) }, align 4
|
||||
; CHECK: _B:
|
||||
; CHECK: .long _MyFunc@0
|
||||
; CHECK: .long "_MyFunc@0"
|
||||
|
||||
|
20
test/MC/COFF/quoted-names.ll
Normal file
20
test/MC/COFF/quoted-names.ll
Normal file
@ -0,0 +1,20 @@
|
||||
; Check that certain symbol and section names are quoted in the asm output.
|
||||
; RUN: llc -mtriple=i686-pc-win32 %s -o - | FileCheck %s
|
||||
|
||||
; Check that the symbol and section names can round-trip through the assembler.
|
||||
; RUN: llc -mtriple=i686-pc-win32 %s -o - | llvm-mc -triple i686-pc-win32 -filetype=obj | llvm-readobj -s -section-symbols | FileCheck %s --check-prefix=READOBJ
|
||||
|
||||
@"\01??__E_Generic_object@?$_Error_objects@H@std@@YAXXZ" = global i32 0
|
||||
|
||||
define weak i32 @"\01??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51"() section ".text" {
|
||||
%res = load i32* @"\01??__E_Generic_object@?$_Error_objects@H@std@@YAXXZ"
|
||||
ret i32 %res
|
||||
}
|
||||
|
||||
; CHECK: .section ".text$??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51","xr"
|
||||
; CHECK: .globl "??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51"
|
||||
; CHECK: "??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51"
|
||||
|
||||
; READOBJ: Symbol
|
||||
; READOBJ: Name: ??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51
|
||||
; READOBJ: Section: .text$??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51
|
Loading…
Reference in New Issue
Block a user