[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 5/9] Change signature of cpu_memory_rw_debug() t
|
From: |
David Gibson |
|
Subject: |
Re: [Qemu-devel] [PATCH 5/9] Change signature of cpu_memory_rw_debug() to avoid casting |
|
Date: |
Fri, 8 Jul 2016 13:39:50 +1000 |
|
User-agent: |
Mutt/1.6.1 (2016-04-27) |
On Thu, Jul 07, 2016 at 04:33:39PM -0700, Andrey Smirnov wrote:
> Change signature of cpu_memory_rw_debug() to expectet void * as a buffer
> instead of uint8_t * to avoid forcing the caller of the function to do a
> type cast.
>
> Signed-off-by: Andrey Smirnov <address@hidden>
Seems reasonable.
Reviewed-by: David Gibson <address@hidden>
> ---
> exec.c | 6 ++++--
> hw/i386/kvmvapic.c | 10 +++++-----
> include/exec/cpu-all.h | 2 +-
> include/exec/softmmu-semi.h | 8 ++++----
> target-arm/arm-semi.c | 2 +-
> target-arm/kvm64.c | 8 ++++----
> target-i386/helper.c | 4 ++--
> target-i386/kvm.c | 8 ++++----
> target-ppc/kvm.c | 8 ++++----
> target-s390x/kvm.c | 6 +++---
> target-xtensa/xtensa-semi.c | 6 +++---
> 11 files changed, 35 insertions(+), 33 deletions(-)
>
> diff --git a/exec.c b/exec.c
> index eea3018..5cef9fe 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -2436,11 +2436,12 @@ MemoryRegion *get_system_io(void)
> /* physical memory access (slow version, mainly for debug) */
> #if defined(CONFIG_USER_ONLY)
> int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr,
> - uint8_t *buf, int len, int is_write)
> + void *b, int len, int is_write)
> {
> int l, flags;
> target_ulong page;
> void * p;
> + uint8_t *buf = b;
>
> while (len > 0) {
> page = addr & TARGET_PAGE_MASK;
> @@ -3609,11 +3610,12 @@ void stq_be_phys(AddressSpace *as, hwaddr addr,
> uint64_t val)
>
> /* virtual memory access for debug (includes writing to ROM) */
> int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr,
> - uint8_t *buf, int len, int is_write)
> + void *b, int len, int is_write)
> {
> int l;
> hwaddr phys_addr;
> target_ulong page;
> + uint8_t *buf = b;
>
> while (len > 0) {
> int asidx;
> diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
> index 3bf1ddd..c684675 100644
> --- a/hw/i386/kvmvapic.c
> +++ b/hw/i386/kvmvapic.c
> @@ -261,7 +261,7 @@ instruction_ok:
> * and update the cached values.
> */
> if (cpu_memory_rw_debug(cs, ip + instr->addr_offset,
> - (void *)&real_tpr_addr,
> + &real_tpr_addr,
> sizeof(real_tpr_addr), 0) < 0) {
> return -1;
> }
> @@ -349,7 +349,7 @@ static int get_kpcr_number(X86CPU *cpu)
> } QEMU_PACKED kpcr;
>
> if (cpu_memory_rw_debug(CPU(cpu), env->segs[R_FS].base,
> - (void *)&kpcr, sizeof(kpcr), 0) < 0 ||
> + &kpcr, sizeof(kpcr), 0) < 0 ||
> kpcr.self != env->segs[R_FS].base) {
> return -1;
> }
> @@ -388,7 +388,7 @@ static void patch_call(VAPICROMState *s, X86CPU *cpu,
> target_ulong ip,
>
> offset = cpu_to_le32(target - ip - 5);
> patch_byte(cpu, ip, 0xe8); /* call near */
> - cpu_memory_rw_debug(CPU(cpu), ip + 1, (void *)&offset, sizeof(offset),
> 1);
> + cpu_memory_rw_debug(CPU(cpu), ip + 1, &offset, sizeof(offset), 1);
> }
>
> static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip)
> @@ -434,8 +434,8 @@ static void patch_instruction(VAPICROMState *s, X86CPU
> *cpu, target_ulong ip)
> break;
> case 0xc7: /* mov imm32, r/m32 (c7/0) */
> patch_byte(cpu, ip, 0x68); /* push imm32 */
> - cpu_memory_rw_debug(cs, ip + 6, (void *)&imm32, sizeof(imm32), 0);
> - cpu_memory_rw_debug(cs, ip + 1, (void *)&imm32, sizeof(imm32), 1);
> + cpu_memory_rw_debug(cs, ip + 6, &imm32, sizeof(imm32), 0);
> + cpu_memory_rw_debug(cs, ip + 1, &imm32, sizeof(imm32), 1);
> patch_call(s, cpu, ip + 5, handlers->set_tpr);
> break;
> case 0xff: /* push r/m32 */
> diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
> index 9f38edf..2b2f38a 100644
> --- a/include/exec/cpu-all.h
> +++ b/include/exec/cpu-all.h
> @@ -302,6 +302,6 @@ void dump_opcount_info(FILE *f, fprintf_function
> cpu_fprintf);
> #endif /* !CONFIG_USER_ONLY */
>
> int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr,
> - uint8_t *buf, int len, int is_write);
> + void *buf, int len, int is_write);
>
> #endif /* CPU_ALL_H */
> diff --git a/include/exec/softmmu-semi.h b/include/exec/softmmu-semi.h
> index 3a58c3f..98e5b5c 100644
> --- a/include/exec/softmmu-semi.h
> +++ b/include/exec/softmmu-semi.h
> @@ -13,7 +13,7 @@ static inline uint64_t softmmu_tget64(CPUArchState *env,
> target_ulong addr)
> {
> uint64_t val;
>
> - cpu_memory_rw_debug(ENV_GET_CPU(env), addr, (uint8_t *)&val, 8, 0);
> + cpu_memory_rw_debug(ENV_GET_CPU(env), addr, &val, 8, 0);
> return tswap64(val);
> }
>
> @@ -21,7 +21,7 @@ static inline uint32_t softmmu_tget32(CPUArchState *env,
> target_ulong addr)
> {
> uint32_t val;
>
> - cpu_memory_rw_debug(ENV_GET_CPU(env), addr, (uint8_t *)&val, 4, 0);
> + cpu_memory_rw_debug(ENV_GET_CPU(env), addr, &val, 4, 0);
> return tswap32(val);
> }
>
> @@ -42,14 +42,14 @@ static inline void softmmu_tput64(CPUArchState *env,
> target_ulong addr, uint64_t val)
> {
> val = tswap64(val);
> - cpu_memory_rw_debug(ENV_GET_CPU(env), addr, (uint8_t *)&val, 8, 1);
> + cpu_memory_rw_debug(ENV_GET_CPU(env), addr, &val, 8, 1);
> }
>
> static inline void softmmu_tput32(CPUArchState *env,
> target_ulong addr, uint32_t val)
> {
> val = tswap32(val);
> - cpu_memory_rw_debug(ENV_GET_CPU(env), addr, (uint8_t *)&val, 4, 1);
> + cpu_memory_rw_debug(ENV_GET_CPU(env), addr, &val, 4, 1);
> }
> #define put_user_u64(arg, p) ({ softmmu_tput64(env, p, arg) ; 0; })
> #define put_user_u32(arg, p) ({ softmmu_tput32(env, p, arg) ; 0; })
> diff --git a/target-arm/arm-semi.c b/target-arm/arm-semi.c
> index 8be0645..03c959d 100644
> --- a/target-arm/arm-semi.c
> +++ b/target-arm/arm-semi.c
> @@ -187,7 +187,7 @@ static void arm_semi_flen_cb(CPUState *cs, target_ulong
> ret, target_ulong err)
> /* The size is always stored in big-endian order, extract
> the value. We assume the size always fit in 32 bits. */
> uint32_t size;
> - cpu_memory_rw_debug(cs, arm_flen_buf(cpu) + 32, (uint8_t *)&size, 4, 0);
> + cpu_memory_rw_debug(cs, arm_flen_buf(cpu) + 32, &size, 4, 0);
> size = be32_to_cpu(size);
> if (is_a64(env)) {
> env->xregs[0] = size;
> diff --git a/target-arm/kvm64.c b/target-arm/kvm64.c
> index 5faa76c..7ba5acd 100644
> --- a/target-arm/kvm64.c
> +++ b/target-arm/kvm64.c
> @@ -874,8 +874,8 @@ static const uint32_t brk_insn = 0xd4200000;
> int kvm_arch_insert_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *bp)
> {
> if (have_guest_debug) {
> - if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn, 4,
> 0) ||
> - cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&brk_insn, 4, 1)) {
> + if (cpu_memory_rw_debug(cs, bp->pc, &bp->saved_insn, 4, 0) ||
> + cpu_memory_rw_debug(cs, bp->pc, &brk_insn, 4, 1)) {
> return -EINVAL;
> }
> return 0;
> @@ -890,9 +890,9 @@ int kvm_arch_remove_sw_breakpoint(CPUState *cs, struct
> kvm_sw_breakpoint *bp)
> static uint32_t brk;
>
> if (have_guest_debug) {
> - if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&brk, 4, 0) ||
> + if (cpu_memory_rw_debug(cs, bp->pc, &brk, 4, 0) ||
> brk != brk_insn ||
> - cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn, 4,
> 1)) {
> + cpu_memory_rw_debug(cs, bp->pc, &bp->saved_insn, 4, 1)) {
> return -EINVAL;
> }
> return 0;
> diff --git a/target-i386/helper.c b/target-i386/helper.c
> index 1c250b8..6b10a8e 100644
> --- a/target-i386/helper.c
> +++ b/target-i386/helper.c
> @@ -1286,8 +1286,8 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsigned
> int selector,
> index = selector & ~7;
> ptr = dt->base + index;
> if ((index + 7) > dt->limit
> - || cpu_memory_rw_debug(cs, ptr, (uint8_t *)&e1, sizeof(e1), 0) != 0
> - || cpu_memory_rw_debug(cs, ptr+4, (uint8_t *)&e2, sizeof(e2), 0) !=
> 0)
> + || cpu_memory_rw_debug(cs, ptr, &e1, sizeof(e1), 0) != 0
> + || cpu_memory_rw_debug(cs, ptr+4, &e2, sizeof(e2), 0) != 0)
> return 0;
>
> *base = ((e1 >> 16) | ((e2 & 0xff) << 16) | (e2 & 0xff000000));
> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> index ff92b1d..dc0cf6b 100644
> --- a/target-i386/kvm.c
> +++ b/target-i386/kvm.c
> @@ -2864,10 +2864,10 @@ static int kvm_handle_tpr_access(X86CPU *cpu)
>
> int kvm_arch_insert_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *bp)
> {
> - static const uint8_t int3 = 0xcc;
> + uint8_t int3 = 0xcc;
>
> - if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn, 1, 0) ||
> - cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&int3, 1, 1)) {
> + if (cpu_memory_rw_debug(cs, bp->pc, &bp->saved_insn, 1, 0) ||
> + cpu_memory_rw_debug(cs, bp->pc, &int3, 1, 1)) {
> return -EINVAL;
> }
> return 0;
> @@ -2878,7 +2878,7 @@ int kvm_arch_remove_sw_breakpoint(CPUState *cs, struct
> kvm_sw_breakpoint *bp)
> uint8_t int3;
>
> if (cpu_memory_rw_debug(cs, bp->pc, &int3, 1, 0) || int3 != 0xcc ||
> - cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn, 1, 1)) {
> + cpu_memory_rw_debug(cs, bp->pc, &bp->saved_insn, 1, 1)) {
> return -EINVAL;
> }
> return 0;
> diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
> index 1620864..efa257b 100644
> --- a/target-ppc/kvm.c
> +++ b/target-ppc/kvm.c
> @@ -1432,9 +1432,9 @@ int kvm_arch_insert_sw_breakpoint(CPUState *cs, struct
> kvm_sw_breakpoint *bp)
> /* Mixed endian case is not handled */
> uint32_t sc = debug_inst_opcode;
>
> - if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn,
> + if (cpu_memory_rw_debug(cs, bp->pc, &bp->saved_insn,
> sizeof(sc), 0) ||
> - cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&sc, sizeof(sc), 1)) {
> + cpu_memory_rw_debug(cs, bp->pc, &sc, sizeof(sc), 1)) {
> return -EINVAL;
> }
>
> @@ -1445,9 +1445,9 @@ int kvm_arch_remove_sw_breakpoint(CPUState *cs, struct
> kvm_sw_breakpoint *bp)
> {
> uint32_t sc;
>
> - if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&sc, sizeof(sc), 0) ||
> + if (cpu_memory_rw_debug(cs, bp->pc, &sc, sizeof(sc), 0) ||
> sc != debug_inst_opcode ||
> - cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn,
> + cpu_memory_rw_debug(cs, bp->pc, &bp->saved_insn,
> sizeof(sc), 1)) {
> return -EINVAL;
> }
> diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
> index 45e94ca..fb7dd55 100644
> --- a/target-s390x/kvm.c
> +++ b/target-s390x/kvm.c
> @@ -671,9 +671,9 @@ static const uint8_t diag_501[] = {0x83, 0x24, 0x05,
> 0x01};
> int kvm_arch_insert_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *bp)
> {
>
> - if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn,
> + if (cpu_memory_rw_debug(cs, bp->pc, &bp->saved_insn,
> sizeof(diag_501), 0) ||
> - cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)diag_501,
> + cpu_memory_rw_debug(cs, bp->pc, diag_501,
> sizeof(diag_501), 1)) {
> return -EINVAL;
> }
> @@ -688,7 +688,7 @@ int kvm_arch_remove_sw_breakpoint(CPUState *cs, struct
> kvm_sw_breakpoint *bp)
> return -EINVAL;
> } else if (memcmp(t, diag_501, sizeof(diag_501))) {
> return -EINVAL;
> - } else if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn,
> + } else if (cpu_memory_rw_debug(cs, bp->pc, &bp->saved_insn,
> sizeof(diag_501), 1)) {
> return -EINVAL;
> }
> diff --git a/target-xtensa/xtensa-semi.c b/target-xtensa/xtensa-semi.c
> index 370e365..ec199ac 100644
> --- a/target-xtensa/xtensa-semi.c
> +++ b/target-xtensa/xtensa-semi.c
> @@ -202,7 +202,7 @@ void HELPER(simcall)(CPUXtensaState *env)
>
> for (i = 0; i < ARRAY_SIZE(name); ++i) {
> rc = cpu_memory_rw_debug(cs, regs[3] + i,
> - (uint8_t *)name + i, 1, 0);
> + &name[i], 1, 0);
> if (rc != 0 || name[i] == 0) {
> break;
> }
> @@ -247,7 +247,7 @@ void HELPER(simcall)(CPUXtensaState *env)
>
> if (target_tv) {
> cpu_memory_rw_debug(cs, target_tv,
> - (uint8_t *)target_tvv, sizeof(target_tvv), 0);
> + target_tvv, sizeof(target_tvv), 0);
> tv.tv_sec = (int32_t)tswap32(target_tvv[0]);
> tv.tv_usec = (int32_t)tswap32(target_tvv[1]);
> }
> @@ -282,7 +282,7 @@ void HELPER(simcall)(CPUXtensaState *env)
>
> argv.argptr[0] = tswap32(regs[3] + offsetof(struct Argv, text));
> cpu_memory_rw_debug(cs,
> - regs[3], (uint8_t *)&argv, sizeof(argv), 1);
> + regs[3], &argv, sizeof(argv), 1);
> }
> break;
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [PATCH 5/9] Change signature of cpu_memory_rw_debug() to avoid casting,
David Gibson <=