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[email protected]
Signed-off-by: Anthony Liguori <[email protected]>

diff --combined target-arm/translate.c
index b3f26d6205420ca63ea7c37a0d007f23938576b8,b462f4bad08f3e6cecc804aa0adf1efb5dcc5b1e..2a18ffe5cf6eb255772382a7dfe0bad0e4880fca
--- 1/target-arm/translate.c
--- 2/target-arm/translate.c
+++ b/target-arm/translate.c
@@@ -6752,7 -6752,7 +6752,7 @@@ static void disas_arm_insn(CPUARMState 
              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) {
@@@ -9916,6 -9916,7 +9916,6 @@@ static inline void gen_intermediate_cod
                         invalidate this TB.  */
                      dc->pc += 2;
                      goto done_generating;
 -                    break;
                  }
              }
          }