From 705c51ef7c478d537c6c7c391b0e3442810a7114 Mon Sep 17 00:00:00 2001
From: Tim Newsome <tim@sifive.com>
Date: Fri, 31 Aug 2018 12:53:25 -0700
Subject: [PATCH] Fix CustomRegisterTest.

gdb in riscv-tools doesn't automatically create a "custom" group like
mainline gdb does.
---
 debug/gdbserver.py | 3 ++-
 debug/testlib.py   | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debug/gdbserver.py b/debug/gdbserver.py
index c362e1d..1d58f76 100755
--- a/debug/gdbserver.py
+++ b/debug/gdbserver.py
@@ -142,7 +142,8 @@ class CustomRegisterTest(SimpleRegisterTest):
         return self.target.implements_custom_test
 
     def check_custom(self, magic):
-        regs = self.gdb.info_registers("custom")
+        regs = {k: v for k, v in self.gdb.info_registers("all").iteritems()
+                if k.startswith("custom")}
         assertEqual(set(regs.keys()),
                 set(("custom1",
                     "custom12345",
diff --git a/debug/testlib.py b/debug/testlib.py
index 6adc43a..59440b3 100644
--- a/debug/testlib.py
+++ b/debug/testlib.py
@@ -556,12 +556,12 @@ class Gdb(object):
         output = self.command("info registers %s" % group)
         result = {}
         for line in output.splitlines():
+            parts = line.split()
+            name = parts[0]
             if "Could not fetch" in line:
-                name, value = line.split(None, 1)
+                result[name] = " ".join(parts[1:])
             else:
-                name, hex_value, _ = line.split(None, 2)
-                value = int(hex_value, 0)
-            result[name] = value
+                result[name] = int(parts[1], 0)
         return result
 
     def stepi(self):
-- 
2.30.2