diff options
61 files changed, 60 insertions, 61 deletions
diff --git a/lldb/include/lldb/Breakpoint/BreakpointLocation.h b/lldb/include/lldb/Breakpoint/BreakpointLocation.h index 43aef9f..d0567cc 100644 --- a/lldb/include/lldb/Breakpoint/BreakpointLocation.h +++ b/lldb/include/lldb/Breakpoint/BreakpointLocation.h @@ -19,7 +19,7 @@ // Project includes #include "lldb/Breakpoint/StoppointLocation.h" #include "lldb/Core/Address.h" -#include "lldb/Core/UserID.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Breakpoint/BreakpointOptions.h b/lldb/include/lldb/Breakpoint/BreakpointOptions.h index e053af35..fc16a43 100644 --- a/lldb/include/lldb/Breakpoint/BreakpointOptions.h +++ b/lldb/include/lldb/Breakpoint/BreakpointOptions.h @@ -17,9 +17,9 @@ // Other libraries and framework includes // Project includes -#include "lldb/Core/Baton.h" #include "lldb/Core/StringList.h" #include "lldb/Core/StructuredData.h" +#include "lldb/Utility/Baton.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Breakpoint/BreakpointSite.h b/lldb/include/lldb/Breakpoint/BreakpointSite.h index b334c6e1..6e98756 100644 --- a/lldb/include/lldb/Breakpoint/BreakpointSite.h +++ b/lldb/include/lldb/Breakpoint/BreakpointSite.h @@ -21,7 +21,7 @@ // Project includes #include "lldb/Breakpoint/BreakpointLocationCollection.h" #include "lldb/Breakpoint/StoppointLocation.h" -#include "lldb/Core/UserID.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-forward.h" namespace lldb_private { diff --git a/lldb/include/lldb/Breakpoint/Stoppoint.h b/lldb/include/lldb/Breakpoint/Stoppoint.h index 5d131a5..3195ef9 100644 --- a/lldb/include/lldb/Breakpoint/Stoppoint.h +++ b/lldb/include/lldb/Breakpoint/Stoppoint.h @@ -14,7 +14,7 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/Core/UserID.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Breakpoint/StoppointLocation.h b/lldb/include/lldb/Breakpoint/StoppointLocation.h index ba03b4e..f64035b 100644 --- a/lldb/include/lldb/Breakpoint/StoppointLocation.h +++ b/lldb/include/lldb/Breakpoint/StoppointLocation.h @@ -14,7 +14,7 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "lldb/Core/UserID.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" // #include "lldb/Breakpoint/BreakpointOptions.h" diff --git a/lldb/include/lldb/Breakpoint/Watchpoint.h b/lldb/include/lldb/Breakpoint/Watchpoint.h index 97f2e28..beb7bad 100644 --- a/lldb/include/lldb/Breakpoint/Watchpoint.h +++ b/lldb/include/lldb/Breakpoint/Watchpoint.h @@ -19,9 +19,9 @@ // Project includes #include "lldb/Breakpoint/StoppointLocation.h" #include "lldb/Breakpoint/WatchpointOptions.h" -#include "lldb/Core/UserID.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Target/Target.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Breakpoint/WatchpointOptions.h b/lldb/include/lldb/Breakpoint/WatchpointOptions.h index bfb814e..94c3d37 100644 --- a/lldb/include/lldb/Breakpoint/WatchpointOptions.h +++ b/lldb/include/lldb/Breakpoint/WatchpointOptions.h @@ -17,8 +17,8 @@ // Other libraries and framework includes // Project includes -#include "lldb/Core/Baton.h" #include "lldb/Core/StringList.h" +#include "lldb/Utility/Baton.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Core/Debugger.h b/lldb/include/lldb/Core/Debugger.h index 93f7125..7a33d23 100644 --- a/lldb/include/lldb/Core/Debugger.h +++ b/lldb/include/lldb/Core/Debugger.h @@ -26,12 +26,12 @@ #include "lldb/Core/IOHandler.h" #include "lldb/Core/Listener.h" #include "lldb/Core/SourceManager.h" -#include "lldb/Core/UserID.h" #include "lldb/Core/UserSettingsController.h" #include "lldb/Host/HostThread.h" #include "lldb/Host/Terminal.h" #include "lldb/Target/Platform.h" #include "lldb/Target/TargetList.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-public.h" #include "llvm/Support/Threading.h" diff --git a/lldb/include/lldb/Core/Section.h b/lldb/include/lldb/Core/Section.h index f8cb2e3..b43a3c7 100644 --- a/lldb/include/lldb/Core/Section.h +++ b/lldb/include/lldb/Core/Section.h @@ -15,10 +15,10 @@ #include "lldb/Core/ModuleChild.h" #include "lldb/Core/RangeMap.h" -#include "lldb/Core/UserID.h" -#include "lldb/Core/VMRange.h" #include "lldb/Symbol/ObjectFile.h" #include "lldb/Utility/ConstString.h" +#include "lldb/Utility/UserID.h" +#include "lldb/Utility/VMRange.h" #include "lldb/lldb-private.h" #include <limits.h> diff --git a/lldb/include/lldb/Core/ValueObject.h b/lldb/include/lldb/Core/ValueObject.h index dc6dd77..63ba328 100644 --- a/lldb/include/lldb/Core/ValueObject.h +++ b/lldb/include/lldb/Core/ValueObject.h @@ -25,7 +25,6 @@ #include "lldb/Utility/DataExtractor.h" #include "lldb/Utility/Flags.h" -#include "lldb/Core/UserID.h" #include "lldb/Core/Value.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Target/ExecutionContext.h" @@ -35,6 +34,7 @@ #include "lldb/Utility/ConstString.h" #include "lldb/Utility/Error.h" #include "lldb/Utility/SharedCluster.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Core/ValueObjectList.h b/lldb/include/lldb/Core/ValueObjectList.h index c5427c6..d05876a 100644 --- a/lldb/include/lldb/Core/ValueObjectList.h +++ b/lldb/include/lldb/Core/ValueObjectList.h @@ -16,8 +16,8 @@ // Other libraries and framework includes // Project includes -#include "lldb/Core/UserID.h" #include "lldb/Target/ExecutionContextScope.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Expression/IRMemoryMap.h b/lldb/include/lldb/Expression/IRMemoryMap.h index 3507900..c1a194d 100644 --- a/lldb/include/lldb/Expression/IRMemoryMap.h +++ b/lldb/include/lldb/Expression/IRMemoryMap.h @@ -10,8 +10,8 @@ #ifndef lldb_IRMemoryMap_h_ #define lldb_IRMemoryMap_h_ -#include "lldb/Core/UserID.h" #include "lldb/Utility/DataBufferHeap.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-public.h" #include <map> diff --git a/lldb/include/lldb/Symbol/Block.h b/lldb/include/lldb/Symbol/Block.h index ce4b357..83ca613 100644 --- a/lldb/include/lldb/Symbol/Block.h +++ b/lldb/include/lldb/Symbol/Block.h @@ -18,11 +18,11 @@ // Project includes #include "lldb/Core/AddressRange.h" #include "lldb/Core/RangeMap.h" -#include "lldb/Core/UserID.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Symbol/LineEntry.h" #include "lldb/Symbol/SymbolContext.h" #include "lldb/Utility/Stream.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Symbol/CompileUnit.h b/lldb/include/lldb/Symbol/CompileUnit.h index 546f6ee..e7a1ebc 100644 --- a/lldb/include/lldb/Symbol/CompileUnit.h +++ b/lldb/include/lldb/Symbol/CompileUnit.h @@ -12,10 +12,10 @@ #include "lldb/Core/FileSpecList.h" #include "lldb/Core/ModuleChild.h" -#include "lldb/Core/UserID.h" #include "lldb/Symbol/DebugMacros.h" #include "lldb/Symbol/Function.h" #include "lldb/Utility/Stream.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-enumerations.h" namespace lldb_private { diff --git a/lldb/include/lldb/Symbol/DWARFCallFrameInfo.h b/lldb/include/lldb/Symbol/DWARFCallFrameInfo.h index 836256d..085def8 100644 --- a/lldb/include/lldb/Symbol/DWARFCallFrameInfo.h +++ b/lldb/include/lldb/Symbol/DWARFCallFrameInfo.h @@ -17,10 +17,10 @@ #include "lldb/Utility/Flags.h" #include "lldb/Core/RangeMap.h" -#include "lldb/Core/VMRange.h" #include "lldb/Core/dwarf.h" #include "lldb/Symbol/ObjectFile.h" #include "lldb/Symbol/UnwindPlan.h" +#include "lldb/Utility/VMRange.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Symbol/Function.h b/lldb/include/lldb/Symbol/Function.h index 232d079..9d376007 100644 --- a/lldb/include/lldb/Symbol/Function.h +++ b/lldb/include/lldb/Symbol/Function.h @@ -12,10 +12,10 @@ #include "lldb/Core/AddressRange.h" #include "lldb/Core/Mangled.h" -#include "lldb/Core/UserID.h" #include "lldb/Expression/DWARFExpression.h" #include "lldb/Symbol/Block.h" #include "lldb/Symbol/Declaration.h" +#include "lldb/Utility/UserID.h" namespace lldb_private { diff --git a/lldb/include/lldb/Symbol/Symbol.h b/lldb/include/lldb/Symbol/Symbol.h index 3f12b9a..44c67f6 100644 --- a/lldb/include/lldb/Symbol/Symbol.h +++ b/lldb/include/lldb/Symbol/Symbol.h @@ -12,8 +12,8 @@ #include "lldb/Core/AddressRange.h" #include "lldb/Core/Mangled.h" -#include "lldb/Core/UserID.h" #include "lldb/Symbol/SymbolContextScope.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Symbol/Type.h b/lldb/include/lldb/Symbol/Type.h index 98fca15..9740dc2 100644 --- a/lldb/include/lldb/Symbol/Type.h +++ b/lldb/include/lldb/Symbol/Type.h @@ -11,11 +11,11 @@ #define liblldb_Type_h_ #include "lldb/Core/ClangForward.h" -#include "lldb/Core/UserID.h" #include "lldb/Symbol/CompilerDecl.h" #include "lldb/Symbol/CompilerType.h" #include "lldb/Symbol/Declaration.h" #include "lldb/Utility/ConstString.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" #include "llvm/ADT/APSInt.h" diff --git a/lldb/include/lldb/Symbol/Variable.h b/lldb/include/lldb/Symbol/Variable.h index 3324989..f076a04 100644 --- a/lldb/include/lldb/Symbol/Variable.h +++ b/lldb/include/lldb/Symbol/Variable.h @@ -15,9 +15,9 @@ #include "lldb/Core/Mangled.h" #include "lldb/Core/RangeMap.h" -#include "lldb/Core/UserID.h" #include "lldb/Expression/DWARFExpression.h" #include "lldb/Symbol/Declaration.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-enumerations.h" #include "lldb/lldb-private.h" diff --git a/lldb/include/lldb/Target/QueueList.h b/lldb/include/lldb/Target/QueueList.h index 038463d..91cf3eb 100644 --- a/lldb/include/lldb/Target/QueueList.h +++ b/lldb/include/lldb/Target/QueueList.h @@ -13,8 +13,8 @@ #include <mutex> #include <vector> -#include "lldb/Core/UserID.h" #include "lldb/Utility/Iterable.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Target/RegisterCheckpoint.h b/lldb/include/lldb/Target/RegisterCheckpoint.h index 8391cad..578cf25 100644 --- a/lldb/include/lldb/Target/RegisterCheckpoint.h +++ b/lldb/include/lldb/Target/RegisterCheckpoint.h @@ -10,8 +10,8 @@ #ifndef liblldb_RegisterCheckpoint_h_ #define liblldb_RegisterCheckpoint_h_ -#include "lldb/Core/UserID.h" #include "lldb/Target/StackID.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Target/StackFrame.h b/lldb/include/lldb/Target/StackFrame.h index 470a19e..1f25575 100644 --- a/lldb/include/lldb/Target/StackFrame.h +++ b/lldb/include/lldb/Target/StackFrame.h @@ -20,13 +20,13 @@ #include "lldb/Utility/Flags.h" #include "lldb/Core/Scalar.h" -#include "lldb/Core/UserID.h" #include "lldb/Core/ValueObjectList.h" #include "lldb/Symbol/SymbolContext.h" #include "lldb/Target/ExecutionContextScope.h" #include "lldb/Target/StackID.h" #include "lldb/Utility/Error.h" #include "lldb/Utility/StreamString.h" +#include "lldb/Utility/UserID.h" namespace lldb_private { diff --git a/lldb/include/lldb/Target/Thread.h b/lldb/include/lldb/Target/Thread.h index 02b40dd..47d0b7d 100644 --- a/lldb/include/lldb/Target/Thread.h +++ b/lldb/include/lldb/Target/Thread.h @@ -22,11 +22,11 @@ #include "lldb/Core/Broadcaster.h" #include "lldb/Core/Event.h" #include "lldb/Core/StructuredData.h" -#include "lldb/Core/UserID.h" #include "lldb/Core/UserSettingsController.h" #include "lldb/Target/ExecutionContextScope.h" #include "lldb/Target/RegisterCheckpoint.h" #include "lldb/Target/StackFrameList.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" #define LLDB_THREAD_MAX_STOP_EXC_DATA 8 diff --git a/lldb/include/lldb/Target/ThreadList.h b/lldb/include/lldb/Target/ThreadList.h index 9e3c940..2ebcd0b 100644 --- a/lldb/include/lldb/Target/ThreadList.h +++ b/lldb/include/lldb/Target/ThreadList.h @@ -13,10 +13,10 @@ #include <mutex> #include <vector> -#include "lldb/Core/UserID.h" #include "lldb/Target/Thread.h" #include "lldb/Target/ThreadCollection.h" #include "lldb/Utility/Iterable.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Target/ThreadPlan.h b/lldb/include/lldb/Target/ThreadPlan.h index 94c1d1a..acc63ff 100644 --- a/lldb/include/lldb/Target/ThreadPlan.h +++ b/lldb/include/lldb/Target/ThreadPlan.h @@ -17,12 +17,12 @@ // Other libraries and framework includes // Project includes -#include "lldb/Core/UserID.h" #include "lldb/Target/Process.h" #include "lldb/Target/StopInfo.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" #include "lldb/Target/ThreadPlanTracer.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Target/ThreadPlanPython.h b/lldb/include/lldb/Target/ThreadPlanPython.h index a053b5b..9b7e5d0 100644 --- a/lldb/include/lldb/Target/ThreadPlanPython.h +++ b/lldb/include/lldb/Target/ThreadPlanPython.h @@ -18,13 +18,13 @@ // Other libraries and framework includes // Project includes #include "lldb/Core/StructuredData.h" -#include "lldb/Core/UserID.h" #include "lldb/Target/Process.h" #include "lldb/Target/StopInfo.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" #include "lldb/Target/ThreadPlan.h" #include "lldb/Target/ThreadPlanTracer.h" +#include "lldb/Utility/UserID.h" #include "lldb/lldb-private.h" namespace lldb_private { diff --git a/lldb/include/lldb/Core/Baton.h b/lldb/include/lldb/Utility/Baton.h index c2ab9f7..c2ab9f7 100644 --- a/lldb/include/lldb/Core/Baton.h +++ b/lldb/include/lldb/Utility/Baton.h diff --git a/lldb/include/lldb/Core/FastDemangle.h b/lldb/include/lldb/Utility/FastDemangle.h index f779aaa..f779aaa 100644 --- a/lldb/include/lldb/Core/FastDemangle.h +++ b/lldb/include/lldb/Utility/FastDemangle.h diff --git a/lldb/include/lldb/Core/History.h b/lldb/include/lldb/Utility/History.h index fcffcdd..fcffcdd 100644 --- a/lldb/include/lldb/Core/History.h +++ b/lldb/include/lldb/Utility/History.h diff --git a/lldb/include/lldb/Core/StreamCallback.h b/lldb/include/lldb/Utility/StreamCallback.h index 0556e46..0556e46 100644 --- a/lldb/include/lldb/Core/StreamCallback.h +++ b/lldb/include/lldb/Utility/StreamCallback.h diff --git a/lldb/include/lldb/Core/StreamGDBRemote.h b/lldb/include/lldb/Utility/StreamGDBRemote.h index 14a41d7..14a41d7 100644 --- a/lldb/include/lldb/Core/StreamGDBRemote.h +++ b/lldb/include/lldb/Utility/StreamGDBRemote.h diff --git a/lldb/include/lldb/Core/UserID.h b/lldb/include/lldb/Utility/UserID.h index 5964483..5964483 100644 --- a/lldb/include/lldb/Core/UserID.h +++ b/lldb/include/lldb/Utility/UserID.h diff --git a/lldb/include/lldb/Core/VMRange.h b/lldb/include/lldb/Utility/VMRange.h index 4ec64c9..4ec64c9 100644 --- a/lldb/include/lldb/Core/VMRange.h +++ b/lldb/include/lldb/Utility/VMRange.h diff --git a/lldb/source/API/SBBreakpointLocation.cpp b/lldb/source/API/SBBreakpointLocation.cpp index 0119b36..d8779ff 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 5273626..7537a76 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 7d49914..0b6762f 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 223ae61..c1e7d9d3 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 f24888e..7d4f94a 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 da5e681..7779db3 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 5222bf7..e3d213b 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 724b9c8..928577c 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 7402c18..c48b3d5 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 1a4898a..363ba26 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 4175c43..f735388 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 a424c0a..6b5f8b07 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 575a581..f0aea5d 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 d650bb9..208c311 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 eca610c..871f382 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 2e59183..efd2cb0 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 179bfa7..094e48c 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 4b2730f..56fb83a 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 db1027a..2f79eaf 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 015ab28..5f8a829 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 0bed4a1..c5324d4 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 bf2e1ea..10344b6 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 95f4293..854cf4b 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 a371d13..08e1965 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 7ad3187..e65b8fa 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 d77908d3..c23065a 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; diff --git a/lldb/unittests/Core/StreamCallbackTest.cpp b/lldb/unittests/Core/StreamCallbackTest.cpp index 4ef14aa..d3ccd02 100644 --- a/lldb/unittests/Core/StreamCallbackTest.cpp +++ b/lldb/unittests/Core/StreamCallbackTest.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Core/StreamCallback.h" +#include "lldb/Utility/StreamCallback.h" #include "gtest/gtest.h" using namespace lldb; diff --git a/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp b/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp index e7d155b..5e70981 100644 --- a/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp +++ b/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp @@ -13,7 +13,7 @@ #include "Plugins/Process/Utility/LinuxSignals.h" #include "Plugins/Process/gdb-remote/GDBRemoteClientBase.h" #include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h" -#include "lldb/Core/StreamGDBRemote.h" +#include "lldb/Utility/StreamGDBRemote.h" #include "llvm/ADT/STLExtras.h" |