From: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Date: Tue, 26 Jan 2010 12:55:55 +0000 (+0100)
Subject: softmmu: Dont clobber retaddr in slow_ldx().
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=794401ca9cdc17faa2049404b5498df4ef239533;p=qemu.git

softmmu: Dont clobber retaddr in slow_ldx().

When splitting up unaligned IO accesses, ld calls slow_ld which was
clobbering retaddr.

AFAIK the problem only shows up when running emulations with -icount
that may abort TB execution on IO accesses.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
---

diff --git a/softmmu_template.h b/softmmu_template.h
index 0e13153748..ac9b9a944a 100644
--- a/softmmu_template.h
+++ b/softmmu_template.h
@@ -152,7 +152,6 @@ static DATA_TYPE glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(target_ulong addr,
             /* IO access */
             if ((addr & (DATA_SIZE - 1)) != 0)
                 goto do_unaligned_access;
-            retaddr = GETPC();
             addend = env->iotlb[mmu_idx][index];
             res = glue(io_read, SUFFIX)(addend, addr, retaddr);
         } else if (((addr & ~TARGET_PAGE_MASK) + DATA_SIZE - 1) >= TARGET_PAGE_SIZE) {