Move recv_and_compare_register_info() and report_match_status() to reginfo.c

Move recv_and_compare_register_info() and report_match_status() to
reginfo.c -- they are essentially the same for all targets so
can be common code. The shared variables they use come with them.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

1 files changed, 108 insertions, 0 deletions

diff --git a/reginfo.c b/reginfo.c
index d62a2ed..96c6342 100644
--- a/reginfo.c
+++ b/reginfo.c
@@ -10,9 +10,17 @@
  *****************************************************************************/
 
 #include <stdio.h>
+#include <string.h>
 
 #include "risu.h"
 
+struct reginfo master_ri, apprentice_ri;
+
+uint8_t apprentice_memblock[MEMBLOCKLEN];
+
+static int mem_used = 0;
+static int packet_mismatch = 0;
+
 int send_register_info(int sock, void *uc)
 {
     struct reginfo ri;
@@ -41,3 +49,103 @@ int send_register_info(int sock, void *uc)
     }
     return 0;
 }
+
+/* Read register info from the socket and compare it with that from the
+ * ucontext. Return 0 for match, 1 for end-of-test, 2 for mismatch.
+ * NB: called from a signal handler.
+ *
+ * We don't have any kind of identifying info in the incoming data
+ * that says whether it is register or memory data, so if the two
+ * sides get out of sync then we will fail obscurely.
+ */
+int recv_and_compare_register_info(int sock, void *uc)
+{
+    int resp = 0, op;
+
+    reginfo_init(&master_ri, uc);
+    op = get_risuop(&master_ri);
+
+    switch (op) {
+    case OP_COMPARE:
+    case OP_TESTEND:
+    default:
+        /* Do a simple register compare on (a) explicit request
+         * (b) end of test (c) a non-risuop UNDEF
+         */
+        if (recv_data_pkt(sock, &apprentice_ri, sizeof(apprentice_ri))) {
+            packet_mismatch = 1;
+            resp = 2;
+
+        } else if (!reginfo_is_eq(&master_ri, &apprentice_ri)) {
+            /* register mismatch */
+            resp = 2;
+
+        } else if (op == OP_TESTEND) {
+            resp = 1;
+        }
+        send_response_byte(sock, resp);
+        break;
+      case OP_SETMEMBLOCK:
+          memblock = (void *)(uintptr_t)get_reginfo_paramreg(&master_ri);
+          break;
+      case OP_GETMEMBLOCK:
+          set_ucontext_paramreg(uc, get_reginfo_paramreg(&master_ri) +
+                                (uintptr_t)memblock);
+          break;
+      case OP_COMPAREMEM:
+         mem_used = 1;
+         if (recv_data_pkt(sock, apprentice_memblock, MEMBLOCKLEN)) {
+             packet_mismatch = 1;
+             resp = 2;
+         } else if (memcmp(memblock, apprentice_memblock, MEMBLOCKLEN) != 0) {
+             /* memory mismatch */
+             resp = 2;
+         }
+         send_response_byte(sock, resp);
+         break;
+   }
+
+    return resp;
+}
+
+/* Print a useful report on the status of the last comparison
+ * done in recv_and_compare_register_info(). This is called on
+ * exit, so need not restrict itself to signal-safe functions.
+ * Should return 0 if it was a good match (ie end of test)
+ * and 1 for a mismatch.
+ */
+int report_match_status(void)
+{
+   int resp = 0;
+   fprintf(stderr, "match status...\n");
+   if (packet_mismatch) {
+       fprintf(stderr, "packet mismatch (probably disagreement "
+               "about UNDEF on load/store)\n");
+       /* We don't have valid reginfo from the apprentice side
+        * so stop now rather than printing anything about it.
+        */
+       fprintf(stderr, "master reginfo:\n");
+       reginfo_dump(&master_ri, stderr);
+       return 1;
+   }
+   if (!reginfo_is_eq(&master_ri, &apprentice_ri)) {
+       fprintf(stderr, "mismatch on regs!\n");
+       resp = 1;
+   }
+   if (mem_used && memcmp(memblock, &apprentice_memblock, MEMBLOCKLEN) != 0) {
+       fprintf(stderr, "mismatch on memory!\n");
+       resp = 1;
+   }
+   if (!resp) {
+       fprintf(stderr, "match!\n");
+       return 0;
+   }
+
+   fprintf(stderr, "master reginfo:\n");
+   reginfo_dump(&master_ri, stderr);
+   fprintf(stderr, "apprentice reginfo:\n");
+   reginfo_dump(&apprentice_ri, stderr);
+
+   reginfo_dump_mismatch(&master_ri, &apprentice_ri, stderr);
+   return resp;
+}