diff options
| author | Michael Kuperstein <michael.m.kuperstein@intel.com> | 2015-02-19 11:38:11 +0000 |
|---|---|---|
| committer | Michael Kuperstein <michael.m.kuperstein@intel.com> | 2015-02-19 11:38:11 +0000 |
| commit | efd7a96d2e8ff886fb2a1bc755dd6355b2bb5f17 (patch) | |
| tree | c0afe1a7e7975789a575b441ac8e4e988da8f49c /llvm/utils/TableGen/FixedLenDecoderEmitter.cpp | |
| parent | 9570ff94f7f19af86a5f0cf3ea2992173980b3d8 (diff) | |
| download | llvm-efd7a96d2e8ff886fb2a1bc755dd6355b2bb5f17.zip llvm-efd7a96d2e8ff886fb2a1bc755dd6355b2bb5f17.tar.gz llvm-efd7a96d2e8ff886fb2a1bc755dd6355b2bb5f17.tar.bz2 | |
Reverting r229831 due to multiple ARM/PPC/MIPS build-bot failures.
llvm-svn: 229841
Diffstat (limited to 'llvm/utils/TableGen/FixedLenDecoderEmitter.cpp')
| -rw-r--r-- | llvm/utils/TableGen/FixedLenDecoderEmitter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp b/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp index 7ab4662..292a2b1 100644 --- a/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp +++ b/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp @@ -848,7 +848,7 @@ emitPredicateFunction(formatted_raw_ostream &OS, PredicateSet &Predicates, // The predicate function is just a big switch statement based on the // input predicate index. OS.indent(Indentation) << "static bool checkDecoderPredicate(unsigned Idx, " - << "const FeatureBitset& Bits) {\n"; + << "uint64_t Bits) {\n"; Indentation += 2; if (!Predicates.empty()) { OS.indent(Indentation) << "switch (Idx) {\n"; @@ -1102,10 +1102,10 @@ unsigned FilterChooser::getDecoderIndex(DecoderSet &Decoders, static void emitSinglePredicateMatch(raw_ostream &o, StringRef str, const std::string &PredicateNamespace) { if (str[0] == '!') - o << "!Bits[" << PredicateNamespace << "::" - << str.slice(1,str.size()) << "]"; + o << "!(Bits & " << PredicateNamespace << "::" + << str.slice(1,str.size()) << ")"; else - o << "Bits[" << PredicateNamespace << "::" << str << "]"; + o << "(Bits & " << PredicateNamespace << "::" << str << ")"; } bool FilterChooser::emitPredicateMatch(raw_ostream &o, unsigned &Indentation, @@ -2010,7 +2010,7 @@ static void emitDecodeInstruction(formatted_raw_ostream &OS) { << " InsnType insn, uint64_t Address,\n" << " const void *DisAsm,\n" << " const MCSubtargetInfo &STI) {\n" - << " const FeatureBitset& Bits = STI.getFeatureBits();\n" + << " uint64_t Bits = STI.getFeatureBits();\n" << "\n" << " const uint8_t *Ptr = DecodeTable;\n" << " uint32_t CurFieldValue = 0;\n" |