From 4ad06a29b2460d4f2474f82dad3cb53467f14eb3 Mon Sep 17 00:00:00 2001 From: bellard Date: Sun, 9 Nov 2003 16:58:12 +0000 Subject: [PATCH] soft mmu fix (aka debian random seg fault fix) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@443 c046a42c-6fe2-441c-8c8c-71466251a162 --- softmmu_template.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/softmmu_template.h b/softmmu_template.h index 4f4f2f4..2dad910 100644 --- a/softmmu_template.h +++ b/softmmu_template.h @@ -187,7 +187,7 @@ void REGPARM(2) glue(glue(__st, SUFFIX), MMUSUFFIX)(unsigned long addr, redo: tlb_addr = env->tlb_write[is_user][index].address; if ((addr & TARGET_PAGE_MASK) == (tlb_addr & (TARGET_PAGE_MASK | TLB_INVALID_MASK))) { - physaddr = addr + env->tlb_read[is_user][index].addend; + physaddr = addr + env->tlb_write[is_user][index].addend; if (tlb_addr & ~TARGET_PAGE_MASK) { /* IO access */ if ((addr & (DATA_SIZE - 1)) != 0) @@ -223,7 +223,7 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(unsigned long addr, redo: tlb_addr = env->tlb_write[is_user][index].address; if ((addr & TARGET_PAGE_MASK) == (tlb_addr & (TARGET_PAGE_MASK | TLB_INVALID_MASK))) { - physaddr = addr + env->tlb_read[is_user][index].addend; + physaddr = addr + env->tlb_write[is_user][index].addend; if (tlb_addr & ~TARGET_PAGE_MASK) { /* IO access */ if ((addr & (DATA_SIZE - 1)) != 0) -- 1.7.9.5