No longer need address argument

Author: DavidSpickett

lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg.cpp

@@ -248,7 +248,7 @@ uint32_t NativeRegisterContextDBReg::SetHardwareWatchpoint(
     return LLDB_INVALID_INDEX32;
   }
 
-  control_value = MakeWatchControlValue(addr, size, watch_flags);
+  control_value = MakeWatchControlValue(size, watch_flags);
 
   // Iterate over stored watchpoints and find a free wp_index
   wp_index = LLDB_INVALID_INDEX32;

lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg.h

@@ -89,8 +89,7 @@ class NativeRegisterContextDBReg
   AdjustWatchpoint(const WatchpointDetails &details) = 0;
 
   virtual uint32_t MakeBreakControlValue(size_t size) = 0;
-  virtual uint32_t MakeWatchControlValue(lldb::addr_t addr, size_t size,
-                                         uint32_t watch_flags) = 0;
+  virtual uint32_t MakeWatchControlValue(size_t size, uint32_t watch_flags) = 0;
   virtual uint32_t GetWatchpointSize(uint32_t wp_index) = 0;
 
   virtual llvm::Error ReadHardwareDebugInfo() = 0;

lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_arm.cpp

@@ -70,8 +70,9 @@ uint32_t NativeRegisterContextDBReg_arm::MakeBreakControlValue(size_t size) {
   }
 }
 
-uint32_t NativeRegisterContextDBReg_arm::MakeWatchControlValue(
-    lldb::addr_t addr, size_t size, uint32_t watch_flags) {
+uint32_t
+NativeRegisterContextDBReg_arm::MakeWatchControlValue(size_t size,
+                                                      uint32_t watch_flags) {
   // We can only watch up to four bytes that follow a 4 byte aligned address
   // per watchpoint register pair, so make sure we can properly encode this.
   // We assume that the address was 4 byte aligned by AdjustWatchpoint.

lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_arm.h

@@ -26,8 +26,7 @@ class NativeRegisterContextDBReg_arm : public NativeRegisterContextDBReg {
 
   uint32_t MakeBreakControlValue(size_t size) override;
 
-  uint32_t MakeWatchControlValue(lldb::addr_t addr, size_t size,
-                                 uint32_t watch_flags) override;
+  uint32_t MakeWatchControlValue(size_t size, uint32_t watch_flags) override;
 
   bool ValidateBreakpoint(size_t size,
                           [[maybe_unused]] lldb::addr_t addr) override {

lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_arm64.cpp

@@ -78,10 +78,9 @@ uint32_t NativeRegisterContextDBReg_arm64::MakeBreakControlValue(size_t size) {
   return m_hw_dbg_enable_bit | pac_bits | encoded_size;
 }
 
-uint32_t NativeRegisterContextDBReg_arm64::MakeWatchControlValue(
-    lldb::addr_t addr, size_t size, uint32_t watch_flags) {
-  (void)addr;
-
+uint32_t
+NativeRegisterContextDBReg_arm64::MakeWatchControlValue(size_t size,
+                                                        uint32_t watch_flags) {
   // PAC (bits 2:1): 0b10
   const uint32_t pac_bits = 2 << 1;
 

lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_arm64.h

@@ -26,8 +26,7 @@ class NativeRegisterContextDBReg_arm64 : public NativeRegisterContextDBReg {
 
   uint32_t MakeBreakControlValue(size_t size) override;
 
-  uint32_t MakeWatchControlValue(lldb::addr_t addr, size_t size,
-                                 uint32_t watch_flags) override;
+  uint32_t MakeWatchControlValue(size_t size, uint32_t watch_flags) override;
 };
 
 } // namespace lldb_private

lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_loongarch.cpp

@@ -52,8 +52,7 @@ NativeRegisterContextDBReg_loongarch::MakeBreakControlValue(size_t size) {
 }
 
 uint32_t NativeRegisterContextDBReg_loongarch::MakeWatchControlValue(
-    lldb::addr_t addr, size_t size, uint32_t watch_flags) {
-  (void)addr;
+    size_t size, uint32_t watch_flags) {
   // Encoding hardware watchpoint control value.
   // Size encoded:
   // case 1 : 0b11

lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_loongarch.h

@@ -26,8 +26,7 @@ class NativeRegisterContextDBReg_loongarch : public NativeRegisterContextDBReg {
 
   uint32_t MakeBreakControlValue(size_t size) override;
 
-  uint32_t MakeWatchControlValue(lldb::addr_t addr, size_t size,
-                                 uint32_t watch_flags) override;
+  uint32_t MakeWatchControlValue(size_t size, uint32_t watch_flags) override;
 };
 
 } // namespace lldb_private