Add more ISAs to MARS (#1265)

MIPT-ILab · Mar 18, 2020 · 081acc6 · 081acc6
1 parent b09a401
commit 081acc6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/simulator/kernel/mars/mars_kernel.cpp b/simulator/kernel/mars/mars_kernel.cpp
@@ -13,6 +13,7 @@
 #include <fstream>
 #include <string>
 #include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
 class MARSKernel : public BaseKernel {
@@ -247,12 +248,19 @@ void MARSKernel::connect_mars_handler()
     elf_loader.load_to( mem.get(), 0x8'0000'0180 - elf_loader.get_text_section_addr());
 }
 
+static bool is_mips_le( std::string_view isa)
+{
+    static std::unordered_set<std::string_view> isas =
+        { "mars", "mars64", "mips32le", "mips32", "mips64", "mips64le" };
+    return isas.count( isa) > 0;
+}
+
 void MARSKernel::connect_exception_handler()
 {
     auto isa = sim->get_isa();
     if ( isa == "riscv32" || isa == "riscv64")
         connect_riscv_handler();
-    else if ( isa == "mars" || isa == "mars64" || isa == "mips32le" || isa == "mips32") 
+    else if ( is_mips_le( isa))
         connect_mars_handler();
     else 
         throw UnsupportedISA( isa);

diff --git a/simulator/kernel/mars/t/unit_test.cpp b/simulator/kernel/mars/t/unit_test.cpp
@@ -433,7 +433,7 @@ TEST_CASE( "MARS: unsupported syscall")
 
 TEST_CASE( "MARS: unsupported isa")
 {
-    auto sim = Simulator::create_simulator( "mips64", true);
+    auto sim = Simulator::create_simulator( "mips64be", true);
     auto mars_kernel = create_mars_kernel( std::cin, std::cout, std::cerr);
     mars_kernel->set_simulator( sim);
     CHECK_THROWS_AS( mars_kernel->connect_exception_handler(), UnsupportedISA);