From 37e576e6486aee4d0cad4f6eeaf030698c2ac384 Mon Sep 17 00:00:00 2001
From: gibbed <rick@gibbed.us>
Date: Mon, 24 Feb 2020 18:08:06 -0600
Subject: [PATCH] [PPC] Prettier printing for failed memory checks.

[PPC] Prettier printing for failed memory checks in tests.
---
 src/xenia/cpu/ppc/testing/ppc_testing_main.cc | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/xenia/cpu/ppc/testing/ppc_testing_main.cc b/src/xenia/cpu/ppc/testing/ppc_testing_main.cc
index 112da086e..bb18dfcb6 100644
--- a/src/xenia/cpu/ppc/testing/ppc_testing_main.cc
+++ b/src/xenia/cpu/ppc/testing/ppc_testing_main.cc
@@ -12,6 +12,7 @@
 #include "xenia/base/main.h"
 #include "xenia/base/math.h"
 #include "xenia/base/platform.h"
+#include "xenia/base/string_buffer.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
 #include "xenia/cpu/cpu_flags.h"
 #include "xenia/cpu/ppc/ppc_context.h"
@@ -325,6 +326,10 @@ class TestRunner {
         auto base_address = memory_->TranslateVirtual(address);
         auto p = base_address;
         const char* c = bytes_str.c_str();
+        bool failed = false;
+        size_t count = 0;
+        StringBuffer expecteds;
+        StringBuffer actuals;
         while (*c) {
           while (*c == ' ') ++c;
           if (!*c) {
@@ -332,18 +337,26 @@ class TestRunner {
           }
           char ccs[3] = {c[0], c[1], 0};
           c += 2;
+          count++;
           uint32_t current_address =
               address + static_cast<uint32_t>(p - base_address);
           uint32_t expected = std::strtoul(ccs, nullptr, 16);
           uint8_t actual = *p;
+
+          expecteds.AppendFormat(" %02X", expected);
+          actuals.AppendFormat(" %02X", actual);
+
           if (expected != actual) {
             any_failed = true;
-            XELOGE("Memory {} assert failed:\n", address_str);
-            XELOGE("  Expected: {:08X} {:02X}\n", current_address, expected);
-            XELOGE("    Actual: {:08X} {:02X}\n", current_address, actual);
+            failed = true;
           }
           ++p;
         }
+        if (failed) {
+          XELOGE("Memory {} assert failed:\n", address_str);
+          XELOGE("  Expected:{}\n", expecteds.to_string());
+          XELOGE("    Actual:{}\n", actuals.to_string());
+        }
       }
     }
     return !any_failed;