adds windows compatibility fixes

gen_input/templates/llvm/vm-vm_CORENAME.cpp.gtl

@@ -30,10 +30,10 @@
  *
  *******************************************************************************/
 
-#include <iss/arch/${coreDef.name.toLowerCase()}.h>
-#include <iss/arch/riscv_hart_m_p.h>
 #include <iss/debugger/gdb_session.h>
 #include <iss/debugger/server.h>
+#include <iss/arch/${coreDef.name.toLowerCase()}.h>
+#include <iss/arch/riscv_hart_m_p.h>
 #include <iss/iss.h>
 #include <iss/llvm/vm_base.h>
 #include <util/logging.h>

src/iss/plugin/cycle_estimate.h

@@ -45,7 +45,7 @@ namespace iss {
 
 namespace plugin {
 
-class cycle_estimate: public iss::vm_plugin {
+class cycle_estimate: public vm_plugin {
 	BEGIN_BF_DECL(instr_desc, uint32_t)
 		BF_FIELD(taken, 24, 8)
 		BF_FIELD(not_taken, 16, 8)

src/main.cpp

@@ -31,7 +31,7 @@
  *******************************************************************************/
 
 #include <iostream>
-#include <iss/factory.h>
+#include "iss/factory.h"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/program_options.hpp>
@@ -43,7 +43,9 @@
 #include "iss/plugin/cycle_estimate.h"
 #include "iss/plugin/instruction_count.h"
 #include "iss/plugin/pctrace.h"
+#ifndef WIN32
 #include <iss/plugin/loader.h>
+#endif
 #if defined(HAS_LUA)
 #include <iss/plugin/lua.h>
 #endif
@@ -181,13 +183,16 @@ int main(int argc, char *argv[]) {
                     vm->register_plugin(*plugin);
                     plugin_list.push_back(plugin);
                } else {
+#ifndef WIN32
                     std::array<char const*, 1> a{{filename.c_str()}};
                     iss::plugin::loader l(plugin_name, {{"initPlugin"}});
                     auto* plugin = l.call_function<iss::vm_plugin*>("initPlugin", a.size(), a.data());
                     if(plugin){
                         vm->register_plugin(*plugin);
                         plugin_list.push_back(plugin);
-                    } else {
+                    } else
+#endif
+                    {
                         LOG(ERR) << "Unknown plugin name: " << plugin_name << ", valid names are 'ce', 'ic'" << std::endl;
                         return 127;
                     }

src/sysc/core_complex.cpp

@@ -37,7 +37,9 @@
 #include <iss/debugger/target_adapter_if.h>
 #include <iss/iss.h>
 #include <iss/vm_types.h>
+#ifndef WIN32
 #include <iss/plugin/loader.h>
+#endif
 #include "core_complex.h"
 #include <iss/arch/tgc_mapper.h>
 #include <scc/report.h>
@@ -409,6 +411,7 @@ void core_complex::before_end_of_elaboration() {
                 cpu->vm->register_plugin(*plugin);
                 plugin_list.push_back(plugin);
             } else {
+#ifndef WIN32
                 std::array<char const*, 1> a{{filename.c_str()}};
                 iss::plugin::loader l(plugin_name, {{"initPlugin"}});
                 auto* plugin = l.call_function<iss::vm_plugin*>("initPlugin", a.size(), a.data());
@@ -416,6 +419,7 @@ void core_complex::before_end_of_elaboration() {
                     cpu->vm->register_plugin(*plugin);
                     plugin_list.push_back(plugin);
                 } else
+#endif
                     SCCERR(SCMOD) << "Unknown plugin '" << plugin_name << "' or plugin not found";
             }
         }

src/vm/interp/vm_tgc_c.cpp

@@ -30,11 +30,10 @@
  *
  *******************************************************************************/
 
-#include <vm/fp_functions.h>
-#include <iss/arch/tgc_c.h>
-#include <iss/arch/riscv_hart_m_p.h>
 #include <iss/debugger/gdb_session.h>
 #include <iss/debugger/server.h>
+#include <iss/arch/tgc_c.h>
+#include <iss/arch/riscv_hart_m_p.h>
 #include <iss/iss.h>
 #include <iss/interp/vm_base.h>
 #include <util/logging.h>