6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-28 22:24:28 +00:00
Code Issues Projects Releases Wiki Activity

Print out the location of expanded multiclass defs in TableGen errors.

Browse Source 
When reporting an error for a defm, we would previously only report the
location of the outer defm, which is not always where the error is.

Now we also print the location of the expanded multiclass defs:

lib/Target/X86/X86InstrSSE.td:2902:12: error: foo
  defm ADD : basic_sse12_fp_binop_s<0x58, "add", fadd, SSE_ALU_ITINS_S>,
             ^
lib/Target/X86/X86InstrSSE.td:2801:11: note: instantiated from multiclass
  defm PD : sse12_fp_packed<opc, !strconcat(OpcodeStr, "pd"), OpNode, VR128,
            ^
lib/Target/X86/X86InstrSSE.td:194:5: note: instantiated from multiclass
    def rm : PI<opc, MRMSrcMem, (outs RC:$dst), (ins RC:$src1, x86memop:$src2),
        ^

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@162409 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakob Stoklund Olesen
2012-08-22 23:33:58 +00:00
parent 6c6237f8dc
commit 376a8a773e
8 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/llvm/TableGen/Error.h
View File

@ -20,21 +20,22 @@
namespace llvm { namespace llvm {
class TGError { class TGError {
SMLoc Loc; SmallVector<SMLoc, 4> Locs;
std::string Message; std::string Message;
public: public:
TGError(SMLoc loc, const std::string &message) : Loc(loc), Message(message) {} TGError(ArrayRef<SMLoc> locs, const std::string &message)
: Locs(locs.begin(), locs.end()), Message(message) {}
SMLoc getLoc() const { return Loc; } ArrayRef<SMLoc> getLoc() const { return Locs; }
const std::string &getMessage() const { return Message; } const std::string &getMessage() const { return Message; }
}; };
void PrintWarning(SMLoc WarningLoc, const Twine &Msg); void PrintWarning(ArrayRef<SMLoc> WarningLoc, const Twine &Msg);
void PrintWarning(const char *Loc, const Twine &Msg); void PrintWarning(const char *Loc, const Twine &Msg);
void PrintWarning(const Twine &Msg); void PrintWarning(const Twine &Msg);
void PrintWarning(const TGError &Warning); void PrintWarning(const TGError &Warning);
void PrintError(SMLoc ErrorLoc, const Twine &Msg); void PrintError(ArrayRef<SMLoc> ErrorLoc, const Twine &Msg);
void PrintError(const char *Loc, const Twine &Msg); void PrintError(const char *Loc, const Twine &Msg);
void PrintError(const Twine &Msg); void PrintError(const Twine &Msg);
void PrintError(const TGError &Error); void PrintError(const TGError &Error);

18
include/llvm/TableGen/Record.h
View File

@ -1301,7 +1301,9 @@ class Record {
// Unique record ID. // Unique record ID.
unsigned ID; unsigned ID;
Init *Name; Init *Name;
SMLoc Loc; // Location where record was instantiated, followed by the location of
// multiclass prototypes used.
SmallVector<SMLoc, 4> Locs;
std::vector<Init *> TemplateArgs; std::vector<Init *> TemplateArgs;
std::vector<RecordVal> Values; std::vector<RecordVal> Values;
std::vector<Record*> SuperClasses; std::vector<Record*> SuperClasses;
@ -1317,13 +1319,15 @@ class Record {
public: public:
// Constructs a record. // Constructs a record.
explicit Record(const std::string &N, SMLoc loc, RecordKeeper &records) : explicit Record(const std::string &N, ArrayRef<SMLoc> locs,
ID(LastID++), Name(StringInit::get(N)), Loc(loc), TrackedRecords(records), RecordKeeper &records) :
TheInit(0) { ID(LastID++), Name(StringInit::get(N)), Locs(locs.begin(), locs.end()),
TrackedRecords(records), TheInit(0) {
init(); init();
} }
explicit Record(Init *N, SMLoc loc, RecordKeeper &records) : explicit Record(Init *N, ArrayRef<SMLoc> locs, RecordKeeper &records) :
ID(LastID++), Name(N), Loc(loc), TrackedRecords(records), TheInit(0) { ID(LastID++), Name(N), Locs(locs.begin(), locs.end()),
TrackedRecords(records), TheInit(0) {
init(); init();
} }
~Record() {} ~Record() {}
@ -1345,7 +1349,7 @@ public:
void setName(Init *Name); // Also updates RecordKeeper. void setName(Init *Name); // Also updates RecordKeeper.
void setName(const std::string &Name); // Also updates RecordKeeper. void setName(const std::string &Name); // Also updates RecordKeeper.
SMLoc getLoc() const { return Loc; } ArrayRef<SMLoc> getLoc() const { return Locs; }
/// get the corresponding DefInit. /// get the corresponding DefInit.
DefInit *getDefInit(); DefInit *getDefInit();

19
lib/TableGen/Error.cpp
View File

@ -20,8 +20,19 @@ namespace llvm {
SourceMgr SrcMgr; SourceMgr SrcMgr;
void PrintWarning(SMLoc WarningLoc, const Twine &Msg) { static void PrintMessage(ArrayRef<SMLoc> Loc, SourceMgr::DiagKind Kind,
SrcMgr.PrintMessage(WarningLoc, SourceMgr::DK_Warning, Msg); const Twine &Msg) {
SMLoc NullLoc;
if (Loc.empty())
Loc = NullLoc;
SrcMgr.PrintMessage(Loc.front(), Kind, Msg);
for (unsigned i = 1; i < Loc.size(); ++i)
SrcMgr.PrintMessage(Loc[i], SourceMgr::DK_Note,
"instantiated from multiclass");
}
void PrintWarning(ArrayRef<SMLoc> WarningLoc, const Twine &Msg) {
PrintMessage(WarningLoc, SourceMgr::DK_Warning, Msg);
} }
void PrintWarning(const char *Loc, const Twine &Msg) { void PrintWarning(const char *Loc, const Twine &Msg) {
@ -36,8 +47,8 @@ void PrintWarning(const TGError &Warning) {
PrintWarning(Warning.getLoc(), Warning.getMessage()); PrintWarning(Warning.getLoc(), Warning.getMessage());
} }
void PrintError(SMLoc ErrorLoc, const Twine &Msg) { void PrintError(ArrayRef<SMLoc> ErrorLoc, const Twine &Msg) {
SrcMgr.PrintMessage(ErrorLoc, SourceMgr::DK_Error, Msg); PrintMessage(ErrorLoc, SourceMgr::DK_Error, Msg);
} }
void PrintError(const char *Loc, const Twine &Msg) { void PrintError(const char *Loc, const Twine &Msg) {

5
lib/TableGen/TGParser.cpp
View File

@ -2277,7 +2277,10 @@ InstantiateMulticlassDef(MultiClass &MC,
DefName, StringRecTy::get())->Fold(DefProto, &MC); DefName, StringRecTy::get())->Fold(DefProto, &MC);
} }
Record *CurRec = new Record(DefName, DefmPrefixLoc, Records); // Make a trail of SMLocs from the multiclass instantiations.
SmallVector<SMLoc, 4> Locs(1, DefmPrefixLoc);
Locs.append(DefProto->getLoc().begin(), DefProto->getLoc().end());
Record *CurRec = new Record(DefName, Locs, Records);
SubClassReference Ref; SubClassReference Ref;
Ref.RefLoc = DefmPrefixLoc; Ref.RefLoc = DefmPrefixLoc;

2
utils/TableGen/AsmMatcherEmitter.cpp
View File

@ -666,7 +666,7 @@ void MatchableInfo::dump() {
} }
static std::pair<StringRef, StringRef> static std::pair<StringRef, StringRef>
parseTwoOperandConstraint(StringRef S, SMLoc Loc) { parseTwoOperandConstraint(StringRef S, ArrayRef<SMLoc> Loc) {
// Split via the '='. // Split via the '='.
std::pair<StringRef, StringRef> Ops = S.split('='); std::pair<StringRef, StringRef> Ops = S.split('=');
if (Ops.second == "") if (Ops.second == "")

2
utils/TableGen/CodeGenInstruction.cpp
View File

@ -409,7 +409,7 @@ FlattenAsmStringVariants(StringRef Cur, unsigned Variant) {
/// successful match, with ResOp set to the result operand to be used. /// successful match, with ResOp set to the result operand to be used.
bool CodeGenInstAlias::tryAliasOpMatch(DagInit *Result, unsigned AliasOpNo, bool CodeGenInstAlias::tryAliasOpMatch(DagInit *Result, unsigned AliasOpNo,
Record *InstOpRec, bool hasSubOps, Record *InstOpRec, bool hasSubOps,
SMLoc Loc, CodeGenTarget &T, ArrayRef<SMLoc> Loc, CodeGenTarget &T,
ResultOperand &ResOp) { ResultOperand &ResOp) {
Init *Arg = Result->getArg(AliasOpNo); Init *Arg = Result->getArg(AliasOpNo);
DefInit *ADI = dynamic_cast<DefInit*>(Arg); DefInit *ADI = dynamic_cast<DefInit*>(Arg);

2
utils/TableGen/CodeGenInstruction.h
View File

@ -319,7 +319,7 @@ namespace llvm {
CodeGenInstAlias(Record *R, CodeGenTarget &T); CodeGenInstAlias(Record *R, CodeGenTarget &T);
bool tryAliasOpMatch(DagInit *Result, unsigned AliasOpNo, bool tryAliasOpMatch(DagInit *Result, unsigned AliasOpNo,
Record *InstOpRec, bool hasSubOps, SMLoc Loc, Record *InstOpRec, bool hasSubOps, ArrayRef<SMLoc> Loc,
CodeGenTarget &T, ResultOperand &ResOp); CodeGenTarget &T, ResultOperand &ResOp);
}; };
} }

4
utils/TableGen/CodeGenRegisters.cpp
View File

@ -298,7 +298,7 @@ CodeGenRegister::computeSubRegs(CodeGenRegBank &RegBank) {
for (SubRegMap::const_iterator SI = SubRegs.begin(), SE = SubRegs.end(); for (SubRegMap::const_iterator SI = SubRegs.begin(), SE = SubRegs.end();
SI != SE; ++SI) { SI != SE; ++SI) {
if (SI->second == this) { if (SI->second == this) {
SMLoc Loc; ArrayRef<SMLoc> Loc;
if (TheDef) if (TheDef)
Loc = TheDef->getLoc(); Loc = TheDef->getLoc();
throw TGError(Loc, "Register " + getName() + throw TGError(Loc, "Register " + getName() +
@ -310,7 +310,7 @@ CodeGenRegister::computeSubRegs(CodeGenRegBank &RegBank) {
if (Ins->second == SI->first) if (Ins->second == SI->first)
continue; continue;
// Trouble: Two different names for SI->second. // Trouble: Two different names for SI->second.
SMLoc Loc; ArrayRef<SMLoc> Loc;
if (TheDef) if (TheDef)
Loc = TheDef->getLoc(); Loc = TheDef->getLoc();
throw TGError(Loc, "Sub-register can't have two names: " + throw TGError(Loc, "Sub-register can't have two names: " +