From c8ff9cde04c2016af4a486330bb3e286ba62b003 Mon Sep 17 00:00:00 2001 From: Alessandro Di Federico Date: Sun, 30 May 2021 08:25:34 +0200 Subject: [PATCH] SegmentInfo::generateName: move to BinaryFile.cpp --- include/revng/Lift/BinaryFile.h | 2 +- lib/Lift/BinaryFile.cpp | 10 ++++++++++ lib/Lift/CodeGenerator.cpp | 10 ---------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/revng/Lift/BinaryFile.h b/include/revng/Lift/BinaryFile.h index d9ce2b14c..d7a34e28c 100644 --- a/include/revng/Lift/BinaryFile.h +++ b/include/revng/Lift/BinaryFile.h @@ -51,7 +51,7 @@ struct SegmentInfo { IsReadable(false) {} /// Produce a name for this segment suitable for human understanding - std::string generateName(); + std::string generateName() const; bool contains(MetaAddress Address) const { return (StartVirtualAddress.addressLowerThanOrEqual(Address) diff --git a/lib/Lift/BinaryFile.cpp b/lib/Lift/BinaryFile.cpp index b3a7c1a55..3840f1d56 100644 --- a/lib/Lift/BinaryFile.cpp +++ b/lib/Lift/BinaryFile.cpp @@ -2030,3 +2030,13 @@ BinaryFile::nameForAddress(MetaAddress Address, uint64_t Size) const { Address.dump(Result); return Result.str(); } + +std::string SegmentInfo::generateName() const { + // Create name from start and size + std::stringstream NameStream; + NameStream << "o_" << (IsReadable ? "r" : "") << (IsWriteable ? "w" : "") + << (IsExecutable ? "x" : "") << "_0x" << std::hex + << StartVirtualAddress.address(); + + return NameStream.str(); +} diff --git a/lib/Lift/CodeGenerator.cpp b/lib/Lift/CodeGenerator.cpp index 57000a0e2..e1d183786 100644 --- a/lib/Lift/CodeGenerator.cpp +++ b/lib/Lift/CodeGenerator.cpp @@ -346,16 +346,6 @@ CodeGenerator::CodeGenerator(BinaryFile &Binary, NeededLibsStream << Library << "\n"; } -std::string SegmentInfo::generateName() { - // Create name from start and size - std::stringstream NameStream; - NameStream << "o_" << (IsReadable ? "r" : "") << (IsWriteable ? "w" : "") - << (IsExecutable ? "x" : "") << "_0x" << std::hex - << StartVirtualAddress.address(); - - return NameStream.str(); -} - static BasicBlock *replaceFunction(Function *ToReplace) { // Save metadata SmallVector, 4> SavedMetadata;