Implement RVC draft

[riscv-isa-sim.git] / spike_main / spike-dasm.cc

diff --git a/spike_main/spike-dasm.cc b/spike_main/spike-dasm.cc
index d0af451f737c309d901ef1b253074f6c51b513ef..aecaa0a05ec3c3c13cf174572fe8be3c38949414 100644 (file)
--- a/spike_main/spike-dasm.cc
+++ b/spike_main/spike-dasm.cc
@@ -22,6 +22,12 @@ int main(int argc, char** argv)
   std::function<extension_t*()> extension;
   option_parser_t parser;
   parser.option(0, "extension", 1, [&](const char* s){extension = find_extension(s);});
+  parser.parse(argv);
+
+  if (extension) {
+    for (auto disasm_insn : extension()->get_disasms())
+      d.add_insn(disasm_insn);
+  }
 
   while (getline(cin, s))
   {
@@ -31,8 +37,13 @@ int main(int argc, char** argv)
       if (end == string::npos)
         break;
 
+      char* endp;
       size_t numstart = start + strlen("DASM(");
-      insn_bits_t bits = strtoull(&s[numstart], NULL, 16);
+      int64_t bits = strtoull(&s[numstart], &endp, 16);
+      size_t nbits = 4 * (endp - &s[numstart]);
+      if (nbits < 64)
+        bits = bits << (64 - nbits) >> (64 - nbits);
+
       string dis = d.disassemble(bits);
       s = s.substr(0, start) + dis + s.substr(end+1);
       start += dis.length();