diff options
Diffstat (limited to 'llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp index 38c291c..e492801 100644 --- a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp +++ b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp @@ -135,7 +135,7 @@ public: ARMDisassembler(const MCSubtargetInfo &STI, MCContext &Ctx, const MCInstrInfo *MCII) : MCDisassembler(STI, Ctx), MCII(MCII) { - InstructionEndianness = STI.getFeatureBits()[ARM::ModeBigEndianInstructions] + InstructionEndianness = STI.hasFeature(ARM::ModeBigEndianInstructions) ? llvm::support::big : llvm::support::little; } @@ -746,7 +746,7 @@ uint64_t ARMDisassembler::suggestBytesToSkip(ArrayRef<uint8_t> Bytes, // In Arm state, instructions are always 4 bytes wide, so there's no // point in skipping any smaller number of bytes if an instruction // can't be decoded. - if (!STI.getFeatureBits()[ARM::ModeThumb]) + if (!STI.hasFeature(ARM::ModeThumb)) return 4; // In a Thumb instruction stream, a halfword is a standalone 2-byte @@ -773,7 +773,7 @@ DecodeStatus ARMDisassembler::getInstruction(MCInst &MI, uint64_t &Size, ArrayRef<uint8_t> Bytes, uint64_t Address, raw_ostream &CS) const { - if (STI.getFeatureBits()[ARM::ModeThumb]) + if (STI.hasFeature(ARM::ModeThumb)) return getThumbInstruction(MI, Size, Bytes, Address, CS); return getARMInstruction(MI, Size, Bytes, Address, CS); } @@ -784,7 +784,7 @@ DecodeStatus ARMDisassembler::getARMInstruction(MCInst &MI, uint64_t &Size, raw_ostream &CS) const { CommentStream = &CS; - assert(!STI.getFeatureBits()[ARM::ModeThumb] && + assert(!STI.hasFeature(ARM::ModeThumb) && "Asked to disassemble an ARM instruction but Subtarget is in Thumb " "mode!"); @@ -1070,7 +1070,7 @@ DecodeStatus ARMDisassembler::getThumbInstruction(MCInst &MI, uint64_t &Size, raw_ostream &CS) const { CommentStream = &CS; - assert(STI.getFeatureBits()[ARM::ModeThumb] && + assert(STI.hasFeature(ARM::ModeThumb) && "Asked to disassemble in Thumb mode but Subtarget is in ARM mode!"); // We want to read exactly 2 bytes of data. |