diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2003-11-09 16:58:12 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2003-11-09 16:58:12 +0000 |
| commit | 4ad06a29b2460d4f2474f82dad3cb53467f14eb3 (patch) | |
| tree | f5ccd7e3c4da0a2e7b99f6f3d5546d9d31d65bac | |
| parent | e58143b3550f08254118995c667adefc64f2cc20 (diff) | |
| download | qemu-4ad06a29b2460d4f2474f82dad3cb53467f14eb3.tar.gz qemu-4ad06a29b2460d4f2474f82dad3cb53467f14eb3.tar.bz2 qemu-4ad06a29b2460d4f2474f82dad3cb53467f14eb3.zip | |
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
| -rw-r--r-- | softmmu_template.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/softmmu_template.h b/softmmu_template.h index 4f4f2f4d31..2dad910bf6 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) |