fix generator

Author: trdthg

src/machine/instruction.test.data.h

@@ -7,21 +7,21 @@
 {0x10e083, "lwu x1, 1(x1)"},
 {0xf, "fence"},
 {0x100f, "fence.i"},
-{0x8093, "addi x1, x1, 0", "mv x1, x1"}, // failed
+{0x8093, "addi x1, x1, 0", "mv x1, x1"},
 {0x108093, "addi x1, x1, 1"},
 {0x109093, "slli x1, x1, 0x1"},
 {0x10a093, "slti x1, x1, 1"},
-{0x10b093, "sltiu x1, x1, 1", "seqz x1, x1"}, // failed
+{0x10b093, "sltiu x1, x1, 1", "seqz x1, x1"},
 {0x10b093, "sltiu x1, x1, 1"},
-{0xfff0c093, "xori x1, x1, -1", "not x1, x1"}, // failed
+{0xfff0c093, "xori x1, x1, -1", "not x1, x1"},
 {0x10c093, "xori x1, x1, 1"},
 {0x10d093, "srli x1, x1, 0x1"},
 {0x4010d093, "srai x1, x1, 0x1"},
 {0x10e093, "ori x1, x1, 1"},
-{0xff0f093, "andi x1, x1, 255", "zext.b x1, x1"}, // failed
+{0xff0f093, "andi x1, x1, 255", "zext.b x1, x1"},
 {0x10f093, "andi x1, x1, 1"},
 {0x1097, "auipc x1, 0x1"},
-{0x809b, "addiw x1, x1, 0", "sext.w x1, x1"}, // failed
+{0x809b, "addiw x1, x1, 0", "sext.w x1, x1"},
 {0x10809b, "addiw x1, x1, 1"},
 {0x10909b, "slliw x1, x1, 0x1"},
 {0x10d09b, "srliw x1, x1, 0x1"},
@@ -119,13 +119,13 @@
 {0xe410b0af, "amomaxu.d.aq x1, x1, (x1)"},
 {0xe610b0af, "amomaxu.d.aqrl x1, x1, (x1)"},
 {0x1080b3, "add x1, x1, x1"},
-{0x401000b3, "sub x1, x0, x1", "neg x1, x1"}, // failed
+{0x401000b3, "sub x1, x0, x1", "neg x1, x1"},
 {0x401080b3, "sub x1, x1, x1"},
 {0x1090b3, "sll x1, x1, x1"},
-{0xa0b3, "slt x1, x1, x0", "sltz x1, x1"}, // failed
-{0x1020b3, "slt x1, x0, x1", "sgtz x1, x1"}, // failed
+{0xa0b3, "slt x1, x1, x0", "sltz x1, x1"},
+{0x1020b3, "slt x1, x0, x1", "sgtz x1, x1"},
 {0x10a0b3, "slt x1, x1, x1"},
-{0x1030b3, "sltu x1, x0, x1", "snez x1, x1"}, // failed
+{0x1030b3, "sltu x1, x0, x1", "snez x1, x1"},
 {0x10b0b3, "sltu x1, x1, x1"},
 {0x10c0b3, "xor x1, x1, x1"},
 {0x10d0b3, "srl x1, x1, x1"},
@@ -142,7 +142,7 @@
 {0x210f0b3, "remu x1, x1, x1"},
 {0x10b7, "lui x1, 0x1"},
 {0x1080bb, "addw x1, x1, x1"},
-{0x401000bb, "subw x1, x0, x1", "negw x1, x1"}, // failed
+{0x401000bb, "subw x1, x0, x1", "negw x1, x1"},
 {0x401080bb, "subw x1, x1, x1"},
 {0x1090bb, "sllw x1, x1, x1"},
 {0x10d0bb, "srlw x1, x1, x1"},
@@ -152,39 +152,39 @@
 {0x210d0bb, "divuw x1, x1, x1"},
 {0x210e0bb, "remw x1, x1, x1"},
 {0x210f0bb, "remuw x1, x1, x1"},
-{0x8163, "beq x1, x0, 0x2", "beqz x1, 0x2"}, // failed
+{0x8163, "beq x1, x0, 0x2", "beqz x1, 0x2"},
 {0x108163, "beq x1, x1, 0x2"},
-{0x9163, "bne x1, x0, 0x2", "bnez x1, 0x2"}, // failed
+{0x9163, "bne x1, x0, 0x2", "bnez x1, 0x2"},
 {0x109163, "bne x1, x1, 0x2"},
-{0xc163, "blt x1, x0, 0x2", "bltz x1, 0x2"}, // failed
-{0x104163, "blt x0, x1, 0x2", "bgtz x1, 0x2"}, // failed
-{0x10c163, "blt x1, x1, 0x2", "bgt x1, x1, 0x2"}, // failed
+{0xc163, "blt x1, x0, 0x2", "bltz x1, 0x2"},
+{0x104163, "blt x0, x1, 0x2", "bgtz x1, 0x2"},
+{0x10c163, "blt x1, x1, 0x2", "bgt x1, x1, 0x2"},
 {0x10c163, "blt x1, x1, 0x2"},
