diff options
Diffstat (limited to 'lldb/source')
26 files changed, 31 insertions, 32 deletions
diff --git a/lldb/source/API/SBBreakpointLocation.cpp b/lldb/source/API/SBBreakpointLocation.cpp index 0119b3621ee..d8779ffe2ba 100644 --- a/lldb/source/API/SBBreakpointLocation.cpp +++ b/lldb/source/API/SBBreakpointLocation.cpp @@ -21,7 +21,6 @@ #include "lldb/Interpreter/ScriptInterpreter.h" #include "lldb/Target/Target.h" #include "lldb/Target/ThreadSpec.h" -#include "lldb/Target/ThreadSpec.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/Stream.h" #include "lldb/lldb-defines.h" diff --git a/lldb/source/API/SBThreadPlan.cpp b/lldb/source/API/SBThreadPlan.cpp index 527362672c4..7537a764539 100644 --- a/lldb/source/API/SBThreadPlan.cpp +++ b/lldb/source/API/SBThreadPlan.cpp @@ -27,7 +27,6 @@ #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" #include "lldb/Target/ThreadPlan.h" -#include "lldb/Target/ThreadPlan.h" #include "lldb/Target/ThreadPlanPython.h" #include "lldb/Target/ThreadPlanStepInRange.h" #include "lldb/Target/ThreadPlanStepInstruction.h" diff --git a/lldb/source/Commands/CommandObjectLog.cpp b/lldb/source/Commands/CommandObjectLog.cpp index 7d499144a11..0b6762f3d31 100644 --- a/lldb/source/Commands/CommandObjectLog.cpp +++ b/lldb/source/Commands/CommandObjectLog.cpp @@ -13,7 +13,6 @@ // Project includes #include "CommandObjectLog.h" #include "lldb/Core/Debugger.h" -#include "lldb/Core/Debugger.h" #include "lldb/Core/Module.h" #include "lldb/Core/StreamFile.h" #include "lldb/Core/Timer.h" diff --git a/lldb/source/Core/CMakeLists.txt b/lldb/source/Core/CMakeLists.txt index 223ae619414..c1e7d9d3ec4 100644 --- a/lldb/source/Core/CMakeLists.txt +++ b/lldb/source/Core/CMakeLists.txt @@ -5,7 +5,6 @@ add_lldb_library(lldbCore AddressResolverFileLine.cpp AddressResolverName.cpp ArchSpec.cpp - Baton.cpp Broadcaster.cpp Communication.cpp Connection.cpp @@ -15,11 +14,9 @@ add_lldb_library(lldbCore DynamicLoader.cpp EmulateInstruction.cpp Event.cpp - FastDemangle.cpp FileLineResolver.cpp FileSpecList.cpp FormatEntity.cpp - History.cpp IOHandler.cpp Listener.cpp Mangled.cpp @@ -35,13 +32,10 @@ add_lldb_library(lldbCore SourceManager.cpp State.cpp StreamAsynchronousIO.cpp - StreamCallback.cpp StreamFile.cpp - StreamGDBRemote.cpp StringList.cpp StructuredData.cpp Timer.cpp - UserID.cpp UserSettingsController.cpp Value.cpp ValueObject.cpp @@ -57,7 +51,6 @@ add_lldb_library(lldbCore ValueObjectRegister.cpp ValueObjectSyntheticFilter.cpp ValueObjectVariable.cpp - VMRange.cpp LINK_LIBS lldbBreakpoint diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp index f24888eaf03..7d4f94af68a 100644 --- a/lldb/source/Core/Debugger.cpp +++ b/lldb/source/Core/Debugger.cpp @@ -28,7 +28,6 @@ #include "lldb/Core/RegisterValue.h" #include "lldb/Core/State.h" #include "lldb/Core/StreamAsynchronousIO.h" -#include "lldb/Core/StreamCallback.h" #include "lldb/Core/StreamFile.h" #include "lldb/Core/StructuredData.h" #include "lldb/Core/Timer.h" @@ -60,6 +59,7 @@ #include "lldb/Target/TargetList.h" #include "lldb/Target/Thread.h" #include "lldb/Utility/AnsiTerminal.h" +#include "lldb/Utility/StreamCallback.h" #include "lldb/Utility/StreamString.h" #include "lldb/lldb-private.h" diff --git a/lldb/source/Core/Mangled.cpp b/lldb/source/Core/Mangled.cpp index da5e681fd0e..7779db3cc16 100644 --- a/lldb/source/Core/Mangled.cpp +++ b/lldb/source/Core/Mangled.cpp @@ -18,8 +18,8 @@ #ifdef LLDB_USE_BUILTIN_DEMANGLER // Provide a fast-path demangler implemented in FastDemangle.cpp until it can // replace the existing C++ demangler with a complete implementation +#include "lldb/Utility/FastDemangle.h" #include "llvm/Demangle/Demangle.h" -#include "lldb/Core/FastDemangle.h" #else #include <cxxabi.h> #endif diff --git a/lldb/source/Core/Timer.cpp b/lldb/source/Core/Timer.cpp index 5222bf72bd7..e3d213bced5 100644 --- a/lldb/source/Core/Timer.cpp +++ b/lldb/source/Core/Timer.cpp @@ -8,14 +8,16 @@ //===----------------------------------------------------------------------===// #include "lldb/Core/Timer.h" +#include "lldb/Host/Host.h" +#include "lldb/Utility/Stream.h" + +#include "llvm/Support/ThreadLocal.h" + #include <algorithm> #include <map> #include <mutex> #include <vector> -#include "lldb/Host/Host.h" -#include "lldb/Utility/Stream.h" - #include <stdio.h> using namespace lldb_private; diff --git a/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp index 724b9c838ac..928577cd7ee 100644 --- a/lldb/source/Expression/DWARFExpression.cpp +++ b/lldb/source/Expression/DWARFExpression.cpp @@ -17,12 +17,12 @@ #include "lldb/Core/RegisterValue.h" #include "lldb/Core/Scalar.h" -#include "lldb/Core/VMRange.h" #include "lldb/Core/Value.h" #include "lldb/Core/dwarf.h" #include "lldb/Utility/DataEncoder.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/StreamString.h" +#include "lldb/Utility/VMRange.h" #include "Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.h" #include "Plugins/ExpressionParser/Clang/ClangExpressionVariable.h" diff --git a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp index 7402c18f131..c48b3d5005c 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp @@ -24,7 +24,6 @@ #include "llvm/Support/Threading.h" // Project includes -#include "lldb/Core/FastDemangle.h" #include "lldb/Core/PluginManager.h" #include "lldb/Core/UniqueCStringMap.h" #include "lldb/DataFormatters/CXXFunctionPointer.h" @@ -32,6 +31,7 @@ #include "lldb/DataFormatters/FormattersHelpers.h" #include "lldb/DataFormatters/VectorType.h" #include "lldb/Utility/ConstString.h" +#include "lldb/Utility/FastDemangle.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/RegularExpression.h" diff --git a/lldb/source/Plugins/Process/Utility/HistoryThread.h b/lldb/source/Plugins/Process/Utility/HistoryThread.h index 1a4898a95b7..363ba266963 100644 --- a/lldb/source/Plugins/Process/Utility/HistoryThread.h +++ b/lldb/source/Plugins/Process/Utility/HistoryThread.h @@ -18,11 +18,11 @@ // Project includes #include "lldb/Core/Broadcaster.h" #include "lldb/Core/Event.h" -#include "lldb/Core/UserID.h" #include "lldb/Core/UserSettingsController.h" #include "lldb/Target/ExecutionContextScope.h" #include "lldb/Target/StackFrameList.h" #include "lldb/Target/Thread.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp index 4175c436e2b..f7353888f8c 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -20,7 +20,6 @@ // Other libraries and framework includes #include "lldb/Core/ModuleSpec.h" #include "lldb/Core/State.h" -#include "lldb/Core/StreamGDBRemote.h" #include "lldb/Host/HostInfo.h" #include "lldb/Host/StringConvert.h" #include "lldb/Interpreter/Args.h" @@ -32,6 +31,7 @@ #include "lldb/Utility/JSON.h" #include "lldb/Utility/LLDBAssert.h" #include "lldb/Utility/Log.h" +#include "lldb/Utility/StreamGDBRemote.h" #include "lldb/Utility/StreamString.h" // Project includes diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp index a424c0aa966..6b5f8b076bb 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp @@ -23,7 +23,6 @@ // Other libraries and framework includes #include "lldb/Core/ModuleSpec.h" -#include "lldb/Core/StreamGDBRemote.h" #include "lldb/Host/Config.h" #include "lldb/Host/File.h" #include "lldb/Host/FileSystem.h" @@ -38,6 +37,7 @@ #include "lldb/Utility/Endian.h" #include "lldb/Utility/JSON.h" #include "lldb/Utility/Log.h" +#include "lldb/Utility/StreamGDBRemote.h" #include "lldb/Utility/StreamString.h" #include "llvm/ADT/Triple.h" diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp index 575a58186fe..f0aea5d77e1 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp @@ -12,7 +12,7 @@ #include "lldb/Host/Config.h" #include "GDBRemoteCommunicationServerLLGS.h" -#include "lldb/Core/StreamGDBRemote.h" +#include "lldb/Utility/StreamGDBRemote.h" // C Includes // C++ Includes diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp index d650bb9ddea..208c3119774 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp @@ -22,7 +22,6 @@ #include "llvm/Support/FileSystem.h" #include "llvm/Support/Threading.h" -#include "lldb/Core/StreamGDBRemote.h" #include "lldb/Core/StructuredData.h" #include "lldb/Host/Config.h" #include "lldb/Host/ConnectionFileDescriptor.h" @@ -35,6 +34,7 @@ #include "lldb/Target/UnixSignals.h" #include "lldb/Utility/JSON.h" #include "lldb/Utility/Log.h" +#include "lldb/Utility/StreamGDBRemote.h" #include "lldb/Utility/StreamString.h" #include "lldb/Utility/UriParser.h" diff --git a/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt b/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt index eca610ce790..871f382298d 100644 --- a/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt +++ b/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt @@ -7,6 +7,7 @@ add_lldb_library(lldbPluginSymbolFilePDB PLUGIN clangLex lldbCore lldbSymbol + lldbUtility LINK_COMPONENTS DebugInfoPDB Support diff --git a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h index 2e5918328ff..efd2cb081dc 100644 --- a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h +++ b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h @@ -10,8 +10,8 @@ #ifndef lldb_Plugins_SymbolFile_PDB_SymbolFilePDB_h_ #define lldb_Plugins_SymbolFile_PDB_SymbolFilePDB_h_ -#include "lldb/Core/UserID.h" #include "lldb/Symbol/SymbolFile.h" +#include "lldb/Utility/UserID.h" #include "llvm/ADT/DenseMap.h" #include "llvm/DebugInfo/PDB/IPDBSession.h" diff --git a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp index 179bfa78b4f..094e48cf00e 100644 --- a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp +++ b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp @@ -14,7 +14,6 @@ #include "lldb/Symbol/CompileUnit.h" #include "lldb/Symbol/Function.h" #include "lldb/Symbol/ObjectFile.h" -#include "lldb/Symbol/ObjectFile.h" #include "lldb/Symbol/Symbol.h" #include "lldb/Symbol/SymbolContext.h" #include "lldb/Symbol/Symtab.h" diff --git a/lldb/source/Target/TargetList.cpp b/lldb/source/Target/TargetList.cpp index 4b2730fa8e2..56fb83a77e8 100644 --- a/lldb/source/Target/TargetList.cpp +++ b/lldb/source/Target/TargetList.cpp @@ -8,6 +8,7 @@ //===----------------------------------------------------------------------===// // Project includes +#include "lldb/Target/TargetList.h" #include "lldb/Core/Broadcaster.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/Event.h" @@ -22,7 +23,6 @@ #include "lldb/Symbol/ObjectFile.h" #include "lldb/Target/Platform.h" #include "lldb/Target/Process.h" -#include "lldb/Target/TargetList.h" // Other libraries and framework includes #include "llvm/ADT/SmallString.h" diff --git a/lldb/source/Core/Baton.cpp b/lldb/source/Utility/Baton.cpp index db1027af1e6..2f79eaf3de5 100644 --- a/lldb/source/Core/Baton.cpp +++ b/lldb/source/Utility/Baton.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/Baton.h" +#include "lldb/Utility/Baton.h" // C Includes // C++ Includes diff --git a/lldb/source/Utility/CMakeLists.txt b/lldb/source/Utility/CMakeLists.txt index 015ab288d61..5f8a829673b 100644 --- a/lldb/source/Utility/CMakeLists.txt +++ b/lldb/source/Utility/CMakeLists.txt @@ -1,10 +1,13 @@ add_lldb_library(lldbUtility + Baton.cpp ConstString.cpp DataBufferHeap.cpp DataBufferLLVM.cpp DataEncoder.cpp DataExtractor.cpp Error.cpp + FastDemangle.cpp + History.cpp JSON.cpp LLDBAssert.cpp Log.cpp @@ -15,14 +18,18 @@ add_lldb_library(lldbUtility SelectHelper.cpp SharingPtr.cpp Stream.cpp + StreamCallback.cpp + StreamGDBRemote.cpp StreamString.cpp StringExtractor.cpp StringExtractorGDBRemote.cpp StringLexer.cpp TaskPool.cpp + UserID.cpp UriParser.cpp UUID.cpp VASprintf.cpp + VMRange.cpp LINK_LIBS # lldbUtility cannot have any dependencies diff --git a/lldb/source/Core/FastDemangle.cpp b/lldb/source/Utility/FastDemangle.cpp index 0bed4a1f20a..c5324d4e3b9 100644 --- a/lldb/source/Core/FastDemangle.cpp +++ b/lldb/source/Utility/FastDemangle.cpp @@ -13,7 +13,7 @@ #include <functional> -#include "lldb/Core/FastDemangle.h" +#include "lldb/Utility/FastDemangle.h" #include "lldb/lldb-private.h" //#define DEBUG_FAILURES 1 diff --git a/lldb/source/Core/History.cpp b/lldb/source/Utility/History.cpp index bf2e1eae162..10344b67c63 100644 --- a/lldb/source/Core/History.cpp +++ b/lldb/source/Utility/History.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/History.h" +#include "lldb/Utility/History.h" // C Includes #include <inttypes.h> diff --git a/lldb/source/Core/StreamCallback.cpp b/lldb/source/Utility/StreamCallback.cpp index 95f4293891a..854cf4b55fa 100644 --- a/lldb/source/Core/StreamCallback.cpp +++ b/lldb/source/Utility/StreamCallback.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/StreamCallback.h" +#include "lldb/Utility/StreamCallback.h" using namespace lldb_private; diff --git a/lldb/source/Core/StreamGDBRemote.cpp b/lldb/source/Utility/StreamGDBRemote.cpp index a371d1316c7..08e19650966 100644 --- a/lldb/source/Core/StreamGDBRemote.cpp +++ b/lldb/source/Utility/StreamGDBRemote.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/StreamGDBRemote.h" +#include "lldb/Utility/StreamGDBRemote.h" #include <stdio.h> using namespace lldb; diff --git a/lldb/source/Core/UserID.cpp b/lldb/source/Utility/UserID.cpp index 7ad31877f42..e65b8fa87d8 100644 --- a/lldb/source/Core/UserID.cpp +++ b/lldb/source/Utility/UserID.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/UserID.h" +#include "lldb/Utility/UserID.h" #include "lldb/Utility/Stream.h" #include <inttypes.h> diff --git a/lldb/source/Core/VMRange.cpp b/lldb/source/Utility/VMRange.cpp index d77908d3faa..c23065ada54 100644 --- a/lldb/source/Core/VMRange.cpp +++ b/lldb/source/Utility/VMRange.cpp @@ -9,8 +9,8 @@ #include "lldb/lldb-private.h" -#include "lldb/Core/VMRange.h" #include "lldb/Utility/Stream.h" +#include "lldb/Utility/VMRange.h" #include <algorithm> using namespace lldb; |
