6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-21 02:29:22 +00:00
Code Issues Projects Releases Wiki Activity

Teach TableGen to understand X.Y notation in the TSFlagsFields strings.

Browse Source 
Remove much horribleness from X86InstrFormats as a result. Similar
simplifications are probably possible for other targets.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99539 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakob Stoklund Olesen 2010-03-25 18:52:01 +00:00
parent 7bf198fd60
commit 70feca409e
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Target/X86/X86.td
View File

@ -160,11 +160,11 @@ def X86InstrInfo : InstrInfo {
"hasAdSizePrefix",
"Prefix",
"hasREX_WPrefix",
"ImmTypeBits",
"FPFormBits",
"ImmT.Value",
"FPForm.Value",
"hasLockPrefix",
"SegOvrBits",
"DomainBits",
"ExeDomain.Value",
"Opcode"];
let TSFlagsShifts = [0,
6,

9
lib/Target/X86/X86InstrFormats.td
View File

@ -111,7 +111,6 @@ class X86Inst<bits<8> opcod, Format f, ImmType i, dag outs, dag ins,
Format Form = f;
bits<6> FormBits = Form.Value;
ImmType ImmT = i;
bits<3> ImmTypeBits = ImmT.Value;
dag OutOperandList = outs;
dag InOperandList = ins;
@ -125,12 +124,10 @@ class X86Inst<bits<8> opcod, Format f, ImmType i, dag outs, dag ins,
bits<4> Prefix = 0; // Which prefix byte does this inst have?
bit hasREX_WPrefix = 0; // Does this inst requires the REX.W prefix?
FPFormat FPForm; // What flavor of FP instruction is this?
bits<3> FPFormBits = 0;
FPFormat FPForm = NotFP; // What flavor of FP instruction is this?
bit hasLockPrefix = 0; // Does this inst have a 0xF0 prefix?
bits<2> SegOvrBits = 0; // Segment override prefix.
Domain Dom = d;
bits<2> DomainBits = Dom.Value;
Domain ExeDomain = d;
}
class I<bits<8> o, Format f, dag outs, dag ins, string asm,
@ -179,7 +176,7 @@ class FPI<bits<8> o, Format F, dag outs, dag ins, string asm>
// FpI_ - Floating Point Psuedo Instruction template. Not Predicated.
class FpI_<dag outs, dag ins, FPFormat fp, list<dag> pattern>
: X86Inst<0, Pseudo, NoImm, outs, ins, ""> {
let FPForm = fp; let FPFormBits = FPForm.Value;
let FPForm = fp;
let Pattern = pattern;
}

2
lib/Target/X86/X86InstrInfo.td
View File

@ -587,7 +587,7 @@ let neverHasSideEffects = 1, isNotDuplicable = 1, Uses = [ESP] in
// Return instructions.
let isTerminator = 1, isReturn = 1, isBarrier = 1,
hasCtrlDep = 1, FPForm = SpecialFP, FPFormBits = SpecialFP.Value in {
hasCtrlDep = 1, FPForm = SpecialFP in {
def RET : I <0xC3, RawFrm, (outs), (ins variable_ops),
"ret",
[(X86retflag 0)]>;

2
utils/TableGen/InstrInfoEmitter.cpp
View File

@ -337,7 +337,7 @@ void InstrInfoEmitter::emitShiftedValue(Record *R, StringInit *Val,
IntInit *ShiftInt, raw_ostream &OS) {
if (Val == 0 || ShiftInt == 0)
throw std::string("Illegal value or shift amount in TargetInfo*!");
RecordVal *RV = R->getValue(Val->getValue());
RecordVal *RV = R->getDottedValue(Val->getValue());
int Shift = ShiftInt->getValue();
if (RV == 0 || RV->getValue() == 0) {

10
utils/TableGen/Record.cpp
View File

@ -1307,6 +1307,16 @@ void Record::resolveReferencesTo(const RecordVal *RV) {
}
}
RecordVal *Record::getDottedValue(StringRef Name) {
size_t pos = Name.find('.');
if (pos == StringRef::npos)
return getValue(Name);
RecordVal *RV = getValue(Name.substr(0, pos));
if (!RV) return 0;
DefInit *DI = dynamic_cast<DefInit*>(RV->getValue());
if (!DI) return 0;
return DI->getDef()->getDottedValue(Name.substr(pos+1));
}
void Record::dump() const { errs() << *this; }

3
utils/TableGen/Record.h
View File

@ -1262,6 +1262,9 @@ public:
return 0;
}
// Like getValue, but allow dotting into members: X.Y
RecordVal *getDottedValue(StringRef Name);
void addTemplateArg(StringRef Name) {
assert(!isTemplateArg(Name) && "Template arg already defined!");
TemplateArgs.push_back(Name);