From 76022e48ffb2ba36bf0c4c75704056e25759afc2 Mon Sep 17 00:00:00 2001 From: Kevin Enderby Date: Mon, 20 Jul 2009 20:25:37 +0000 Subject: Removed the DumpSymbolsandMacros and LoadSymbolsandMacros MCStreamer API as the parsing of the .dump and .load should be done in the assembly parser and not have any need for an MCStreamer API. Changed the code for now so these just produce an error saying these specific directives are not yet implemented since they are likely no longer used and may never need to be implemented. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@76462 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-mc/AsmParser.cpp | 14 ++++++++------ tools/llvm-mc/AsmParser.h | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/llvm-mc/AsmParser.cpp b/tools/llvm-mc/AsmParser.cpp index 066879f..1b9ca05 100644 --- a/tools/llvm-mc/AsmParser.cpp +++ b/tools/llvm-mc/AsmParser.cpp @@ -539,9 +539,9 @@ bool AsmParser::ParseStatement() { if (!strcmp(IDVal, ".include")) return ParseDirectiveInclude(); if (!strcmp(IDVal, ".dump")) - return ParseDirectiveDarwinDumpOrLoad(/*IsDump=*/true); + return ParseDirectiveDarwinDumpOrLoad(IDLoc, /*IsDump=*/true); if (!strcmp(IDVal, ".load")) - return ParseDirectiveDarwinDumpOrLoad(/*IsLoad=*/false); + return ParseDirectiveDarwinDumpOrLoad(IDLoc, /*IsLoad=*/false); Warning(IDLoc, "ignoring directive for now"); EatToEndOfStatement(); @@ -1197,11 +1197,11 @@ bool AsmParser::ParseDirectiveInclude() { /// ParseDirectiveDarwinDumpOrLoad /// ::= ( .dump | .load ) "filename" -bool AsmParser::ParseDirectiveDarwinDumpOrLoad(bool IsDump) { +bool AsmParser::ParseDirectiveDarwinDumpOrLoad(SMLoc IDLoc, bool IsDump) { if (Lexer.isNot(asmtok::String)) return TokError("expected string in '.dump' or '.load' directive"); - const char *Str = Lexer.getCurStrVal(); + Lexer.getCurStrVal(); Lexer.Lex(); @@ -1210,10 +1210,12 @@ bool AsmParser::ParseDirectiveDarwinDumpOrLoad(bool IsDump) { Lexer.Lex(); + // FIXME: If/when .dump and .load are implemented they will be done in the + // the assembly parser and not have any need for an MCStreamer API. if (IsDump) - Out.DumpSymbolsandMacros(Str); + Warning(IDLoc, "ignoring directive .dump for now"); else - Out.LoadSymbolsandMacros(Str); + Warning(IDLoc, "ignoring directive .load for now"); return false; } diff --git a/tools/llvm-mc/AsmParser.h b/tools/llvm-mc/AsmParser.h index d9f4b4c..b3190b12 100644 --- a/tools/llvm-mc/AsmParser.h +++ b/tools/llvm-mc/AsmParser.h @@ -127,7 +127,7 @@ private: // Darwin specific ".subsections_via_symbols" bool ParseDirectiveDarwinSubsectionsViaSymbols(); // Darwin specific .dump and .load - bool ParseDirectiveDarwinDumpOrLoad(bool IsDump); + bool ParseDirectiveDarwinDumpOrLoad(SMLoc IDLoc, bool IsDump); bool ParseDirectiveAbort(); // ".abort" bool ParseDirectiveInclude(); // ".include" -- cgit v1.1