[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RISU PATCH 01/11] risu: make match status take tracing int
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [RISU PATCH 01/11] risu: make match status take tracing into account |
Date: |
Tue, 4 Jul 2017 15:48:49 +0100 |
Signed-off-by: Alex Bennée <address@hidden>
---
reginfo.c | 14 +++++++++-----
risu.c | 4 ++--
risu.h | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/reginfo.c b/reginfo.c
index 13879d5..d9d37b3 100644
--- a/reginfo.c
+++ b/reginfo.c
@@ -138,7 +138,7 @@ int recv_and_compare_register_info(read_fn read_fn,
* Should return 0 if it was a good match (ie end of test)
* and 1 for a mismatch.
*/
-int report_match_status(void)
+int report_match_status(int trace)
{
int resp = 0;
fprintf(stderr, "match status...\n");
@@ -148,7 +148,7 @@ int report_match_status(void)
/* We don't have valid reginfo from the apprentice side
* so stop now rather than printing anything about it.
*/
- fprintf(stderr, "master reginfo:\n");
+ fprintf(stderr, "%s reginfo:\n", trace ? "this":"master");
reginfo_dump(&master_ri, stderr);
return 1;
}
@@ -166,11 +166,15 @@ int report_match_status(void)
return 0;
}
- fprintf(stderr, "master reginfo:\n");
+ fprintf(stderr, "%s reginfo:\n", trace ? "this":"master");
reginfo_dump(&master_ri, stderr);
- fprintf(stderr, "apprentice reginfo:\n");
+ fprintf(stderr, "%s reginfo:\n", trace ? "trace":"apprentice");
reginfo_dump(&apprentice_ri, stderr);
- reginfo_dump_mismatch(&master_ri, &apprentice_ri, stderr);
+ if (trace) {
+ reginfo_dump_mismatch(&apprentice_ri, &master_ri, stderr);
+ } else {
+ reginfo_dump_mismatch(&master_ri, &apprentice_ri, stderr);
+ }
return resp;
}
diff --git a/risu.c b/risu.c
index 6f213dc..47471c6 100644
--- a/risu.c
+++ b/risu.c
@@ -228,7 +228,7 @@ int master(void)
signal_count);
return 0;
} else {
- return report_match_status();
+ return report_match_status(0);
}
}
set_sigill_handler(&master_sigill);
@@ -250,7 +250,7 @@ int apprentice(void)
#endif
close(apprentice_fd);
fprintf(stderr, "finished early after %zd checkpoints\n",
signal_count);
- return report_match_status();
+ return report_match_status(1);
}
set_sigill_handler(&apprentice_sigill);
fprintf(stderr, "starting apprentice image at 0x%"PRIxPTR"\n",
diff --git a/risu.h b/risu.h
index 9f15662..1c8ecee 100644
--- a/risu.h
+++ b/risu.h
@@ -91,7 +91,7 @@ int recv_and_compare_register_info(read_fn read_fn,
* Should return 0 if it was a good match (ie end of test)
* and 1 for a mismatch.
*/
-int report_match_status(void);
+int report_match_status(int trace);
/* Interface provided by CPU-specific code: */
--
2.13.0
- [Qemu-devel] [RISU PATCH 00/11] Misc fixes, documentation and patterns, Alex Bennée, 2017/07/04
- [Qemu-devel] [RISU PATCH 04/11] README: document record/replay support, Alex Bennée, 2017/07/04
- [Qemu-devel] [RISU PATCH 03/11] README: document --static builds, Alex Bennée, 2017/07/04
- [Qemu-devel] [RISU PATCH 01/11] risu: make match status take tracing into account,
Alex Bennée <=
- [Qemu-devel] [RISU PATCH 05/11] risu.el: derive from text-mode, Alex Bennée, 2017/07/04
- [Qemu-devel] [RISU PATCH 06/11] risugen: fix bad indent, Alex Bennée, 2017/07/04
- [Qemu-devel] [RISU PATCH 02/11] reginfo.c: always return 1 on OP_TESTEND, Alex Bennée, 2017/07/04
- [Qemu-devel] [RISU PATCH 07/11] risugen: support @GroupName in risu files, Alex Bennée, 2017/07/04
- [Qemu-devel] [RISU PATCH 08/11] aarch64.risu: document naming conventions, Alex Bennée, 2017/07/04
- [Qemu-devel] [RISU PATCH 09/11] aarch64.risu: remove duplicate AdvSIMD Scalar 3 same block, Alex Bennée, 2017/07/04
- [Qemu-devel] [RISU PATCH 10/11] aarch64.risu: remove duplicate AdvSIMD scalar 2 reg misc block, Alex Bennée, 2017/07/04
- [Qemu-devel] [RISU PATCH 11/11] aarch64.risu: update AdvancedSIMD across lanes, Alex Bennée, 2017/07/04
- Re: [Qemu-devel] [RISU PATCH 00/11] Misc fixes, documentation and patterns, Peter Maydell, 2017/07/10