diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-06-29 13:26:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-29 13:26:43 +0100 |
| commit | 2b464e13f0d30e6c0b8f69ec908fceab30aea986 (patch) | |
| tree | 06ae381ccdd91de0c76e762011d7ee9f09e2bc63 | |
| parent | dc1e1350f8061021df765b396295329797d66933 (diff) | |
| parent | 5f37fd8e2980818ab71bc4b4e21129e29acd73f7 (diff) | |
| download | hqemu-2b464e13f0d30e6c0b8f69ec908fceab30aea986.zip hqemu-2b464e13f0d30e6c0b8f69ec908fceab30aea986.tar.gz | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target-tricore/op_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-tricore/op_helper.c b/target-tricore/op_helper.c index 10ed541..53edbda 100644 --- a/target-tricore/op_helper.c +++ b/target-tricore/op_helper.c @@ -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)); |
