diff options
author | Jay Foad <jay.foad@gmail.com> | 2011-06-23 09:09:15 +0000 |
---|---|---|
committer | Jay Foad <jay.foad@gmail.com> | 2011-06-23 09:09:15 +0000 |
commit | 95c3e48f9557adb6064d580684bb14cacec2f826 (patch) | |
tree | 377049dc513cb4332763e8da894cc3e7aa7ec72e /lib/MC/MCAsmStreamer.cpp | |
parent | 5b46e8e6b82226810d0d6440b7b5fb05e68df5e8 (diff) | |
download | llvm-95c3e48f9557adb6064d580684bb14cacec2f826.tar.gz llvm-95c3e48f9557adb6064d580684bb14cacec2f826.tar.bz2 llvm-95c3e48f9557adb6064d580684bb14cacec2f826.tar.xz |
Reinstate r133513 (reverted in r133700) with an additional fix for a
-Wshorten-64-to-32 warning in Instructions.h.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133708 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/MCAsmStreamer.cpp')
-rw-r--r-- | lib/MC/MCAsmStreamer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp index 54e6b5d9b9..acf77558c3 100644 --- a/lib/MC/MCAsmStreamer.cpp +++ b/lib/MC/MCAsmStreamer.cpp @@ -1119,7 +1119,7 @@ void MCAsmStreamer::AddEncodingComment(const MCInst &Inst) { } else { // Otherwise, write out in binary. OS << "0b"; - for (int j = 7; j >= 0; j--) { + for (unsigned j = 8; j--;) { unsigned Bit = (Code[i] >> j) & 1; unsigned FixupBit; @@ -1128,9 +1128,9 @@ void MCAsmStreamer::AddEncodingComment(const MCInst &Inst) { else FixupBit = i * 8 + (7-j); - if (uint8_t FixupMapEntry = FixupMap[FixupBit]) { - //assert(Bit == 0 && "Encoder wrote into fixed up bit!"); - OS << char('A' + FixupMapEntry - 1); + if (uint8_t MapEntry = FixupMap[FixupBit]) { + assert(Bit == 0 && "Encoder wrote into fixed up bit!"); + OS << char('A' + MapEntry - 1); } else OS << Bit; } |