summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEwan Crawford <ewan@codeplay.com>2015-06-24 15:14:26 +0000
committerEwan Crawford <ewan@codeplay.com>2015-06-24 15:14:26 +0000
commitaa7eda7a9e2c70d389f8edb20ea3b5c1e8e13a24 (patch)
treec02b5f7eaf86b36771b771e6393deb6ee4919234
parent26eabf6d0f8aca2a59777dba5d929270a346aa17 (diff)
downloadbcm5719-llvm-aa7eda7a9e2c70d389f8edb20ea3b5c1e8e13a24.tar.gz
bcm5719-llvm-aa7eda7a9e2c70d389f8edb20ea3b5c1e8e13a24.zip
Proper handling of QNonStop packet response.
Turn non-stop mode off if reply to QNonStop packet isn't an OK. llvm-svn: 240546
-rw-r--r--lldb/include/lldb/Target/Target.h5
-rw-r--r--lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp2
-rw-r--r--lldb/source/Target/Target.cpp7
3 files changed, 12 insertions, 2 deletions
diff --git a/lldb/include/lldb/Target/Target.h b/lldb/include/lldb/Target/Target.h
index 1681d216a67..427f68e4c5d 100644
--- a/lldb/include/lldb/Target/Target.h
+++ b/lldb/include/lldb/Target/Target.h
@@ -198,7 +198,10 @@ public:
bool
GetNonStopModeEnabled () const;
-
+
+ void
+ SetNonStopModeEnabled (bool b);
+
bool
GetDisplayRuntimeSupportValues () const;
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index c1ad2e69754..2b7ff2427b9 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -1172,7 +1172,7 @@ ProcessGDBRemote::ConnectToDebugserver (const char *connect_url)
// Send $QNonStop:1 packet on startup if required
if (GetTarget().GetNonStopModeEnabled())
- m_gdb_comm.SetNonStopMode(true);
+ GetTarget().SetNonStopModeEnabled (m_gdb_comm.SetNonStopMode(true));
m_gdb_comm.GetEchoSupported ();
m_gdb_comm.GetThreadSuffixSupported ();
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index d88810c3ebb..6ba09f4ee94 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -3550,6 +3550,13 @@ TargetProperties::GetNonStopModeEnabled () const
return m_collection_sp->GetPropertyAtIndexAsBoolean (NULL, idx, false);
}
+void
+TargetProperties::SetNonStopModeEnabled (bool b)
+{
+ const uint32_t idx = ePropertyNonStopModeEnabled;
+ m_collection_sp->SetPropertyAtIndexAsBoolean (NULL, idx, b);
+}
+
const ProcessLaunchInfo &
TargetProperties::GetProcessLaunchInfo ()
{
OpenPOWER on IntegriCloud