diff options
author | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2010-01-26 13:55:55 +0100 |
---|---|---|
committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2010-01-28 22:46:13 +0100 |
commit | 794401ca9cdc17faa2049404b5498df4ef239533 (patch) | |
tree | 081340975dfaf7e1f1c637a84ec2c2d00a674db5 | |
parent | 6792aa115e05d59419dd167c772496f41fc451cc (diff) |
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>
-rw-r--r-- | softmmu_template.h | 1 |
1 files changed, 0 insertions, 1 deletions
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) { |