diff options
| author | Bastian Koppelmann <kbastian@mail.uni-paderborn.de> | 2023-06-12 13:32:45 +0200 |
|---|---|---|
| committer | Bastian Koppelmann <kbastian@mail.uni-paderborn.de> | 2023-06-21 18:09:54 +0200 |
| commit | 82736612e75b84f51d8f3529cb35fa3835de5741 (patch) | |
| tree | d528827e1b6f14ce34af93ed660207a26fb6f32c /target/tricore | |
| parent | 6991777ec4b2a344d47bddec62744bedd9883d78 (diff) | |
| download | qemu-82736612e75b84f51d8f3529cb35fa3835de5741.zip qemu-82736612e75b84f51d8f3529cb35fa3835de5741.tar.gz qemu-82736612e75b84f51d8f3529cb35fa3835de5741.tar.bz2 | |
target/tricore: Fix helper_ret() not correctly restoring PSW
We are always taking the TRICORE_FEATURE_13 branch as every CPU has TRICORE_FEATURE_13.
For CPUs with ISA > 1.3 we have to take the else branch.
We fix this by inverting the condition. We check for
TRICORE_FEATURE_131, which every CPU except TRICORE_FEATURE_13 CPUs
have.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1700
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-Id: <20230612113245.56667-5-kbastian@mail.uni-paderborn.de>
Diffstat (limited to 'target/tricore')
| -rw-r--r-- | target/tricore/op_helper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/tricore/op_helper.c b/target/tricore/op_helper.c index 9a7a26b..821a4b6 100644 --- a/target/tricore/op_helper.c +++ b/target/tricore/op_helper.c @@ -2584,12 +2584,12 @@ void helper_ret(CPUTriCoreState *env) /* PCXI = new_PCXI; */ env->PCXI = new_PCXI; - if (tricore_feature(env, TRICORE_FEATURE_13)) { - /* PSW = new_PSW */ - psw_write(env, new_PSW); - } else { + if (tricore_feature(env, TRICORE_FEATURE_131)) { /* PSW = {new_PSW[31:26], PSW[25:24], new_PSW[23:0]}; */ psw_write(env, (new_PSW & ~(0x3000000)) + (psw & (0x3000000))); + } else { /* TRICORE_FEATURE_13 only */ + /* PSW = new_PSW */ + psw_write(env, new_PSW); } } |