This is an archive of the discontinued LLVM Phabricator instance.

Differential D43936

[Asm] Refactor debug printing of AsmToken
ClosedPublic

Authored by olista01 on Mar 1 2018, 3:45 AM.

Details

Reviewers
rengolin
SjoerdMeijer
christof
Commits
rG5c032cef2fd1: [Asm] Refactor debug printing of AsmToken
rL326794: [Asm] Refactor debug printing of AsmToken
Summary
  • Move printing from llvm-mc to the AsmToken class, so that it can be used elsewhere.
  • Add 5 cases which were missed: BigNum, Comment, HashDirective, Space and BackSlash, and remove the default case so that -Wswitch will catch this error in future.

This is almost NFC, except for the fact that llvm-mc can now print those 5 tokens in -as-lex mode.

Diff Detail

Repository
rL LLVM

Event Timeline

olista01 created this revision.Mar 1 2018, 3:45 AM
olista01 added a child revision: D43937: [Asm] Add debug printing for assembler macros.Mar 1 2018, 3:47 AM
SjoerdMeijer accepted this revision.Mar 6 2018, 5:36 AM

Looks like a sensible change to me.

lib/MC/MCParser/MCAsmLexer.cpp
99 ↗(On Diff #136492)

Nit: I see this code is copy-pasted here, but I was wondering why from this
case the style is different, i.e. single line vs. multiple lines.

This revision is now accepted and ready to land.Mar 6 2018, 5:36 AM
olista01 added inline comments.Mar 6 2018, 5:46 AM
lib/MC/MCParser/MCAsmLexer.cpp
99 ↗(On Diff #136492)

I assume that this was done because a lot of these are too long to keep the alignment with the ones above. I'll re-format this in a more consistent way before committing.

Closed by commit rL326794: [Asm] Refactor debug printing of AsmToken (authored by olista01). · Explain WhyMar 6 2018, 6:05 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
include/
llvm/
MC/
MCParser/
4 lines
lib/
MC/
MCParser/
93 lines
tools/
llvm-mc/
140 lines

Diff 137181

llvm/trunk/include/llvm/MC/MCParser/MCAsmLexer.h

//===- llvm/MC/MCAsmLexer.h - Abstract Asm Lexer Interface ------*- C++ -*-===// //===- llvm/MC/MCAsmLexer.h - Abstract Asm Lexer Interface ------*- C++ -*-===//
// //
// The LLVM Compiler Infrastructure // The LLVM Compiler Infrastructure
// //
// This file is distributed under the University of Illinois Open Source // This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details. // License. See LICENSE.TXT for details.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef LLVM_MC_MCPARSER_MCASMLEXER_H #ifndef LLVM_MC_MCPARSER_MCASMLEXER_H
#define LLVM_MC_MCPARSER_MCASMLEXER_H #define LLVM_MC_MCPARSER_MCASMLEXER_H
#include "llvm/ADT/APInt.h" #include "llvm/ADT/APInt.h"
#include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringRef.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/SMLoc.h" #include "llvm/Support/SMLoc.h"
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include <string> #include <string>
namespace llvm { namespace llvm {
▲ Show 20 Lines • Show All 98 Lines • ▼ Show 20 Lines int64_t getIntVal() const {
return IntVal.getZExtValue(); return IntVal.getZExtValue();
} }
APInt getAPIntVal() const { APInt getAPIntVal() const {
assert((Kind == Integer || Kind == BigNum) && assert((Kind == Integer || Kind == BigNum) &&
"This token isn't an integer!"); "This token isn't an integer!");
return IntVal; return IntVal;
} }
void dump(raw_ostream &OS) const;
void dump() const { dump(dbgs()); }
}; };
/// A callback class which is notified of each comment in an assembly file as /// A callback class which is notified of each comment in an assembly file as
/// it is lexed. /// it is lexed.
class AsmCommentConsumer { class AsmCommentConsumer {
public: public:
virtual ~AsmCommentConsumer() = default; virtual ~AsmCommentConsumer() = default;
▲ Show 20 Lines • Show All 133 Lines • Show Last 20 Lines

llvm/trunk/lib/MC/MCParser/MCAsmLexer.cpp

//===- MCAsmLexer.cpp - Abstract Asm Lexer Interface ----------------------===// //===- MCAsmLexer.cpp - Abstract Asm Lexer Interface ----------------------===//
// //
// The LLVM Compiler Infrastructure // The LLVM Compiler Infrastructure
// //
// This file is distributed under the University of Illinois Open Source // This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details. // License. See LICENSE.TXT for details.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "llvm/MC/MCParser/MCAsmLexer.h" #include "llvm/MC/MCParser/MCAsmLexer.h"
#include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringRef.h"
#include "llvm/Support/SMLoc.h" #include "llvm/Support/SMLoc.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h"
using namespace llvm; using namespace llvm;
MCAsmLexer::MCAsmLexer() : AltMacroMode(false) { MCAsmLexer::MCAsmLexer() : AltMacroMode(false) {
CurTok.emplace_back(AsmToken::Space, StringRef()); CurTok.emplace_back(AsmToken::Space, StringRef());
} }
MCAsmLexer::~MCAsmLexer() = default; MCAsmLexer::~MCAsmLexer() = default;
SMLoc MCAsmLexer::getLoc() const { SMLoc MCAsmLexer::getLoc() const {
return SMLoc::getFromPointer(TokStart); return SMLoc::getFromPointer(TokStart);
} }
SMLoc AsmToken::getLoc() const { SMLoc AsmToken::getLoc() const {
return SMLoc::getFromPointer(Str.data()); return SMLoc::getFromPointer(Str.data());
} }
SMLoc AsmToken::getEndLoc() const { SMLoc AsmToken::getEndLoc() const {
return SMLoc::getFromPointer(Str.data() + Str.size()); return SMLoc::getFromPointer(Str.data() + Str.size());
} }
SMRange AsmToken::getLocRange() const { SMRange AsmToken::getLocRange() const {
return SMRange(getLoc(), getEndLoc()); return SMRange(getLoc(), getEndLoc());
} }
void AsmToken::dump(raw_ostream &OS) const {
switch (Kind) {
case AsmToken::Error:
OS << "error";
break;
case AsmToken::Identifier:
OS << "identifier: " << getString();
break;
case AsmToken::Integer:
OS << "int: " << getString();
break;
case AsmToken::Real:
OS << "real: " << getString();
break;
case AsmToken::String:
OS << "string: " << getString();
break;
case AsmToken::Amp: OS << "Amp"; break;
case AsmToken::AmpAmp: OS << "AmpAmp"; break;
case AsmToken::At: OS << "At"; break;
case AsmToken::BackSlash: OS << "BackSlash"; break;
case AsmToken::BigNum: OS << "BigNum"; break;
case AsmToken::Caret: OS << "Caret"; break;
case AsmToken::Colon: OS << "Colon"; break;
case AsmToken::Comma: OS << "Comma"; break;
case AsmToken::Comment: OS << "Comment"; break;
case AsmToken::Dollar: OS << "Dollar"; break;
case AsmToken::Dot: OS << "Dot"; break;
case AsmToken::EndOfStatement: OS << "EndOfStatement"; break;
case AsmToken::Eof: OS << "Eof"; break;
case AsmToken::Equal: OS << "Equal"; break;
case AsmToken::EqualEqual: OS << "EqualEqual"; break;
case AsmToken::Exclaim: OS << "Exclaim"; break;
case AsmToken::ExclaimEqual: OS << "ExclaimEqual"; break;
case AsmToken::Greater: OS << "Greater"; break;
case AsmToken::GreaterEqual: OS << "GreaterEqual"; break;
case AsmToken::GreaterGreater: OS << "GreaterGreater"; break;
case AsmToken::Hash: OS << "Hash"; break;
case AsmToken::HashDirective: OS << "HashDirective"; break;
case AsmToken::LBrac: OS << "LBrac"; break;
case AsmToken::LCurly: OS << "LCurly"; break;
case AsmToken::LParen: OS << "LParen"; break;
case AsmToken::Less: OS << "Less"; break;
case AsmToken::LessEqual: OS << "LessEqual"; break;
case AsmToken::LessGreater: OS << "LessGreater"; break;
case AsmToken::LessLess: OS << "LessLess"; break;
case AsmToken::Minus: OS << "Minus"; break;
case AsmToken::Percent: OS << "Percent"; break;
case AsmToken::Pipe: OS << "Pipe"; break;
case AsmToken::PipePipe: OS << "PipePipe"; break;
case AsmToken::Plus: OS << "Plus"; break;
case AsmToken::RBrac: OS << "RBrac"; break;
case AsmToken::RCurly: OS << "RCurly"; break;
case AsmToken::RParen: OS << "RParen"; break;
case AsmToken::Slash: OS << "Slash"; break;
case AsmToken::Space: OS << "Space"; break;
case AsmToken::Star: OS << "Star"; break;
case AsmToken::Tilde: OS << "Tilde"; break;
case AsmToken::PercentCall16: OS << "PercentCall16"; break;
case AsmToken::PercentCall_Hi: OS << "PercentCall_Hi"; break;
case AsmToken::PercentCall_Lo: OS << "PercentCall_Lo"; break;
case AsmToken::PercentDtprel_Hi: OS << "PercentDtprel_Hi"; break;
case AsmToken::PercentDtprel_Lo: OS << "PercentDtprel_Lo"; break;
case AsmToken::PercentGot: OS << "PercentGot"; break;
case AsmToken::PercentGot_Disp: OS << "PercentGot_Disp"; break;
case AsmToken::PercentGot_Hi: OS << "PercentGot_Hi"; break;
case AsmToken::PercentGot_Lo: OS << "PercentGot_Lo"; break;
case AsmToken::PercentGot_Ofst: OS << "PercentGot_Ofst"; break;
case AsmToken::PercentGot_Page: OS << "PercentGot_Page"; break;
case AsmToken::PercentGottprel: OS << "PercentGottprel"; break;
case AsmToken::PercentGp_Rel: OS << "PercentGp_Rel"; break;
case AsmToken::PercentHi: OS << "PercentHi"; break;
case AsmToken::PercentHigher: OS << "PercentHigher"; break;
case AsmToken::PercentHighest: OS << "PercentHighest"; break;
case AsmToken::PercentLo: OS << "PercentLo"; break;
case AsmToken::PercentNeg: OS << "PercentNeg"; break;
case AsmToken::PercentPcrel_Hi: OS << "PercentPcrel_Hi"; break;
case AsmToken::PercentPcrel_Lo: OS << "PercentPcrel_Lo"; break;
case AsmToken::PercentTlsgd: OS << "PercentTlsgd"; break;
case AsmToken::PercentTlsldm: OS << "PercentTlsldm"; break;
case AsmToken::PercentTprel_Hi: OS << "PercentTprel_Hi"; break;
case AsmToken::PercentTprel_Lo: OS << "PercentTprel_Lo"; break;
}
// Print the token string.
OS << " (\"";
OS.write_escaped(getString());
OS << "\")";
}

llvm/trunk/tools/llvm-mc/llvm-mc.cpp

Show First 20 Lines • Show All 232 Lines • ▼ Show 20 Lines
static int AsLexInput(SourceMgr &SrcMgr, MCAsmInfo &MAI, static int AsLexInput(SourceMgr &SrcMgr, MCAsmInfo &MAI,
raw_ostream &OS) { raw_ostream &OS) {
AsmLexer Lexer(MAI); AsmLexer Lexer(MAI);
Lexer.setBuffer(SrcMgr.getMemoryBuffer(SrcMgr.getMainFileID())->getBuffer()); Lexer.setBuffer(SrcMgr.getMemoryBuffer(SrcMgr.getMainFileID())->getBuffer());
bool Error = false; bool Error = false;
while (Lexer.Lex().isNot(AsmToken::Eof)) { while (Lexer.Lex().isNot(AsmToken::Eof)) {
const AsmToken &Tok = Lexer.getTok(); Lexer.getTok().dump(OS);
OS << "\n";
switch (Tok.getKind()) { if (Lexer.getTok().getKind() == AsmToken::Error)
default:
SrcMgr.PrintMessage(Lexer.getLoc(), SourceMgr::DK_Warning,
"unknown token");
Error = true; Error = true;
break;
case AsmToken::Error:
Error = true; // error already printed.
break;
case AsmToken::Identifier:
OS << "identifier: " << Lexer.getTok().getString();
break;
case AsmToken::Integer:
OS << "int: " << Lexer.getTok().getString();
break;
case AsmToken::Real:
OS << "real: " << Lexer.getTok().getString();
break;
case AsmToken::String:
OS << "string: " << Lexer.getTok().getString();
break;
case AsmToken::Amp: OS << "Amp"; break;
case AsmToken::AmpAmp: OS << "AmpAmp"; break;
case AsmToken::At: OS << "At"; break;
case AsmToken::Caret: OS << "Caret"; break;
case AsmToken::Colon: OS << "Colon"; break;
case AsmToken::Comma: OS << "Comma"; break;
case AsmToken::Dollar: OS << "Dollar"; break;
case AsmToken::Dot: OS << "Dot"; break;
case AsmToken::EndOfStatement: OS << "EndOfStatement"; break;
case AsmToken::Eof: OS << "Eof"; break;
case AsmToken::Equal: OS << "Equal"; break;
case AsmToken::EqualEqual: OS << "EqualEqual"; break;
case AsmToken::Exclaim: OS << "Exclaim"; break;
case AsmToken::ExclaimEqual: OS << "ExclaimEqual"; break;
case AsmToken::Greater: OS << "Greater"; break;
case AsmToken::GreaterEqual: OS << "GreaterEqual"; break;
case AsmToken::GreaterGreater: OS << "GreaterGreater"; break;
case AsmToken::Hash: OS << "Hash"; break;
case AsmToken::LBrac: OS << "LBrac"; break;
case AsmToken::LCurly: OS << "LCurly"; break;
case AsmToken::LParen: OS << "LParen"; break;
case AsmToken::Less: OS << "Less"; break;
case AsmToken::LessEqual: OS << "LessEqual"; break;
case AsmToken::LessGreater: OS << "LessGreater"; break;
case AsmToken::LessLess: OS << "LessLess"; break;
case AsmToken::Minus: OS << "Minus"; break;
case AsmToken::Percent: OS << "Percent"; break;
case AsmToken::Pipe: OS << "Pipe"; break;
case AsmToken::PipePipe: OS << "PipePipe"; break;
case AsmToken::Plus: OS << "Plus"; break;
case AsmToken::RBrac: OS << "RBrac"; break;
case AsmToken::RCurly: OS << "RCurly"; break;
case AsmToken::RParen: OS << "RParen"; break;
case AsmToken::Slash: OS << "Slash"; break;
case AsmToken::Star: OS << "Star"; break;
case AsmToken::Tilde: OS << "Tilde"; break;
case AsmToken::PercentCall16:
OS << "PercentCall16";
break;
case AsmToken::PercentCall_Hi:
OS << "PercentCall_Hi";
break;
case AsmToken::PercentCall_Lo:
OS << "PercentCall_Lo";
break;
case AsmToken::PercentDtprel_Hi:
OS << "PercentDtprel_Hi";
break;
case AsmToken::PercentDtprel_Lo:
OS << "PercentDtprel_Lo";
break;
case AsmToken::PercentGot:
OS << "PercentGot";
break;
case AsmToken::PercentGot_Disp:
OS << "PercentGot_Disp";
break;
case AsmToken::PercentGot_Hi:
OS << "PercentGot_Hi";
break;
case AsmToken::PercentGot_Lo:
OS << "PercentGot_Lo";
break;
case AsmToken::PercentGot_Ofst:
OS << "PercentGot_Ofst";
break;
case AsmToken::PercentGot_Page:
OS << "PercentGot_Page";
break;
case AsmToken::PercentGottprel:
OS << "PercentGottprel";
break;
case AsmToken::PercentGp_Rel:
OS << "PercentGp_Rel";
break;
case AsmToken::PercentHi:
OS << "PercentHi";
break;
case AsmToken::PercentHigher:
OS << "PercentHigher";
break;
case AsmToken::PercentHighest:
OS << "PercentHighest";
break;
case AsmToken::PercentLo:
OS << "PercentLo";
break;
case AsmToken::PercentNeg:
OS << "PercentNeg";
break;
case AsmToken::PercentPcrel_Hi:
OS << "PercentPcrel_Hi";
break;
case AsmToken::PercentPcrel_Lo:
OS << "PercentPcrel_Lo";
break;
case AsmToken::PercentTlsgd:
OS << "PercentTlsgd";
break;
case AsmToken::PercentTlsldm:
OS << "PercentTlsldm";
break;
case AsmToken::PercentTprel_Hi:
OS << "PercentTprel_Hi";
break;
case AsmToken::PercentTprel_Lo:
OS << "PercentTprel_Lo";
break;
}
// Print the token string.
OS << " (\"";
OS.write_escaped(Tok.getString());
OS << "\")\n";
} }
return Error; return Error;
} }
static int fillCommandLineSymbols(MCAsmParser &Parser) { static int fillCommandLineSymbols(MCAsmParser &Parser) {
for (auto &I: DefineSymbol) { for (auto &I: DefineSymbol) {
auto Pair = StringRef(I).split('='); auto Pair = StringRef(I).split('=');
▲ Show 20 Lines • Show All 241 Lines • Show Last 20 Lines