Message ID | 1336254271-26269-1-git-send-email-jcmvbkbc@gmail.com |
---|---|
State | New |
Headers | show |
Thanks, applied. On Sat, May 5, 2012 at 9:44 PM, Max Filippov <jcmvbkbc@gmail.com> wrote: > Cleanup commit e554861766d9ae84dd5720baa4869f4ed711506f have changed > code_address calculation in the tlb_set_page function in case of access > to a page with a watchpoint. This caused QEMU segfault in the xtensa > test_break unit test. Fix it by moving code_address assignment above > memory_region_section_get_iotlb call. > > Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> > --- > cputlb.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/cputlb.c b/cputlb.c > index 7f40a62..0d1e252 100644 > --- a/cputlb.c > +++ b/cputlb.c > @@ -272,10 +272,10 @@ void tlb_set_page(CPUArchState *env, target_ulong vaddr, > } else { > addend = 0; > } > - iotlb = memory_region_section_get_iotlb(env, section, vaddr, paddr, prot, > - &address); > > code_address = address; > + iotlb = memory_region_section_get_iotlb(env, section, vaddr, paddr, prot, > + &address); > > index = (vaddr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); > env->iotlb[mmu_idx][index] = iotlb - vaddr; > -- > 1.7.7.6 >
diff --git a/cputlb.c b/cputlb.c index 7f40a62..0d1e252 100644 --- a/cputlb.c +++ b/cputlb.c @@ -272,10 +272,10 @@ void tlb_set_page(CPUArchState *env, target_ulong vaddr, } else { addend = 0; } - iotlb = memory_region_section_get_iotlb(env, section, vaddr, paddr, prot, - &address); code_address = address; + iotlb = memory_region_section_get_iotlb(env, section, vaddr, paddr, prot, + &address); index = (vaddr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); env->iotlb[mmu_idx][index] = iotlb - vaddr;
Cleanup commit e554861766d9ae84dd5720baa4869f4ed711506f have changed code_address calculation in the tlb_set_page function in case of access to a page with a watchpoint. This caused QEMU segfault in the xtensa test_break unit test. Fix it by moving code_address assignment above memory_region_section_get_iotlb call. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> --- cputlb.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)