From: Chris Lattner Date: Mon, 2 Dec 2002 16:43:30 +0000 (+0000) Subject: * Move BitsInit::resolveReferences up with the rest of BitsInit code X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=28520c4b61ed71d6c47ce3f9bfc9e2ed659d51a5;p=oota-llvm.git * Move BitsInit::resolveReferences up with the rest of BitsInit code * Initial support for field expressions git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4849 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/support/tools/TableGen/Record.cpp b/support/tools/TableGen/Record.cpp index 8324bad5c16..d9cddf8fce2 100644 --- a/support/tools/TableGen/Record.cpp +++ b/support/tools/TableGen/Record.cpp @@ -206,6 +206,26 @@ bool BitsInit::printAsUnset(std::ostream &OS) const { return false; } +Init *BitsInit::resolveReferences(Record &R) { + bool Changed = false; + BitsInit *New = new BitsInit(getNumBits()); + + for (unsigned i = 0, e = Bits.size(); i != e; ++i) { + Init *B; + New->setBit(i, getBit(i)); + do { + B = New->getBit(i); + New->setBit(i, B->resolveReferences(R)); + Changed |= B != New->getBit(i); + } while (B != New->getBit(i)); + } + + if (Changed) + return New; + delete New; + return this; +} + Init *IntInit::convertInitializerBitRange(const std::vector &Bits) { BitsInit *BI = new BitsInit(Bits.size()); @@ -244,28 +264,14 @@ Init *VarInit::convertInitializerBitRange(const std::vector &Bits) { return BI; } -Init *BitsInit::resolveReferences(Record &R) { - bool Changed = false; - BitsInit *New = new BitsInit(getNumBits()); - - for (unsigned i = 0, e = Bits.size(); i != e; ++i) { - Init *B; - New->setBit(i, getBit(i)); - do { - B = New->getBit(i); - New->setBit(i, B->resolveReferences(R)); - Changed |= B != New->getBit(i); - } while (B != New->getBit(i)); - } - - if (Changed) - return New; - delete New; - return this; +RecTy *VarInit::getFieldType(const std::string &FieldName) const { + if (RecordRecTy *RTy = dynamic_cast(Ty)) + if (const RecordVal *RV = RTy->getRecord()->getValue(FieldName)) + return RV->getType(); + return 0; } - Init *VarBitInit::resolveReferences(Record &R) { if (R.isTemplateArg(getVariable()->getName())) return this; diff --git a/utils/TableGen/Record.cpp b/utils/TableGen/Record.cpp index 8324bad5c16..d9cddf8fce2 100644 --- a/utils/TableGen/Record.cpp +++ b/utils/TableGen/Record.cpp @@ -206,6 +206,26 @@ bool BitsInit::printAsUnset(std::ostream &OS) const { return false; } +Init *BitsInit::resolveReferences(Record &R) { + bool Changed = false; + BitsInit *New = new BitsInit(getNumBits()); + + for (unsigned i = 0, e = Bits.size(); i != e; ++i) { + Init *B; + New->setBit(i, getBit(i)); + do { + B = New->getBit(i); + New->setBit(i, B->resolveReferences(R)); + Changed |= B != New->getBit(i); + } while (B != New->getBit(i)); + } + + if (Changed) + return New; + delete New; + return this; +} + Init *IntInit::convertInitializerBitRange(const std::vector &Bits) { BitsInit *BI = new BitsInit(Bits.size()); @@ -244,28 +264,14 @@ Init *VarInit::convertInitializerBitRange(const std::vector &Bits) { return BI; } -Init *BitsInit::resolveReferences(Record &R) { - bool Changed = false; - BitsInit *New = new BitsInit(getNumBits()); - - for (unsigned i = 0, e = Bits.size(); i != e; ++i) { - Init *B; - New->setBit(i, getBit(i)); - do { - B = New->getBit(i); - New->setBit(i, B->resolveReferences(R)); - Changed |= B != New->getBit(i); - } while (B != New->getBit(i)); - } - - if (Changed) - return New; - delete New; - return this; +RecTy *VarInit::getFieldType(const std::string &FieldName) const { + if (RecordRecTy *RTy = dynamic_cast(Ty)) + if (const RecordVal *RV = RTy->getRecord()->getValue(FieldName)) + return RV->getType(); + return 0; } - Init *VarBitInit::resolveReferences(Record &R) { if (R.isTemplateArg(getVariable()->getName())) return this;