Signed-off-by: Richard Henderson <[email protected]>
---
include/accel/tcg/cpu-ops.h | 5 -----
include/hw/core/cpu.h | 2 --
accel/tcg/watchpoint.c | 6 ------
3 files changed, 13 deletions(-)
diff --git a/include/accel/tcg/cpu-ops.h b/include/accel/tcg/cpu-ops.h
index 734bcd537b..a232288152 100644
--- a/include/accel/tcg/cpu-ops.h
+++ b/include/accel/tcg/cpu-ops.h
@@ -249,11 +249,6 @@ struct TCGCPUOps {
MMUAccessType access_type,
int mmu_idx, uintptr_t retaddr);
- /**
- * @adjust_watchpoint_address: hack for cpu_check_watchpoint (used by ARM)
- */
- vaddr (*adjust_watchpoint_address)(CPUState *cpu, vaddr addr, int len);
-
/**
* @debug_check_watchpoint: return true if the architectural
* watchpoint whose address has matched should really fire.
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 5401d7c14b..c4c86b8595 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -139,8 +139,6 @@ struct SysemuCPUOps;
* to GDB. The returned value is expected to be a simple constant string:
* the caller will not g_free() it.
* @disas_set_info: Setup architecture specific components of disassembly info
- * @adjust_watchpoint_address: Perform a target-specific adjustment to an
- * address before attempting to match it against watchpoints.
* @deprecation_note: If this CPUClass is deprecated, this field provides
* related information.
* @max_as: Maximum valid index used to refer to the address spaces supported
by
diff --git a/accel/tcg/watchpoint.c b/accel/tcg/watchpoint.c
index f96ffc018d..b8a49b7567 100644
--- a/accel/tcg/watchpoint.c
+++ b/accel/tcg/watchpoint.c
@@ -68,12 +68,6 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr
len,
return;
}
- if (cpu->cc->tcg_ops->adjust_watchpoint_address) {
- /* this is currently used only by ARM BE32 */
- addr = cpu->cc->tcg_ops->adjust_watchpoint_address(cpu, addr, len);
- last = addr + len - 1;
- }
-
assert((flags & ~BP_MEM_ACCESS) == 0);
for (n = interval_tree_iter_first(&cpu->watchpoints, addr, last); n;
--
2.43.0
