aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-06-14 07:50:58 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-06-14 07:50:59 -0500
commitdb9707f7a17d00781a8fb13354a359bd05a46646 (patch)
treea53dd481275715407918670199628188aeab45ba
parent6e8d2b654656830877937ba02bb8ea1c4945a1fc (diff)
parent5866e078770cba631a33e6d3062afa7a4068adf8 (diff)
downloadqemu-arm-db9707f7a17d00781a8fb13354a359bd05a46646.tar.gz
Merge remote-tracking branch 'pmaydell/target-arm.next' into staging
# By Peter Chubb # Via Peter Maydell * pmaydell/target-arm.next: Fix rfe instruction Message-id: 1370268884-25945-1-git-send-email-peter.maydell@linaro.org Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--target-arm/translate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-arm/translate.c b/target-arm/translate.c
index b3f26d6205..2a18ffe5cf 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -6752,7 +6752,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)
tcg_gen_qemu_ld32u(tmp, addr, 0);
tcg_gen_addi_i32(addr, addr, 4);
tmp2 = tcg_temp_new_i32();
- tcg_gen_qemu_ld32u(tmp, addr, 0);
+ tcg_gen_qemu_ld32u(tmp2, addr, 0);
if (insn & (1 << 21)) {
/* Base writeback. */
switch (i) {