Index: llvm/lib/MC/MCInstPrinter.cpp =================================================================== --- llvm/lib/MC/MCInstPrinter.cpp +++ llvm/lib/MC/MCInstPrinter.cpp @@ -83,15 +83,19 @@ } format_object MCInstPrinter::formatHex(int64_t Value) const { - switch(PrintHexStyle) { + switch (PrintHexStyle) { case HexStyle::C: - if (Value < 0) + if (Value == std::numeric_limits::min()) + return format("-0x8000000000000000"); + else if (Value < 0) return format("-0x%" PRIx64, -Value); else return format("0x%" PRIx64, Value); case HexStyle::Asm: - if (Value < 0) { - if (needsLeadingZero((uint64_t)(-Value))) + if (Value == std::numeric_limits::min()) + return format("-8000000000000000h"); + else if (Value < 0) { + if (needsLeadingZero(-(uint64_t)(Value))) return format("-0%" PRIx64 "h", -Value); else return format("-%" PRIx64 "h", -Value); Index: llvm/unittests/MC/CMakeLists.txt =================================================================== --- llvm/unittests/MC/CMakeLists.txt +++ llvm/unittests/MC/CMakeLists.txt @@ -8,6 +8,7 @@ add_llvm_unittest(MCTests Disassembler.cpp DwarfLineTables.cpp + MCInstPrinter.cpp StringTableBuilderTest.cpp TargetRegistry.cpp ) Index: llvm/unittests/MC/MCInstPrinter.cpp =================================================================== --- /dev/null +++ llvm/unittests/MC/MCInstPrinter.cpp @@ -0,0 +1,76 @@ +//===- llvm/unittest/MC/MCInstPrinter.cpp ---------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "llvm/MC/MCInstPrinter.h" +#include "llvm/MC/MCAsmInfo.h" +#include "llvm/MC/MCInstrInfo.h" +#include "llvm/Support/TargetRegistry.h" +#include "llvm/Support/TargetSelect.h" +#include "llvm/Target/TargetMachine.h" +#include "llvm/Target/TargetOptions.h" +#include "gtest/gtest.h" + +using namespace llvm; + +namespace { + +struct Printer { + std::unique_ptr MRI; + std::unique_ptr MAI; + std::unique_ptr MII; + std::unique_ptr MIP; + + Printer() { + llvm::InitializeAllTargetInfos(); + llvm::InitializeAllTargetMCs(); + + std::string TripleName = "x86_64-pc-linux"; + std::string ErrorStr; + + const Target *TheTarget = + TargetRegistry::lookupTarget(TripleName, ErrorStr); + + // If we didn't build x86, do not run the test. + if (!TheTarget) + return; + + MRI.reset(TheTarget->createMCRegInfo(TripleName)); + MAI.reset(TheTarget->createMCAsmInfo(*MRI, TripleName)); + MII.reset(TheTarget->createMCInstrInfo()); + MIP.reset(TheTarget->createMCInstPrinter( + Triple(TripleName), MAI->getAssemblerDialect(), *MAI, *MII, *MRI)); + } + + operator bool() { return MIP.get(); } + + template std::string formatHex(T i) { + std::string Buffer; + raw_string_ostream OS(Buffer); + OS << MIP->formatHex(i); + OS.flush(); + return Buffer; + } +}; + +Printer &getPrinter() { + static Printer P; + return P; +} +} // namespace + +TEST(MCInstPrinter, formatHex) { + Printer &P = getPrinter(); + if (!P) + return; + + EXPECT_EQ("0x1", P.formatHex(1)); + EXPECT_EQ("0x7fffffffffffffff", + P.formatHex(std::numeric_limits::max())); + EXPECT_EQ("-0x8000000000000000", + P.formatHex(std::numeric_limits::min())); +}