Fix incorrect instruction mappings (#58)
* Remove left-over 'msr_si_pstate' instruction references
* Remove erroneous trailing underscore in instruction names
diff --git a/src/aarch64/decoder-visitor-map-aarch64.h b/src/aarch64/decoder-visitor-map-aarch64.h
index b202247..58ab316 100644
--- a/src/aarch64/decoder-visitor-map-aarch64.h
+++ b/src/aarch64/decoder-visitor-map-aarch64.h
@@ -2593,7 +2593,6 @@
{"dsb_bo_barriers"_h, &VISITORCLASS::VisitSystem}, \
{"hint_hm_hints"_h, &VISITORCLASS::VisitSystem}, \
{"mrs_rs_systemmove"_h, &VISITORCLASS::VisitSystem}, \
- {"msr_si_pstate"_h, &VISITORCLASS::VisitSystem}, \
{"msr_sr_systemmove"_h, &VISITORCLASS::VisitSystem}, \
{"psb_hc_hints"_h, &VISITORCLASS::VisitSystem}, \
{"sb_only_barriers"_h, &VISITORCLASS::VisitSystem}, \
@@ -2644,7 +2643,7 @@
{"bfdot_asimdelem_e"_h, &VISITORCLASS::VisitUnimplemented}, \
{"bfdot_asimdsame2_d"_h, &VISITORCLASS::VisitUnimplemented}, \
{"bfmlal_asimdelem_f"_h, &VISITORCLASS::VisitUnimplemented}, \
- {"bfmlal_asimdsame2_f_"_h, &VISITORCLASS::VisitUnimplemented}, \
+ {"bfmlal_asimdsame2_f"_h, &VISITORCLASS::VisitUnimplemented}, \
{"bfmmla_asimdsame2_e"_h, &VISITORCLASS::VisitUnimplemented}, \
{"dsb_bon_barriers"_h, &VISITORCLASS::VisitUnimplemented}, \
{"eor3_vvv16_crypto4"_h, &VISITORCLASS::VisitUnimplemented}, \
@@ -2690,13 +2689,13 @@
{"xar_vvv2_crypto3_imm6"_h, &VISITORCLASS::VisitUnimplemented}, \
{"bfcvt_z_p_z_s2bf"_h, &VISITORCLASS::VisitUnimplemented}, \
{"bfcvtnt_z_p_z_s2bf"_h, &VISITORCLASS::VisitUnimplemented}, \
- {"bfdot_z_zzz_"_h, &VISITORCLASS::VisitUnimplemented}, \
- {"bfdot_z_zzzi_"_h, &VISITORCLASS::VisitUnimplemented}, \
- {"bfmlalb_z_zzz_"_h, &VISITORCLASS::VisitUnimplemented}, \
- {"bfmlalb_z_zzzi_"_h, &VISITORCLASS::VisitUnimplemented}, \
- {"bfmlalt_z_zzz_"_h, &VISITORCLASS::VisitUnimplemented}, \
- {"bfmlalt_z_zzzi_"_h, &VISITORCLASS::VisitUnimplemented}, \
- {"bfmmla_z_zzz_"_h, &VISITORCLASS::VisitUnimplemented}, { \
+ {"bfdot_z_zzz"_h, &VISITORCLASS::VisitUnimplemented}, \
+ {"bfdot_z_zzzi"_h, &VISITORCLASS::VisitUnimplemented}, \
+ {"bfmlalb_z_zzz"_h, &VISITORCLASS::VisitUnimplemented}, \
+ {"bfmlalb_z_zzzi"_h, &VISITORCLASS::VisitUnimplemented}, \
+ {"bfmlalt_z_zzz"_h, &VISITORCLASS::VisitUnimplemented}, \
+ {"bfmlalt_z_zzzi"_h, &VISITORCLASS::VisitUnimplemented}, \
+ {"bfmmla_z_zzz"_h, &VISITORCLASS::VisitUnimplemented}, { \
"unallocated"_h, &VISITORCLASS::VisitUnallocated \
}
diff --git a/src/aarch64/disasm-aarch64.cc b/src/aarch64/disasm-aarch64.cc
index ab59949..6f9f6fc 100644
--- a/src/aarch64/disasm-aarch64.cc
+++ b/src/aarch64/disasm-aarch64.cc
@@ -1995,7 +1995,6 @@
case "mrs_rs_systemmove"_h:
form = "'Xt, 'IY";
break;
- case "msr_si_pstate"_h:
case "msr_sr_systemmove"_h:
form = "'IY, 'Xt";
break;