| Message ID | 20250505015223.3895275-2-pierrick.bouvier@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | single-binary: compile target/arm twice | expand |
On 5/5/25 03:51, Pierrick Bouvier wrote: > From: Philippe Mathieu-Daudé <philmd@linaro.org> > > CPUARMState::pc is of type uint64_t. Richard made a comment on this description: https://lore.kernel.org/qemu-devel/655c920b-8204-456f-91a3-85129c5e3b06@linaro.org/ > > Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> > --- > target/arm/internals.h | 6 +++--- > target/arm/hyp_gdbstub.c | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-)
On 5/5/25 3:44 AM, Philippe Mathieu-Daudé wrote: > On 5/5/25 03:51, Pierrick Bouvier wrote: >> From: Philippe Mathieu-Daudé <philmd@linaro.org> >> >> CPUARMState::pc is of type uint64_t. > > Richard made a comment on this description: > https://lore.kernel.org/qemu-devel/655c920b-8204-456f-91a3-85129c5e3b06@linaro.org/ > Thanks! Once your updated commit is upstream, I can rebase the series on top of it. >> >> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> >> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> >> --- >> target/arm/internals.h | 6 +++--- >> target/arm/hyp_gdbstub.c | 6 +++--- >> 2 files changed, 6 insertions(+), 6 deletions(-) >
On 5/5/25 11:39 AM, Pierrick Bouvier wrote: > On 5/5/25 3:44 AM, Philippe Mathieu-Daudé wrote: >> On 5/5/25 03:51, Pierrick Bouvier wrote: >>> From: Philippe Mathieu-Daudé <philmd@linaro.org> >>> >>> CPUARMState::pc is of type uint64_t. >> >> Richard made a comment on this description: >> https://lore.kernel.org/qemu-devel/655c920b-8204-456f-91a3-85129c5e3b06@linaro.org/ >> > > Thanks! > Once your updated commit is upstream, I can rebase the series on top of it. > I'll just update this commit here, so the series is not blocked meanwhile. >>> >>> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> >>> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> >>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> >>> --- >>> target/arm/internals.h | 6 +++--- >>> target/arm/hyp_gdbstub.c | 6 +++--- >>> 2 files changed, 6 insertions(+), 6 deletions(-) >> >
diff --git a/target/arm/internals.h b/target/arm/internals.h index 4d3d84ffebd..c30689c9fcd 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1949,9 +1949,9 @@ extern GArray *hw_breakpoints, *hw_watchpoints; #define get_hw_bp(i) (&g_array_index(hw_breakpoints, HWBreakpoint, i)) #define get_hw_wp(i) (&g_array_index(hw_watchpoints, HWWatchpoint, i)) -bool find_hw_breakpoint(CPUState *cpu, target_ulong pc); -int insert_hw_breakpoint(target_ulong pc); -int delete_hw_breakpoint(target_ulong pc); +bool find_hw_breakpoint(CPUState *cpu, uint64_t pc); +int insert_hw_breakpoint(uint64_t pc); +int delete_hw_breakpoint(uint64_t pc); bool check_watchpoint_in_range(int i, vaddr addr); CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, vaddr addr); diff --git a/target/arm/hyp_gdbstub.c b/target/arm/hyp_gdbstub.c index 0512d67f8cf..4d8fd933868 100644 --- a/target/arm/hyp_gdbstub.c +++ b/target/arm/hyp_gdbstub.c @@ -54,7 +54,7 @@ GArray *hw_breakpoints, *hw_watchpoints; * here so future PC comparisons will work properly. */ -int insert_hw_breakpoint(target_ulong addr) +int insert_hw_breakpoint(uint64_t addr) { HWBreakpoint brk = { .bcr = 0x1, /* BCR E=1, enable */ @@ -80,7 +80,7 @@ int insert_hw_breakpoint(target_ulong addr) * Delete a breakpoint and shuffle any above down */ -int delete_hw_breakpoint(target_ulong pc) +int delete_hw_breakpoint(uint64_t pc) { int i; for (i = 0; i < hw_breakpoints->len; i++) { @@ -226,7 +226,7 @@ int delete_hw_watchpoint(vaddr addr, vaddr len, int type) return -ENOENT; } -bool find_hw_breakpoint(CPUState *cpu, target_ulong pc) +bool find_hw_breakpoint(CPUState *cpu, uint64_t pc) { int i;