[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RISU v2 10/17] Pass non-OK result back through siglongjmp
From: |
Richard Henderson |
Subject: |
[RISU v2 10/17] Pass non-OK result back through siglongjmp |
Date: |
Mon, 18 May 2020 19:53:48 -0700 |
Rather than doing some work in the signal handler and
some work outside, move all of the non-resume work outside.
This works because we arranged for RES_OK to be 0, which
is the normal return from sigsetjmp.
Signed-off-by: Richard Henderson <address@hidden>
---
risu.c | 50 ++++++++++++++++++++++++--------------------------
1 file changed, 24 insertions(+), 26 deletions(-)
diff --git a/risu.c b/risu.c
index 78c6b8f..d09ac0b 100644
--- a/risu.c
+++ b/risu.c
@@ -107,15 +107,10 @@ static void master_sigill(int sig, siginfo_t *si, void
*uc)
} else {
r = recv_and_compare_register_info(uc);
}
-
- switch (r) {
- case RES_OK:
- /* match OK */
+ if (r == RES_OK) {
advance_pc(uc);
- return;
- default:
- /* mismatch, or end of test */
- siglongjmp(jmpbuf, 1);
+ } else {
+ siglongjmp(jmpbuf, r);
}
}
@@ -129,21 +124,10 @@ static void apprentice_sigill(int sig, siginfo_t *si,
void *uc)
} else {
r = send_register_info(uc);
}
-
- switch (r) {
- case RES_OK:
- /* match OK */
+ if (r == RES_OK) {
advance_pc(uc);
- return;
- case RES_END:
- /* end of test */
- exit(EXIT_SUCCESS);
- default:
- /* mismatch */
- if (trace) {
- siglongjmp(jmpbuf, 1);
- }
- exit(EXIT_FAILURE);
+ } else {
+ siglongjmp(jmpbuf, r);
}
}
@@ -200,7 +184,9 @@ static void load_image(const char *imgfile)
static int master(void)
{
- if (sigsetjmp(jmpbuf, 1)) {
+ RisuResult res = sigsetjmp(jmpbuf, 1);
+
+ if (res != RES_OK) {
#ifdef HAVE_ZLIB
if (trace && comm_fd != STDOUT_FILENO) {
gzclose(gz_trace_file);
@@ -226,15 +212,27 @@ static int master(void)
static int apprentice(void)
{
- if (sigsetjmp(jmpbuf, 1)) {
+ RisuResult res = sigsetjmp(jmpbuf, 1);
+
+ if (res != RES_OK) {
#ifdef HAVE_ZLIB
if (trace && comm_fd != STDIN_FILENO) {
gzclose(gz_trace_file);
}
#endif
close(comm_fd);
- fprintf(stderr, "finished early after %zd checkpoints\n",
signal_count);
- return report_match_status(true);
+
+ switch (res) {
+ case RES_END:
+ return EXIT_SUCCESS;
+ default:
+ if (!trace) {
+ return EXIT_FAILURE;
+ }
+ fprintf(stderr, "finished early after %zd checkpoints\n",
+ signal_count);
+ return report_match_status(true);
+ }
}
set_sigill_handler(&apprentice_sigill);
fprintf(stderr, "starting apprentice image at 0x%"PRIxPTR"\n",
--
2.20.1
- [RISU v2 06/17] Make some risu.c symbols static, (continued)
- [RISU v2 06/17] Make some risu.c symbols static, Richard Henderson, 2020/05/18
- [RISU v2 07/17] Add enum RisuOp, Richard Henderson, 2020/05/18
- [RISU v2 08/17] Add enum RisuResult, Richard Henderson, 2020/05/18
- [RISU v2 09/17] Unify i/o functions and use RisuResult, Richard Henderson, 2020/05/18
- [RISU v2 11/17] Always write for --master, Richard Henderson, 2020/05/18
- [RISU v2 10/17] Pass non-OK result back through siglongjmp,
Richard Henderson <=
- [RISU v2 12/17] Simplify syncing with master, Richard Henderson, 2020/05/18
- [RISU v2 13/17] Split RES_MISMATCH for registers and memory, Richard Henderson, 2020/05/18
- [RISU v2 14/17] Add magic and size to the trace header, Richard Henderson, 2020/05/18
- [RISU v2 15/17] Compute reginfo_size based on the reginfo, Richard Henderson, 2020/05/18