Commit 2b464e13 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150629' into staging 



TriCore bugfixes

# gpg: Signature made Mon Jun 29 13:08:17 2015 BST using RSA key ID 6B69CA14
# gpg: Good signature from "Bastian Koppelmann <kbastian@mail.uni-paderborn.de>"

* remotes/bkoppelmann/tags/pull-tricore-20150629:
  target-tricore: fix depositing bits from PCXI into ICR

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents dc1e1350 5f37fd8e

target-tricore/op_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -2545,10 +2545,10 @@ void helper_rfm(CPUTriCoreState *env) 
    env->PC = (env->gpr_a[11] & ~0x1);

    /* ICR.IE = PCXI.PIE; */

    env->ICR = (env->ICR & ~MASK_ICR_IE) |

               ((env->PCXI & ~MASK_PCXI_PIE) >> 15);

               ((env->PCXI & MASK_PCXI_PIE) >> 15);

    /* ICR.CCPN = PCXI.PCPN; */

    env->ICR = (env->ICR & ~MASK_ICR_CCPN) |

               ((env->PCXI & ~MASK_PCXI_PCPN) >> 24);

               ((env->PCXI & MASK_PCXI_PCPN) >> 24);

    /* {PCXI, PSW, A[10], A[11]} = M(DCX, 4 * word); */

    env->PCXI = cpu_ldl_data(env, env->DCX);

    psw_write(env, cpu_ldl_data(env, env->DCX+4));