From ee6a068b067c64c8c1e4f6fa729817efc315713d Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sun, 1 Oct 2023 18:33:14 +0200
Subject: [PATCH] streamlines backends and reporting

---
 src/main.cpp               | 4 +++-
 src/vm/interp/vm_tgc5c.cpp | 4 ++--
 src/vm/llvm/vm_tgc5c.cpp   | 4 ++--
 src/vm/tcc/vm_tgc5c.cpp    | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index c93d558..bd9638c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -118,7 +118,9 @@ int main(int argc, char *argv[]) {
         iss::cpu_ptr cpu{nullptr};
         std::string isa_opt(clim["isa"].as<std::string>());
         if(isa_opt.size()==0 || isa_opt == "?") {
-            std::cout<<"Available cores: "<<util::join(f.get_names(), ", ")<<std::endl;
+            auto list = f.get_names();
+            std::sort(std::begin(list), std::end(list));
+            std::cout<<"Available implementations (core|platform|backend):\n  - "<<util::join(list, "\n  - ")<<std::endl;
             return 0;
         } else if (isa_opt.find('|') != std::string::npos) {
             std::tie(cpu, vm) = f.create(isa_opt+"|"+clim["backend"].as<std::string>(), clim["gdb-port"].as<unsigned>());
diff --git a/src/vm/interp/vm_tgc5c.cpp b/src/vm/interp/vm_tgc5c.cpp
index f05220b..4f4e494 100644
--- a/src/vm/interp/vm_tgc5c.cpp
+++ b/src/vm/interp/vm_tgc5c.cpp
@@ -2699,13 +2699,13 @@ volatile std::array<bool, 2> dummy = {
 		    auto vm = new interp::tgc5c::vm_impl<arch::tgc5c>(*cpu, false);
 		    if (port != 0) debugger::server<debugger::gdb_session>::run_server(vm, port);
             return {cpu_ptr{cpu}, vm_ptr{vm}};
-        }),
+        })/*,
         core_factory::instance().register_creator("tgc5c|mu_p|interp", [](unsigned port, void*) -> std::tuple<cpu_ptr, vm_ptr>{
             auto* cpu = new iss::arch::riscv_hart_mu_p<iss::arch::tgc5c>();
 		    auto vm = new interp::tgc5c::vm_impl<arch::tgc5c>(*cpu, false);
 		    if (port != 0) debugger::server<debugger::gdb_session>::run_server(vm, port);
             return {cpu_ptr{cpu}, vm_ptr{vm}};
-        })
+        })*/
 };
 }
 }
diff --git a/src/vm/llvm/vm_tgc5c.cpp b/src/vm/llvm/vm_tgc5c.cpp
index 2229db3..460a9d7 100644
--- a/src/vm/llvm/vm_tgc5c.cpp
+++ b/src/vm/llvm/vm_tgc5c.cpp
@@ -4549,13 +4549,13 @@ volatile std::array<bool, 2> dummy = {
             auto* vm = new llvm::tgc5c::vm_impl<arch::tgc5c>(*cpu, false);
             if (port != 0) debugger::server<debugger::gdb_session>::run_server(vm, port);
             return {cpu_ptr{cpu}, vm_ptr{vm}};
-        }),
+        })/*,
         core_factory::instance().register_creator("tgc5c|mu_p|llvm", [](unsigned port, void*) -> std::tuple<cpu_ptr, vm_ptr>{
             auto* cpu = new iss::arch::riscv_hart_mu_p<iss::arch::tgc5c>();
             auto* vm = new llvm::tgc5c::vm_impl<arch::tgc5c>(*cpu, false);
             if (port != 0) debugger::server<debugger::gdb_session>::run_server(vm, port);
             return {cpu_ptr{cpu}, vm_ptr{vm}};
-        })
+        })*/
 };
 }
 }
diff --git a/src/vm/tcc/vm_tgc5c.cpp b/src/vm/tcc/vm_tgc5c.cpp
index 965b9c7..3e8511b 100644
--- a/src/vm/tcc/vm_tgc5c.cpp
+++ b/src/vm/tcc/vm_tgc5c.cpp
@@ -3655,13 +3655,13 @@ volatile std::array<bool, 2> dummy = {
 		    auto vm = new tcc::tgc5c::vm_impl<arch::tgc5c>(*cpu, false);
 		    if (port != 0) debugger::server<debugger::gdb_session>::run_server(vm, port);
             return {cpu_ptr{cpu}, vm_ptr{vm}};
-        }),
+        })/*,
         core_factory::instance().register_creator("tgc5c|mu_p|tcc", [](unsigned port, void*) -> std::tuple<cpu_ptr, vm_ptr>{
             auto* cpu = new iss::arch::riscv_hart_mu_p<iss::arch::tgc5c>();
 		    auto vm = new tcc::tgc5c::vm_impl<arch::tgc5c>(*cpu, false);
 		    if (port != 0) debugger::server<debugger::gdb_session>::run_server(vm, port);
             return {cpu_ptr{cpu}, vm_ptr{vm}};
-        })
+        })*/
 };
 }
 }