[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 16/25] Split out recv_register_info
From: |
Richard Henderson |
Subject: |
[PATCH v3 16/25] Split out recv_register_info |
Date: |
Thu, 21 May 2020 19:34:31 -0700 |
We will want to share this code when dumping.
Signed-off-by: Richard Henderson <address@hidden>
---
risu.c | 50 ++++++++++++++++++++++++++++++++++----------------
1 file changed, 34 insertions(+), 16 deletions(-)
diff --git a/risu.c b/risu.c
index b91ad38..80bc3b1 100644
--- a/risu.c
+++ b/risu.c
@@ -166,6 +166,34 @@ static void master_sigill(int sig, siginfo_t *si, void *uc)
}
}
+static RisuResult recv_register_info(struct reginfo *ri)
+{
+ RisuResult res;
+
+ res = read_buffer(&header, sizeof(header));
+ if (res != RES_OK) {
+ return res;
+ }
+
+ /* send OK for the header */
+ respond(RES_OK);
+
+ switch (header.risu_op) {
+ case OP_COMPARE:
+ case OP_TESTEND:
+ case OP_SIGILL:
+ return read_buffer(ri, reginfo_size());
+ case OP_COMPAREMEM:
+ return read_buffer(other_memblock, MEMBLOCKLEN);
+ case OP_SETMEMBLOCK:
+ case OP_GETMEMBLOCK:
+ return RES_OK;
+ default:
+ /* TODO: Create a better error message. */
+ return RES_BAD_IO;
+ }
+}
+
static RisuResult recv_and_compare_register_info(void *uc)
{
uint64_t paramreg;
@@ -173,33 +201,26 @@ static RisuResult recv_and_compare_register_info(void *uc)
RisuOp op;
reginfo_init(&ri[APPRENTICE], uc);
- op = get_risuop(&ri[APPRENTICE]);
- res = read_buffer(&header, sizeof(header));
+ res = recv_register_info(&ri[MASTER]);
if (res != RES_OK) {
+ /* I/O error. Tell master to exit. */
+ respond(RES_END);
return res;
}
+ op = get_risuop(&ri[APPRENTICE]);
if (header.risu_op != op) {
/* We are out of sync. Tell master to exit. */
respond(RES_END);
return RES_BAD_IO;
}
- /* send OK for the header */
- respond(RES_OK);
-
switch (op) {
case OP_COMPARE:
case OP_TESTEND:
case OP_SIGILL:
- /* Do a simple register compare on (a) explicit request
- * (b) end of test (c) a non-risuop UNDEF
- */
- res = read_buffer(&ri[MASTER], reginfo_size());
- if (res != RES_OK) {
- /* fail */
- } else if (!reginfo_is_eq(&ri[MASTER], &ri[APPRENTICE])) {
+ if (!reginfo_is_eq(&ri[MASTER], &ri[APPRENTICE])) {
/* register mismatch */
res = RES_MISMATCH_REG;
} else if (op == OP_TESTEND) {
@@ -216,10 +237,7 @@ static RisuResult recv_and_compare_register_info(void *uc)
set_ucontext_paramreg(uc, paramreg + (uintptr_t)memblock);
break;
case OP_COMPAREMEM:
- res = read_buffer(other_memblock, MEMBLOCKLEN);
- if (res != RES_OK) {
- /* fail */
- } else if (memcmp(memblock, other_memblock, MEMBLOCKLEN) != 0) {
+ if (memcmp(memblock, other_memblock, MEMBLOCKLEN) != 0) {
/* memory mismatch */
res = RES_MISMATCH_MEM;
}
--
2.20.1
- [PATCH v3 06/25] Make some risu.c symbols static, (continued)
- [PATCH v3 06/25] Make some risu.c symbols static, Richard Henderson, 2020/05/21
- [PATCH v3 08/25] Add enum RisuResult, Richard Henderson, 2020/05/21
- [PATCH v3 07/25] Add enum RisuOp, Richard Henderson, 2020/05/21
- [PATCH v3 09/25] Unify i/o functions and use RisuResult, Richard Henderson, 2020/05/21
- [PATCH v3 10/25] Pass non-OK result back through siglongjmp, Richard Henderson, 2020/05/21
- [PATCH v3 11/25] Always write for --master, Richard Henderson, 2020/05/21
- [PATCH v3 12/25] Simplify syncing with master, Richard Henderson, 2020/05/21
- [PATCH v3 13/25] Split RES_MISMATCH for registers and memory, Richard Henderson, 2020/05/21
- [PATCH v3 15/25] Rearrange reginfo and memblock buffers, Richard Henderson, 2020/05/21
- [PATCH v3 14/25] Merge reginfo.c into risu.c, Richard Henderson, 2020/05/21
- [PATCH v3 16/25] Split out recv_register_info,
Richard Henderson <=
- [PATCH v3 17/25] Add magic and size to the trace header, Richard Henderson, 2020/05/21
- [PATCH v3 18/25] Compute reginfo_size based on the reginfo, Richard Henderson, 2020/05/21
- [PATCH v3 19/25] aarch64: Reorg sve reginfo to save space, Richard Henderson, 2020/05/21
- [PATCH v3 20/25] aarch64: Use arch_init to configure sve, Richard Henderson, 2020/05/21
- [PATCH v3 21/25] ppc64: Use uint64_t to represent double, Richard Henderson, 2020/05/21
- [PATCH v3 22/25] Standardize reginfo_dump_mismatch printing, Richard Henderson, 2020/05/21
- [PATCH v3 23/25] Add --fulldump and --diffdup options, Richard Henderson, 2020/05/21
- [PATCH v3 25/25] ppc64: Clean up reginfo handling, Richard Henderson, 2020/05/21
- [PATCH v3 24/25] Remove return value from reginfo_dump, Richard Henderson, 2020/05/21