-{0xd163, "bge x1, x0, 0x2", "bgez x1, 0x2"}, // failed
-{0x10d163, "bge x1, x1, 0x2", "ble x1, x1, 0x2"}, // failed
-{0x105163, "bge x0, x1, 0x2", "blez x1, 0x2"}, // failed
+{0xd163, "bge x1, x0, 0x2", "bgez x1, 0x2"},
+{0x10d163, "bge x1, x1, 0x2", "ble x1, x1, 0x2"},
+{0x105163, "bge x0, x1, 0x2", "blez x1, 0x2"},
 {0x10d163, "bge x1, x1, 0x2"},
-{0x10e163, "bltu x1, x1, 0x2", "bgtu x1, x1, 0x2"}, // failed
+{0x10e163, "bltu x1, x1, 0x2", "bgtu x1, x1, 0x2"},
 {0x10e163, "bltu x1, x1, 0x2"},
-{0x10f163, "bgeu x1, x1, 0x2", "bleu x1, x1, 0x2"}, // failed
+{0x10f163, "bgeu x1, x1, 0x2", "bleu x1, x1, 0x2"},
 {0x10f163, "bgeu x1, x1, 0x2"},
-{0x8067, "jalr x0, 0(x1)", "ret"}, // failed
-{0x8067, "jalr x0, 0(x1)", "jr x1"}, // failed
-{0x108067, "jalr x0, 1(x1)", "jr 1(x1)"}, // failed
-{0x80e7, "jalr x1, 0(x1)", "jalr x1"}, // failed
-{0x1080e7, "jalr x1, 1(x1)", "jalr 1(x1)"}, // failed
-{0x1080e7, "jalr x1, 1(x1)", "jalr x1, x1, 1"}, // failed
+{0x8067, "jalr x0, 0(x1)", "ret"},
+{0x8067, "jalr x0, 0(x1)", "jr x1"},
+{0x108067, "jalr x0, 1(x1)", "jr 1(x1)"},
+{0x80e7, "jalr x1, 0(x1)", "jalr x1"},
+{0x1080e7, "jalr x1, 1(x1)", "jalr 1(x1)"},
+{0x1080e7, "jalr x1, 1(x1)", "jalr x1, x1, 1"},
 {0x1080e7, "jalr x1, 1(x1)"},
-{0x20006f, "jal x0, 0x2", "j 0x2"}, // failed
-{0x2000ef, "jal x1, 0x2", "jal 0x2"}, // failed
+{0x20006f, "jal x0, 0x2", "j 0x2"},
+{0x2000ef, "jal x1, 0x2", "jal 0x2"},
 {0x2000ef, "jal x1, 0x2"},
 {0x73, "ecall"},
 {0x100073, "ebreak"},
 {0x10200073, "sret"},
 {0x30200073, "mret"},
-{0x109073, "csrrw x0, 0x1, x1", "csrw 0x1, x1"}, // failed
+{0x109073, "csrrw x0, 0x1, x1", "csrw 0x1, x1"},
 {0x1090f3, "csrrw x1, 0x1, x1"},
-{0x1020f3, "csrrs x1, 0x1, x0", "csrr x1, 0x1"}, // failed
+{0x1020f3, "csrrs x1, 0x1, x0", "csrr x1, 0x1"},
 {0x10a0f3, "csrrs x1, 0x1, x1"},
 {0x10b0f3, "csrrc x1, 0x1, x1"},
 {0x10d0f3, "csrrwi x1, 0x1, 0x1"},

src/machine/instruction.test.gendata.cpp

@@ -133,15 +133,25 @@ void generate_code_and_string_data(QTextStream& out, const InstructionMap* im_it
         }
 
         QString enum_str;;
-
+        bool check_failed = false;
+        QString parsed_string_data = Instruction(code).to_str();
         if (alias_parent == nullptr) {
             enum_str = QString::asprintf("{0x%x, \"%s\"},", code, qPrintable(string_data));
+            if (parsed_string_data != string_data) {
+                check_failed = true;
+            }
         } else {
-            enum_str = QString::asprintf("{0x%x, \"%s\", \"%s\"},", code, qPrintable(Instruction(code).to_str()), qPrintable(string_data));
+            enum_str = QString::asprintf("{0x%x, \"%s\", \"%s\"},", code, qPrintable(parsed_string_data), qPrintable(string_data));
         }
-        if (Instruction(code).to_str() != string_data) {
+        uint32_t parsed_code;
+        Instruction::code_from_string(&parsed_code, parsed_string_data.length(), string_data, Address(0x0));
+        if (parsed_code != code) {
+            check_failed = true;
+        }
+        if (check_failed) {
             enum_str += " // failed";
         }
+        
         enum_str += "\n";
         out << enum_str;
     }