pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lldb-netbsd: Kill SupportHardwareSingleStepping() as unneded complexity now



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Dec 21 17:05:10 2016 +0100
Changeset:	6541ee7593c09d25c31e52ef572054679e0699a0

Modified Files:
	lldb-netbsd/distinfo
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
	lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp

Log Message:
lldb-netbsd: Kill SupportHardwareSingleStepping() as unneded complexity now

LLDB supports emulated in software PT_STEP for some targets like ARM.

Sponsored by <The NetBSD Foundation>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6541ee7593c09d25c31e52ef572054679e0699a0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lldb-netbsd/distinfo                               |  6 ++--
 ..._Plugins_Process_NetBSD_NativeProcessNetBSD.cpp | 34 ++--------------------
 ...ce_Plugins_Process_NetBSD_NativeProcessNetBSD.h |  6 ++--
 ...e_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp |  9 ++----
 4 files changed, 10 insertions(+), 45 deletions(-)

diffs:
diff --git a/lldb-netbsd/distinfo b/lldb-netbsd/distinfo
index c9f0eaf..b3a34a8 100644
--- a/lldb-netbsd/distinfo
+++ b/lldb-netbsd/distinfo
@@ -27,9 +27,9 @@ SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp) = 129e853c1f93f06
 SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.h) = 4327a21e79378b8f35adb07614adb41c37bbaf61
 SHA1 (patch-source_Plugins_Process_CMakeLists.txt) = c0168f81da56d9896eb414e6b8bb7262de04ac33
 SHA1 (patch-source_Plugins_Process_NetBSD_CMakeLists.txt) = df17afdf71c29d945c887e318718904793cd48ad
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = f83c6cdb1c66713707e723a342ddfd864048ddba
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = 4f2ef718b2780d4407fd7fa950848aa51605c7fd
-SHA1 (patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp) = 5a43593b1626679f57420973fab6f96951339d25
+SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = 7d0ffde884d5f1e2fa2940c82df8338bb890aa2f
+SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = 3b15e8b5c4240846dbe1a5ef38b02da0c1299a85
+SHA1 (patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp) = a36d09154a2f1d795700aaa56c78120fc91794c0
 SHA1 (patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.h) = a2510080812c538a2c65a7237bfe029d4e55b77d
 SHA1 (patch-tools_lldb-mi_MICmnBase.cpp) = 851c82ac61e1241018755fbd7236af00379ac986
 SHA1 (patch-tools_lldb-mi_MICmnBase.h) = f550d5e10bcf02fb46472733acdbb820791f22e5
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
index 575d189..62d5908 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp.orig	2016-12-19 01:22:58.080559848 +0000
+--- source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp.orig	2016-12-21 15:47:29.499519618 +0000
 +++ source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp
-@@ -0,0 +1,1820 @@
+@@ -0,0 +1,1790 @@
 +//===-- NativeProcessNetBSD.cpp -------------------------------- -*- C++ -*-===//
 +//
 +//                     The LLVM Compiler Infrastructure
@@ -731,42 +731,12 @@ $NetBSD$
 +  return Error();
 +}
 +
-+bool NativeProcessNetBSD::SupportHardwareSingleStepping() const {
-+  if (m_arch.GetMachine() == llvm::Triple::arm ||
-+      m_arch.GetMachine() == llvm::Triple::mips64 ||
-+      m_arch.GetMachine() == llvm::Triple::mips64el ||
-+      m_arch.GetMachine() == llvm::Triple::mips ||
-+      m_arch.GetMachine() == llvm::Triple::mipsel)
-+    return false;
-+  return true;
-+}
-+
 +Error NativeProcessNetBSD::Resume(const ResumeActionList &resume_actions) {
 +  Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS | LIBLLDB_LOG_THREAD));
 +  if (log)
 +    log->Printf("NativeProcessNetBSD::%s called: pid %" PRIu64, __FUNCTION__,
 +                GetID());
 +
-+  bool software_single_step = !SupportHardwareSingleStepping();
-+
-+  if (software_single_step) {
-+    for (auto thread_sp : m_threads) {
-+      assert(thread_sp && "thread list should not contain NULL threads");
-+
-+      const ResumeAction *const action =
-+          resume_actions.GetActionForThread(thread_sp->GetID(), true);
-+      if (action == nullptr)
-+        continue;
-+
-+      if (action->state == eStateStepping) {
-+        Error error = SetupSoftwareSingleStepping(
-+            static_cast<NativeThreadNetBSD &>(*thread_sp));
-+        if (error.Fail())
-+          return error;
-+      }
-+    }
-+  }
-+
 +  for (auto thread_sp : m_threads) {
 +    assert(thread_sp && "thread list should not contain NULL threads");
 +
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
index beccf88..a96c208 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/NativeProcessNetBSD.h.orig	2016-12-19 01:22:58.087120268 +0000
+--- source/Plugins/Process/NetBSD/NativeProcessNetBSD.h.orig	2016-12-21 15:47:29.506673013 +0000
 +++ source/Plugins/Process/NetBSD/NativeProcessNetBSD.h
-@@ -0,0 +1,186 @@
+@@ -0,0 +1,184 @@
 +//===-- NativeProcessNetBSD.h ---------------------------------- -*- C++ -*-===//
 +//
 +//                     The LLVM Compiler Infrastructure
@@ -107,8 +107,6 @@ $NetBSD$
 +  static Error PtraceWrapper(int req, lldb::pid_t pid, void *addr = nullptr,
 +                             int data = 0, int *result = nullptr);
 +
-+  bool SupportHardwareSingleStepping() const;
-+
 +protected:
 +  // ---------------------------------------------------------------------
 +  // NativeProcessProtocol protected interface
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp
index 66ba19e..3e6ed36 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Process_NetBSD_NativeThreadNetBSD.cpp
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/NativeThreadNetBSD.cpp.orig	2016-12-19 01:22:58.093122208 +0000
+--- source/Plugins/Process/NetBSD/NativeThreadNetBSD.cpp.orig	2016-12-21 15:47:29.514533040 +0000
 +++ source/Plugins/Process/NetBSD/NativeThreadNetBSD.cpp
-@@ -0,0 +1,306 @@
+@@ -0,0 +1,303 @@
 +//===-- NativeThreadNetBSD.cpp --------------------------------- -*- C++ -*-===//
 +//
 +//                     The LLVM Compiler Infrastructure
@@ -179,10 +179,7 @@ $NetBSD$
 +  // If hardware single-stepping is not supported, we just do a continue. The
 +  // breakpoint on the
 +  // next instruction has been setup in NativeProcessNetBSD::Resume.
-+  return NativeProcessNetBSD::PtraceWrapper(
-+      GetProcess().SupportHardwareSingleStepping() ? PT_STEP
-+                                                   : PT_CONTINUE,
-+      GetID(), (void *)1, data);
++  return NativeProcessNetBSD::PtraceWrapper(PT_STEP, GetID(), (void *)1, data);
 +}
 +
 +void NativeThreadNetBSD::SetStoppedBySignal(uint32_t signo,


Home | Main Index | Thread Index | Old Index