soc/integration/soc_core: improve error message for missing csrs

litex/soc/integration/soc_core.py

@@ -258,15 +258,12 @@ class SoCCore(Module):
         try:
             return self.csr_map[name]
         except KeyError as e:
-            raise RuntimeError("""\
+            msg = "Undefined \"{}\" CSR.\n".format(name)
-Unable to find {} in your SoC's csr address map.
+            msg += "Avalaible CSRs in {} ({}):\n".format(
-
+                self.__class__.__name__, inspect.getfile(self.__class__))
-Check {}.csr_map in {}
+            for k in sorted(self.csr_map.keys()):
-
+                msg += "- {}\n".format(k)
-Found {} in the csr_map""".format(
+            raise RuntimeError(msg)
-                name, self.__class__.__name__, inspect.getfile(self.__class__),
-                ", ".join(self.csr_map.keys()))
-            ) from e
         except ValueError:
             return None