Index: include/lldb/Utility/MemoryRegionInfo.h =================================================================== --- include/lldb/Utility/MemoryRegionInfo.h +++ include/lldb/Utility/MemoryRegionInfo.h @@ -1,5 +1,4 @@ -//===-- MemoryRegionInfo.h ---------------------------------------*- C++ -//-*-===// +//===-- MemoryRegionInfo.h --------------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef lldb_MemoryRegionInfo_h -#define lldb_MemoryRegionInfo_h +#ifndef LLDB_UTILITY_MEMORYREGIONINFO_H +#define LLDB_UTILITY_MEMORYREGIONINFO_H #include "lldb/Utility/ConstString.h" #include "lldb/Utility/RangeMap.h" @@ -107,7 +106,7 @@ OptionalBool m_flash; lldb::offset_t m_blocksize; }; - + inline bool operator<(const MemoryRegionInfo &lhs, const MemoryRegionInfo &rhs) { return lhs.GetRange() < rhs.GetRange(); @@ -127,14 +126,14 @@ using std::vector::vector; }; -} +} // namespace lldb_private namespace llvm { template <> struct format_provider { static void format(const lldb_private::MemoryRegionInfo::OptionalBool &B, raw_ostream &OS, StringRef Options) { - switch(B) { + switch (B) { case lldb_private::MemoryRegionInfo::eNo: OS << "no"; return; @@ -147,6 +146,6 @@ } } }; -} +} // namespace llvm -#endif // #ifndef lldb_MemoryRegionInfo_h +#endif // LLDB_UTILITY_MEMORYREGIONINFO_H Index: source/API/SBMemoryRegionInfo.cpp =================================================================== --- source/API/SBMemoryRegionInfo.cpp +++ source/API/SBMemoryRegionInfo.cpp @@ -10,7 +10,7 @@ #include "lldb/API/SBDefines.h" #include "lldb/API/SBError.h" #include "lldb/API/SBStream.h" -#include "lldb/Target/MemoryRegionInfo.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/StreamString.h" using namespace lldb; Index: source/API/SBMemoryRegionInfoList.cpp =================================================================== --- source/API/SBMemoryRegionInfoList.cpp +++ source/API/SBMemoryRegionInfoList.cpp @@ -9,8 +9,8 @@ #include "lldb/API/SBMemoryRegionInfoList.h" #include "lldb/API/SBMemoryRegionInfo.h" #include "lldb/API/SBStream.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Utility/Log.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include Index: source/API/SBProcess.cpp =================================================================== --- source/API/SBProcess.cpp +++ source/API/SBProcess.cpp @@ -17,7 +17,6 @@ #include "lldb/Core/Module.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/StreamFile.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" #include "lldb/Target/SystemRuntime.h" @@ -29,7 +28,6 @@ #include "lldb/Utility/State.h" #include "lldb/Utility/Stream.h" - #include "lldb/API/SBBroadcaster.h" #include "lldb/API/SBCommandReturnObject.h" #include "lldb/API/SBDebugger.h" Index: source/Commands/CommandObjectMemory.cpp =================================================================== --- source/Commands/CommandObjectMemory.cpp +++ source/Commands/CommandObjectMemory.cpp @@ -29,13 +29,13 @@ #include "lldb/Symbol/SymbolFile.h" #include "lldb/Symbol/TypeList.h" #include "lldb/Target/MemoryHistory.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/Process.h" #include "lldb/Target/StackFrame.h" #include "lldb/Target/Thread.h" #include "lldb/Utility/Args.h" #include "lldb/Utility/DataBufferHeap.h" #include "lldb/Utility/DataBufferLLVM.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/StreamString.h" #include "lldb/lldb-private.h" Index: source/Core/DynamicLoader.cpp =================================================================== --- source/Core/DynamicLoader.cpp +++ source/Core/DynamicLoader.cpp @@ -14,10 +14,10 @@ #include "lldb/Core/PluginManager.h" #include "lldb/Core/Section.h" #include "lldb/Symbol/ObjectFile.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/Process.h" #include "lldb/Target/Target.h" #include "lldb/Utility/ConstString.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/lldb-private-interfaces.h" #include "llvm/ADT/StringRef.h" Index: source/Expression/IRMemoryMap.cpp =================================================================== --- source/Expression/IRMemoryMap.cpp +++ source/Expression/IRMemoryMap.cpp @@ -7,13 +7,13 @@ //===----------------------------------------------------------------------===// #include "lldb/Expression/IRMemoryMap.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/Process.h" #include "lldb/Target/Target.h" #include "lldb/Utility/DataBufferHeap.h" #include "lldb/Utility/DataExtractor.h" #include "lldb/Utility/LLDBAssert.h" #include "lldb/Utility/Log.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/Scalar.h" #include "lldb/Utility/Status.h" Index: source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp =================================================================== --- source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp +++ source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp @@ -18,13 +18,13 @@ #include "lldb/Core/Section.h" #include "lldb/Symbol/Function.h" #include "lldb/Symbol/ObjectFile.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/Platform.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" #include "lldb/Target/ThreadPlanRunToAddress.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/ProcessInfo.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include Index: source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp =================================================================== --- source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -23,7 +23,6 @@ #include "lldb/Symbol/DWARFCallFrameInfo.h" #include "lldb/Symbol/ObjectFile.h" #include "lldb/Target/DynamicLoader.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/Platform.h" #include "lldb/Target/Process.h" #include "lldb/Target/SectionLoadList.h" @@ -34,6 +33,7 @@ #include "lldb/Utility/DataBuffer.h" #include "lldb/Utility/FileSpec.h" #include "lldb/Utility/Log.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/RangeMap.h" #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/Status.h" Index: source/Plugins/Process/Darwin/NativeProcessDarwin.h =================================================================== --- source/Plugins/Process/Darwin/NativeProcessDarwin.h +++ source/Plugins/Process/Darwin/NativeProcessDarwin.h @@ -24,9 +24,9 @@ #include "lldb/Host/HostThread.h" #include "lldb/Host/Pipe.h" #include "lldb/Host/common/NativeProcessProtocol.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Utility/ArchSpec.h" #include "lldb/Utility/FileSpec.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/lldb-types.h" #include "LaunchFlavor.h" Index: source/Plugins/Process/Linux/NativeProcessLinux.h =================================================================== --- source/Plugins/Process/Linux/NativeProcessLinux.h +++ source/Plugins/Process/Linux/NativeProcessLinux.h @@ -15,9 +15,9 @@ #include "lldb/Host/Debug.h" #include "lldb/Host/HostThread.h" #include "lldb/Host/linux/Support.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Utility/ArchSpec.h" #include "lldb/Utility/FileSpec.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/lldb-types.h" #include "NativeThreadLinux.h" Index: source/Plugins/Process/NetBSD/NativeProcessNetBSD.h =================================================================== --- source/Plugins/Process/NetBSD/NativeProcessNetBSD.h +++ source/Plugins/Process/NetBSD/NativeProcessNetBSD.h @@ -9,9 +9,9 @@ #ifndef liblldb_NativeProcessNetBSD_H_ #define liblldb_NativeProcessNetBSD_H_ -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Utility/ArchSpec.h" #include "lldb/Utility/FileSpec.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "NativeThreadNetBSD.h" #include "lldb/Host/common/NativeProcessProtocol.h" Index: source/Plugins/Process/Utility/LinuxProcMaps.cpp =================================================================== --- source/Plugins/Process/Utility/LinuxProcMaps.cpp +++ source/Plugins/Process/Utility/LinuxProcMaps.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "LinuxProcMaps.h" -#include "llvm/ADT/StringRef.h" -#include "lldb/Target/MemoryRegionInfo.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/StringExtractor.h" +#include "llvm/ADT/StringRef.h" using namespace lldb_private; Index: source/Plugins/Process/Windows/Common/ProcessWindows.cpp =================================================================== --- source/Plugins/Process/Windows/Common/ProcessWindows.cpp +++ source/Plugins/Process/Windows/Common/ProcessWindows.cpp @@ -23,9 +23,9 @@ #include "lldb/Host/windows/windows.h" #include "lldb/Symbol/ObjectFile.h" #include "lldb/Target/DynamicLoader.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/StopInfo.h" #include "lldb/Target/Target.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/State.h" #include "llvm/Support/ConvertUTF.h" Index: source/Plugins/Process/elf-core/ProcessElfCore.cpp =================================================================== --- source/Plugins/Process/elf-core/ProcessElfCore.cpp +++ source/Plugins/Process/elf-core/ProcessElfCore.cpp @@ -16,11 +16,11 @@ #include "lldb/Core/PluginManager.h" #include "lldb/Core/Section.h" #include "lldb/Target/DynamicLoader.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/Target.h" #include "lldb/Target/UnixSignals.h" #include "lldb/Utility/DataBufferHeap.h" #include "lldb/Utility/Log.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/State.h" #include "llvm/BinaryFormat/ELF.h" Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp =================================================================== --- source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -18,7 +18,6 @@ #include "lldb/Host/HostInfo.h" #include "lldb/Host/XML.h" #include "lldb/Symbol/Symbol.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/Target.h" #include "lldb/Target/UnixSignals.h" #include "lldb/Utility/Args.h" @@ -26,6 +25,7 @@ #include "lldb/Utility/JSON.h" #include "lldb/Utility/LLDBAssert.h" #include "lldb/Utility/Log.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/State.h" #include "lldb/Utility/StreamString.h" Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp =================================================================== --- source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp +++ source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp @@ -28,13 +28,13 @@ #include "lldb/Host/common/NativeProcessProtocol.h" #include "lldb/Host/common/NativeRegisterContext.h" #include "lldb/Host/common/NativeThreadProtocol.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Utility/Args.h" #include "lldb/Utility/DataBuffer.h" #include "lldb/Utility/Endian.h" #include "lldb/Utility/JSON.h" #include "lldb/Utility/LLDBAssert.h" #include "lldb/Utility/Log.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/RegisterValue.h" #include "lldb/Utility/State.h" #include "lldb/Utility/StreamString.h" Index: source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp =================================================================== --- source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -57,7 +57,6 @@ #include "lldb/Symbol/ObjectFile.h" #include "lldb/Target/ABI.h" #include "lldb/Target/DynamicLoader.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/SystemRuntime.h" #include "lldb/Target/Target.h" #include "lldb/Target/TargetList.h" @@ -65,6 +64,7 @@ #include "lldb/Utility/Args.h" #include "lldb/Utility/CleanUp.h" #include "lldb/Utility/FileSpec.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/Reproducer.h" #include "lldb/Utility/State.h" #include "lldb/Utility/StreamString.h" Index: source/Plugins/Process/mach-core/ProcessMachCore.cpp =================================================================== --- source/Plugins/Process/mach-core/ProcessMachCore.cpp +++ source/Plugins/Process/mach-core/ProcessMachCore.cpp @@ -20,11 +20,11 @@ #include "lldb/Core/Section.h" #include "lldb/Host/Host.h" #include "lldb/Symbol/ObjectFile.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" #include "lldb/Utility/DataBuffer.h" #include "lldb/Utility/Log.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/State.h" #include "ProcessMachCore.h" Index: source/Plugins/Process/minidump/MinidumpParser.h =================================================================== --- source/Plugins/Process/minidump/MinidumpParser.h +++ source/Plugins/Process/minidump/MinidumpParser.h @@ -11,9 +11,9 @@ #include "MinidumpTypes.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Utility/ArchSpec.h" #include "lldb/Utility/DataBuffer.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/Status.h" #include "lldb/Utility/UUID.h" Index: source/Plugins/Process/minidump/ProcessMinidump.cpp =================================================================== --- source/Plugins/Process/minidump/ProcessMinidump.cpp +++ source/Plugins/Process/minidump/ProcessMinidump.cpp @@ -22,12 +22,12 @@ #include "lldb/Interpreter/OptionArgParser.h" #include "lldb/Interpreter/OptionGroupBoolean.h" #include "lldb/Target/JITLoaderList.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/SectionLoadList.h" #include "lldb/Target/Target.h" #include "lldb/Target/UnixSignals.h" #include "lldb/Utility/LLDBAssert.h" #include "lldb/Utility/Log.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/State.h" #include "llvm/Support/MemoryBuffer.h" Index: source/Target/Process.cpp =================================================================== --- source/Target/Process.cpp +++ source/Target/Process.cpp @@ -46,7 +46,6 @@ #include "lldb/Target/JITLoaderList.h" #include "lldb/Target/LanguageRuntime.h" #include "lldb/Target/MemoryHistory.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/ObjCLanguageRuntime.h" #include "lldb/Target/OperatingSystem.h" #include "lldb/Target/Platform.h" @@ -63,6 +62,7 @@ #include "lldb/Target/UnixSignals.h" #include "lldb/Utility/Event.h" #include "lldb/Utility/Log.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/NameMatches.h" #include "lldb/Utility/ProcessInfo.h" #include "lldb/Utility/SelectHelper.h" Index: unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp =================================================================== --- unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp +++ unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp @@ -9,8 +9,8 @@ #include "GDBRemoteTestUtils.h" #include "lldb/Core/ModuleSpec.h" #include "lldb/Host/XML.h" -#include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Utility/DataBuffer.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/StructuredData.h" #include "lldb/Utility/TraceOptions.h" #include "lldb/lldb-enumerations.h" Index: unittests/Process/minidump/MinidumpParserTest.cpp =================================================================== --- unittests/Process/minidump/MinidumpParserTest.cpp +++ unittests/Process/minidump/MinidumpParserTest.cpp @@ -12,7 +12,7 @@ #include "Plugins/Process/minidump/RegisterContextMinidump_x86_64.h" #include "TestingSupport/TestUtilities.h" #include "lldb/Host/FileSystem.h" -#include "lldb/Target/MemoryRegionInfo.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "lldb/Utility/ArchSpec.h" #include "lldb/Utility/DataExtractor.h" #include "lldb/Utility/FileSpec.h" Index: unittests/Target/CMakeLists.txt =================================================================== --- unittests/Target/CMakeLists.txt +++ unittests/Target/CMakeLists.txt @@ -1,5 +1,4 @@ add_lldb_unittest(TargetTests - MemoryRegionInfoTest.cpp ModuleCacheTest.cpp PathMappingListTest.cpp ProcessInstanceInfoTest.cpp Index: unittests/Utility/CMakeLists.txt =================================================================== --- unittests/Utility/CMakeLists.txt +++ unittests/Utility/CMakeLists.txt @@ -16,6 +16,7 @@ JSONTest.cpp ListenerTest.cpp LogTest.cpp + MemoryRegionInfoTest.cpp NameMatchesTest.cpp PredicateTest.cpp ProcessInfoTest.cpp Index: unittests/Utility/MemoryRegionInfoTest.cpp =================================================================== --- unittests/Utility/MemoryRegionInfoTest.cpp +++ unittests/Utility/MemoryRegionInfoTest.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Target/MemoryRegionInfo.h" +#include "lldb/Utility/MemoryRegionInfo.h" #include "llvm/Support/FormatVariadic.h" #include "gtest/gtest.h" @@ -15,5 +15,6 @@ TEST(MemoryRegionInfoTest, Formatv) { EXPECT_EQ("yes", llvm::formatv("{0}", MemoryRegionInfo::eYes).str()); EXPECT_EQ("no", llvm::formatv("{0}", MemoryRegionInfo::eNo).str()); - EXPECT_EQ("don't know", llvm::formatv("{0}", MemoryRegionInfo::eDontKnow).str()); + EXPECT_EQ("don't know", + llvm::formatv("{0}", MemoryRegionInfo::eDontKnow).str()); }