Machine: fix parse_csr_address

Author: trdthg

src/machine/csr/controlstate.h

@@ -253,7 +253,25 @@ namespace machine { namespace CSR {
         }
     };
 
+    class RegisterMapByName {
+        bool initialized = false;
+        std::unordered_map<const char *, size_t> map;
+
+        void init() {
+            for (size_t i = 0; i < REGISTERS.size(); i++) {
+                map.emplace(REGISTERS[i].name, i);
+            }
+            initialized = true;
+        }
+    public:
+        size_t at(const char* name) {
+            if (!initialized) init();
+            return map.at(name);
+        }
+    };
+
     static RegisterMap REGISTER_MAP;
+    static RegisterMapByName REGISTER_MAP_BY_NAME;
 }} // namespace machine::CSR
 
 Q_DECLARE_METATYPE(machine::CSR::ControlState)

src/machine/instruction.cpp

@@ -145,6 +145,7 @@ struct InstructionMap {
 #define IT_U Instruction::U
 #define IT_J Instruction::J
 #define IT_AMO Instruction::AMO
+#define IT_ZICSR Instruction::ZICSR
 #define IT_UNKNOWN Instruction::UNKNOWN
 
 // clang-format off
@@ -1374,15 +1375,14 @@ bool parse_immediate_value(
 
 uint16_t parse_csr_address(const QString &field_token, uint &chars_taken) {
     if (field_token.at(0).isLetter()) {
-        // TODO maybe optimize
-        for (auto &reg : CSR::REGISTERS) {
-            if (field_token.startsWith(reg.name, Qt::CaseInsensitive)) {
-                chars_taken = strlen(reg.name);
-                return reg.address.data;
-            }
+        size_t index = CSR::REGISTER_MAP_BY_NAME.at(qPrintable(field_token));
+        if (index < 0) {
+            chars_taken = 0;
+            return 0;
         }
-        chars_taken = 0;
-        return 0;
+        auto &reg = CSR::REGISTERS[index];
+        chars_taken = strlen(reg.name);
+        return reg.address.data;
     } else {
         char *r;
         uint64_t val;