aboutsummaryrefslogtreecommitdiffstats
path: root/tools/llvm-mc/llvm-mc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/llvm-mc/llvm-mc.cpp')
-rw-r--r--tools/llvm-mc/llvm-mc.cpp138
1 files changed, 89 insertions, 49 deletions
diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp
index 0cc9689..67bb06b 100644
--- a/tools/llvm-mc/llvm-mc.cpp
+++ b/tools/llvm-mc/llvm-mc.cpp
@@ -23,6 +23,7 @@
#include "llvm/Target/TargetAsmParser.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Target/TargetRegistry.h"
+#include "llvm/Target/SubtargetFeature.h" // FIXME.
#include "llvm/Target/TargetMachine.h" // FIXME.
#include "llvm/Target/TargetSelect.h"
#include "llvm/ADT/OwningPtr.h"
@@ -33,7 +34,7 @@
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/raw_ostream.h"
+#include "llvm/Support/ToolOutputFile.h"
#include "llvm/System/Host.h"
#include "llvm/System/Signals.h"
#include "Disassembler.h"
@@ -95,6 +96,12 @@ static cl::opt<std::string>
TripleName("triple", cl::desc("Target triple to assemble for, "
"see -version for available targets"));
+static cl::opt<std::string>
+MCPU("mcpu",
+ cl::desc("Target a specific cpu type (-mcpu=help for details)"),
+ cl::value_desc("cpu-name"),
+ cl::init(""));
+
static cl::opt<bool>
NoInitialTextSection("n", cl::desc(
"Don't assume assembly file starts in the text section"));
@@ -140,7 +147,7 @@ static const Target *GetTarget(const char *ProgName) {
return 0;
}
-static formatted_tool_output_file *GetOutputStream() {
+static tool_output_file *GetOutputStream() {
if (OutputFilename == "")
OutputFilename = "-";
@@ -152,9 +159,8 @@ static formatted_tool_output_file *GetOutputStream() {
delete Out;
return 0;
}
-
- return new formatted_tool_output_file(*Out,
- formatted_raw_ostream::DELETE_STREAM);
+
+ return Out;
}
static int AsLexInput(const char *ProgName) {
@@ -189,13 +195,15 @@ static int AsLexInput(const char *ProgName) {
AsmLexer Lexer(*MAI);
Lexer.setBuffer(SrcMgr.getMemoryBuffer(0));
- OwningPtr<formatted_tool_output_file> Out(GetOutputStream());
+ OwningPtr<tool_output_file> Out(GetOutputStream());
if (!Out)
return 1;
bool Error = false;
while (Lexer.Lex().isNot(AsmToken::Eof)) {
- switch (Lexer.getKind()) {
+ AsmToken Tok = Lexer.getTok();
+
+ switch (Tok.getKind()) {
default:
SrcMgr.PrintMessage(Lexer.getLoc(), "unknown token", "warning");
Error = true;
@@ -204,45 +212,63 @@ static int AsLexInput(const char *ProgName) {
Error = true; // error already printed.
break;
case AsmToken::Identifier:
- *Out << "identifier: " << Lexer.getTok().getString() << '\n';
- break;
- case AsmToken::String:
- *Out << "string: " << Lexer.getTok().getString() << '\n';
+ Out->os() << "identifier: " << Lexer.getTok().getString();
break;
case AsmToken::Integer:
- *Out << "int: " << Lexer.getTok().getString() << '\n';
+ Out->os() << "int: " << Lexer.getTok().getString();
+ break;
+ case AsmToken::Real:
+ Out->os() << "real: " << Lexer.getTok().getString();
+ break;
+ case AsmToken::Register:
+ Out->os() << "register: " << Lexer.getTok().getRegVal();
+ break;
+ case AsmToken::String:
+ Out->os() << "string: " << Lexer.getTok().getString();
break;
- case AsmToken::Amp: *Out << "Amp\n"; break;
- case AsmToken::AmpAmp: *Out << "AmpAmp\n"; break;
- case AsmToken::Caret: *Out << "Caret\n"; break;
- case AsmToken::Colon: *Out << "Colon\n"; break;
- case AsmToken::Comma: *Out << "Comma\n"; break;
- case AsmToken::Dollar: *Out << "Dollar\n"; break;
- case AsmToken::EndOfStatement: *Out << "EndOfStatement\n"; break;
- case AsmToken::Eof: *Out << "Eof\n"; break;
- case AsmToken::Equal: *Out << "Equal\n"; break;
- case AsmToken::EqualEqual: *Out << "EqualEqual\n"; break;
- case AsmToken::Exclaim: *Out << "Exclaim\n"; break;
- case AsmToken::ExclaimEqual: *Out << "ExclaimEqual\n"; break;
- case AsmToken::Greater: *Out << "Greater\n"; break;
- case AsmToken::GreaterEqual: *Out << "GreaterEqual\n"; break;
- case AsmToken::GreaterGreater: *Out << "GreaterGreater\n"; break;
- case AsmToken::LParen: *Out << "LParen\n"; break;
- case AsmToken::Less: *Out << "Less\n"; break;
- case AsmToken::LessEqual: *Out << "LessEqual\n"; break;
- case AsmToken::LessGreater: *Out << "LessGreater\n"; break;
- case AsmToken::LessLess: *Out << "LessLess\n"; break;
- case AsmToken::Minus: *Out << "Minus\n"; break;
- case AsmToken::Percent: *Out << "Percent\n"; break;
- case AsmToken::Pipe: *Out << "Pipe\n"; break;
- case AsmToken::PipePipe: *Out << "PipePipe\n"; break;
- case AsmToken::Plus: *Out << "Plus\n"; break;
- case AsmToken::RParen: *Out << "RParen\n"; break;
- case AsmToken::Slash: *Out << "Slash\n"; break;
- case AsmToken::Star: *Out << "Star\n"; break;
- case AsmToken::Tilde: *Out << "Tilde\n"; break;
+ case AsmToken::Amp: Out->os() << "Amp"; break;
+ case AsmToken::AmpAmp: Out->os() << "AmpAmp"; break;
+ case AsmToken::At: Out->os() << "At"; break;
+ case AsmToken::Caret: Out->os() << "Caret"; break;
+ case AsmToken::Colon: Out->os() << "Colon"; break;
+ case AsmToken::Comma: Out->os() << "Comma"; break;
+ case AsmToken::Dollar: Out->os() << "Dollar"; break;
+ case AsmToken::Dot: Out->os() << "Dot"; break;
+ case AsmToken::EndOfStatement: Out->os() << "EndOfStatement"; break;
+ case AsmToken::Eof: Out->os() << "Eof"; break;
+ case AsmToken::Equal: Out->os() << "Equal"; break;
+ case AsmToken::EqualEqual: Out->os() << "EqualEqual"; break;
+ case AsmToken::Exclaim: Out->os() << "Exclaim"; break;
+ case AsmToken::ExclaimEqual: Out->os() << "ExclaimEqual"; break;
+ case AsmToken::Greater: Out->os() << "Greater"; break;
+ case AsmToken::GreaterEqual: Out->os() << "GreaterEqual"; break;
+ case AsmToken::GreaterGreater: Out->os() << "GreaterGreater"; break;
+ case AsmToken::Hash: Out->os() << "Hash"; break;
+ case AsmToken::LBrac: Out->os() << "LBrac"; break;
+ case AsmToken::LCurly: Out->os() << "LCurly"; break;
+ case AsmToken::LParen: Out->os() << "LParen"; break;
+ case AsmToken::Less: Out->os() << "Less"; break;
+ case AsmToken::LessEqual: Out->os() << "LessEqual"; break;
+ case AsmToken::LessGreater: Out->os() << "LessGreater"; break;
+ case AsmToken::LessLess: Out->os() << "LessLess"; break;
+ case AsmToken::Minus: Out->os() << "Minus"; break;
+ case AsmToken::Percent: Out->os() << "Percent"; break;
+ case AsmToken::Pipe: Out->os() << "Pipe"; break;
+ case AsmToken::PipePipe: Out->os() << "PipePipe"; break;
+ case AsmToken::Plus: Out->os() << "Plus"; break;
+ case AsmToken::RBrac: Out->os() << "RBrac"; break;
+ case AsmToken::RCurly: Out->os() << "RCurly"; break;
+ case AsmToken::RParen: Out->os() << "RParen"; break;
+ case AsmToken::Slash: Out->os() << "Slash"; break;
+ case AsmToken::Star: Out->os() << "Star"; break;
+ case AsmToken::Tilde: Out->os() << "Tilde"; break;
}
+
+ // Print the token string.
+ Out->os() << " (\"";
+ Out->os().write_escaped(Tok.getString());
+ Out->os() << "\")\n";
}
// Keep output if no errors.
@@ -282,8 +308,20 @@ static int AssembleInput(const char *ProgName) {
MCContext Ctx(*MAI);
+ // Package up features to be passed to target/subtarget
+ std::string FeaturesStr;
+ if (MCPU.size()) {
+ SubtargetFeatures Features;
+ Features.setCPU(MCPU);
+ FeaturesStr = Features.getString();
+ }
+
// FIXME: We shouldn't need to do this (and link in codegen).
- OwningPtr<TargetMachine> TM(TheTarget->createTargetMachine(TripleName, ""));
+ // When we split this out, we should do it in a way that makes
+ // it straightforward to switch subtargets on the fly (.e.g,
+ // the .cpu and .code16 directives).
+ OwningPtr<TargetMachine> TM(TheTarget->createTargetMachine(TripleName,
+ FeaturesStr));
if (!TM) {
errs() << ProgName << ": error: could not create target for triple '"
@@ -291,10 +329,11 @@ static int AssembleInput(const char *ProgName) {
return 1;
}
- OwningPtr<formatted_tool_output_file> Out(GetOutputStream());
+ OwningPtr<tool_output_file> Out(GetOutputStream());
if (!Out)
return 1;
+ formatted_raw_ostream FOS(Out->os());
OwningPtr<MCStreamer> Str;
if (FileType == OFT_AssemblyFile) {
@@ -303,8 +342,9 @@ static int AssembleInput(const char *ProgName) {
MCCodeEmitter *CE = 0;
if (ShowEncoding)
CE = TheTarget->createCodeEmitter(*TM, Ctx);
- Str.reset(createAsmStreamer(Ctx, *Out,TM->getTargetData()->isLittleEndian(),
- /*asmverbose*/true, IP, CE, ShowInst));
+ Str.reset(TheTarget->createAsmStreamer(Ctx, FOS,
+ TM->getTargetData()->isLittleEndian(),
+ /*asmverbose*/true, IP, CE, ShowInst));
} else if (FileType == OFT_Null) {
Str.reset(createNullStreamer(Ctx));
} else {
@@ -312,7 +352,7 @@ static int AssembleInput(const char *ProgName) {
MCCodeEmitter *CE = TheTarget->createCodeEmitter(*TM, Ctx);
TargetAsmBackend *TAB = TheTarget->createAsmBackend(TripleName);
Str.reset(TheTarget->createObjectStreamer(TripleName, Ctx, *TAB,
- *Out, CE, RelaxAll));
+ FOS, CE, RelaxAll));
}
if (EnableLogging) {
@@ -358,15 +398,15 @@ static int DisassembleInput(const char *ProgName, bool Enhanced) {
return 1;
}
- OwningPtr<formatted_tool_output_file> Out(GetOutputStream());
+ OwningPtr<tool_output_file> Out(GetOutputStream());
if (!Out)
return 1;
int Res;
if (Enhanced)
- Res = Disassembler::disassembleEnhanced(TripleName, *Buffer, *Out);
+ Res = Disassembler::disassembleEnhanced(TripleName, *Buffer, Out->os());
else
- Res = Disassembler::disassemble(*TheTarget, TripleName, *Buffer, *Out);
+ Res = Disassembler::disassemble(*TheTarget, TripleName, *Buffer, Out->os());
// Keep output if no errors.
if (Res == 0) Out->keep();
generated by cgit v1.1 at 2025-08-25 08:01:17 +0000