diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-08 18:29:41 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-08 18:29:41 +0000 |
| commit | 1eb5da3b732466320d6c0c81459bb3a8df72a1d1 (patch) | |
| tree | e2a90381265925b31315e21ca26711c67b5eec45 | |
| parent | 234afe78281b10a798fb97c584e1b677844aaab8 (diff) | |
| parent | d1c1d88ce6fd768cb98cd7af81b1b23ac9fe168d (diff) | |
| download | qemu-1eb5da3b732466320d6c0c81459bb3a8df72a1d1.zip qemu-1eb5da3b732466320d6c0c81459bb3a8df72a1d1.tar.gz qemu-1eb5da3b732466320d6c0c81459bb3a8df72a1d1.tar.bz2 | |
Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-2019-03-08' into staging
Fixes mixed up operands in CADDN and CADD
# gpg: Signature made Fri 08 Mar 2019 09:45:05 GMT
# gpg: using RSA key 6E636A7E83F2DD0CFA6E6E370AD2C6396B69CA14
# gpg: issuer "kbastian@mail.uni-paderborn.de"
# gpg: Good signature from "Bastian Koppelmann <kbastian@mail.uni-paderborn.de>" [full]
# Primary key fingerprint: 6E63 6A7E 83F2 DD0C FA6E 6E37 0AD2 C639 6B69 CA14
* remotes/bkoppelmann/tags/pull-tricore-2019-03-08:
tricore: fixed RCR_CADDN instruction
tricore: fixed RCR_CADD instruction
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/tricore/translate.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/tricore/translate.c b/target/tricore/translate.c index 14f0ddf..b12c391 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -5867,12 +5867,12 @@ static void decode_rcr_cond_select(CPUTriCoreState *env, DisasContext *ctx) switch (op2) { case OPC2_32_RCR_CADD: - gen_condi_add(TCG_COND_NE, cpu_gpr_d[r1], const9, cpu_gpr_d[r3], - cpu_gpr_d[r4]); + gen_condi_add(TCG_COND_NE, cpu_gpr_d[r1], const9, cpu_gpr_d[r4], + cpu_gpr_d[r3]); break; case OPC2_32_RCR_CADDN: - gen_condi_add(TCG_COND_EQ, cpu_gpr_d[r1], const9, cpu_gpr_d[r3], - cpu_gpr_d[r4]); + gen_condi_add(TCG_COND_EQ, cpu_gpr_d[r1], const9, cpu_gpr_d[r4], + cpu_gpr_d[r3]); break; case OPC2_32_RCR_SEL: temp = tcg_const_i32(0); |