summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorBastian Koppelmann <kbastian@mail.uni-paderborn.de>2023-06-12 13:32:43 +0200
committerBastian Koppelmann <kbastian@mail.uni-paderborn.de>2023-06-21 18:09:54 +0200
commit5434557ffc5b46f178ccf325517db2b1f5e2c037 (patch)
tree04a908d894af0e60aafe3331dcc871fcc6c9eecc
parentd34b092cab606a47a0d76edde45aab7100bb2435 (diff)
downloadfocaccia-qemu-5434557ffc5b46f178ccf325517db2b1f5e2c037.tar.gz
focaccia-qemu-5434557ffc5b46f178ccf325517db2b1f5e2c037.zip
target/tricore: Correctly fix saving PSW.CDE to CSA on call
we don't want to save PSW.CDC to the CSA, but PSW.CDE must be saved.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1699
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-Id: <20230612113245.56667-3-kbastian@mail.uni-paderborn.de>
-rw-r--r--target/tricore/op_helper.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/target/tricore/op_helper.c b/target/tricore/op_helper.c
index 026e15f3e0..9a7a26b171 100644
--- a/target/tricore/op_helper.c
+++ b/target/tricore/op_helper.c
@@ -2499,7 +2499,12 @@ void helper_call(CPUTriCoreState *env, uint32_t next_pc)
     }
     /* PSW.CDE = 1;*/
     psw |= MASK_PSW_CDE;
-    psw_write(env, psw);
+    /*
+     * we need to save PSW.CDE and not PSW.CDC into the CSAs. psw already
+     * contains the CDC from cdc_increment(), so we cannot call psw_write()
+     * here.
+     */
+    env->PSW |= MASK_PSW_CDE;
 
     /* tmp_FCX = FCX; */
     tmp_FCX = env->FCX;