motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 02:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/arm: Replace target_ulong -> vaddr for CPUWatchpoint

Browse source 
CPUWatchpoint::vaddr/len are of type vaddr.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250415172246.79470-4-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-04-04 00:25:06 +02:00
parent 35ca9d14c1
commit 6fa103069d
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
target/arm/hyp_gdbstub.c
View file

@ -125,7 +125,7 @@ int delete_hw_breakpoint(target_ulong pc)
* need to ensure you mask the address as required and set BAS=0xff * need to ensure you mask the address as required and set BAS=0xff
*/ */
int insert_hw_watchpoint(target_ulong addr, target_ulong len, int type) int insert_hw_watchpoint(vaddr addr, vaddr len, int type)
{ {
HWWatchpoint wp = { HWWatchpoint wp = {
.wcr = R_DBGWCR_E_MASK, /* E=1, enable */ .wcr = R_DBGWCR_E_MASK, /* E=1, enable */
@ -182,7 +182,7 @@ int insert_hw_watchpoint(target_ulong addr, target_ulong len, int type)
return 0; return 0;
} }
bool check_watchpoint_in_range(int i, target_ulong addr) bool check_watchpoint_in_range(int i, vaddr addr)
{ {
HWWatchpoint *wp = get_hw_wp(i); HWWatchpoint *wp = get_hw_wp(i);
uint64_t addr_top, addr_bottom = wp->wvr; uint64_t addr_top, addr_bottom = wp->wvr;
@ -214,7 +214,7 @@ bool check_watchpoint_in_range(int i, target_ulong addr)
* Delete a breakpoint and shuffle any above down * Delete a breakpoint and shuffle any above down
*/ */
int delete_hw_watchpoint(target_ulong addr, target_ulong len, int type) int delete_hw_watchpoint(vaddr addr, vaddr len, int type)
{ {
int i; int i;
for (i = 0; i < cur_hw_wps; i++) { for (i = 0; i < cur_hw_wps; i++) {
@ -239,7 +239,7 @@ bool find_hw_breakpoint(CPUState *cpu, target_ulong pc)
return false; return false;
} }
CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr) CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, vaddr addr)
{ {
int i; int i;

9
target/arm/internals.h
View file

@ -26,6 +26,7 @@
#define TARGET_ARM_INTERNALS_H #define TARGET_ARM_INTERNALS_H
#include "exec/hwaddr.h" #include "exec/hwaddr.h"
#include "exec/vaddr.h"
#include "exec/breakpoint.h" #include "exec/breakpoint.h"
#include "hw/registerfields.h" #include "hw/registerfields.h"
#include "tcg/tcg-gvec-desc.h" #include "tcg/tcg-gvec-desc.h"
@ -1952,10 +1953,10 @@ bool find_hw_breakpoint(CPUState *cpu, target_ulong pc);
int insert_hw_breakpoint(target_ulong pc); int insert_hw_breakpoint(target_ulong pc);
int delete_hw_breakpoint(target_ulong pc); int delete_hw_breakpoint(target_ulong pc);
bool check_watchpoint_in_range(int i, target_ulong addr); bool check_watchpoint_in_range(int i, vaddr addr);
CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr); CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, vaddr addr);
int insert_hw_watchpoint(target_ulong addr, target_ulong len, int type); int insert_hw_watchpoint(vaddr addr, vaddr len, int type);
int delete_hw_watchpoint(target_ulong addr, target_ulong len, int type); int delete_hw_watchpoint(vaddr addr, vaddr len, int type);
/* Return the current value of the system counter in ticks */ /* Return the current value of the system counter in ticks */
uint64_t gt_get_countervalue(CPUARMState *env); uint64_t gt_get_countervalue(CPUARMState *env);