diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-01 16:59:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-01 16:59:29 +0100 |
| commit | 5e6ebacc3b1e4e8d52a27b9f236fdc01d828641c (patch) | |
| tree | 08b11c91ac919bf8aa7d6e001dc201c5bbc4b683 /target/m68k/helper.c | |
| parent | ae9108f8f0746ce64d02afb1a216153a50926132 (diff) | |
| parent | c6d0700f57b2c50229a27e31b9f99056a011215f (diff) | |
| download | focaccia-qemu-5e6ebacc3b1e4e8d52a27b9f236fdc01d828641c.tar.gz focaccia-qemu-5e6ebacc3b1e4e8d52a27b9f236fdc01d828641c.zip | |
Merge remote-tracking branch 'remotes/vivier/tags/m68k-next-pull-request' into staging
remove m68k simulator syscall interface Fix comments format Fix gdbstub # gpg: Signature made Wed 26 Jun 2019 17:20:41 BST # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier/tags/m68k-next-pull-request: linux-user/m68k: remove simulator syscall interface m68k comments break patch submission due to being incorrectly formatted The m68k gdbstub SR reg request doesnt include Condition-Codes Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/m68k/helper.c')
| -rw-r--r-- | target/m68k/helper.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 31aacb51c6..ae766a6cb0 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -965,9 +965,11 @@ void HELPER(set_sr)(CPUM68KState *env, uint32_t val) } /* MAC unit. */ -/* FIXME: The MAC unit implementation is a bit of a mess. Some helpers - take values, others take register numbers and manipulate the contents - in-place. */ +/* + * FIXME: The MAC unit implementation is a bit of a mess. Some helpers + * take values, others take register numbers and manipulate the contents + * in-place. + */ void HELPER(mac_move)(CPUM68KState *env, uint32_t dest, uint32_t src) { uint32_t mask; @@ -1047,9 +1049,11 @@ void HELPER(macsats)(CPUM68KState *env, uint32_t acc) if (env->macsr & MACSR_V) { env->macsr |= MACSR_PAV0 << acc; if (env->macsr & MACSR_OMC) { - /* The result is saturated to 32 bits, despite overflow occurring - at 48 bits. Seems weird, but that's what the hardware docs - say. */ + /* + * The result is saturated to 32 bits, despite overflow occurring + * at 48 bits. Seems weird, but that's what the hardware docs + * say. + */ result = (result >> 63) ^ 0x7fffffff; } } |