[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/48] accel/hvf: Widen pc/saved_insn for hvf_sw_breakpoint
From: |
Richard Henderson |
Subject: |
[PULL 02/48] accel/hvf: Widen pc/saved_insn for hvf_sw_breakpoint |
Date: |
Wed, 23 Aug 2023 13:22:40 -0700 |
From: Anton Johansson via <qemu-devel@nongnu.org>
Widens the pc and saved_insn fields of hvf_sw_breakpoint from
target_ulong to vaddr. Other hvf_* functions accessing hvf_sw_breakpoint
are also widened to match.
Signed-off-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230807155706.9580-3-anjo@rev.ng>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/sysemu/hvf.h | 6 +++---
accel/hvf/hvf-accel-ops.c | 4 ++--
accel/hvf/hvf-all.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h
index 70549b9158..4cbae87ced 100644
--- a/include/sysemu/hvf.h
+++ b/include/sysemu/hvf.h
@@ -39,14 +39,14 @@ DECLARE_INSTANCE_CHECKER(HVFState, HVF_STATE,
#ifdef NEED_CPU_H
struct hvf_sw_breakpoint {
- target_ulong pc;
- target_ulong saved_insn;
+ vaddr pc;
+ vaddr saved_insn;
int use_count;
QTAILQ_ENTRY(hvf_sw_breakpoint) entry;
};
struct hvf_sw_breakpoint *hvf_find_sw_breakpoint(CPUState *cpu,
- target_ulong pc);
+ vaddr pc);
int hvf_sw_breakpoints_active(CPUState *cpu);
int hvf_arch_insert_sw_breakpoint(CPUState *cpu, struct hvf_sw_breakpoint *bp);
diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c
index a44cf1c144..3c94c79747 100644
--- a/accel/hvf/hvf-accel-ops.c
+++ b/accel/hvf/hvf-accel-ops.c
@@ -474,7 +474,7 @@ static void hvf_start_vcpu_thread(CPUState *cpu)
cpu, QEMU_THREAD_JOINABLE);
}
-static int hvf_insert_breakpoint(CPUState *cpu, int type, hwaddr addr, hwaddr
len)
+static int hvf_insert_breakpoint(CPUState *cpu, int type, vaddr addr, vaddr
len)
{
struct hvf_sw_breakpoint *bp;
int err;
@@ -512,7 +512,7 @@ static int hvf_insert_breakpoint(CPUState *cpu, int type,
hwaddr addr, hwaddr le
return 0;
}
-static int hvf_remove_breakpoint(CPUState *cpu, int type, hwaddr addr, hwaddr
len)
+static int hvf_remove_breakpoint(CPUState *cpu, int type, vaddr addr, vaddr
len)
{
struct hvf_sw_breakpoint *bp;
int err;
diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c
index 4920787af6..db05b81be5 100644
--- a/accel/hvf/hvf-all.c
+++ b/accel/hvf/hvf-all.c
@@ -51,7 +51,7 @@ void assert_hvf_ok(hv_return_t ret)
abort();
}
-struct hvf_sw_breakpoint *hvf_find_sw_breakpoint(CPUState *cpu, target_ulong
pc)
+struct hvf_sw_breakpoint *hvf_find_sw_breakpoint(CPUState *cpu, vaddr pc)
{
struct hvf_sw_breakpoint *bp;
--
2.34.1
- [PULL 10/48] target/m68k: Use tcg_gen_deposit_i32 in gen_partset_reg, (continued)
- [PULL 10/48] target/m68k: Use tcg_gen_deposit_i32 in gen_partset_reg, Richard Henderson, 2023/08/23
- [PULL 12/48] tcg: Fold deposit with zero to and, Richard Henderson, 2023/08/23
- [PULL 04/48] sysemu/hvf: Use vaddr for hvf_arch_[insert|remove]_hw_breakpoint, Richard Henderson, 2023/08/23
- [PULL 17/48] tcg: Use tcg_gen_negsetcond_*, Richard Henderson, 2023/08/23
- [PULL 16/48] tcg: Introduce negsetcond opcodes, Richard Henderson, 2023/08/23
- [PULL 08/48] accel/tcg: Widen address arg in tlb_compare_set(), Richard Henderson, 2023/08/23
- [PULL 03/48] sysemu/kvm: Use vaddr for kvm_arch_[insert|remove]_hw_breakpoint, Richard Henderson, 2023/08/23
- [PULL 25/48] tcg/ppc: Implement negsetcond_*, Richard Henderson, 2023/08/23
- [PULL 29/48] tcg/riscv: Implement negsetcond_*, Richard Henderson, 2023/08/23
- [PULL 30/48] tcg/s390x: Implement negsetcond_*, Richard Henderson, 2023/08/23
- [PULL 02/48] accel/hvf: Widen pc/saved_insn for hvf_sw_breakpoint,
Richard Henderson <=
- [PULL 05/48] include/exec: Replace target_ulong with abi_ptr in cpu_[st|ld]*(), Richard Henderson, 2023/08/23
- [PULL 34/48] tcg/i386: Merge tcg_out_movcond{32,64}, Richard Henderson, 2023/08/23
- [PULL 39/48] tcg/tcg-op: Document bswap16_i32() byte pattern, Richard Henderson, 2023/08/23
- [PULL 06/48] include/exec: typedef abi_ptr to vaddr in softmmu, Richard Henderson, 2023/08/23
- [PULL 01/48] accel/kvm: Widen pc/saved_insn for kvm_sw_breakpoint, Richard Henderson, 2023/08/23
- [PULL 32/48] tcg/i386: Merge tcg_out_brcond{32,64}, Richard Henderson, 2023/08/23
- [PULL 27/48] tcg/aarch64: Implement negsetcond_*, Richard Henderson, 2023/08/23
- [PULL 24/48] target/tricore: Replace gen_cond_w with tcg_gen_negsetcond_tl, Richard Henderson, 2023/08/23
- [PULL 31/48] tcg/sparc64: Implement negsetcond_*, Richard Henderson, 2023/08/23
- [PULL 33/48] tcg/i386: Merge tcg_out_setcond{32,64}, Richard Henderson, 2023/08/23