diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-25 12:57:22 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-25 12:57:22 +0000 |
| commit | 774ae4254d3910f1c94ad6ed44d14cbea0e6a2f2 (patch) | |
| tree | 849f6c692b0c502cb694e291d9e9a7bb3a2f4fe5 /target-tricore/helper.c | |
| parent | df215b59d907ceed60bca088f5a3d50982919d59 (diff) | |
| parent | 828066c78a02a98bc395d125002b2d7a888285bb (diff) | |
Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20160225' into staging
TriCore bugfixes and synchronous trap implementation
# gpg: Signature made Thu 25 Feb 2016 11:57:41 GMT using RSA key ID 6B69CA14
# gpg: Good signature from "Bastian Koppelmann <kbastian@mail.uni-paderborn.de>"
* remotes/bkoppelmann/tags/pull-tricore-20160225:
target-tricore: add opd trap generation
target-tricore: add illegal opcode trap generation
target-tricore: add context managment trap generation
target-tricore: Add trap handling & SOVF/OVF traps
target-tricore: Fix wrong precedences on psw_write
target-tricore: fix save_context_upper using env->PSW
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-tricore/helper.c')
| -rw-r--r-- | target-tricore/helper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target-tricore/helper.c b/target-tricore/helper.c index a8fd418b42..7d96daddb1 100644 --- a/target-tricore/helper.c +++ b/target-tricore/helper.c @@ -127,9 +127,9 @@ uint32_t psw_read(CPUTriCoreState *env) void psw_write(CPUTriCoreState *env, uint32_t val) { env->PSW_USB_C = (val & MASK_USB_C); - env->PSW_USB_V = (val & MASK_USB_V << 1); - env->PSW_USB_SV = (val & MASK_USB_SV << 2); - env->PSW_USB_AV = ((val & MASK_USB_AV) << 3); - env->PSW_USB_SAV = ((val & MASK_USB_SAV) << 4); + env->PSW_USB_V = (val & MASK_USB_V) << 1; + env->PSW_USB_SV = (val & MASK_USB_SV) << 2; + env->PSW_USB_AV = (val & MASK_USB_AV) << 3; + env->PSW_USB_SAV = (val & MASK_USB_SAV) << 4; env->PSW = val; } |