diff --git a/src/target/aarch64.c b/src/target/aarch64.c
index 4ba92c8a0..e6eb2cafd 100644
--- a/src/target/aarch64.c
+++ b/src/target/aarch64.c
@@ -1856,7 +1856,7 @@ int aarch64_hit_watchpoint(struct target *target,
 	uint64_t exception_address;
 	struct watchpoint *wp;
 
-	exception_address = armv8->dpm.wp_pc;
+	exception_address = armv8->dpm.wp_addr;
 
 	if (exception_address == 0xFFFFFFFF)
 		return ERROR_FAIL;
@@ -1867,12 +1867,12 @@ int aarch64_hit_watchpoint(struct target *target,
 	/* the EDWAR value needs to have 8 added to it so we add  */
 	/* that check as well not sure if that is a core bug)     */
 	/**********************************************************/
-	for (exception_address = armv8->dpm.wp_pc; exception_address <= (armv8->dpm.wp_pc + 8);
+	for (exception_address = armv8->dpm.wp_addr; exception_address <= (armv8->dpm.wp_addr + 8);
 		exception_address += 8) {
 		for (wp = target->watchpoints; wp; wp = wp->next) {
 			if ((exception_address >= wp->address) && (exception_address < (wp->address + wp->length))) {
 				*hit_watchpoint = wp;
-				if (exception_address != armv8->dpm.wp_pc)
+				if (exception_address != armv8->dpm.wp_addr)
 					LOG_DEBUG("watchpoint hit required EDWAR to be increased by 8");
 				return ERROR_OK;
 			}
diff --git a/src/target/arm11.c b/src/target/arm11.c
index 68d4e1894..ff125d0ea 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -355,8 +355,7 @@ static int arm11_arch_state(struct target *target)
 	/* REVISIT also display ARM11-specific MMU and cache status ... */
 
 	if (target->debug_reason == DBG_REASON_WATCHPOINT)
-		LOG_USER("Watchpoint triggered at PC %#08x",
-			(unsigned) arm11->dpm.wp_pc);
+		LOG_USER("Watchpoint triggered at PC " TARGET_ADDR_FMT, arm11->dpm.wp_addr);
 
 	return retval;
 }
diff --git a/src/target/arm_dpm.c b/src/target/arm_dpm.c
index 6bfe355ba..e172fad37 100644
--- a/src/target/arm_dpm.c
+++ b/src/target/arm_dpm.c
@@ -1010,7 +1010,7 @@ void arm_dpm_report_wfar(struct arm_dpm *dpm, uint32_t addr)
 			/* ?? */
 			break;
 	}
-	dpm->wp_pc = addr;
+	dpm->wp_addr = addr;
 }
 
 /*----------------------------------------------------------------------*/
diff --git a/src/target/arm_dpm.h b/src/target/arm_dpm.h
index 82707822b..80587f5fe 100644
--- a/src/target/arm_dpm.h
+++ b/src/target/arm_dpm.h
@@ -137,8 +137,12 @@ struct arm_dpm {
 	struct dpm_bp *dbp;
 	struct dpm_wp *dwp;
 
-	/** Address of the instruction which triggered a watchpoint. */
-	target_addr_t wp_pc;
+	/**
+	 * Target dependent watchpoint address.
+	 * Either the address of the instruction which triggered a watchpoint
+	 * or the memory address whose access triggered a watchpoint.
+	 */
+	target_addr_t wp_addr;
 
 	/** Recent value of DSCR. */
 	uint32_t dscr;
diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index abca3358f..5c9f3085c 100644
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -571,8 +571,7 @@ int armv7a_arch_state(struct target *target)
 	if (arm->core_mode == ARM_MODE_ABT)
 		armv7a_show_fault_registers(target);
 	if (target->debug_reason == DBG_REASON_WATCHPOINT)
-		LOG_USER("Watchpoint triggered at PC %#08x",
-			(unsigned) armv7a->dpm.wp_pc);
+		LOG_USER("Watchpoint triggered at PC " TARGET_ADDR_FMT, armv7a->dpm.wp_addr);
 
 	return ERROR_OK;
 }
diff --git a/src/target/armv8.c b/src/target/armv8.c
index 6bf3b110d..e209e8896 100644
--- a/src/target/armv8.c
+++ b/src/target/armv8.c
@@ -1169,8 +1169,7 @@ int armv8_arch_state(struct target *target)
 		armv8_show_fault_registers(target);
 
 	if (target->debug_reason == DBG_REASON_WATCHPOINT)
-		LOG_USER("Watchpoint triggered at PC %#08x",
-			(unsigned) armv8->dpm.wp_pc);
+		LOG_USER("Watchpoint triggered at PC " TARGET_ADDR_FMT, armv8->dpm.wp_addr);
 
 	return ERROR_OK;
 }
diff --git a/src/target/armv8_dpm.c b/src/target/armv8_dpm.c
index e7d0f864e..a7b4f1d38 100644
--- a/src/target/armv8_dpm.c
+++ b/src/target/armv8_dpm.c
@@ -1297,7 +1297,7 @@ void armv8_dpm_report_wfar(struct arm_dpm *dpm, uint64_t addr)
 			LOG_DEBUG("Unknown core_state");
 			break;
 	}
-	dpm->wp_pc = addr;
+	dpm->wp_addr = addr;
 }
 
 /*