Address @fjricci's review comments

facebookarchive · Apr 7, 2018 · 7f4e6f9 · 7f4e6f9
1 parent 6081095
commit 7f4e6f9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/Headers/DebugServer2/Core/HardwareBreakpointManager.h b/Headers/DebugServer2/Core/HardwareBreakpointManager.h
@@ -43,15 +43,15 @@ class HardwareBreakpointManager : public BreakpointManager {
 
 protected:
   bool softwareImplementationOfReadonlyWatchpoints(Address const &address,
-                                                   Site & site);
+                                                   Site &site);
   ErrorCode storeNewValueAtAddress(Address const &address);
 
 protected:
   bool enabled(Target::Thread *thread = nullptr) const override;
 
 public:
   virtual size_t maxWatchpoints();
-  virtual bool checkIfWrittenTo(Address const &address);
+  virtual bool wasWritten(Address const &address);
 
 public:
   void enable(Target::Thread *thread = nullptr) override;

diff --git a/Sources/Core/ARM/HardwareBreakpointManager.cpp b/Sources/Core/ARM/HardwareBreakpointManager.cpp
@@ -35,10 +35,8 @@ size_t HardwareBreakpointManager::maxWatchpoints() {
   return _process->getMaxWatchpoints();
 }
 
-bool HardwareBreakpointManager::checkIfWrittenTo(Address const &address) {
-  bool implemented = false;
-  DS2ASSERT(implemented);
-  return implemented;
+bool HardwareBreakpointManager::wasWritten(Address const &address) {
+  DS2BUG("not implemented");
 }
 
 ErrorCode HardwareBreakpointManager::isValid(Address const &address,

diff --git a/Sources/Core/HardwareBreakpointManager.cpp b/Sources/Core/HardwareBreakpointManager.cpp
@@ -21,7 +21,6 @@ HardwareBreakpointManager::HardwareBreakpointManager(
     Target::ProcessBase *process)
     : super(process), _locations(maxWatchpoints()) {}
 
-
 HardwareBreakpointManager::~HardwareBreakpointManager() {}
 
 ErrorCode HardwareBreakpointManager::add(Address const &address,
@@ -106,7 +105,7 @@ HardwareBreakpointManager::softwareImplementationOfReadonlyWatchpoints(
   // if this is a readonly hardware watchpoint
   case kModeRead:
     // if written to, return false. if not, invoke super.
-    return checkIfWrittenTo(address) ? false : super::hit(address, site);
+    return wasWritten(address) ? false : super::hit(address, site);
     break;
   default:
     return super::hit(address, site);
@@ -143,7 +142,7 @@ int HardwareBreakpointManager::getAvailableLocation() {
   auto it = std::find(_locations.begin(), _locations.end(), 0);
   DS2ASSERT(it != _locations.end());
 
-  return (it - _locations.begin());
+  return it - _locations.begin();
 }
 
 void HardwareBreakpointManager::enumerateThreads(

diff --git a/Sources/Core/X86/HardwareBreakpointManager.cpp b/Sources/Core/X86/HardwareBreakpointManager.cpp
@@ -32,7 +32,7 @@ size_t HardwareBreakpointManager::maxWatchpoints() {
   return 4; // dr0, dr1, dr2, dr3
 }
 
-bool HardwareBreakpointManager::checkIfWrittenTo(Address const &address) {
+bool HardwareBreakpointManager::wasWritten(Address const &address) {
   Site site;
   try {
     site = _sites.at(address);