diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2022-01-08 18:04:53 +0000 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2022-01-09 12:05:02 +0100 |
| commit | 31144eb6393b66b06a13e8a6ad0e730f9e82d4c6 (patch) | |
| tree | 7aad9a78e192ac7925732ef6de618bfd03ffe41c /target/m68k | |
| parent | 4e136629f003d0f5be2985b15176acbec2c5a344 (diff) | |
| download | qemu-31144eb6393b66b06a13e8a6ad0e730f9e82d4c6.zip qemu-31144eb6393b66b06a13e8a6ad0e730f9e82d4c6.tar.gz qemu-31144eb6393b66b06a13e8a6ad0e730f9e82d4c6.tar.bz2 | |
target/m68k: don't word align SP in stack frame if M68K_FEATURE_UNALIGNED_DATA feature enabled
Commit a9431a03f7 ("target/m68k: add M68K_FEATURE_UNALIGNED_DATA feature") added
a new feature for processors from the 68020 onwards which do not require data
accesses to be word aligned.
Unfortunately the original commit missed an additional case whereby the SP is
still word aligned when setting up an additional format 1 stack frame so add the
necessary M68K_FEATURE_UNALIGNED_DATA feature guard.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Fixes: a9431a03f7 ("target/m68k: add M68K_FEATURE_UNALIGNED_DATA feature")
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220108180453.18680-1-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'target/m68k')
| -rw-r--r-- | target/m68k/op_helper.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index c0f4825..acbd473 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -415,7 +415,10 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw) oldsr = sr; env->aregs[7] = sp; cpu_m68k_set_sr(env, sr &= ~SR_M); - sp = env->aregs[7] & ~1; + sp = env->aregs[7]; + if (!m68k_feature(env, M68K_FEATURE_UNALIGNED_DATA)) { + sp &= ~1; + } do_stack_frame(env, &sp, 1, oldsr, 0, retaddr); } else { do_stack_frame(env, &sp, 0, oldsr, 0, retaddr); |