Simplify register_base_instructions

diff --git a/riscv/processor.cc b/riscv/processor.cc
index 962e9cd39f4226828b7b460ed3a2e2758a3217a1..8870cc99c9548aa217f714bf6e5f373db01bd7f6 100644 (file)
--- a/riscv/processor.cc
+++ b/riscv/processor.cc
@@ -557,17 +557,13 @@ void processor_t::register_extension(extension_t* x)
 
 void processor_t::register_base_instructions()
 {
-  std::map<std::string, std::pair<insn_bits_t, insn_bits_t>> opcodes;
-
   #define DECLARE_INSN(name, match, mask) \
-    opcodes[#name] = std::make_pair(match, mask);
+    insn_bits_t name##_match = (match), name##_mask = (mask);
   #include "encoding.h"
   #undef DECLARE_INSN
 
   #define DEFINE_INSN(name) \
-    if (!opcodes.count(#name)) \
-      throw std::logic_error("opcode for " #name " not found"); \
-    REGISTER_INSN(this, name, opcodes[#name].first, opcodes[#name].second)
+    REGISTER_INSN(this, name, name##_match, name##_mask)
   #include "insn_list.h"
   #undef DEFINE_INSN