Moving header files from source/Host/common to proper location.

llvm-svn: 227929

21 files changed, 30 insertions, 626 deletions

diff --git a/lldb/source/Host/CMakeLists.txt b/lldb/source/Host/CMakeLists.txt
index ce8d31b1fe1..785812b5df6 100644
--- a/lldb/source/Host/CMakeLists.txt
+++ b/lldb/source/Host/CMakeLists.txt
@@ -19,6 +19,8 @@ add_host_subdirectory(common
   common/NativeBreakpoint.cpp
   common/NativeBreakpointList.cpp
   common/NativeProcessProtocol.cpp
+  common/NativeRegisterContext.cpp
+  common/NativeRegisterContextRegisterInfo.cpp
   common/NativeThreadProtocol.cpp
   common/OptionParser.cpp
   common/PipeBase.cpp
diff --git a/lldb/source/Host/common/NativeBreakpoint.cpp b/lldb/source/Host/common/NativeBreakpoint.cpp
index 284d7d11d6c..622b4eab172 100644
--- a/lldb/source/Host/common/NativeBreakpoint.cpp
+++ b/lldb/source/Host/common/NativeBreakpoint.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "NativeBreakpoint.h"
+#include "lldb/Host/common/NativeBreakpoint.h"
 
 #include "lldb/lldb-defines.h"
 #include "lldb/Core/Error.h"
diff --git a/lldb/source/Host/common/NativeBreakpoint.h b/lldb/source/Host/common/NativeBreakpoint.h
deleted file mode 100644
index 367003b94e3..00000000000
--- a/lldb/source/Host/common/NativeBreakpoint.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//===-- NativeBreakpoint.h --------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef liblldb_NativeBreakpoint_h_
-#define liblldb_NativeBreakpoint_h_
-
-#include "lldb/lldb-types.h"
-
-namespace lldb_private
-{
-    class NativeBreakpointList;
-
-    class NativeBreakpoint
-    {
-        friend class NativeBreakpointList;
-
-    public:
-        // The assumption is that derived breakpoints are enabled when created.
-        NativeBreakpoint (lldb::addr_t addr);
-
-        virtual
-        ~NativeBreakpoint ();
-
-        Error
-        Enable ();
-
-        Error
-        Disable ();
-
-        lldb::addr_t
-        GetAddress () const { return m_addr; }
-
-        bool
-        IsEnabled () const { return m_enabled; }
-
-        virtual bool
-        IsSoftwareBreakpoint () const = 0;
-
-    protected:
-        const lldb::addr_t m_addr;
-        int32_t m_ref_count;
-
-        virtual Error
-        DoEnable () = 0;
-
-        virtual Error
-        DoDisable () = 0;
-
-    private:
-        bool m_enabled;
-
-        // -----------------------------------------------------------
-        // interface for NativeBreakpointList
-        // -----------------------------------------------------------
-        void AddRef ();
-        int32_t DecRef ();
-    };
-}
-
-#endif // ifndef liblldb_NativeBreakpoint_h_
diff --git a/lldb/source/Host/common/NativeBreakpointList.cpp b/lldb/source/Host/common/NativeBreakpointList.cpp
index 521ccc8e75c..94d0b3756da 100644
--- a/lldb/source/Host/common/NativeBreakpointList.cpp
+++ b/lldb/source/Host/common/NativeBreakpointList.cpp
@@ -7,11 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "NativeBreakpointList.h"
+#include "lldb/Host/common/NativeBreakpointList.h"
 
 #include "lldb/Core/Log.h"
 
-#include "NativeBreakpoint.h"
+#include "lldb/Host/common/NativeBreakpoint.h"
 
 using namespace lldb;
 using namespace lldb_private;
diff --git a/lldb/source/Host/common/NativeBreakpointList.h b/lldb/source/Host/common/NativeBreakpointList.h
deleted file mode 100644
index 51617330d07..00000000000
--- a/lldb/source/Host/common/NativeBreakpointList.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//===-- NativeBreakpointList.h ----------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef liblldb_NativeBreakpointList_h_
-#define liblldb_NativeBreakpointList_h_
-
-#include "lldb/lldb-private-forward.h"
-#include "lldb/Core/Error.h"
-#include "lldb/Host/Mutex.h"
-// #include "lldb/Host/NativeBreakpoint.h"
-
-#include <functional>
-#include <map>
-
-namespace lldb_private
-{
-    class NativeBreakpointList
-    {
-    public:
-        typedef std::function<Error (lldb::addr_t addr, size_t size_hint, bool hardware, NativeBreakpointSP &breakpoint_sp)> CreateBreakpointFunc;
-
-        NativeBreakpointList ();
-
-        Error
-        AddRef (lldb::addr_t addr, size_t size_hint, bool hardware, CreateBreakpointFunc create_func);
-
-        Error
-        DecRef (lldb::addr_t addr);
-
-        Error
-        EnableBreakpoint (lldb::addr_t addr);
-
-        Error
-        DisableBreakpoint (lldb::addr_t addr);
-
-        Error
-        GetBreakpoint (lldb::addr_t addr, NativeBreakpointSP &breakpoint_sp);
-
-    private:
-        typedef std::map<lldb::addr_t, NativeBreakpointSP> BreakpointMap;
-
-        Mutex m_mutex;
-        BreakpointMap m_breakpoints;
-    };
-}
-
-#endif // ifndef liblldb_NativeBreakpointList_h_
diff --git a/lldb/source/Host/common/NativeProcessProtocol.cpp b/lldb/source/Host/common/NativeProcessProtocol.cpp
index e192f19a889..9c29f32a631 100644
--- a/lldb/source/Host/common/NativeProcessProtocol.cpp
+++ b/lldb/source/Host/common/NativeProcessProtocol.cpp
@@ -7,17 +7,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "NativeProcessProtocol.h"
+#include "lldb/Host/common/NativeProcessProtocol.h"
 
 #include "lldb/lldb-enumerations.h"
 #include "lldb/Core/ArchSpec.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/State.h"
 #include "lldb/Host/Host.h"
-#include "lldb/Target/NativeRegisterContext.h"
+#include "lldb/Host/common/NativeRegisterContext.h"
 
-#include "NativeThreadProtocol.h"
-#include "SoftwareBreakpoint.h"
+#include "lldb/Host/common/NativeThreadProtocol.h"
+#include "lldb/Host/common/SoftwareBreakpoint.h"
 
 using namespace lldb;
 using namespace lldb_private;
diff --git a/lldb/source/Host/common/NativeProcessProtocol.h b/lldb/source/Host/common/NativeProcessProtocol.h
deleted file mode 100644
index 19d8f353b26..00000000000
--- a/lldb/source/Host/common/NativeProcessProtocol.h
+++ /dev/null
@@ -1,344 +0,0 @@
-//===-- NativeProcessProtocol.h ---------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef liblldb_NativeProcessProtocol_h_
-#define liblldb_NativeProcessProtocol_h_
-
-#include <vector>
-
-#include "lldb/lldb-private-forward.h"
-#include "lldb/lldb-types.h"
-#include "lldb/Core/Error.h"
-#include "lldb/Host/Mutex.h"
-
-#include "NativeBreakpointList.h"
-
-namespace lldb_private
-{
-    class MemoryRegionInfo;
-    class ResumeActionList;
-
-    //------------------------------------------------------------------
-    // NativeProcessProtocol
-    //------------------------------------------------------------------
-    class NativeProcessProtocol :
-        public std::enable_shared_from_this<NativeProcessProtocol>
-    {
-        friend class SoftwareBreakpoint;
-
-    public:
-        static NativeProcessProtocol *
-        CreateInstance (lldb::pid_t pid);
-
-        // lldb_private::Host calls should be used to launch a process for debugging, and
-        // then the process should be attached to. When attaching to a process
-        // lldb_private::Host calls should be used to locate the process to attach to,
-        // and then this function should be called.
-        NativeProcessProtocol (lldb::pid_t pid);
-
-    public:
-        virtual ~NativeProcessProtocol ()
-        {
-        }
-
-        virtual Error
-        Resume (const ResumeActionList &resume_actions) = 0;
-
-        virtual Error
-        Halt () = 0;
-
-        virtual Error
-        Detach () = 0;
-
-        //------------------------------------------------------------------
-        /// Sends a process a UNIX signal \a signal.
-        ///
-        /// @return
-        ///     Returns an error object.
-        //------------------------------------------------------------------
-        virtual Error
-        Signal (int signo) = 0;
-
-        //------------------------------------------------------------------
-        /// Tells a process to interrupt all operations as if by a Ctrl-C.
-        ///
-        /// The default implementation will send a local host's equivalent of
-        /// a SIGSTOP to the process via the NativeProcessProtocol::Signal()
-        /// operation.
-        ///
-        /// @return
-        ///     Returns an error object.
-        //------------------------------------------------------------------
-        virtual Error
-        Interrupt ();
-
-        virtual Error
-        Kill () = 0;
-
-        //----------------------------------------------------------------------
-        // Memory and memory region functions
-        //----------------------------------------------------------------------
-
-        virtual Error
-        GetMemoryRegionInfo (lldb::addr_t load_addr, MemoryRegionInfo &range_info);
-
-        virtual Error
-        ReadMemory (lldb::addr_t addr, void *buf, lldb::addr_t size, lldb::addr_t &bytes_read) = 0;
-
-        virtual Error
-        WriteMemory (lldb::addr_t addr, const void *buf, lldb::addr_t size, lldb::addr_t &bytes_written) = 0;
-
-        virtual Error
-        AllocateMemory (lldb::addr_t size, uint32_t permissions, lldb::addr_t &addr) = 0;
-
-        virtual Error
-        DeallocateMemory (lldb::addr_t addr) = 0;
-
-        virtual lldb::addr_t
-        GetSharedLibraryInfoAddress () = 0;
-
-        virtual bool
-        IsAlive () const;
-
-        virtual size_t
-        UpdateThreads () = 0;
-
-        virtual bool
-        GetArchitecture (ArchSpec &arch) const = 0;
-
-        //----------------------------------------------------------------------
-        // Breakpoint functions
-        //----------------------------------------------------------------------
-        virtual Error
-        SetBreakpoint (lldb::addr_t addr, uint32_t size, bool hardware) = 0;
-
-        virtual Error
-        RemoveBreakpoint (lldb::addr_t addr);
-
-        virtual Error
-        EnableBreakpoint (lldb::addr_t addr);
-
-        virtual Error
-        DisableBreakpoint (lldb::addr_t addr);
-
-        //----------------------------------------------------------------------
-        // Watchpoint functions
-        //----------------------------------------------------------------------
-        virtual uint32_t
-        GetMaxWatchpoints () const;
-
-        virtual Error
-        SetWatchpoint (lldb::addr_t addr, size_t size, uint32_t watch_flags, bool hardware);
-
-        virtual Error
-        RemoveWatchpoint (lldb::addr_t addr);
-
-        //----------------------------------------------------------------------
-        // Accessors
-        //----------------------------------------------------------------------
-        lldb::pid_t
-        GetID() const
-        {
-            return m_pid;
-        }
-
-        lldb::StateType
-        GetState () const;
-
-        bool
-        IsRunning () const
-        {
-            return m_state == lldb::eStateRunning || IsStepping();
-        }
-
-        bool
-        IsStepping () const
-        {
-            return m_state == lldb::eStateStepping;
-        }
-
-        bool
-        CanResume () const
-        {
-            return m_state == lldb::eStateStopped;
-        }
-
-        bool
-        GetByteOrder (lldb::ByteOrder &byte_order) const;
-
-        //----------------------------------------------------------------------
-        // Exit Status
-        //----------------------------------------------------------------------
-        virtual bool
-        GetExitStatus (lldb_private::ExitType *exit_type, int *status, std::string &exit_description);
-
-        virtual bool
-        SetExitStatus (lldb_private::ExitType exit_type, int status, const char *exit_description, bool bNotifyStateChange);
-
-        //----------------------------------------------------------------------
-        // Access to threads
-        //----------------------------------------------------------------------
-        NativeThreadProtocolSP
-        GetThreadAtIndex (uint32_t idx);
-
-        NativeThreadProtocolSP
-        GetThreadByID (lldb::tid_t tid);
-
-        void
-        SetCurrentThreadID (lldb::tid_t tid)
-        {
-            m_current_thread_id = tid;
-        }
-
-        lldb::tid_t
-        GetCurrentThreadID ()
-        {
-            return m_current_thread_id;
-        }
-
-        NativeThreadProtocolSP
-        GetCurrentThread ()
-        {
-            return GetThreadByID (m_current_thread_id);
-        }
-
-        //----------------------------------------------------------------------
-        // Access to inferior stdio
-        //----------------------------------------------------------------------
-        virtual
-        int GetTerminalFileDescriptor ()
-        {
-            return m_terminal_fd;
-        }
-
-        //----------------------------------------------------------------------
-        // Stop id interface
-        //----------------------------------------------------------------------
-
-        uint32_t
-        GetStopID () const;
-
-        // ---------------------------------------------------------------------
-        // Callbacks for low-level process state changes
-        // ---------------------------------------------------------------------
-        class NativeDelegate
-        {
-        public:
-            virtual
-            ~NativeDelegate () {}
-
-            virtual void
-            InitializeDelegate (NativeProcessProtocol *process) = 0;
-
-            virtual void
-            ProcessStateChanged (NativeProcessProtocol *process, lldb::StateType state) = 0;
-
-            virtual void
-            DidExec (NativeProcessProtocol *process) = 0;
-        };
-
-        //------------------------------------------------------------------
-        /// Register a native delegate.
-        ///
-        /// Clients can register nofication callbacks by passing in a
-        /// NativeDelegate impl and passing it into this function.
-        ///
-        /// Note: it is required that the lifetime of the
-        /// native_delegate outlive the NativeProcessProtocol.
-        ///
-        /// @param[in] native_delegate
-        ///     A NativeDelegate impl to be called when certain events
-        ///     happen within the NativeProcessProtocol or related threads.
-        ///
-        /// @return
-        ///     true if the delegate was registered successfully;
-        ///     false if the delegate was already registered.
-        ///
-        /// @see NativeProcessProtocol::NativeDelegate.
-        //------------------------------------------------------------------
-        bool
-        RegisterNativeDelegate (NativeDelegate &native_delegate);
-
-        //------------------------------------------------------------------
-        /// Unregister a native delegate previously registered.
-        ///
-        /// @param[in] native_delegate
-        ///     A NativeDelegate impl previously registered with this process.
-        ///
-        /// @return Returns \b true if the NativeDelegate was
-        /// successfully removed from the process, \b false otherwise.
-        ///
-        /// @see NativeProcessProtocol::NativeDelegate
-        //------------------------------------------------------------------
-        bool
-        UnregisterNativeDelegate (NativeDelegate &native_delegate);
-
-    protected:
-        lldb::pid_t m_pid;
-
-        std::vector<NativeThreadProtocolSP> m_threads;
-        lldb::tid_t m_current_thread_id;
-        mutable Mutex m_threads_mutex;
-
-        lldb::StateType m_state;
-        mutable Mutex m_state_mutex;
-
-        lldb_private::ExitType m_exit_type;
-        int m_exit_status;
-        std::string m_exit_description;
-        Mutex m_delegates_mutex;
-        std::vector<NativeDelegate*> m_delegates;
-        NativeBreakpointList m_breakpoint_list;
-        int m_terminal_fd;
-        uint32_t m_stop_id;
-
-        // -----------------------------------------------------------
-        // Internal interface for state handling
-        // -----------------------------------------------------------
-        void
-        SetState (lldb::StateType state, bool notify_delegates = true);
-
-        // Derived classes need not implement this.  It can be used as a
-        // hook to clear internal caches that should be invalidated when
-        // stop ids change.
-        //
-        // Note this function is called with the state mutex obtained
-        // by the caller.
-        virtual void
-        DoStopIDBumped (uint32_t newBumpId);
-
-        // -----------------------------------------------------------
-        // Internal interface for software breakpoints
-        // -----------------------------------------------------------
-        Error
-        SetSoftwareBreakpoint (lldb::addr_t addr, uint32_t size_hint);
-
-        virtual Error
-        GetSoftwareBreakpointTrapOpcode (size_t trap_opcode_size_hint, size_t &actual_opcode_size, const uint8_t *&trap_opcode_bytes) = 0;
-
-        // -----------------------------------------------------------
-        /// Notify the delegate that an exec occurred.
-        ///
-        /// Provide a mechanism for a delegate to clear out any exec-
-        /// sensitive data.
-        // -----------------------------------------------------------
-        void
-        NotifyDidExec ();
-
-        NativeThreadProtocolSP
-        GetThreadByIDUnlocked (lldb::tid_t tid);
-
-    private:
-
-        void
-        SynchronouslyNotifyProcessStateChanged (lldb::StateType state);
-    };
-}
-
-#endif // #ifndef liblldb_NativeProcessProtocol_h_
diff --git a/lldb/source/Target/NativeRegisterContext.cpp b/lldb/source/Host/common/NativeRegisterContext.cpp
index d84e2279a45..5722879e8c0 100644
--- a/lldb/source/Target/NativeRegisterContext.cpp
+++ b/lldb/source/Host/common/NativeRegisterContext.cpp
@@ -7,15 +7,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/Target/NativeRegisterContext.h"
+#include "lldb/Host/common/NativeRegisterContext.h"
 
 #include "lldb/Core/Log.h"
 #include "lldb/Core/RegisterValue.h"
 
 #include "lldb/lldb-private-log.h"
 
-#include "Host/common/NativeProcessProtocol.h"
-#include "Host/common/NativeThreadProtocol.h"
+#include "lldb/Host/common/NativeProcessProtocol.h"
+#include "lldb/Host/common/NativeThreadProtocol.h"
 
 using namespace lldb;
 using namespace lldb_private;
diff --git a/lldb/source/Target/NativeRegisterContextRegisterInfo.cpp b/lldb/source/Host/common/NativeRegisterContextRegisterInfo.cpp
index 671ab608420..0d7c6eced75 100644
--- a/lldb/source/Target/NativeRegisterContextRegisterInfo.cpp
+++ b/lldb/source/Host/common/NativeRegisterContextRegisterInfo.cpp
@@ -9,7 +9,7 @@
 
 #include "lldb/lldb-types.h"
 #include "lldb/lldb-private-forward.h"
-#include "lldb/Target/NativeRegisterContextRegisterInfo.h"
+#include "lldb/Host/common/NativeRegisterContextRegisterInfo.h"
 
 using namespace lldb_private;
 
diff --git a/lldb/source/Host/common/NativeThreadProtocol.cpp b/lldb/source/Host/common/NativeThreadProtocol.cpp
index 91d00200906..ea406e9ef2c 100644
--- a/lldb/source/Host/common/NativeThreadProtocol.cpp
+++ b/lldb/source/Host/common/NativeThreadProtocol.cpp
@@ -7,11 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "NativeThreadProtocol.h"
+#include "lldb/Host/common/NativeThreadProtocol.h"
 
-#include "NativeProcessProtocol.h"
-#include "lldb/Target/NativeRegisterContext.h"
-#include "SoftwareBreakpoint.h"
+#include "lldb/Host/common/NativeProcessProtocol.h"
+#include "lldb/Host/common/NativeRegisterContext.h"
+#include "lldb/Host/common/SoftwareBreakpoint.h"
 
 using namespace lldb;
 using namespace lldb_private;
diff --git a/lldb/source/Host/common/NativeThreadProtocol.h b/lldb/source/Host/common/NativeThreadProtocol.h
deleted file mode 100644
index 954ffb36a94..00000000000
--- a/lldb/source/Host/common/NativeThreadProtocol.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//===-- NativeThreadProtocol.h ----------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef liblldb_NativeThreadProtocol_h_
-#define liblldb_NativeThreadProtocol_h_
-
-#include <memory>
-
-#include "lldb/lldb-private-forward.h"
-#include "lldb/lldb-types.h"
-#include "lldb/Host/Debug.h"
-
-namespace lldb_private
-{
-    //------------------------------------------------------------------
-    // NativeThreadProtocol
-    //------------------------------------------------------------------
-    class NativeThreadProtocol:
-        public std::enable_shared_from_this<NativeThreadProtocol>
-    {
-    public:
-        NativeThreadProtocol (NativeProcessProtocol *process, lldb::tid_t tid);
-
-        virtual ~NativeThreadProtocol()
-        {
-        }
-
-        virtual std::string
-        GetName() = 0;
-
-        virtual lldb::StateType
-        GetState () = 0;
-
-        virtual NativeRegisterContextSP
-        GetRegisterContext () = 0;
-
-        virtual Error
-        ReadRegister (uint32_t reg, RegisterValue &reg_value);
-
-        virtual Error
-        WriteRegister (uint32_t reg, const RegisterValue &reg_value);
-
-        virtual Error
-        SaveAllRegisters (lldb::DataBufferSP &data_sp);
-
-        virtual Error
-        RestoreAllRegisters (lldb::DataBufferSP &data_sp);
-
-        virtual bool
-        GetStopReason (ThreadStopInfo &stop_info, std::string& description) = 0;
-
-        lldb::tid_t
-        GetID() const
-        {
-            return m_tid;
-        }
-
-        NativeProcessProtocolSP
-        GetProcess ();
-
-        // ---------------------------------------------------------------------
-        // Thread-specific watchpoints
-        // ---------------------------------------------------------------------
-        virtual Error
-        SetWatchpoint (lldb::addr_t addr, size_t size, uint32_t watch_flags, bool hardware) = 0;
-
-        virtual Error
-        RemoveWatchpoint (lldb::addr_t addr) = 0;
-
-    protected:
-        NativeProcessProtocolWP m_process_wp;
-        lldb::tid_t m_tid;
-    };
-}
-
-#endif // #ifndef liblldb_NativeThreadProtocol_h_
diff --git a/lldb/source/Host/common/SoftwareBreakpoint.cpp b/lldb/source/Host/common/SoftwareBreakpoint.cpp
index d9d1fa67156..67f472b88f5 100644
--- a/lldb/source/Host/common/SoftwareBreakpoint.cpp
+++ b/lldb/source/Host/common/SoftwareBreakpoint.cpp
@@ -7,14 +7,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SoftwareBreakpoint.h"
+#include "lldb/Host/common/SoftwareBreakpoint.h"
 
 #include "lldb/Core/Error.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Host/Debug.h"
 #include "lldb/Host/Mutex.h"
 
-#include "NativeProcessProtocol.h"
+#include "lldb/Host/common/NativeProcessProtocol.h"
 
 using namespace lldb_private;
 
diff --git a/lldb/source/Host/common/SoftwareBreakpoint.h b/lldb/source/Host/common/SoftwareBreakpoint.h
deleted file mode 100644
index 1fed19eca61..00000000000
--- a/lldb/source/Host/common/SoftwareBreakpoint.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//===-- SoftwareBreakpoint.h ------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef liblldb_SoftwareBreakpoint_h_
-#define liblldb_SoftwareBreakpoint_h_
-
-#include "lldb/lldb-private-forward.h"
-#include "NativeBreakpoint.h"
-
-namespace lldb_private
-{
-    class SoftwareBreakpoint : public NativeBreakpoint
-    {
-    public:
-        static Error
-        CreateSoftwareBreakpoint (NativeProcessProtocol &process, lldb::addr_t addr, size_t size_hint, NativeBreakpointSP &breakpoint_spn);
-
-        SoftwareBreakpoint (NativeProcessProtocol &process, lldb::addr_t addr, const uint8_t *saved_opcodes, const uint8_t *trap_opcodes, size_t opcode_size);
-
-    protected:
-        Error
-        DoEnable () override;
-
-        Error
-        DoDisable () override;
-
-        bool
-        IsSoftwareBreakpoint () const override;
-
-    private:
-        /// Max number of bytes that a software trap opcode sequence can occupy.
-        static const size_t MAX_TRAP_OPCODE_SIZE = 8;
-
-        NativeProcessProtocol &m_process;
-        uint8_t m_saved_opcodes [MAX_TRAP_OPCODE_SIZE];
-        uint8_t m_trap_opcodes [MAX_TRAP_OPCODE_SIZE];
-        const size_t m_opcode_size;
-
-        static Error
-        EnableSoftwareBreakpoint (NativeProcessProtocol &process, lldb::addr_t addr, size_t bp_opcode_size, const uint8_t *bp_opcode_bytes, uint8_t *saved_opcode_bytes);
-
-    };
-}
-
-#endif // #ifndef liblldb_SoftwareBreakpoint_h_
diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
index 7c27483819e..5ff30bd93a6 100644
--- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
+++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
@@ -56,11 +56,11 @@
 #include "lldb/Host/HostInfo.h"
 #include "lldb/Host/ThreadLauncher.h"
 #include "lldb/Symbol/ObjectFile.h"
-#include "lldb/Target/NativeRegisterContext.h"
+#include "lldb/Host/common/NativeRegisterContext.h"
 #include "lldb/Target/ProcessLaunchInfo.h"
 #include "lldb/Utility/PseudoTerminal.h"
 
-#include "Host/common/NativeBreakpoint.h"
+#include "lldb/Host/common/NativeBreakpoint.h"
 #include "Utility/StringExtractor.h"
 
 #include "Plugins/Process/Utility/LinuxSignals.h"
diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.h b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.h
index 628209b2fa8..0b8e760b9a2 100644
--- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.h
+++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.h
@@ -25,7 +25,7 @@
 #include "lldb/Host/Mutex.h"
 #include "lldb/Target/MemoryRegionInfo.h"
 
-#include "Host/common/NativeProcessProtocol.h"
+#include "lldb/Host/common/NativeProcessProtocol.h"
 
 namespace lldb_private
 {
diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.cpp b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.cpp
index 0878f2e7364..649dfb238be 100644
--- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.cpp
+++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.cpp
@@ -13,8 +13,8 @@
 #include "lldb/Core/DataBufferHeap.h"
 #include "lldb/Core/Error.h"
 #include "lldb/Core/RegisterValue.h"
-#include "Host/common/NativeProcessProtocol.h"
-#include "Host/common/NativeThreadProtocol.h"
+#include "lldb/Host/common/NativeProcessProtocol.h"
+#include "lldb/Host/common/NativeThreadProtocol.h"
 #include "Plugins/Process/Linux/NativeProcessLinux.h"
 
 using namespace lldb_private;
diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.h b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.h
index ab47f0c287d..e624cc1c224 100644
--- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.h
+++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.h
@@ -11,7 +11,7 @@
 #ifndef lldb_NativeRegisterContextLinux_x86_64_h
 #define lldb_NativeRegisterContextLinux_x86_64_h
 
-#include "lldb/Target/NativeRegisterContextRegisterInfo.h"
+#include "lldb/Host/common/NativeRegisterContextRegisterInfo.h"
 #include "Plugins/Process/Utility/RegisterContext_x86.h"
 #include "Plugins/Process/Utility/lldb-x86-register-enums.h"
 
diff --git a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.h b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.h
index 1e4ae53e322..7233b30237b 100644
--- a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.h
+++ b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.h
@@ -11,7 +11,7 @@
 #define liblldb_NativeThreadLinux_H_
 
 #include "lldb/lldb-private-forward.h"
-#include "../../../Host/common/NativeThreadProtocol.h"
+#include "lldb/Host/common/NativeThreadProtocol.h"
 
 namespace lldb_private
 {
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
index 0dd68128ec8..de3e3768844 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
@@ -39,9 +39,9 @@
 #include "lldb/Target/FileAction.h"
 #include "lldb/Target/Platform.h"
 #include "lldb/Target/Process.h"
-#include "lldb/Target/NativeRegisterContext.h"
-#include "Host/common/NativeProcessProtocol.h"
-#include "Host/common/NativeThreadProtocol.h"
+#include "lldb/Host/common/NativeRegisterContext.h"
+#include "lldb/Host/common/NativeProcessProtocol.h"
+#include "lldb/Host/common/NativeThreadProtocol.h"
 
 // Project includes
 #include "Utility/StringExtractorGDBRemote.h"
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h
index 07ce98e29ac..0a2eb0d8c57 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h
@@ -23,7 +23,7 @@
 #include "lldb/Target/Process.h"
 #include "GDBRemoteCommunication.h"
 
-#include "../../../Host/common/NativeProcessProtocol.h"
+#include "lldb/Host/common/NativeProcessProtocol.h"
 
 class ProcessGDBRemote;
 class StringExtractorGDBRemote;
diff --git a/lldb/source/Target/CMakeLists.txt b/lldb/source/Target/CMakeLists.txt
index f534b33bad2..d34aa92b223 100644
--- a/lldb/source/Target/CMakeLists.txt
+++ b/lldb/source/Target/CMakeLists.txt
@@ -14,8 +14,6 @@ add_lldb_library(lldbTarget
   LanguageRuntime.cpp
   Memory.cpp
   MemoryHistory.cpp
-  NativeRegisterContext.cpp
-  NativeRegisterContextRegisterInfo.cpp
   ObjCLanguageRuntime.cpp
   OperatingSystem.cpp
   PathMappingList.cpp