target/arm/internals: Replace some target_ulong uses
cover target/arm/internals: Replace some target_ulong uses
Hi
This series replace some target_ulong types in ARMMMUFaultInfo and some methods by appropriate target agnostic type.
Regards,
Phil.
Philippe Mathieu-Daudé (3):
target/arm: Replace target_ulong -> hwaddr in ARMMMUFaultInfo target/arm: Replace target_ulong -> uint64_t for HWBreakpoint target/arm: Replace target_ulong -> vaddr for CPUWatchpoint
target/arm/internals.h | 20 +++++++++++--------- target/arm/hyp_gdbstub.c | 14 +++++++------- 2 files changed, 18 insertions(+), 16 deletions(-)
Signature · 1 line
2.47.1
RFC PATCH 1/3 target/arm: Replace target_ulong -> hwaddr in ARMMMUFaultInfo
--- target/arm/internals.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
target/arm/internals.h +3 -2
@@ -25,6 +25,7 @@#ifndef TARGET_ARM_INTERNALS_H #define TARGET_ARM_INTERNALS_H +#include "exec/hwaddr.h" #include "exec/breakpoint.h" #include "hw/registerfields.h" #include "tcg/tcg-gvec-desc.h"
@@ -724,8 +725,8 @@ typedef struct ARMMMUFaultInfo ARMMMUFaultInfo;struct ARMMMUFaultInfo {ARMFaultType type;ARMGPCF gpcf; -target_ulong s2addr; -target_ulong paddr; +hwaddr s2addr; +hwaddr paddr;ARMSecuritySpace paddr_space;int level;int domain;
Signature · 1 line
2.47.1
Re: [RFC PATCH 1/3] target/arm: Replace target_ulong -> hwaddr in ARMMMUFaultInfo
Quoted 18 lines · Philippe Mathieu-Daudé
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/arm/internals.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)target/arm/internals.h +1
-0@@ -25,6 +25,7 @@#ifndef TARGET_ARM_INTERNALS_H #define TARGET_ARM_INTERNALS_H +#include "exec/hwaddr.h" #include "exec/breakpoint.h" #include "hw/registerfields.h" #include "tcg/tcg-gvec-desc.h"
target/arm/internals.h typedef struct ARMMMUFaultInfo ARMMMUFaultInfo; · line 732
Quoted 10 lines
target/arm/internals.h +2
-2@@ -724,8 +725,8 @@ typedef struct ARMMMUFaultInfo ARMMMUFaultInfo;struct ARMMMUFaultInfo {ARMFaultType type;ARMGPCF gpcf; -target_ulong s2addr; -target_ulong paddr; +hwaddr s2addr; +hwaddr paddr;ARMSecuritySpace paddr_space;int level;int domain;
Re: [RFC PATCH 1/3] target/arm: Replace target_ulong -> hwaddr in ARMMMUFaultInfo
In reply to Philippe Mathieu-DaudéQuoted 4 lines · Philippe Mathieu-Daudé
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/arm/internals.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
r~
Quoted 24 lines
target/arm/internals.h +3
-2@@ -25,6 +25,7 @@#ifndef TARGET_ARM_INTERNALS_H #define TARGET_ARM_INTERNALS_H +#include "exec/hwaddr.h" #include "exec/breakpoint.h" #include "hw/registerfields.h" #include "tcg/tcg-gvec-desc.h" @@ -724,8 +725,8 @@ typedef struct ARMMMUFaultInfo ARMMMUFaultInfo;struct ARMMMUFaultInfo {ARMFaultType type;ARMGPCF gpcf; -target_ulong s2addr; -target_ulong paddr; +hwaddr s2addr; +hwaddr paddr;ARMSecuritySpace paddr_space;int level;int domain;
RFC PATCH 2/3 target/arm: Replace target_ulong -> uint64_t for HWBreakpoint
In reply to Philippe Mathieu-DaudéCPUARMState::pc is of type uint64_t.
--- target/arm/internals.h | 6 +++--- target/arm/hyp_gdbstub.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
target/arm/internals.h +3 -3
@@ -1942,9 +1942,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,target_ulong addr);CPUWatchpoint *find_hw_watchpoint (CPUState *cpu,target_ulong addr);
target/arm/hyp_gdbstub.c +3 -3
@@ -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(target_ulong addr, target_ulong 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;
Signature · 1 line
2.47.1
Re: [RFC PATCH 2/3] target/arm: Replace target_ulong -> uint64_t for HWBreakpoint
Quoted 48 lines · Philippe Mathieu-Daudé
CPUARMState::pcis of typeuint64_t.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/arm/internals.h | 6 +++--- target/arm/hyp_gdbstub.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)target/arm/internals.h +3
-3@@ -1942,9 +1942,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,target_ulong addr);CPUWatchpoint *find_hw_watchpoint (CPUState *cpu,target_ulong addr);target/arm/hyp_gdbstub.c +2
-2@@ -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++) {
target/arm/hyp_gdbstub.c int delete_hw_watchpoint(target_ulong addr, target_ulong len, int type) · line 232
Quoted 8 lines
target/arm/hyp_gdbstub.c +1
-1@@ -226,7 +226,7 @@ int delete_hw_watchpoint(target_ulong addr, target_ulong 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;
Re: [RFC PATCH 2/3] target/arm: Replace target_ulong -> uint64_t for HWBreakpoint
In reply to Philippe Mathieu-DaudéQuoted 1 line · Philippe Mathieu-Daudé
CPUARMState::pcis of typeuint64_t.
That's not a good argument. It's a guest virtual address, and using vaddr would self-document that fact.
r~
Re: [RFC PATCH 2/3] target/arm: Replace target_ulong -> uint64_t for HWBreakpoint
Quoted 6 lines · Richard Henderson
Quoted 1 line · Philippe Mathieu-Daudé
CPUARMState::pcis of typeuint64_t.That's not a good argument. It's a guest virtual address, and using vaddr would self-document that fact.
Ideally, should we update CPUARMState::pc also?
Quoted 2 lines
r~
Re: [RFC PATCH 2/3] target/arm: Replace target_ulong -> uint64_t for HWBreakpoint
Quoted 9 lines · Pierrick Bouvier
Quoted 6 lines · Richard Henderson
Quoted 1 line · Philippe Mathieu-Daudé
CPUARMState::pcis of typeuint64_t.That's not a good argument. It's a guest virtual address, and using vaddr would self-document that fact.
Ideally, should we update
CPUARMState::pcalso?
I don't think so, no.
r~
RFC PATCH 3/3 target/arm: Replace target_ulong -> vaddr for CPUWatchpoint
In reply to Philippe Mathieu-DaudéCPUWatchpoint::vaddr/len are of type vaddr.
--- target/arm/internals.h | 9 +++++---- target/arm/hyp_gdbstub.c | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-)
target/arm/internals.h +5 -4
@@ -26,6 +26,7 @@#define TARGET_ARM_INTERNALS_H #include "exec/hwaddr.h" +#include "exec/vaddr.h" #include "exec/breakpoint.h" #include "hw/registerfields.h" #include "tcg/tcg-gvec-desc.h"
@@ -1946,10 +1947,10 @@ 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,target_ulong addr); -CPUWatchpoint *find_hw_watchpoint (CPUState *cpu,target_ulong addr); -int insert_hw_watchpoint (target_ulong addr,target_ulong len,int type); -int delete_hw_watchpoint (target_ulong addr,target_ulong len,int type); +bool check_watchpoint_in_range (int i,vaddr addr); +CPUWatchpoint *find_hw_watchpoint (CPUState *cpu,vaddr addr); +int insert_hw_watchpoint (vaddr addr,vaddr len,int type); +int delete_hw_watchpoint (vaddr addr,vaddr len,int type);/* Return the current value of the system counter in ticks */ uint64_t gt_get_countervalue (CPUARMState *env);
target/arm/hyp_gdbstub.c +4 -4
@@ -125,7 +125,7 @@ int delete_hw_breakpoint(uint64_t pc)* 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 = { .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 ; } -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);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 */ -int delete_hw_watchpoint (target_ulong addr,target_ulong len,int type) +int delete_hw_watchpoint (vaddr addr,vaddr len,int type) {int i;for (i =0 ; i < cur_hw_wps; i++) {
@@ -239,7 +239,7 @@ bool find_hw_breakpoint(CPUState *cpu, uint64_t pc)return false; } -CPUWatchpoint *find_hw_watchpoint (CPUState *cpu,target_ulong addr) +CPUWatchpoint *find_hw_watchpoint (CPUState *cpu,vaddr addr) {int i;
Signature · 1 line
2.47.1
Re: [RFC PATCH 3/3] target/arm: Replace target_ulong -> vaddr for CPUWatchpoint
Quoted 67 lines · Philippe Mathieu-Daudé
CPUWatchpoint::vaddr/len are of type vaddr.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/arm/internals.h | 9 +++++---- target/arm/hyp_gdbstub.c | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-)target/arm/internals.h +5
-4@@ -26,6 +26,7 @@#define TARGET_ARM_INTERNALS_H #include "exec/hwaddr.h" +#include "exec/vaddr.h" #include "exec/breakpoint.h" #include "hw/registerfields.h" #include "tcg/tcg-gvec-desc.h" @@ -1946,10 +1947,10 @@ 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,target_ulong addr); -CPUWatchpoint *find_hw_watchpoint (CPUState *cpu,target_ulong addr); -int insert_hw_watchpoint (target_ulong addr,target_ulong len,int type); -int delete_hw_watchpoint (target_ulong addr,target_ulong len,int type); +bool check_watchpoint_in_range (int i,vaddr addr); +CPUWatchpoint *find_hw_watchpoint (CPUState *cpu,vaddr addr); +int insert_hw_watchpoint (vaddr addr,vaddr len,int type); +int delete_hw_watchpoint (vaddr addr,vaddr len,int type);/* Return the current value of the system counter in ticks */ uint64_t gt_get_countervalue (CPUARMState *env);target/arm/hyp_gdbstub.c +3
-3@@ -125,7 +125,7 @@ int delete_hw_breakpoint(uint64_t pc)* 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 = { .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 ; } -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);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 */ -int delete_hw_watchpoint (target_ulong addr,target_ulong len,int type) +int delete_hw_watchpoint (vaddr addr,vaddr len,int type) {int i;for (i =0 ; i < cur_hw_wps; i++) {
target/arm/hyp_gdbstub.c bool find_hw_breakpoint(CPUState *cpu, uint64_t pc) · line 245
Quoted 8 lines
target/arm/hyp_gdbstub.c +1
-1@@ -239,7 +239,7 @@ bool find_hw_breakpoint(CPUState *cpu, uint64_t pc)return false; } -CPUWatchpoint *find_hw_watchpoint (CPUState *cpu,target_ulong addr) +CPUWatchpoint *find_hw_watchpoint (CPUState *cpu,vaddr addr) {int i;
Re: [RFC PATCH 3/3] target/arm: Replace target_ulong -> vaddr for CPUWatchpoint
In reply to Philippe Mathieu-DaudéQuoted 7 lines · Philippe Mathieu-Daudé
CPUWatchpoint::vaddr/len are of type vaddr.
Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/arm/internals.h | 9 +++++---- target/arm/hyp_gdbstub.c | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-)
r~