From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: laurent@vivier.eu
Subject: [PATCH v3 09/17] target/m68k: Fix stack frame for EXCP_ILLEGAL
Date: Tue, 15 Mar 2022 22:58:32 -0700 [thread overview]
Message-ID: <20220316055840.727571-10-richard.henderson@linaro.org> (raw)
In-Reply-To: <20220316055840.727571-1-richard.henderson@linaro.org>
According to the M68040 Users Manual, section 8.4.3, Four word
stack frame (format 0), includes Illegal Instruction. Use the
correct frame format, which does not use the ADDR argument.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/m68k/op_helper.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c
index 4140f65422..6aebf9d737 100644
--- a/target/m68k/op_helper.c
+++ b/target/m68k/op_helper.c
@@ -391,11 +391,14 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
}
break;
+ case EXCP_ILLEGAL:
+ do_stack_frame(env, &sp, 0, oldsr, 0, env->pc);
+ break;
+
case EXCP_ADDRESS:
do_stack_frame(env, &sp, 2, oldsr, 0, env->pc);
break;
- case EXCP_ILLEGAL:
case EXCP_TRAPCC:
/* FIXME: addr is not only env->pc */
do_stack_frame(env, &sp, 2, oldsr, env->pc, env->pc);
--
2.25.1
next prev parent reply other threads:[~2022-03-16 6:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-16 5:58 [PATCH v3 00/17] target/m68k: Conditional traps + trap cleanup Richard Henderson
2022-03-16 5:58 ` [PATCH v3 01/17] target/m68k: Raise the TRAPn exception with the correct pc Richard Henderson
2022-03-16 5:58 ` [PATCH v3 02/17] target/m68k: Switch over exception type in m68k_interrupt_all Richard Henderson
2022-03-16 5:58 ` [PATCH v3 03/17] target/m68k: Fix coding style " Richard Henderson
2022-03-16 5:58 ` [PATCH v3 04/17] linux-user/m68k: Handle EXCP_TRAP1 through EXCP_TRAP15 Richard Henderson
2022-03-16 5:58 ` [PATCH v3 05/17] target/m68k: Remove retaddr in m68k_interrupt_all Richard Henderson
2022-03-16 5:58 ` [PATCH v3 06/17] target/m68k: Fix address argument for EXCP_CHK Richard Henderson
2022-03-16 5:58 ` [PATCH v3 07/17] target/m68k: Fix pc, c flag, and address argument for EXCP_DIV0 Richard Henderson
2022-03-16 5:58 ` [PATCH v3 08/17] target/m68k: Fix address argument for EXCP_TRACE Richard Henderson
2022-03-16 5:58 ` Richard Henderson [this message]
2022-03-16 5:58 ` [PATCH v3 10/17] target/m68k: Implement TRAPcc Richard Henderson
2022-03-16 5:58 ` [PATCH v3 11/17] target/m68k: Implement TPF in terms of TRAPcc Richard Henderson
2022-03-16 5:58 ` [PATCH v3 12/17] target/m68k: Implement TRAPV Richard Henderson
2022-03-16 5:58 ` [PATCH v3 13/17] target/m68k: Implement FTRAPcc Richard Henderson
2022-03-16 5:58 ` [PATCH v3 14/17] tests/tcg/m68k: Add trap.c Richard Henderson
2022-03-16 5:58 ` [PATCH v3 15/17] linux-user/strace: Fix print_syscall_err Richard Henderson
2022-03-17 10:43 ` Pierre Muller
2022-03-16 5:58 ` [PATCH v3 16/17] linux-user/strace: Adjust get_thread_area for m68k Richard Henderson
2022-03-16 5:58 ` [PATCH v3 17/17] target/m68k: Mark helper_raise_exception as noreturn Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220316055840.727571-10-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).