Jun Koi wrote: > This patch avoids handling write watchpoints on read-only memory access. > It also breaks the searching loop for watchpoint once the setup for > handling watchpoint later is done. > > Signed-off-by: Jun Koi <junkoi2...@gmail.com> >
Works fine.
Acked-by: Jan Kiszka <jan.kis...@siemens.com>
>
> diff --git a/exec.c b/exec.c
> index 14d1fd7..6fd859f 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -2236,10 +2236,12 @@ void tlb_set_page(CPUState *env, target_ulong vaddr,
> watchpoint trap routines. */
> QTAILQ_FOREACH(wp, &env->watchpoints, entry) {
> if (vaddr == (wp->vaddr & TARGET_PAGE_MASK)) {
> - iotlb = io_mem_watch + paddr;
> - /* TODO: The memory case can be optimized by not trapping
> - reads of pages with a write breakpoint. */
> - address |= TLB_MMIO;
> + /* Avoid trapping reads of pages with a write breakpoint. */
> + if ((prot & PAGE_WRITE) || (wp->flags & BP_MEM_READ)) {
> + iotlb = io_mem_watch + paddr;
> + address |= TLB_MMIO;
> + break;
> + }
> }
> }
signature.asc
Description: OpenPGP digital signature
