Factor out the dummy RoCC accelerator

[riscv-isa-sim.git] / riscv / extension.h

diff --git a/riscv/extension.h b/riscv/extension.h
index cce8345121f61a9f2fe554d0f284b810977236f5..f73a5a82d592b70f9b9de9e55fce5dea26e2757e 100644 (file)
--- a/riscv/extension.h
+++ b/riscv/extension.h
@@ -3,8 +3,6 @@
 
 #include "processor.h"
 #include "disasm.h"
-#include <map>
-#include <string>
 #include <vector>
 #include <functional>
 
@@ -27,11 +25,12 @@ class extension_t
   void clear_interrupt();
 };
 
-std::map<std::string, std::function<extension_t*()>>& extensions();
+std::function<extension_t*()> find_extension(const char* name);
+void register_extension(const char* name, std::function<extension_t*()> f);
 
 #define REGISTER_EXTENSION(name, constructor) \
   class register_##name { \
-    public: register_##name() { extensions()[#name] = constructor; } \
+    public: register_##name() { register_extension(#name, constructor); } \
   }; static register_##name dummy_##name;
 
 #endif