diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-05-13 11:50:42 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-05-13 11:50:42 +0100 |
| commit | 14fccfa91ecac7af36ac03dc1c2bb9a1d7fbca26 (patch) | |
| tree | e16d07f5421f02f9270bd37bf77d7e59b336c906 /target-mips | |
| parent | 20c20318f9fb0e64c41202c4cd66a7c599cfeecb (diff) | |
| parent | 7fe91a5b33fe100bbc68ee434f947752c69b3f68 (diff) | |
Merge remote-tracking branch 'remotes/lalrae/tags/mips-20160513' into staging
MIPS patches 2016-05-13
Changes:
* fix zeroing CP0.WatchLo registers in soft reset
* QOMify Jazz led
# gpg: Signature made Fri 13 May 2016 11:04:04 BST using RSA key ID 0B29DA6B
# gpg: Good signature from "Leon Alrae <leon.alrae@imgtec.com>"
* remotes/lalrae/tags/mips-20160513:
hw/display: QOM'ify jazz_led.c
target-mips: fix call to memset in soft reset code
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-mips')
| -rw-r--r-- | target-mips/helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-mips/helper.c b/target-mips/helper.c index 1004edee05..cfea177ee5 100644 --- a/target-mips/helper.c +++ b/target-mips/helper.c @@ -539,7 +539,7 @@ void mips_cpu_do_interrupt(CPUState *cs) break; case EXCP_SRESET: env->CP0_Status |= (1 << CP0St_SR); - memset(env->CP0_WatchLo, 0, sizeof(*env->CP0_WatchLo)); + memset(env->CP0_WatchLo, 0, sizeof(env->CP0_WatchLo)); goto set_error_EPC; case EXCP_NMI: env->CP0_Status |= (1 << CP0St_NMI); |