From 74096f725805a8c281f9a4da87af348f8fa348f0 Mon Sep 17 00:00:00 2001 From: Krzysztof Parzyszek Date: Fri, 30 Mar 2018 19:30:28 +0000 Subject: [PATCH] [Hexagon] Reduce excessive indentation in .s output llvm-svn: 328898 --- .../Hexagon/MCTargetDesc/HexagonInstPrinter.cpp | 20 ++++++-------------- .../Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp | 4 ++-- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonInstPrinter.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonInstPrinter.cpp index 4142b99..3b3a15b 100644 --- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonInstPrinter.cpp +++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonInstPrinter.cpp @@ -69,20 +69,12 @@ void HexagonInstPrinter::printInst(const MCInst *MI, raw_ostream &OS, OS << "\n"; } - if (HexagonMCInstrInfo::isInnerLoop(*MI)) { - if (HexagonMCInstrInfo::isOuterLoop(*MI)) { - MCInst ME; - ME.setOpcode(Hexagon::ENDLOOP01); - printInstruction(&ME, OS); - } else { - MCInst ME; - ME.setOpcode(Hexagon::ENDLOOP0); - printInstruction(&ME, OS); - } - } else if (HexagonMCInstrInfo::isOuterLoop(*MI)) { - MCInst ME; - ME.setOpcode(Hexagon::ENDLOOP1); - printInstruction(&ME, OS); + bool IsLoop0 = HexagonMCInstrInfo::isInnerLoop(*MI); + bool IsLoop1 = HexagonMCInstrInfo::isOuterLoop(*MI); + if (IsLoop0) { + OS << (IsLoop1 ? " :endloop01" : " :endloop0"); + } else if (IsLoop1) { + OS << " :endloop1"; } } diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp index 3fbe219..5a330fa 100644 --- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp +++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp @@ -147,7 +147,7 @@ public: auto PacketBundle = Contents.rsplit('\n'); auto HeadTail = PacketBundle.first.split('\n'); StringRef Separator = "\n"; - StringRef Indent = "\t\t"; + StringRef Indent = "\t"; OS << "\t{\n"; while (!HeadTail.first.empty()) { StringRef InstTxt; @@ -164,7 +164,7 @@ public: } if (HexagonMCInstrInfo::isMemReorderDisabled(Inst)) - OS << "\n\t}:mem_noshuf" << PacketBundle.second; + OS << "\n\t} :mem_noshuf" << PacketBundle.second; else OS << "\t}" << PacketBundle.second; } -- 2.7.4