fix CMakeList.txt so that it builds without platform and external libs

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "gen_input/CoreDSL-Instruction-Set-Description"]
+	path = gen_input/CoreDSL-Instruction-Set-Description
+	url = ../CoreDSL-Instruction-Set-Description.git

CMakeLists.txt

@@ -1,135 +1,110 @@
 cmake_minimum_required(VERSION 3.12)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) # main (top) cmake dir
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) # project specific cmake dir
 
-# CMake useful variables
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") 
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+project("tgfs" VERSION 1.0.0)
 
-# Set the name of your project here
-project("riscv")
-
-include(Common)
+include(GNUInstallDirs)
 
 conan_basic_setup()
 
 find_package(Boost COMPONENTS program_options system thread filesystem REQUIRED)
-
-# This sets the include directory for the reference project. This is the -I flag in gcc.
-include_directories(
-    ${PROJECT_SOURCE_DIR}/incl
-	${SOFTFLOAT_INCLUDE_DIRS}
-    ${LLVM_INCLUDE_DIRS}
-)
-add_dependent_subproject(dbt-core)
-include_directories(
-    ${PROJECT_SOURCE_DIR}/incl
-    ${PROJECT_SOURCE_DIR}/../external/elfio
-    ${PROJECT_SOURCE_DIR}/../external/libGIS
-    ${Boost_INCLUDE_DIRS}
-)
-
+if(WITH_LLVM)
+	if(DEFINED ENV{LLVM_HOME})
+		find_path (LLVM_DIR LLVM-Config.cmake $ENV{LLVM_HOME}/lib/cmake/llvm)
+	endif(DEFINED ENV{LLVM_HOME})
+	find_package(LLVM REQUIRED CONFIG)
+	message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+	message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
+	llvm_map_components_to_libnames(llvm_libs support core mcjit x86codegen x86asmparser)
+endif()
 
 #Mac needed variables (adapt for your needs - http://www.cmake.org/Wiki/CMake_RPATH_handling#Mac_OS_X_and_the_RPATH)
-set(CMAKE_MACOSX_RPATH ON)
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+#set(CMAKE_MACOSX_RPATH ON)
+#set(CMAKE_SKIP_BUILD_RPATH FALSE)
+#set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+#set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+#set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_subdirectory(softfloat)
 
 # library files
 FILE(GLOB RiscVSCHeaders ${CMAKE_CURRENT_SOURCE_DIR}/incl/sysc/*.h ${CMAKE_CURRENT_SOURCE_DIR}/incl/sysc/*/*.h)
-set(LIB_HEADERS ${RiscVSCHeaders} )
+set(LIB_HEADERS tgfscVSCHeaders} )
 set(LIB_SOURCES 
-	#src/iss/rv32gc.cpp
-	src/iss/rv32imac.cpp
-	#src/iss/rv64i.cpp
-	#src/iss/rv64gc.cpp
-	src/iss/mnrv32.cpp
-	src/vm/llvm/fp_functions.cpp
-	src/vm/llvm/vm_mnrv32.cpp
-	#src/vm/llvm/vm_rv32gc.cpp
-	#src/vm/llvm/vm_rv32imac.cpp
-	#src/vm/llvm/vm_rv64i.cpp
-	#src/vm/llvm/vm_rv64gc.cpp
-	src/vm/tcc/vm_mnrv32.cpp
-	src/vm/interp/vm_mnrv32.cpp
+	src/iss/tgf_b.cpp
+	src/iss/tgf_c.cpp
+	src/vm/fp_functions.cpp
+	src/vm/tcc/vm_tgf_b.cpp
+	src/vm/tcc/vm_tgf_c.cpp
+	src/vm/interp/vm_tgf_b.cpp
+	src/vm/interp/vm_tgf_c.cpp
     src/plugin/instruction_count.cpp
-    src/plugin/cycle_estimate.cpp)
-
-# Define two variables in order not to repeat ourselves.
-set(LIBRARY_NAME riscv)
+    src/plugin/cycle_estimate.cpp
+)
+if(WITH_LLVM)
+set(LIB_SOURCES ${LIB_SOURCES}
+	src/vm/llvm/fp_impl.cpp
+	src/vm/llvm/vm_tgf_b.cpp
+	src/vm/llvm/vm_tgf_c.cpp
+)
+endif()
 
 # Define the library
-add_library(${LIBRARY_NAME} ${LIB_SOURCES})
-SET(${LIBRARY_NAME} -Wl,-whole-archive -l${LIBRARY_NAME} -Wl,-no-whole-archive)
-target_link_libraries(${LIBRARY_NAME} softfloat dbt-core scc-util)
-set_target_properties(${LIBRARY_NAME} PROPERTIES
-  VERSION ${VERSION}  # ${VERSION} was defined in the main CMakeLists.
+add_library(tgfs SHARED ${LIB_SOURCES})
+target_compile_options(tgfs PRIVATE -Wno-shift-count-overflow)
+target_include_directories(tgfs PUBLIC incl)
+target_link_libraries(tgfs PUBLIC softfloat scc-util)
+target_link_libraries(tgfs PUBLIC -Wl,--whole-archive dbt-core -Wl,--no-whole-archive)
+set_target_properties(tgfs PROPERTIES
+  VERSION ${PROJECT_VERSION}
   FRAMEWORK FALSE
   PUBLIC_HEADER "${LIB_HEADERS}" # specify the public headers
 )
 
 if(SystemC_FOUND)
-	set(SC_LIBRARY_NAME riscv_sc)
-	add_library(${SC_LIBRARY_NAME} src/sysc/core_complex.cpp)
-	add_definitions(-DWITH_SYSTEMC) 
-	include_directories(${SystemC_INCLUDE_DIRS})
-	
-	include_directories(${CCI_INCLUDE_DIRS})
+	add_library(tgfs_sc src/sysc/core_complex.cpp)
+	target_compile_definitions(tgfs_sc PUBLIC WITH_SYSTEMC) 
+	target_include_directories(tgfs_sc PUBLIC ../incl ${SystemC_INCLUDE_DIRS} ${CCI_INCLUDE_DIRS})
 	
 	if(SCV_FOUND)   
-	    add_definitions(-DWITH_SCV)
-	    include_directories(${SCV_INCLUDE_DIRS})
+	    target_compile_definitions(tgfs_sc PUBLIC WITH_SCV)
+	    target_include_directories(tgfs_sc PUBLIC ${SCV_INCLUDE_DIRS})
 	endif()
-	target_link_libraries(${SC_LIBRARY_NAME} ${LIBRARY_NAME})
-	target_link_libraries(${SC_LIBRARY_NAME} dbt-core)
-	target_link_libraries(${SC_LIBRARY_NAME} softfloat)
-	target_link_libraries(${SC_LIBRARY_NAME} scc)
-	target_link_libraries(${SC_LIBRARY_NAME} external)
-	target_link_libraries(${SC_LIBRARY_NAME} ${llvm_libs})
-	target_link_libraries(${SC_LIBRARY_NAME} ${Boost_LIBRARIES} )
-	set_target_properties(${SC_LIBRARY_NAME} PROPERTIES
-	  VERSION ${VERSION}  # ${VERSION} was defined in the main CMakeLists.
+	target_link_libraries(tgfs_sc PUBLIC tgfs scc )
+	if(WITH_LLVM)
+		target_link_libraries(tgfs_sc PUBLIC ${llvm_libs})
+	endif()
+	target_link_libraries(tgfs_sc PUBLIC ${Boost_LIBRARIES} )
+	set_target_properties(tgfs_sc PROPERTIES
+	  VERSION ${PROJECT_VERSION}
 	  FRAMEWORK FALSE
 	  PUBLIC_HEADER "${LIB_HEADERS}" # specify the public headers
 	)
 endif()
 
-project("riscv-sim")
-
-# This is a make target, so you can do a "make riscv-sc"
-set(APPLICATION_NAME riscv-sim)
-
-add_executable(${APPLICATION_NAME} src/main.cpp)
+project("tgfs-sim")
+add_executable(tgfs-sim src/main.cpp)
+# This sets the include directory for the reference project. This is the -I flag in gcc.
 
+if(WITH_LLVM)
+	target_compile_definitions(tgfs-sim PRIVATE WITH_LLVM)
+	target_link_libraries(tgfs-sim PUBLIC ${llvm_libs})
+endif()
 # Links the target exe against the libraries
-target_link_libraries(${APPLICATION_NAME} ${LIBRARY_NAME})
-target_link_libraries(${APPLICATION_NAME} jsoncpp)
-target_link_libraries(${APPLICATION_NAME} dbt-core)
-target_link_libraries(${APPLICATION_NAME} external)
-target_link_libraries(${APPLICATION_NAME} ${llvm_libs})
-target_link_libraries(${APPLICATION_NAME} ${Boost_LIBRARIES} )
+target_link_libraries(tgfs-sim tgfs)
+target_link_libraries(tgfs-sim jsoncpp)
+target_link_libraries(tgfs-sim ${Boost_LIBRARIES} )
 if (Tcmalloc_FOUND)
-    target_link_libraries(${APPLICATION_NAME} ${Tcmalloc_LIBRARIES})
+    target_link_libraries(tgfs-sim ${Tcmalloc_LIBRARIES})
 endif(Tcmalloc_FOUND)
 
-# Says how and where to install software
-# Targets:
-#   * <prefix>/lib/<libraries>
-#   * header location after install: <prefix>/include/<project>/*.h
-#   * headers can be included by C++ code `#<project>/Bar.hpp>`
-install(TARGETS ${LIBRARY_NAME} ${APPLICATION_NAME}
+install(TARGETS tgfs tgfs-sim
   EXPORT ${PROJECT_NAME}Targets            # for downstream dependencies
-  ARCHIVE DESTINATION lib COMPONENT libs   # static lib
-  RUNTIME DESTINATION bin COMPONENT libs   # binaries
-  LIBRARY DESTINATION lib COMPONENT libs   # shared lib
-  FRAMEWORK DESTINATION bin COMPONENT libs # for mac
-  PUBLIC_HEADER DESTINATION incl/${PROJECT_NAME} COMPONENT devel   # headers for mac (note the different component -> different package)
-  INCLUDES DESTINATION incl             # headers
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libs   # static lib
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libs   # binaries
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libs   # shared lib
+  FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libs # for mac
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} COMPONENT devel   # headers for mac (note the different component -> different package)
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}             # headers
 )
 
 

CMakeLists.txt.orig

@@ -1,119 +0,0 @@
-cmake_minimum_required(VERSION 3.3)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/sc-components/cmake)
-
-set(ENABLE_SCV TRUE CACHE BOOL "Enable use of SCV")
-set(ENABLE_SHARED TRUE CACHE BOOL "Build shared libraries")
-
-include(GitFunctions)
-get_branch_from_git()
-# if we are not on master or develop set the submodules to develop
-IF(NOT ${GIT_BRANCH} MATCHES "master") 
-	IF(NOT ${GIT_BRANCH} MATCHES "develop") 
-		message(STATUS "main branch is '${GIT_BRANCH}', setting submodules to 'develop'")
-		set(GIT_BRANCH develop)
-	endif()
-endif()
-
-### set the directory names of the submodules
-set(GIT_SUBMODULES elfio libGIS sc-components dbt-core)
-set(GIT_SUBMODULE_DIR_sc-components .)
-set(GIT_SUBMODULE_DIR_dbt-core .)
-### set each submodules's commit or tag that is to be checked out
-### (leave empty if you want master)
-#set(GIT_SUBMODULE_VERSION_sc-comp 3af6b9836589b082c19d9131c5d0b7afa8ddd7cd)
-set(GIT_SUBMODULE_BRANCH_sc-components ${GIT_BRANCH})
-set(GIT_SUBMODULE_BRANCH_dbt-core ${GIT_BRANCH})
-
-include(GNUInstallDirs)
-include(Submodules)
-include(Conan)
-
-#enable_testing() 
-
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
-include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE)
-if(COMPILER_SUPPORTS_MARCH_NATIVE)
-if("${CMAKE_BUILD_TYPE}" STREQUAL "") 
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
-elseif(NOT(${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo"))
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
-endif()
-endif()
-
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    set(warnings "-Wall -Wextra -Werror")
-    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
-    set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
-    set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-    set(warnings "/W4 /WX /EHsc")
-endif()
-
-setup_conan()
-
-# This line finds the boost lib and headers. 
-set(Boost_NO_BOOST_CMAKE ON) #  Don't do a find_package in config mode before searching for a regular boost install.
-find_package(Boost COMPONENTS program_options system thread filesystem REQUIRED)
-
-if(DEFINED ENV{LLVM_HOME})
-	find_path (LLVM_DIR LLVM-Config.cmake $ENV{LLVM_HOME}/lib/cmake/llvm)
-endif(DEFINED ENV{LLVM_HOME})
-find_package(LLVM REQUIRED CONFIG)
-message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
-message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
-llvm_map_components_to_libnames(llvm_libs support core mcjit x86codegen x86asmparser)
-
-find_package(Threads)
-find_package(Tcmalloc)
-find_package(ZLIB)
-find_package(SystemC)
-if(SystemC_FOUND)
-        message(STATUS "SystemC headers at ${SystemC_INCLUDE_DIRS}")
-        message(STATUS "SystemC library at ${SystemC_LIBRARY_DIRS}")
-        if(SCV_FOUND)
-            message(STATUS "SCV headers at ${SCV_INCLUDE_DIRS}")
-            message(STATUS "SCV library at ${SCV_LIBRARY_DIRS}")
-        endif(SCV_FOUND)
-        if(CCI_FOUND)
-            message(STATUS "CCI headers at ${CCI_INCLUDE_DIRS}")
-            message(STATUS "CCI library at ${CCI_LIBRARY_DIRS}")
-        endif()
-endif(SystemC_FOUND)
-
-set(PROJECT_3PARTY_DIRS external)
-include(clang-format)
-
-set(ENABLE_CLANG_TIDY OFF CACHE BOOL "Add clang-tidy automatically to builds")
-if (ENABLE_CLANG_TIDY)
-    find_program (CLANG_TIDY_EXE NAMES "clang-tidy" PATHS /usr/local/opt/llvm/bin )
-    if (CLANG_TIDY_EXE)
-        message(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
-        set(CLANG_TIDY_CHECKS "-*,modernize-*")
-        set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_EXE};-checks=${CLANG_TIDY_CHECKS};-header-filter='${CMAKE_SOURCE_DIR}/*';-fix"
-            CACHE STRING "" FORCE)
-    else()
-        message(AUTHOR_WARNING "clang-tidy not found!")
-        set(CMAKE_CXX_CLANG_TIDY "" CACHE STRING "" FORCE) # delete it
-    endif()
-endif()
-  
-# Set the version number of your project here (format is MAJOR.MINOR.PATCHLEVEL - e.g. 1.0.0)
-set(VERSION_MAJOR "1")
-set(VERSION_MINOR "0")
-set(VERSION_PATCH "0")
-set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-
-add_subdirectory(external)
-add_subdirectory(dbt-core)
-add_subdirectory(sc-components)
-add_subdirectory(softfloat)
-GET_DIRECTORY_PROPERTY(SOFTFLOAT_INCLUDE_DIRS DIRECTORY softfloat DEFINITION SOFTFLOAT_INCLUDE_DIRS)
-add_subdirectory(riscv)
-add_subdirectory(platform)
-
-message(STATUS "Build Type: ${CMAKE_BUILD_TYPE}")

README.md

@@ -1,18 +1,16 @@
-# DBT-RISE-RISCV
-Core of an instruction set simulator based on DBT-RISE implementing the RISC-V ISA. The project is hosted at https://git.minres.com/DBT-RISE/DBT-RISE-RISCV .
+# DBT-RISE-TGFS
+Core of an instruction set simulator based on DBT-RISE implementing Minres The Good Folks Series cores. The project is hosted at https://git.minres.com/DBT-RISE/DBT-RISE-TGFS .
 
-This repo contains only the code of the RISC-V ISS and can only be used with the DBT_RISE. A complete VP using this ISS can be found at https://git.minres.com/VP/RISCV-VP which models SiFives FE310 controlling a brushless DC (BLDC) motor.
+This repo contains only the code of the RISC-V ISS and can only be used with the DBT_RISE. A complete VP using this ISS can be found at https://git.minres.com/VP/Ecosystem-VP ~~which models SiFives FE310 controlling a brushless DC (BLDC) motor~~.
 
 This library provide the infrastructure to build RISC-V ISS. Currently part of the library are the following implementations adhering to version 2.2 of the 'The RISC-V Instruction Set Manual Volume I: User-Level ISA':
 
-* RV32IMAC
-* RV32GC
-* RC64I
-* RV64GC
+* RV32I 	(TGF-B)
+* RV32MIC	(TGF-C)
 
-All pass the respective compliance tests. Along with those ISA implementations there is a wrapper implementing the M/S/U modes inlcuding virtual memory management and CSRs as of privileged spec 1.10. The main.cpp in src allows to build a standalone ISS when integrated into a top-level project. For further information please have a look at [https://git.minres.com/VP/RISCV-VP](https://git.minres.com/VP/RISCV-VP).
+All pass the respective compliance tests. Along with those ISA implementations there is a wrapper (riscv_hart_m_p.h) implementing the Machine privileged mode as of privileged spec 1.10. The main.cpp in src allows to build a stand-alone ISS when integrated into a top-level project. For further information please have a look at [https://git.minres.com/VP/RISCV-VP](https://git.minres.com/VP/RISCV-VP).
 
 Last but not least an SystemC wrapper is provided which allows easy integration into SystemC based virtual platforms.
 
-Since DBT-RISE uses a generative approch other needed combinations or custom extension can be generated. For further information please contact [info@minres.com](mailto:info@minres.com).
+Since DBT-RISE uses a generative approach other needed combinations or custom extension can be generated. For further information please contact [info@minres.com](mailto:info@minres.com).
 

gen_input/RISCVBase.core_desc

@@ -1,50 +0,0 @@
-InsructionSet RISCVBase {
-    constants {
-        XLEN,
-        fence:=0,
-        fencei:=1,
-        fencevmal:=2,
-        fencevmau:=3
-    }
-    
-    address_spaces { 
-        MEM[8], CSR[XLEN], FENCE[XLEN], RES[8]
-    }
-                
-    registers { 
-        [31:0]   X[XLEN],
-                PC[XLEN](is_pc),
-                alias ZERO[XLEN] is X[0],
-                alias RA[XLEN] is X[1],
-                alias SP[XLEN] is X[2],
-                alias GP[XLEN] is X[3],
-                alias TP[XLEN] is X[4],
-                alias T0[XLEN] is X[5],
-                alias T1[XLEN] is X[6],
-                alias T2[XLEN] is X[7],
-                alias S0[XLEN] is X[8],
-                alias S1[XLEN] is X[9],
-                alias A0[XLEN] is X[10],
-                alias A1[XLEN] is X[11],
-                alias A2[XLEN] is X[12],
-                alias A3[XLEN] is X[13],
-                alias A4[XLEN] is X[14],
-                alias A5[XLEN] is X[15],
-                alias A6[XLEN] is X[16],
-                alias A7[XLEN] is X[17],
-                alias S2[XLEN] is X[18],
-                alias S3[XLEN] is X[19],
-                alias S4[XLEN] is X[20],
-                alias S5[XLEN] is X[21],
-                alias S6[XLEN] is X[22],
-                alias S7[XLEN] is X[23],
-                alias S8[XLEN] is X[24],
-                alias S9[XLEN] is X[25],
-                alias S10[XLEN] is X[26],
-                alias S11[XLEN] is X[27],
-                alias T3[XLEN] is X[28],
-                alias T4[XLEN] is X[29],
-                alias T5[XLEN] is X[30],
-                alias T6[XLEN] is X[31]
-    }
-}

gen_input/RV32I.core_desc

@@ -1,309 +0,0 @@
-import "RISCVBase.core_desc"
-
-InsructionSet RV32I extends RISCVBase{
-     
-    instructions { 
-        LUI{
-            encoding: imm[31:12]s | rd[4:0] | b0110111;
-            args_disass: "{name(rd)}, {imm:#05x}";
-            if(rd!=0) X[rd] <= imm;
-        }
-        AUIPC{
-            encoding: imm[31:12]s | rd[4:0] | b0010111;
-            args_disass: "{name(rd)}, {imm:#08x}";
-            if(rd!=0) X[rd] <= PC's+imm;
-        }
-        JAL(no_cont){
-            encoding: imm[20:20]s | imm[10:1]s | imm[11:11]s | imm[19:12]s | rd[4:0] | b1101111;
-            args_disass: "{name(rd)}, {imm:#0x}";
-            if(rd!=0) X[rd] <= PC+4;
-            PC<=PC's+imm;
-        }
-        JALR(no_cont){
-            encoding: imm[11:0]s | rs1[4:0] | b000 | rd[4:0] | b1100111;
-            args_disass: "{name(rd)}, {name(rs1)}, {imm:#0x}";
-            val new_pc[XLEN] <= X[rs1]'s+ imm;
-            val align[XLEN] <= new_pc & 0x2;
-            if(align != 0){
-                raise(0, 0);
-            } else {
-                if(rd!=0) X[rd] <= PC+4;
-                PC<=new_pc & ~0x1;
-            }
-        }
-        BEQ(no_cont,cond){
-            encoding: imm[12:12]s |imm[10:5]s | rs2[4:0] | rs1[4:0] | b000 | imm[4:1]s | imm[11:11]s | b1100011;
-            args_disass:"{name(rs1)}, {name(rs2)}, {imm:#0x}";
-            PC<=choose(X[rs1]==X[rs2], PC's+imm, PC+4);
-        }
-        BNE(no_cont,cond){
-            encoding: imm[12:12]s |imm[10:5]s | rs2[4:0] | rs1[4:0] | b001 | imm[4:1]s | imm[11:11]s | b1100011;
-            args_disass:"{name(rs1)}, {name(rs2)}, {imm:#0x}";
-            PC<=choose(X[rs1]!=X[rs2], PC's+imm, PC+4);
-        }
-        BLT(no_cont,cond){
-            encoding: imm[12:12]s |imm[10:5]s | rs2[4:0] | rs1[4:0] | b100 | imm[4:1]s | imm[11:11]s | b1100011;
-            args_disass:"{name(rs1)}, {name(rs2)}, {imm:#0x}";
-            PC<=choose(X[rs1]s<X[rs2]s, PC's+imm, PC+4);
-        }
-        BGE(no_cont,cond) {
-            encoding: imm[12:12]s |imm[10:5]s | rs2[4:0] | rs1[4:0] | b101 | imm[4:1]s | imm[11:11]s | b1100011;
-            args_disass:"{name(rs1)}, {name(rs2)}, {imm:#0x}";
-            PC<=choose(X[rs1]s>=X[rs2]s, PC's+imm, PC+4);
-        }
-        BLTU(no_cont,cond) {
-            encoding: imm[12:12]s |imm[10:5]s | rs2[4:0] | rs1[4:0] | b110 | imm[4:1]s | imm[11:11]s | b1100011;
-            args_disass:"{name(rs1)}, {name(rs2)}, {imm:#0x}";
-            PC<=choose(X[rs1]<X[rs2],PC's+imm, PC+4);
-        }
-        BGEU(no_cont,cond) {
-            encoding: imm[12:12]s |imm[10:5]s | rs2[4:0] | rs1[4:0] | b111 | imm[4:1]s | imm[11:11]s | b1100011;
-            args_disass:"{name(rs1)}, {name(rs2)}, {imm:#0x}";
-            PC<=choose(X[rs1]>=X[rs2], PC's+imm, PC+4);
-        }
-        LB {
-            encoding: imm[11:0]s | rs1[4:0] | b000 | rd[4:0] | b0000011;
-            args_disass:"{name(rd)}, {imm}({name(rs1)})";
-            val offs[XLEN] <= X[rs1]'s+imm;
-            if(rd!=0) X[rd]<=sext(MEM[offs]);
-        }
-        LH {
-            encoding: imm[11:0]s | rs1[4:0] | b001 | rd[4:0] | b0000011;
-            args_disass:"{name(rd)}, {imm}({name(rs1)})";
-            val offs[XLEN] <= X[rs1]'s+imm;
-            if(rd!=0) X[rd]<=sext(MEM[offs]{16});            
-        }
-        LW {
-            encoding: imm[11:0]s | rs1[4:0] | b010 | rd[4:0] | b0000011;
-            args_disass:"{name(rd)}, {imm}({name(rs1)})";
-            val offs[XLEN] <= X[rs1]'s+imm;
-            if(rd!=0) X[rd]<=sext(MEM[offs]{32});
-        }
-        LBU {
-            encoding: imm[11:0]s | rs1[4:0] | b100 | rd[4:0] | b0000011;
-            args_disass:"{name(rd)}, {imm}({name(rs1)})";
-            val offs[XLEN] <= X[rs1]'s+imm;
-            if(rd!=0) X[rd]<=zext(MEM[offs]);
-        }
-        LHU {
-            encoding: imm[11:0]s | rs1[4:0] | b101 | rd[4:0] | b0000011;
-            args_disass:"{name(rd)}, {imm}({name(rs1)})";
-            val offs[XLEN] <= X[rs1]'s+imm;
-            if(rd!=0) X[rd]<=zext(MEM[offs]{16});            
-        }
-        SB {
-            encoding: imm[11:5]s | rs2[4:0] | rs1[4:0] | b000 | imm[4:0]s | b0100011;
-            args_disass:"{name(rs2)}, {imm}({name(rs1)})";
-            val offs[XLEN] <= X[rs1]'s + imm;
-            MEM[offs] <= X[rs2];
-        }
-        SH {
-            encoding: imm[11:5]s | rs2[4:0] | rs1[4:0] | b001 | imm[4:0]s | b0100011;
-            args_disass:"{name(rs2)}, {imm}({name(rs1)})";
-            val offs[XLEN] <= X[rs1]'s + imm;
-            MEM[offs]{16} <= X[rs2];
-        }
-        SW {
-            encoding: imm[11:5]s | rs2[4:0] | rs1[4:0] | b010 | imm[4:0]s | b0100011;
-            args_disass:"{name(rs2)}, {imm}({name(rs1)})";
-            val offs[XLEN] <= X[rs1]'s + imm;
-            MEM[offs]{32} <= X[rs2];
-        }
-        ADDI {
-            encoding: imm[11:0]s | rs1[4:0] | b000 | rd[4:0] | b0010011;
-            args_disass:"{name(rd)}, {name(rs1)}, {imm}";
-            if(rd != 0) X[rd] <= X[rs1]'s + imm;
-        }
-        SLTI {
-            encoding: imm[11:0]s | rs1[4:0] | b010 | rd[4:0] | b0010011;
-            args_disass:"{name(rd)}, {name(rs1)}, {imm}";
-            if (rd != 0) X[rd] <= choose(X[rs1]s < imm's, 1, 0);
-        }
-        SLTIU {
-            encoding: imm[11:0]s | rs1[4:0] | b011 | rd[4:0] | b0010011;
-            args_disass:"{name(rd)}, {name(rs1)}, {imm}";
-            val full_imm[XLEN] <= imm's;
-            if (rd != 0) X[rd] <= choose(X[rs1]'u < full_imm'u, 1, 0);
-        }
-        XORI {
-            encoding: imm[11:0]s | rs1[4:0] | b100 | rd[4:0] | b0010011;
-            args_disass:"{name(rd)}, {name(rs1)}, {imm}";
-            if(rd != 0) X[rd] <= X[rs1]s ^ imm;
-        }
-        ORI {
-            encoding: imm[11:0]s | rs1[4:0] | b110 | rd[4:0] | b0010011;
-            args_disass:"{name(rd)}, {name(rs1)}, {imm}";
-            if(rd != 0) X[rd] <= X[rs1]s | imm;
-        }
-        ANDI {
-            encoding: imm[11:0]s | rs1[4:0] | b111 | rd[4:0] | b0010011;
-            args_disass:"{name(rd)}, {name(rs1)}, {imm}";
-            if(rd != 0) X[rd] <= X[rs1]s & imm;
-        }
-        SLLI {
-            encoding: b0000000 | shamt[4:0] | rs1[4:0] | b001 | rd[4:0] | b0010011;
-            args_disass:"{name(rd)}, {name(rs1)}, {shamt}";
-            if(shamt > 31){
-                raise(0,0);
-            } else {
-                if(rd != 0) X[rd] <= shll(X[rs1], shamt);
-            }
-        }
-        SRLI {
-            encoding: b0000000 | shamt[4:0] | rs1[4:0] | b101 | rd[4:0] | b0010011;
-            args_disass:"{name(rd)}, {name(rs1)}, {shamt}";
-            if(shamt > 31){
-                raise(0,0);
-            } else {
-                if(rd != 0) X[rd] <= shrl(X[rs1], shamt);
-            }
-        }
-        SRAI {
-            encoding: b0100000 | shamt[4:0] | rs1[4:0] | b101 | rd[4:0] | b0010011;
-            args_disass:"{name(rd)}, {name(rs1)}, {shamt}";
-            if(shamt > 31){
-                raise(0,0);
-            } else {
-                if(rd != 0) X[rd] <= shra(X[rs1], shamt);
-            }
-        }
-        ADD {
-            encoding: b0000000 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0) X[rd] <= X[rs1] + X[rs2];
-        }
-        SUB {
-            encoding: b0100000 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0) X[rd] <= X[rs1] - X[rs2];
-        }
-        SLL {
-            encoding: b0000000 | rs2[4:0] | rs1[4:0] | b001 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0) X[rd] <= shll(X[rs1], X[rs2]&(XLEN-1));
-        }
-        SLT {
-            encoding: b0000000 | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if (rd != 0) X[rd] <= choose(X[rs1]s < X[rs2]s, 1, 0);
-        }
-        SLTU {
-            encoding: b0000000 | rs2[4:0] | rs1[4:0] | b011 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if (rd != 0) X[rd] <= choose(zext(X[rs1]) < zext(X[rs2]), 1, 0);
-        }
-        XOR {
-            encoding: b0000000 | rs2[4:0] | rs1[4:0] | b100 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0) X[rd] <= X[rs1] ^ X[rs2];
-        }
-        SRL {
-            encoding: b0000000 | rs2[4:0] | rs1[4:0] | b101 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0) X[rd] <= shrl(X[rs1], X[rs2]&(XLEN-1));
-        }
-        SRA {
-            encoding: b0100000 | rs2[4:0] | rs1[4:0] | b101 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0) X[rd] <= shra(X[rs1], X[rs2]&(XLEN-1));
-        }
-        OR {
-            encoding: b0000000 | rs2[4:0] | rs1[4:0] | b110 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0) X[rd] <= X[rs1] | X[rs2];
-        }
-        AND {
-            encoding: b0000000 | rs2[4:0] | rs1[4:0] | b111 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0) X[rd] <= X[rs1] & X[rs2];
-        }
-        FENCE {
-            encoding: b0000 | pred[3:0] | succ[3:0] | rs1[4:0] | b000 | rd[4:0] | b0001111;
-            FENCE[fence] <= pred<<4 | succ;
-        }
-        FENCE_I(flush) {
-            encoding: imm[11:0] | rs1[4:0] | b001 | rd[4:0] | b0001111 ;
-            FENCE[fencei] <= imm;
-        }
-        ECALL(no_cont) {
-            encoding: b000000000000 | b00000 | b000 | b00000 | b1110011;
-            raise(0, 11);
-        }
-        EBREAK(no_cont) {
-            encoding: b000000000001 | b00000 | b000 | b00000 | b1110011;
-            raise(0, 3);
-        }
-        URET(no_cont) {
-            encoding: b0000000 | b00010 | b00000 | b000 | b00000 | b1110011;
-            leave(0);
-        }
-        SRET(no_cont)  {
-            encoding: b0001000 | b00010 | b00000 | b000 | b00000 | b1110011;
-            leave(1);
-        }
-        MRET(no_cont) {
-            encoding: b0011000 | b00010 | b00000 | b000 | b00000 | b1110011;
-            leave(3);
-        }
-        WFI  {
-            encoding: b0001000 | b00101 | b00000 | b000 | b00000 | b1110011;
-            wait(1);
-        }
-        SFENCE.VMA {
-            encoding: b0001001 | rs2[4:0] | rs1[4:0] | b000 | b00000 | b1110011;
-            FENCE[fencevmal] <= rs1;
-            FENCE[fencevmau] <= rs2;
-        }
-        CSRRW {
-            encoding: csr[11:0] | rs1[4:0] | b001 | rd[4:0] | b1110011;
-            args_disass:"{name(rd)}, {csr}, {name(rs1)}";
-            val rs_val[XLEN] <= X[rs1];
-            if(rd!=0){
-                val csr_val[XLEN] <= CSR[csr];
-                CSR[csr] <= rs_val; 
-                // make sure Xrd is updated once CSR write succeeds
-                X[rd] <= csr_val;
-            } else {
-                CSR[csr] <= rs_val;
-            }
-        }
-        CSRRS {
-            encoding: csr[11:0] | rs1[4:0] | b010 | rd[4:0] | b1110011;
-            args_disass:"{name(rd)}, {csr}, {name(rs1)}";
-            val xrd[XLEN] <= CSR[csr];
-            val xrs1[XLEN] <= X[rs1];
-            if(rd!=0) X[rd] <= xrd;
-            if(rs1!=0) CSR[csr] <= xrd | xrs1;    
-        }
-        CSRRC {
-            encoding: csr[11:0] | rs1[4:0] | b011 | rd[4:0] | b1110011;
-            args_disass:"{name(rd)}, {csr}, {name(rs1)}";
-            val xrd[XLEN] <= CSR[csr];
-            val xrs1[XLEN] <= X[rs1];
-            if(rd!=0) X[rd] <= xrd;
-            if(rs1!=0) CSR[csr] <= xrd & ~xrs1;    
-        }
-        CSRRWI {
-            encoding: csr[11:0] | zimm[4:0] | b101 | rd[4:0] | b1110011;
-            args_disass:"{name(rd)}, {csr}, {zimm:#0x}";
-            if(rd!=0) X[rd] <= CSR[csr];
-            CSR[csr] <= zext(zimm);    
-        }
-        CSRRSI {
-            encoding: csr[11:0] | zimm[4:0] | b110 | rd[4:0] | b1110011;
-            args_disass:"{name(rd)}, {csr}, {zimm:#0x}";
-            val res[XLEN] <= CSR[csr];
-            if(zimm!=0) CSR[csr] <= res | zext(zimm);
-            // make sure rd is written after csr write succeeds    
-            if(rd!=0) X[rd] <= res;
-        }
-        CSRRCI {
-            encoding: csr[11:0] | zimm[4:0] | b111 | rd[4:0] | b1110011;
-            args_disass:"{name(rd)}, {csr}, {zimm:#0x}";
-            val res[XLEN] <= CSR[csr];
-            if(rd!=0) X[rd] <= res;
-            if(zimm!=0) CSR[csr] <= res & ~zext(zimm, XLEN);    
-        }   
-    }
-}
-

gen_input/RV64I.core_desc

@@ -1,116 +0,0 @@
-import "RV32I.core_desc"
-
-InsructionSet RV64I extends RV32I {
-    instructions{
-        LWU { //    80000104: 0000ef03            lwu t5,0(ra)
-            encoding: imm[11:0]s | rs1[4:0] | b110 | rd[4:0] | b0000011;
-            args_disass:"{name(rd)}, {imm}({name(rs1)})";
-            val offs[XLEN] <= X[rs1]'s+imm;
-            if(rd!=0) X[rd]<=zext(MEM[offs]{32});
-        }
-        LD{
-            encoding: imm[11:0]s | rs1[4:0] | b011 | rd[4:0] | b0000011;
-            args_disass:"{name(rd)}, {imm}({name(rs1)})";
-            val offs[XLEN] <= X[rs1]'s + imm;
-            if(rd!=0) X[rd]<=sext(MEM[offs]{64});
-        }
-        SD{
-            encoding: imm[11:5]s | rs2[4:0] | rs1[4:0] | b011 | imm[4:0]s | b0100011;
-            args_disass:"{name(rs2)}, {imm}({name(rs1)})";
-            val offs[XLEN] <= X[rs1]'s + imm;
-            MEM[offs]{64} <= X[rs2];
-        }
-        SLLI {
-            encoding: b000000 | shamt[5:0] | rs1[4:0] | b001 | rd[4:0] | b0010011;
-            args_disass:"{name(rd)}, {name(rs1)}, {shamt}";
-            if(rd != 0) X[rd] <= shll(X[rs1], shamt);
-        }
-        SRLI {
-            encoding: b000000 | shamt[5:0] | rs1[4:0] | b101 | rd[4:0] | b0010011;
-            args_disass:"{name(rd)}, {name(rs1)}, {shamt}";
-            if(rd != 0) X[rd] <= shrl(X[rs1], shamt);
-        }
-        SRAI {
-            encoding: b010000 | shamt[5:0] | rs1[4:0] | b101 | rd[4:0] | b0010011;
-            args_disass:"{name(rd)}, {name(rs1)}, {shamt}";
-            if(rd != 0) X[rd] <= shra(X[rs1], shamt);
-        }
-        ADDIW {
-            encoding: imm[11:0]s | rs1[4:0] | b000 | rd[4:0] | b0011011;
-            args_disass:"{name(rd)}, {name(rs1)}, {imm}";
-            if(rd != 0){
-                val res[32] <= X[rs1]{32}'s + imm;
-                X[rd] <= sext(res);
-            } 
-        }
-        SLLIW {
-            encoding: b0000000 | shamt[4:0] | rs1[4:0] | b001 | rd[4:0] | b0011011;
-            args_disass:"{name(rd)}, {name(rs1)}, {shamt}";
-            if(rd != 0){
-                val sh_val[32] <= shll(X[rs1]{32}, shamt);
-                X[rd] <= sext(sh_val);
-            } 
-        }
-        SRLIW {
-            encoding: b0000000 | shamt[4:0] | rs1[4:0] | b101 | rd[4:0] | b0011011;
-            args_disass:"{name(rd)}, {name(rs1)}, {shamt}";
-            if(rd != 0){
-                val sh_val[32] <= shrl(X[rs1]{32}, shamt);
-                X[rd] <= sext(sh_val);
-            } 
-        }
-        SRAIW {
-            encoding: b0100000 | shamt[4:0] | rs1[4:0] | b101 | rd[4:0] | b0011011;
-            args_disass:"{name(rd)}, {name(rs1)}, {shamt}";
-            if(rd != 0){
-                val sh_val[32] <= shra(X[rs1]{32}, shamt);    
-                X[rd] <= sext(sh_val);
-            }
-        }
-        ADDW {
-            encoding: b0000000 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b0111011;
-            if(rd != 0){
-                val res[32] <= X[rs1]{32} + X[rs2]{32};
-                X[rd] <= sext(res);
-            } 
-        }
-        SUBW {
-            encoding: b0100000 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b0111011;
-            if(rd != 0){
-                val res[32] <= X[rs1]{32} - X[rs2]{32};
-                X[rd] <= sext(res);
-            } 
-        }
-        SLLW {
-            encoding: b0000000 | rs2[4:0] | rs1[4:0] | b001 | rd[4:0] | b0111011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                val mask[32] <= 0x1f;
-                val count[32] <= X[rs2]{32} & mask;
-                val sh_val[32] <= shll(X[rs1]{32}, count);
-                X[rd] <= sext(sh_val);
-            } 
-        }
-        SRLW {
-            encoding: b0000000 | rs2[4:0] | rs1[4:0] | b101 | rd[4:0] | b0111011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                val mask[32] <= 0x1f;
-                val count[32] <= X[rs2]{32} & mask;
-                val sh_val[32] <= shrl(X[rs1]{32}, count);
-                X[rd] <= sext(sh_val);
-            } 
-        }
-        SRAW {
-            encoding: b0100000 | rs2[4:0] | rs1[4:0] | b101 | rd[4:0] | b0111011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                val mask[32] <= 0x1f;
-                val count[32] <= X[rs2]{32} & mask;
-                val sh_val[32] <= shra(X[rs1]{32}, count);
-                X[rd] <= sext(sh_val);
-            } 
-        }
-    }    
-}
-

gen_input/RVA.core_desc

@@ -1,210 +0,0 @@
-import "RISCVBase.core_desc"
-
-InsructionSet RV32A extends RISCVBase{
-     
-    instructions{
-        LR.W {
-            encoding: b00010 | aq[0:0] | rl[0:0]  | b00000 | rs1[4:0] | b010 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}";
-            if(rd!=0){
-                val offs[XLEN] <= X[rs1];
-                X[rd]<= sext(MEM[offs]{32}, XLEN);
-                RES[offs]{32}<=sext(-1, 32);
-            }
-        }
-        SC.W {
-            encoding: b00011 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)}";
-            val offs[XLEN] <= X[rs1];
-            val res1[32] <= RES[offs]{32};
-            if(res1!=0)
-                MEM[offs]{32} <= X[rs2];
-            if(rd!=0) X[rd]<= choose(res1!=zext(0, 32), 0, 1);
-        }
-        AMOSWAP.W{
-            encoding: b00001 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN]<=X[rs1];
-            if(rd!=0) X[rd]<=sext(MEM[offs]{32});
-            MEM[offs]{32}<=X[rs2];
-        }
-        AMOADD.W{
-            encoding: b00000 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN]<=X[rs1];
-            val res1[XLEN] <= sext(MEM[offs]{32});
-            if(rd!=0) X[rd]<=res1;
-            val res2[XLEN]<=res1 + X[rs2];
-            MEM[offs]{32}<=res2;
-        }
-        AMOXOR.W{
-            encoding: b00100 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN]<=X[rs1];
-            val res1[XLEN] <= sext(MEM[offs]{32});
-            if(rd!=0) X[rd]<=res1;
-            val res2[XLEN]<=res1 ^ X[rs2];
-            MEM[offs]{32}<=res2;
-        }
-        AMOAND.W{
-            encoding: b01100 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN]<=X[rs1];
-            val res1[XLEN] <= sext(MEM[offs]{32});
-            if(rd!=0) X[rd]<=res1;
-            val res2[XLEN] <=res1 & X[rs2];
-            MEM[offs]{32}<=res2;
-        }
-        AMOOR.W {
-            encoding: b01000 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN]<=X[rs1];
-            val res1[XLEN] <= sext(MEM[offs]{32});
-            if(rd!=0) X[rd]<=res1;
-            val res2[XLEN]<=res1 | X[rs2];
-            MEM[offs]{32}<=res2;
-        }
-        AMOMIN.W{
-            encoding: b10000 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN]<=X[rs1];
-            val res1[XLEN] <= sext(MEM[offs]{32});
-            if(rd!=0) X[rd] <= res1;
-            val res2[XLEN] <= choose(res1's > X[rs2]s, X[rs2], res1);
-            MEM[offs]{32} <= res2;
-        }
-        AMOMAX.W{
-            encoding: b10100 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN]<=X[rs1];
-            val res1[XLEN] <= sext(MEM[offs]{32});
-            if(rd!=0) X[rd]<=res1;
-            val res2[XLEN]<= choose(res1's<X[rs2]s, X[rs2], res1);
-            MEM[offs]{32}<=res2;
-        }
-        AMOMINU.W{
-            encoding: b11000 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN]<=X[rs1];
-            val res1[XLEN] <= sext(MEM[offs]{32});
-            if(rd!=0) X[rd]<=res1;
-            val res2[XLEN]<= choose(res1>X[rs2], X[rs2], res1);
-            MEM[offs]{32}<=res2;
-        }
-        AMOMAXU.W{
-            encoding: b11100 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN]<=X[rs1];
-            val res1[XLEN] <= sext(MEM[offs]{32});
-            if(rd!=0) X[rd] <= res1;
-            val res2[XLEN] <= choose(res1 < X[rs2], X[rs2], res1);
-            MEM[offs]{32} <= res2;
-        }
-    }
-}
-
-InsructionSet RV64A extends RV32A {
-     
-    instructions{
-        LR.D {
-            encoding: b00010 | aq[0:0] | rl[0:0]  | b00000 | rs1[4:0] | b011 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}";
-            if(rd!=0){
-                val offs[XLEN] <= X[rs1];
-                X[rd]<= sext(MEM[offs]{64}, XLEN);
-                RES[offs]{64}<=sext(-1, 64);
-            }        
-        }
-        SC.D {
-            encoding: b00011 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b011 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)}";
-            val offs[XLEN] <= X[rs1];
-            val res[64] <= RES[offs];
-            if(res!=0){
-                MEM[offs]{64} <= X[rs2];
-                if(rd!=0) X[rd]<=0;
-            } else{ 
-                if(rd!=0) X[rd]<= 1;
-            }
-        }
-        AMOSWAP.D{
-            encoding: b00001 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b011 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN] <= X[rs1];
-            if(rd!=0) X[rd] <= sext(MEM[offs]{64});
-            MEM[offs]{64} <= X[rs2];            
-        }
-        AMOADD.D{
-            encoding: b00000 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b011 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN] <= X[rs1];
-            val res[XLEN] <= sext(MEM[offs]{64});
-            if(rd!=0) X[rd]<=res;
-            val res2[XLEN] <= res + X[rs2];
-            MEM[offs]{64}<=res2;            
-        }
-        AMOXOR.D{
-            encoding: b00100 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b011 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN] <= X[rs1];
-            val res[XLEN] <= sext(MEM[offs]{64});
-            if(rd!=0) X[rd] <= res;
-            val res2[XLEN] <= res ^ X[rs2];
-            MEM[offs]{64} <= res2;            
-        }
-        AMOAND.D{
-            encoding: b01100 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b011 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN] <= X[rs1];
-            val res[XLEN] <= sext(MEM[offs]{64});
-            if(rd!=0) X[rd] <= res;
-            val res2[XLEN] <= res & X[rs2];
-            MEM[offs]{64} <= res2;            
-        }
-        AMOOR.D {
-            encoding: b01000 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b011 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN] <= X[rs1];
-            val res[XLEN] <= sext(MEM[offs]{64});
-            if(rd!=0) X[rd] <= res;
-            val res2[XLEN] <= res | X[rs2];
-            MEM[offs]{64} <= res2;            
-        }
-        AMOMIN.D{
-            encoding: b10000 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b011 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN] <= X[rs1];
-            val res1[XLEN] <= sext(MEM[offs]{64});
-            if(rd!=0) X[rd] <= res1;
-            val res2[XLEN] <= choose(res1's > X[rs2]s, X[rs2], res1);
-            MEM[offs]{64} <= res2;
-        }
-        AMOMAX.D{
-            encoding: b10100 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b011 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN] <= X[rs1];
-            val res[XLEN] <= sext(MEM[offs]{64});
-            if(rd!=0) X[rd] <= res;
-            val res2[XLEN] <= choose(res s < X[rs2]s, X[rs2], res);            
-            MEM[offs]{64} <= res2;            
-        }
-        AMOMINU.D{
-            encoding: b11000 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b011 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN] <= X[rs1];
-            val res[XLEN] <= sext(MEM[offs]{64});
-            if(rd!=0) X[rd] <= res;
-            val res2[XLEN] <= choose(res > X[rs2], X[rs2], res);            
-            MEM[offs]{64} <= res2;            
-        }
-        AMOMAXU.D{
-            encoding: b11100 | aq[0:0] | rl[0:0] | rs2[4:0] | rs1[4:0] | b011 | rd[4:0] | b0101111;
-            args_disass: "{name(rd)}, {name(rs1)}, {name(rs2)} (aqu={aq},rel={rl})";
-            val offs[XLEN] <= X[rs1];
-            val res1[XLEN] <= sext(MEM[offs]{64});
-            if(rd!=0) X[rd] <= res1;
-            val res2[XLEN] <= choose(res1 < X[rs2], X[rs2], res1);
-            MEM[offs]{64} <= res2;
-        }
-    }
-}

gen_input/RVC.core_desc

@@ -1,367 +0,0 @@
-import "RISCVBase.core_desc"
-
-InsructionSet RV32IC extends RISCVBase{
-
-    instructions{
-        JALR(no_cont){ // overwriting the implementation if rv32i, alignment does not need to be word
-            encoding: imm[11:0]s | rs1[4:0] | b000 | rd[4:0] | b1100111;
-            args_disass: "{name(rd)}, {name(rs1)}, {imm:#0x}";
-            val new_pc[XLEN] <= X[rs1]s + imm;
-            if(rd!=0) X[rd] <= PC+4;
-            PC<=new_pc & ~0x1;
-        }
-        C.ADDI4SPN { //(RES, imm=0)
-            encoding: b000 | imm[5:4] | imm[9:6] | imm[2:2] | imm[3:3] | rd[2:0] | b00;
-            args_disass: "{name(rd)}, {imm:#05x}";
-            if(imm == 0) raise(0, 2);
-            X[rd+8] <= X[2] + imm;
-        }
-        C.LW { // (RV32)
-            encoding: b010 | uimm[5:3] | rs1[2:0] | uimm[2:2] | uimm[6:6] | rd[2:0] | b00;
-            args_disass: "{name(8+rd)}, {uimm:#05x}({name(8+rs1)})";
-            val offs[XLEN] <= X[rs1+8]+uimm;
-            X[rd+8] <= sext(MEM[offs]{32});
-        }
-        C.SW {//(RV32)
-            encoding: b110 | uimm[5:3] | rs1[2:0] | uimm[2:2] | uimm[6:6] | rs2[2:0] | b00;
-            args_disass: "{name(8+rs2)}, {uimm:#05x}({name(8+rs1)})";
-            val offs[XLEN] <= X[rs1+8]+uimm;
-            MEM[offs]{32} <= X[rs2+8];
-        }
-        C.ADDI {//(RV32)
-            encoding:b000 | imm[5:5]s | rs1[4:0] | imm[4:0]s | b01;
-            args_disass: "{name(rs1)}, {imm:#05x}";
-            X[rs1] <= X[rs1]'s + imm;
-        }
-        C.NOP {
-            encoding:b000 | b0 | b00000 | b00000 | b01;
-        }
-        // C.JAL will be overwritten by C.ADDIW for RV64/128
-        C.JAL(no_cont) {//(RV32)
-            encoding: b001 | imm[11:11]s | imm[4:4]s | imm[9:8]s | imm[10:10]s | imm[6:6]s | imm[7:7]s | imm[3:1]s | imm[5:5]s | b01;
-            args_disass: "{imm:#05x}";
-            X[1] <= PC+2;
-            PC<=PC's+imm;
-        }
-        C.LI {//(RV32)
-            encoding:b010 | imm[5:5]s | rd[4:0] | imm[4:0]s | b01;
-            args_disass: "{name(rd)}, {imm:#05x}";
-            if(rd == 0)    raise(0, 2);   //TODO: should it be handled as trap?
-            X[rd] <= imm;
-        }
-        // order matters here as C.ADDI16SP overwrites C.LUI vor rd==2
-        C.LUI {//(RV32)
-            encoding:b011 | imm[17:17] | rd[4:0] | imm[16:12]s | b01;
-            args_disass: "{name(rd)}, {imm:#05x}";
-            if(rd == 0) raise(0, 2);   //TODO: should it be handled as trap?
-            if(imm == 0) raise(0, 2);   //TODO: should it be handled as trap?
-            X[rd] <= imm;
-        }
-        C.ADDI16SP {//(RV32)
-            encoding:b011 | imm[9:9]s | b00010 | imm[4:4]s | imm[6:6]s | imm[8:7]s | imm[5:5]s | b01;
-            args_disass: "{imm:#05x}";
-            X[2] <= X[2]s + imm;
-        }
-        C.SRLI {//(RV32 nse)
-            encoding:b100 | b0 | b00 | rs1[2:0] | shamt[4:0] | b01;
-            args_disass: "{name(8+rs1)}, {shamt}";
-            val rs1_idx[5] <= rs1+8;
-            X[rs1_idx] <= shrl(X[rs1_idx], shamt);
-        }
-        C.SRAI {//(RV32)
-            encoding:b100 | b0 | b01 | rs1[2:0] | shamt[4:0] | b01;
-            args_disass: "{name(8+rs1)}, {shamt}";
-            val rs1_idx[5] <= rs1+8;
-            X[rs1_idx] <= shra(X[rs1_idx], shamt);
-        }
-        C.ANDI {//(RV32)
-            encoding:b100 | imm[5:5]s | b10 | rs1[2:0] | imm[4:0]s | b01;
-            args_disass: "{name(8+rs1)}, {imm:#05x}";
-            val rs1_idx[5] <= rs1 + 8;
-            X[rs1_idx] <= X[rs1_idx]s & imm;
-        }
-        C.SUB {//(RV32)
-            encoding:b100 | b0 | b11 | rd[2:0] | b00 | rs2[2:0] | b01;
-            args_disass: "{name(8+rd)}, {name(8+rs2)}";
-            val rd_idx[5] <= rd + 8;
-            X[rd_idx] <= X[rd_idx] - X[rs2 + 8];
-        }
-        C.XOR {//(RV32)
-            encoding:b100 | b0 | b11 | rd[2:0] | b01 | rs2[2:0] | b01;
-            args_disass: "{name(8+rd)}, {name(8+rs2)}";
-            val rd_idx[5] <= rd + 8;
-            X[rd_idx] <= X[rd_idx] ^ X[rs2 + 8];
-        }
-        C.OR {//(RV32)
-            encoding:b100 | b0 | b11 | rd[2:0] | b10 | rs2[2:0] | b01;
-            args_disass: "{name(8+rd)}, {name(8+rs2)}";
-            val rd_idx[5] <= rd + 8;
-            X[rd_idx] <= X[rd_idx] | X[rs2 + 8];
-        }
-        C.AND {//(RV32)
-            encoding:b100 | b0 | b11 | rd[2:0] | b11 | rs2[2:0] | b01;
-            args_disass: "{name(8+rd)}, {name(8+rs2)}";
-            val rd_idx[5] <= rd + 8;
-            X[rd_idx] <= X[rd_idx] & X[rs2 + 8];
-        }
-        C.J(no_cont) {//(RV32)
-            encoding:b101 | imm[11:11]s | imm[4:4]s | imm[9:8]s | imm[10:10]s | imm[6:6]s | imm[7:7]s | imm[3:1]s | imm[5:5]s | b01;
-            args_disass: "{imm:#05x}";
-            PC<=PC's+imm;
-        }
-        C.BEQZ(no_cont,cond) {//(RV32)
-            encoding:b110 | imm[8:8]s | imm[4:3]s | rs1[2:0] | imm[7:6]s |imm[2:1]s | imm[5:5]s | b01;
-            args_disass: "{name(8+rs1)}, {imm:#05x}";
-            PC<=choose(X[rs1+8]==0, PC's+imm, PC+2);
-        }
-        C.BNEZ(no_cont,cond) {//(RV32)
-            encoding:b111 | imm[8:8]s | imm[4:3]s | rs1[2:0] | imm[7:6]s | imm[2:1]s | imm[5:5]s | b01;
-            args_disass: "{name(8+rs1)}, {imm:#05x}";
-            PC<=choose(X[rs1+8]!=0, PC's+imm, PC+2);
-        }
-        C.SLLI {//(RV32)
-            encoding:b000 | b0 | rs1[4:0] | shamt[4:0] | b10;
-            args_disass: "{name(rs1)}, {shamt}";
-            if(rs1 == 0) raise(0, 2);
-            X[rs1] <= shll(X[rs1], shamt);
-        }
-        C.LWSP {//
-            encoding:b010 | uimm[5:5] | rd[4:0] | uimm[4:2] | uimm[7:6] | b10;
-            args_disass: "{name(rd)}, sp, {uimm:#05x}";
-            val offs[XLEN] <= X[2] + uimm;
-            X[rd] <= sext(MEM[offs]{32});
-        }
-        // order matters as C.JR is a special case of C.MV
-        C.MV {//(RV32)
-            encoding:b100 | b0 | rd[4:0] | rs2[4:0] | b10;
-            args_disass: "{name(rd)}, {name(rs2)}";
-            X[rd] <= X[rs2];
-        }
-        C.JR(no_cont) {//(RV32)
-            encoding:b100 | b0 | rs1[4:0] | b00000 | b10;
-            args_disass: "{name(rs1)}";
-            PC <= X[rs1];
-        }
-        // order matters as C.EBREAK is a special case of C.JALR which is a special case of C.ADD
-        C.ADD {//(RV32)
-            encoding:b100 | b1 | rd[4:0] | rs2[4:0] | b10;
-            args_disass: "{name(rd)}, {name(rs2)}";
-            X[rd] <= X[rd] + X[rs2];
-        }
-        C.JALR(no_cont) {//(RV32)
-            encoding:b100 | b1 | rs1[4:0] | b00000 | b10;
-            args_disass: "{name(rs1)}";
-            X[1] <= PC+2;
-            PC<=X[rs1];
-        }
-        C.EBREAK(no_cont) {//(RV32)
-            encoding:b100 | b1 | b00000 | b00000 | b10;
-            raise(0, 3);
-        }
-        C.SWSP {//
-            encoding:b110 | uimm[5:2] | uimm[7:6] | rs2[4:0] | b10;
-            args_disass: "{name(rs2)}, {uimm:#05x}(sp)";
-            val offs[XLEN] <= X[2] + uimm;
-            MEM[offs]{32} <= X[rs2];
-        }
-        DII(no_cont) { // Defined Illegal Instruction
-            encoding:b000 | b0 | b00000 | b00000 | b00;
-            raise(0, 2);
-        }
-    }
-}
-
-InsructionSet RV32FC extends RV32IC{
-    constants {
-        FLEN
-    }
-    registers { 
-        [31:0]   F[FLEN]
-    }
-    instructions{
-        C.FLW {
-            encoding: b011 | uimm[5:3] | rs1[2:0] | uimm[2:2] | uimm[6:6] | rd[2:0] | b00;
-            args_disass:"f(8+{rd}), {uimm}({name(8+rs1)})";
-            val offs[XLEN] <= X[rs1+8]+uimm;
-            val res[32] <= MEM[offs]{32};
-            if(FLEN==32)
-                F[rd+8] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd+8] <= (upper<<32) | zext(res, FLEN);
-            }
-        } 
-        C.FSW {
-            encoding: b111 | uimm[5:3] | rs1[2:0] | uimm[2:2] | uimm[6:6] | rs2[2:0] | b00;
-            args_disass:"f(8+{rs2}), {uimm}({name(8+rs1)})";
-            val offs[XLEN] <= X[rs1+8]+uimm;
-            MEM[offs]{32}<=F[rs2+8]{32};
-        }
-        C.FLWSP {
-            encoding:b011 | uimm[5:5] | rd[4:0] | uimm[4:2] | uimm[7:6] | b10;
-            args_disass:"f{rd}, {uimm}(x2)";
-            val offs[XLEN] <= X[2]+uimm;
-            val res[32] <= MEM[offs]{32};
-            if(FLEN==32)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-        }
-        C.FSWSP {
-            encoding:b111 | uimm[5:2] | uimm[7:6] | rs2[4:0] | b10;
-            args_disass:"f{rs2}, {uimm}(x2), ";
-            val offs[XLEN] <= X[2]+uimm;
-            MEM[offs]{32}<=F[rs2]{32};
-        }        
-    }
-}
-
-InsructionSet RV32DC extends RV32IC{
-    constants {
-        FLEN
-    }
-    registers { 
-        [31:0]   F[FLEN]
-    }
-    instructions{
-        C.FLD { //(RV32/64)
-            encoding: b001 | uimm[5:3] | rs1[2:0] | uimm[7:6] | rd[2:0] | b00;
-            args_disass:"f(8+{rd}), {uimm}({name(8+rs1)})";
-            val offs[XLEN] <= X[rs1+8]+uimm;
-            val res[64] <= MEM[offs]{64};
-            if(FLEN==64)
-                F[rd+8] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd+8] <= (upper<<64) | res;
-            }
-         }
-        C.FSD { //(RV32/64)
-            encoding: b101 | uimm[5:3] | rs1[2:0] | uimm[7:6] | rs2[2:0] | b00;
-            args_disass:"f(8+{rs2}), {uimm}({name(8+rs1)})";
-            val offs[XLEN] <= X[rs1+8]+uimm;
-            MEM[offs]{64}<=F[rs2+8]{64};
-        } 
-        C.FLDSP {//(RV32/64)
-            encoding:b001 | uimm[5:5] | rd[4:0] | uimm[4:3] | uimm[8:6] | b10;
-            args_disass:"f{rd}, {uimm}(x2)";
-            val offs[XLEN] <= X[2]+uimm;
-            val res[64] <= MEM[offs]{64};
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | zext(res, FLEN);
-            }
-        }
-        C.FSDSP {//(RV32/64)
-            encoding:b101 | uimm[5:3] | uimm[8:6] | rs2[4:0] | b10;
-            args_disass:"f{rs2}, {uimm}(x2), ";
-            val offs[XLEN] <= X[2]+uimm;
-            MEM[offs]{64}<=F[rs2]{64};
-        }
-    }
-}
-
-InsructionSet RV64IC extends RV32IC {
-
-    instructions{
-        C.LD {//(RV64/128) 
-            encoding:b011 | uimm[5:3] | rs1[2:0] | uimm[7:6] | rd[2:0] | b00;
-            args_disass: "{name(8+rd)}, {uimm},({name(8+rs1)})";
-            val offs[XLEN] <= X[rs1+8] + uimm;
-            X[rd+8]<=sext(MEM[offs]{64});
-        }
-        C.SD { //(RV64/128) 
-            encoding:b111 | uimm[5:3] | rs1[2:0] | uimm[7:6] | rs2[2:0] | b00;
-            args_disass: "{name(8+rs2)}, {uimm},({name(8+rs1)})";
-            val offs[XLEN] <= X[rs1+8] + uimm;
-            MEM[offs]{64} <= X[rs2+8];
-        }
-        C.SUBW {//(RV64/128, RV32 res)
-            encoding:b100 | b1 | b11 | rd[2:0] | b00 | rs2[2:0] | b01;
-            args_disass: "{name(8+rd)}, {name(8+rd)}, {name(8+rs2)}";
-            val res[32] <= X[rd+8]{32} - X[rs2+8]{32};
-            X[rd+8] <= sext(res);
-        }
-        C.ADDW {//(RV64/128 RV32 res)
-            encoding:b100 | b1 | b11 | rd[2:0] | b01 | rs2[2:0] | b01;
-            args_disass: "{name(8+rd)}, {name(8+rd)}, {name(8+rs2)}";   
-            val res[32] <= X[rd+8]{32} + X[rs2+8]{32};
-            X[rd+8] <= sext(res);
-        }
-        C.ADDIW {//(RV64/128)
-            encoding:b001 | imm[5:5]s | rs1[4:0] | imm[4:0]s | b01;
-            args_disass: "{name(rs1)}, {imm:#05x}";
-            if(rs1 != 0){
-                val res[32] <= X[rs1]{32}'s + imm;
-                X[rs1] <= sext(res);
-            } 
-        }
-        C.SRLI {//(RV64)
-            encoding:b100 | shamt[5:5] | b00 | rs1[2:0] | shamt[4:0] | b01;
-            args_disass: "{name(8+rs1)}, {shamt}";
-            val rs1_idx[5] <= rs1+8;
-            X[rs1_idx] <= shrl(X[rs1_idx], shamt);
-        }
-        C.SRAI {//(RV64)
-            encoding:b100 | shamt[5:5] | b01 | rs1[2:0] | shamt[4:0] | b01;
-            args_disass: "{name(8+rs1)}, {shamt}";
-            val rs1_idx[5] <= rs1+8;
-            X[rs1_idx] <= shra(X[rs1_idx], shamt);
-        }
-        C.SLLI {//(RV64)
-            encoding:b000 | shamt[5:5] | rs1[4:0] | shamt[4:0] | b10;
-            args_disass: "{name(rs1)}, {shamt}";
-            if(rs1 == 0) raise(0, 2);
-            X[rs1] <= shll(X[rs1], shamt);
-        }
-        C.LDSP {//(RV64/128
-            encoding:b011 | uimm[5:5] | rd[4:0] | uimm[4:3] | uimm[8:6] | b10;
-            args_disass:"{name(rd)}, {uimm}(sp)";
-            val offs[XLEN] <= X[2] + uimm;
-            if(rd!=0) X[rd]<=sext(MEM[offs]{64});
-        }
-        C.SDSP {//(RV64/128)
-            encoding:b111 | uimm[5:3] | uimm[8:6] | rs2[4:0] | b10;
-            args_disass:"{name(rs2)}, {uimm}(sp)";
-            val offs[XLEN] <= X[2] + uimm;
-            MEM[offs]{64} <= X[rs2];
-        }
-    }
-}
-
-InsructionSet RV128IC extends RV64IC {
-
-    instructions{
-        C.SRLI {//(RV128)
-            encoding:b100 | shamt[5:5] | b00 | rs1[2:0] | shamt[4:0] | b01;
-            args_disass: "{name(8+rs1)}, {shamt}";
-            val rs1_idx[5] <= rs1+8;
-            X[rs1_idx] <= shrl(X[rs1_idx], shamt);
-        }
-        C.SRAI {//(RV128)
-            encoding:b100 | shamt[5:5] | b01 | rs1[2:0] | shamt[4:0] | b01;
-            args_disass: "{name(8+rs1)}, {shamt}";
-            val rs1_idx[5] <= rs1+8;
-            X[rs1_idx] <= shra(X[rs1_idx], shamt);
-        }
-        C.SLLI {//(RV128)
-            encoding:b000 | shamt[5:5] | rs1[4:0] | shamt[4:0] | b10;
-            args_disass: "{name(rs1)}, {shamt}";
-            if(rs1 == 0) raise(0, 2);
-            X[rs1] <= shll(X[rs1], shamt);
-        }
-        C.LQ { //(RV128)
-             encoding:b001 | uimm[5:4] | uimm[8:8] | rs1[2:0] | uimm[7:6] | rd[2:0] | b00;
-        }
-        C.SQ { //(RV128) 
-            encoding:b101 | uimm[5:4] | uimm[8:8] | rs1[2:0] | uimm[7:6] | rs2[2:0] | b00;
-        }
-        C.SQSP {//(RV128)
-            encoding:b101 | uimm[5:4] | uimm[9:6] | rs2[4:0] | b10;
-        }
-    }
-}

gen_input/RVD.core_desc

@@ -1,360 +0,0 @@
-import "RISCVBase.core_desc"
-
-InsructionSet RV32D extends RISCVBase{
-    constants {
-        FLEN, FFLAG_MASK := 0x1f
-    } 
-    registers {
-        [31:0]    F[FLEN],  FCSR[32]
-    }    
-    instructions{
-        FLD {
-            encoding: imm[11:0]s | rs1[4:0] | b011 | rd[4:0] | b0000111;
-            args_disass:"f{rd}, {imm}({name(rs1)})";
-            val offs[XLEN] <= X[rs1]'s + imm;
-            val res[64] <= MEM[offs]{64};
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-        }
-        FSD {
-            encoding: imm[11:5]s | rs2[4:0] | rs1[4:0] | b011 | imm[4:0]s | b0100111;
-            args_disass:"f{rs2}, {imm}({name(rs1)})";
-            val offs[XLEN] <= X[rs1]'s + imm;
-            MEM[offs]{64}<=F[rs2]{64};
-        }
-        FMADD.D {
-            encoding: rs3[4:0] | b01 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1000011;
-            args_disass:"{name(rd)}, f{rs1}, f{rs2}, f{rs3}";
-            //F[rd]f<= F[rs1]f * F[rs2]f + F[rs3]f;
-            val res[64] <= fdispatch_fmadd_d(F[rs1]{64}, F[rs2]{64}, F[rs3]{64}, zext(0, 64), choose(rm<7, rm{8}, FCSR{8}));
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FMSUB.D {
-            encoding: rs3[4:0] | b01 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1000111;
-            args_disass:"{name(rd)}, f{rs1}, f{rs2}, f{rs3}";
-            //F[rd]f<=F[rs1]f * F[rs2]f - F[rs3]f;
-            val res[64] <= fdispatch_fmadd_d(F[rs1]{64}, F[rs2]{64}, F[rs3]{64}, zext(1, 32), choose(rm<7, rm{8}, FCSR{8}));
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};    
-        }
-        FNMADD.D {
-            encoding: rs3[4:0] | b01 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1001111;
-            args_disass:"{name(rd)}, f{rs1}, f{rs2}, f{rs3}";
-            //F[rd]f<=-F[rs1]f * F[rs2]f + F[rs3]f;
-            val res[64] <= fdispatch_fmadd_d(F[rs1]{64}, F[rs2]{64}, F[rs3]{64}, zext(2, 32), choose(rm<7, rm{8}, FCSR{8}));
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FNMSUB.D {
-            encoding: rs3[4:0] | b01 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1001011;
-            args_disass:"{name(rd)}, f{rs1}, f{rs2}, f{rs3}";
-            //F[rd]f<=-F[rs1]f * F[rs2]f - F[rs3]f;
-            val res[64] <= fdispatch_fmadd_d(F[rs1]{64}, F[rs2]{64}, F[rs3]{64}, zext(3, 32), choose(rm<7, rm{8}, FCSR{8}));
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FADD.D {
-            encoding: b0000001 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}, f{rs2}";
-            // F[rd]f <= F[rs1]f + F[rs2]f;
-            val res[64] <= fdispatch_fadd_d(F[rs1]{64}, F[rs2]{64}, choose(rm<7, rm{8}, FCSR{8}));
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FSUB.D {
-            encoding: b0000101 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}, f{rs2}";
-            // F[rd]f <= F[rs1]f - F[rs2]f;
-            val res[64] <= fdispatch_fsub_d(F[rs1]{64}, F[rs2]{64}, choose(rm<7, rm{8}, FCSR{8}));
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FMUL.D {
-            encoding: b0001001 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}, f{rs2}";
-            // F[rd]f <= F[rs1]f * F[rs2]f;
-            val res[64] <= fdispatch_fmul_d(F[rs1]{64}, F[rs2]{64}, choose(rm<7, rm{8}, FCSR{8}));
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FDIV.D {
-            encoding: b0001101 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}, f{rs2}";
-            // F[rd]f <= F[rs1]f / F[rs2]f;
-            val res[64] <= fdispatch_fdiv_d(F[rs1]{64}, F[rs2]{64}, choose(rm<7, rm{8}, FCSR{8}));
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FSQRT.D {
-            encoding: b0101101 | b00000 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}";
-            //F[rd]f<=sqrt(F[rs1]f);
-            val res[64] <= fdispatch_fsqrt_d(F[rs1]{64}, choose(rm<7, rm{8}, FCSR{8}));
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FSGNJ.D {
-            encoding: b0010001 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}, f{rs2}";
-            val ONE[64] <= 1;
-            val MSK1[64] <= ONE<<63;
-            val MSK2[64] <= MSK1-1;
-            val res[64] <= (F[rs1]{64} & MSK2) | (F[rs2]{64} & MSK1);
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-        }
-        FSGNJN.D {
-            encoding: b0010001 | rs2[4:0] | rs1[4:0] | b001 | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}, f{rs2}";
-            val ONE[64] <= 1;
-            val MSK1[64] <= ONE<<63;
-            val MSK2[64] <= MSK1-1;
-            val res[64] <= (F[rs1]{64} & MSK2) | (~F[rs2]{64} & MSK1);
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-        }
-        FSGNJX.D {
-            encoding: b0010001 | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}, f{rs2}";
-            val ONE[64] <= 1;
-            val MSK1[64] <= ONE<<63;
-            val res[64] <= F[rs1]{64} ^ (F[rs2]{64} & MSK1);
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-        }
-        FMIN.D  {
-            encoding: b0010101 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}, f{rs2}";
-            //F[rd]f<= choose(F[rs1]f<F[rs2]f, F[rs1]f, F[rs2]f);
-            val res[64] <= fdispatch_fsel_d(F[rs1]{64}, F[rs2]{64}, zext(0, 32));
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FMAX.D {
-            encoding: b0010101 | rs2[4:0] | rs1[4:0] | b001 | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}, f{rs2}";
-            //F[rd]f<= choose(F[rs1]f>F[rs2]f, F[rs1]f, F[rs2]f);
-            val res[64] <= fdispatch_fsel_d(F[rs1]{64}, F[rs2]{64}, zext(1, 32));
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FCVT.S.D {
-            encoding: b0100000 | b00001 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}";
-            val res[32] <= fdispatch_fconv_d2f(F[rs1], rm{8});
-            // NaN boxing
-            val upper[FLEN] <= -1;
-            F[rd] <= upper<<32 | zext(res, FLEN);
-        }
-        FCVT.D.S {
-            encoding: b0100001 | b00000 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}";
-            val res[64] <= fdispatch_fconv_f2d(F[rs1]{32}, rm{8});
-            if(FLEN==64){
-                F[rd] <= res;
-            } else {
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-        }
-        FEQ.D {
-            encoding: b1010001 | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}, f{rs2}";
-            X[rd]<=zext(fdispatch_fcmp_d(F[rs1]{64}, F[rs2]{64}, zext(0, 32)));
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FLT.D {
-            encoding: b1010001 | rs2[4:0] | rs1[4:0] | b001 | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}, f{rs2}";
-            X[rd]<=zext(fdispatch_fcmp_d(F[rs1]{64}, F[rs2]{64}, zext(2, 32)));
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FLE.D {
-            encoding: b1010001 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}, f{rs2}";
-            X[rd]<=zext(fdispatch_fcmp_d(F[rs1]{64}, F[rs2]{64}, zext(1, 32)));
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FCLASS.D {
-            encoding: b1110001 | b00000 | rs1[4:0] | b001 | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}";
-            X[rd]<=fdispatch_fclass_d(F[rs1]{64});
-        }
-        FCVT.W.D {
-            encoding: b1100001 | b00000 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}";
-            X[rd]<= sext(fdispatch_fcvt_64_32(F[rs1]{64}, zext(0, 32), rm{8}), XLEN);
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FCVT.WU.D {
-            encoding: b1100001 | b00001 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}";
-            //FIXME: should be zext accodring to spec but needs to be sext according to tests
-            X[rd]<= sext(fdispatch_fcvt_64_32(F[rs1]{64}, zext(1, 32), rm{8}), XLEN);
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FCVT.D.W {
-            encoding: b1101001 | b00000 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, {name(rs1)}";
-            val res[64] <= fdispatch_fcvt_32_64(sext(X[rs1]{32},64), zext(2, 32), rm{8});
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-        }
-        FCVT.D.WU {
-            encoding: b1101001 | b00001 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, {name(rs1)}";
-            val res[64] <=fdispatch_fcvt_32_64(zext(X[rs1]{32},64), zext(3,32), rm{8});
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-        }
-    }
-}
-InsructionSet RV64D extends RV32D{
-
-    instructions{
-        FCVT.L.D {
-            encoding: b1100001 | b00010 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}";
-            X[rd]<= sext(fdispatch_fcvt_d(F[rs1]{64}, zext(0, 32), rm{8}), XLEN);
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FCVT.LU.D {
-            encoding: b1100001 | b00011 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}";
-            X[rd]<= sext(fdispatch_fcvt_d(F[rs1]{64}, zext(1, 32), rm{8}), XLEN);
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FCVT.D.L {
-            encoding: b1101001 | b00010 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, {name(rs1)}";
-            val res[64] <= fdispatch_fcvt_d(sext(X[rs1],64), zext(2, 32), rm{8});
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-        }
-        FCVT.D.LU {
-            encoding: b1101001 | b00011 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, {name(rs1)}";
-            val res[64] <=fdispatch_fcvt_d(zext(X[rs1],64), zext(3,32), rm{8});
-            if(FLEN==64)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<64) | res;
-            }
-        }
-        FMV.X.D {
-            encoding: b1110001 | b00000 | rs1[4:0] | b000 | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}";
-            X[rd]<=sext(F[rs1]);
-        }
-        FMV.D.X {
-            encoding: b1111001 | b00000 | rs1[4:0] | b000 | rd[4:0] | b1010011;
-            args_disass:"f{rd}, {name(rs1)}";
-            F[rd] <= zext(X[rs1]);
-        }
-    }
-}
-    
-    

gen_input/RVF.core_desc

@@ -1,400 +0,0 @@
-import "RV32I.core_desc"
-
-InsructionSet RV32F extends RV32I{
-    constants {
-        FLEN, FFLAG_MASK := 0x1f
-    } 
-    registers {
-        [31:0]    F[FLEN],  FCSR[32]
-    }    
-    instructions{
-        FLW {
-            encoding: imm[11:0]s | rs1[4:0] | b010 | rd[4:0] | b0000111;
-            args_disass:"f{rd}, {imm}(x{rs1})";
-            val offs[XLEN] <= X[rs1]'s + imm;
-            val res[32] <= MEM[offs]{32};
-            if(FLEN==32)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-        }
-        FSW {
-            encoding: imm[11:5]s | rs2[4:0] | rs1[4:0] | b010 | imm[4:0]s | b0100111;
-            args_disass:"f{rs2}, {imm}(x{rs1})";
-            val offs[XLEN] <= X[rs1]'s + imm;
-            MEM[offs]{32}<=F[rs2]{32};
-        }
-        FMADD.S {
-            encoding: rs3[4:0] | b00 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1000011;
-            args_disass:"x{rd}, f{rs1}, f{rs2}, f{rs3}";
-            //F[rd]f<= F[rs1]f * F[rs2]f + F[rs3]f;
-            if(FLEN==32)
-	            F[rd] <= fdispatch_fmadd_s(F[rs1], F[rs2], F[rs3], zext(0, 32), choose(rm<7, rm{8}, FCSR{8}));
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-	            val frs3[32] <= fdispatch_unbox_s(F[rs3]);
-                val res[32] <= fdispatch_fmadd_s(frs1, frs2, frs3, zext(0, 32), choose(rm<7, rm{8}, FCSR{8}));            
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FMSUB.S {
-            encoding: rs3[4:0] | b00 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1000111;
-            args_disass:"x{rd}, f{rs1}, f{rs2}, f{rs3}";
-            //F[rd]f<=F[rs1]f * F[rs2]f - F[rs3]f;
-            if(FLEN==32)
-	            F[rd] <= fdispatch_fmadd_s(F[rs1], F[rs2], F[rs3], zext(1, 32), choose(rm<7, rm{8}, FCSR{8}));
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-	            val frs3[32] <= fdispatch_unbox_s(F[rs3]);
-                val res[32] <= fdispatch_fmadd_s(frs1, frs2, frs3, zext(1, 32), choose(rm<7, rm{8}, FCSR{8}));
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};    
-        }
-        FNMADD.S {
-            encoding: rs3[4:0] | b00 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1001111;
-            args_disass:"x{rd}, f{rs1}, f{rs2}, f{rs3}";
-            //F[rd]f<=-F[rs1]f * F[rs2]f + F[rs3]f;
-            if(FLEN==32)
-                F[rd] <= fdispatch_fmadd_s(F[rs1], F[rs2], F[rs3], zext(2, 32), choose(rm<7, rm{8}, FCSR{8}));
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-	            val frs3[32] <= fdispatch_unbox_s(F[rs3]);
-                val res[32] <= fdispatch_fmadd_s(frs1, frs2, frs3, zext(2, 32), choose(rm<7, rm{8}, FCSR{8}));
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FNMSUB.S {
-            encoding: rs3[4:0] | b00 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1001011;
-            args_disass:"x{rd}, f{rs1}, f{rs2}, f{rs3}";
-            //F[rd]f<=-F[rs1]f * F[rs2]f - F[rs3]f;
-            if(FLEN==32)
-	            F[rd] <= fdispatch_fmadd_s(F[rs1], F[rs2], F[rs3], zext(3, 32), choose(rm<7, rm{8}, FCSR{8}));
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-	            val frs3[32] <= fdispatch_unbox_s(F[rs3]);
-                val res[32] <= fdispatch_fmadd_s(frs1, frs2, frs3, zext(3, 32), choose(rm<7, rm{8}, FCSR{8}));
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FADD.S {
-            encoding: b0000000 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}, f{rs2}";
-            // F[rd]f <= F[rs1]f + F[rs2]f;
-            if(FLEN==32)
-	            F[rd] <= fdispatch_fadd_s(F[rs1], F[rs2], choose(rm<7, rm{8}, FCSR{8}));
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-                val res[32] <= fdispatch_fadd_s(frs1, frs2, choose(rm<7, rm{8}, FCSR{8}));
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FSUB.S {
-            encoding: b0000100 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}, f{rs2}";
-            // F[rd]f <= F[rs1]f - F[rs2]f;
-            if(FLEN==32)
-	            F[rd] <= fdispatch_fsub_s(F[rs1], F[rs2], choose(rm<7, rm{8}, FCSR{8}));
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-                val res[32] <= fdispatch_fsub_s(frs1, frs2, choose(rm<7, rm{8}, FCSR{8}));
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FMUL.S {
-            encoding: b0001000 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}, f{rs2}";
-            // F[rd]f <= F[rs1]f * F[rs2]f;
-            if(FLEN==32)
-	            F[rd] <= fdispatch_fmul_s(F[rs1], F[rs2], choose(rm<7, rm{8}, FCSR{8}));
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-                val res[32] <= fdispatch_fmul_s(frs1, frs2, choose(rm<7, rm{8}, FCSR{8}));
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FDIV.S {
-            encoding: b0001100 | rs2[4:0] | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}, f{rs2}";
-            // F[rd]f <= F[rs1]f / F[rs2]f;
-            if(FLEN==32)
-	            F[rd] <= fdispatch_fdiv_s(F[rs1], F[rs2], choose(rm<7, rm{8}, FCSR{8}));
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-                val res[32] <= fdispatch_fdiv_s(frs1, frs2, choose(rm<7, rm{8}, FCSR{8}));
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FSQRT.S {
-            encoding: b0101100 | b00000 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}";
-            //F[rd]f<=sqrt(F[rs1]f);
-            if(FLEN==32)
-	            F[rd] <= fdispatch_fsqrt_s(F[rs1], choose(rm<7, rm{8}, FCSR{8}));
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-                val res[32] <= fdispatch_fsqrt_s(frs1, choose(rm<7, rm{8}, FCSR{8}));
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FSGNJ.S {
-            encoding: b0010000 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}, f{rs2}";
-            if(FLEN==32)
-	            F[rd] <= (F[rs1] & 0x7fffffff) | (F[rs2] & 0x80000000);
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-                val res[32] <= (frs1 & 0x7fffffff) | (frs2 & 0x80000000);
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-        }
-        FSGNJN.S {
-            encoding: b0010000 | rs2[4:0] | rs1[4:0] | b001 | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}, f{rs2}";
-            if(FLEN==32)
-	            F[rd] <= (F[rs1] & 0x7fffffff) | (~F[rs2] & 0x80000000);
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-                val res[32] <= (frs1 & 0x7fffffff) | (~frs2 & 0x80000000);
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-        }
-        FSGNJX.S {
-            encoding: b0010000 | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}, f{rs2}";
-            if(FLEN==32)
-	            F[rd] <= F[rs1] ^ (F[rs2] & 0x80000000);
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-                val res[32] <= frs1 ^ (frs2 & 0x80000000);
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-        }
-        FMIN.S  {
-            encoding: b0010100 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}, f{rs2}";
-            //F[rd]f<= choose(F[rs1]f<F[rs2]f, F[rs1]f, F[rs2]f);
-            if(FLEN==32)
-	            F[rd] <= fdispatch_fsel_s(F[rs1], F[rs2], zext(0, 32));
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-                val res[32] <= fdispatch_fsel_s(frs1, frs2, zext(0, 32));
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FMAX.S {
-            encoding: b0010100 | rs2[4:0] | rs1[4:0] | b001 | rd[4:0] | b1010011;
-            args_disass:"f{rd}, f{rs1}, f{rs2}";
-            //F[rd]f<= choose(F[rs1]f>F[rs2]f, F[rs1]f, F[rs2]f);
-            if(FLEN==32)
-	            F[rd] <= fdispatch_fsel_s(F[rs1], F[rs2], zext(1, 32));
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-                val res[32] <= fdispatch_fsel_s(frs1, frs2, zext(1, 32));
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FCVT.W.S {
-            encoding: b1100000 | b00000 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}";
-            if(FLEN==32)
-	            X[rd] <= sext(fdispatch_fcvt_s(F[rs1], zext(0, 32), rm{8}), XLEN);
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-                X[rd]<= sext(fdispatch_fcvt_s(frs1, zext(0, 32), rm{8}), XLEN);
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FCVT.WU.S {
-            encoding: b1100000 | b00001 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}";
-            //FIXME: according to the spec it should be zero-extended not sign extended
-            if(FLEN==32)
-           		 X[rd]<= sext(fdispatch_fcvt_s(F[rs1], zext(1, 32), rm{8}), XLEN);
-            else { // NaN boxing
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-                X[rd]<= sext(fdispatch_fcvt_s(frs1, zext(1, 32), rm{8}), XLEN);
-            }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FEQ.S {
-            encoding: b1010000 | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}, f{rs2}";
-            if(FLEN==32)
-	            X[rd]<=zext(fdispatch_fcmp_s(F[rs1], F[rs2], zext(0, 32)));
-	        else {
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-	            X[rd]<=zext(fdispatch_fcmp_s(frs1, frs2, zext(0, 32)));	        
-	        }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FLT.S {
-            encoding: b1010000 | rs2[4:0] | rs1[4:0] | b001 | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}, f{rs2}";
-            if(FLEN==32)
-            	X[rd]<=zext(fdispatch_fcmp_s(F[rs1], F[rs2], zext(2, 32)));
-	        else {
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-            	X[rd]<=zext(fdispatch_fcmp_s(frs1, frs2, zext(2, 32)));
-            }
-            X[rd]<=fdispatch_fcmp_s(F[rs1]{32}, F[rs2]{32}, zext(2, 32));
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FLE.S {
-            encoding: b1010000 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}, f{rs2}";
-            if(FLEN==32)
-	            X[rd]<=zext(fdispatch_fcmp_s(F[rs1], F[rs2], zext(1, 32)));
-	        else {
-	            val frs1[32] <= fdispatch_unbox_s(F[rs1]);
-	            val frs2[32] <= fdispatch_unbox_s(F[rs2]);
-	            X[rd]<=zext(fdispatch_fcmp_s(frs1, frs2, zext(1, 32)));
-	        }
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FCLASS.S {
-            encoding: b1110000 | b00000 | rs1[4:0] | b001 | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}";
-            X[rd]<=fdispatch_fclass_s(fdispatch_unbox_s(F[rs1]));
-        }
-        FCVT.S.W {
-            encoding: b1101000 | b00000 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, {name(rs1)}";
-            if(FLEN==32)
-	            F[rd]  <= fdispatch_fcvt_s(X[rs1]{32}, zext(2, 32), rm{8});
-            else { // NaN boxing
-                val res[32] <= fdispatch_fcvt_s(X[rs1]{32}, zext(2, 32), rm{8});
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-        }
-        FCVT.S.WU {
-            encoding: b1101000 | b00001 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, {name(rs1)}";
-            if(FLEN==32)
-    	        F[rd]  <=fdispatch_fcvt_s(X[rs1]{32}, zext(3,32), rm{8});
-            else { // NaN boxing
-                val res[32] <=fdispatch_fcvt_s(X[rs1]{32}, zext(3,32), rm{8});
-    	        val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-        }
-        FMV.X.W {
-            encoding: b1110000 | b00000 | rs1[4:0] | b000 | rd[4:0] | b1010011;
-            args_disass:"{name(rd)}, f{rs1}";
-            X[rd]<=sext(F[rs1]{32});
-        }
-        FMV.W.X {
-            encoding: b1111000 | b00000 | rs1[4:0] | b000 | rd[4:0] | b1010011;
-            args_disass:"f{rd}, {name(rs1)}";
-            if(FLEN==32)
-                F[rd] <= X[rs1]{32};
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(X[rs1]{32}, FLEN);
-            }
-        }
-    }
-}
-
-InsructionSet RV64F extends RV32F{
-
-    instructions{
-        FCVT.L.S { // fp to 64bit signed integer
-            encoding: b1100000 | b00010 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"x{rd}, f{rs1}";
-            val res[64] <= fdispatch_fcvt_32_64(fdispatch_unbox_s(F[rs1]), zext(0, 32), rm{8});
-            X[rd]<= sext(res);
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FCVT.LU.S { // fp to 64bit unsigned integer
-            encoding: b1100000 | b00011 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"x{rd}, f{rs1}";
-            val res[64] <= fdispatch_fcvt_32_64(fdispatch_unbox_s(F[rs1]), zext(1, 32), rm{8});
-            X[rd]<= zext(res);
-            val flags[32] <= fdispatch_fget_flags();
-            FCSR <= (FCSR & ~FFLAG_MASK) + flags{5};
-        }
-        FCVT.S.L { // 64bit signed int to to fp 
-            encoding: b1101000 | b00010 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, x{rs1}";
-            val res[32] <= fdispatch_fcvt_64_32(X[rs1], zext(2, 32));
-            if(FLEN==32)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-        }
-        FCVT.S.LU { // 64bit unsigned int to to fp 
-            encoding: b1101000 | b00011 | rs1[4:0] | rm[2:0] | rd[4:0] | b1010011;
-            args_disass:"f{rd}, x{rs1}";
-            val res[32] <=fdispatch_fcvt_64_32(X[rs1], zext(3,32));
-            if(FLEN==32)
-                F[rd] <= res;
-            else { // NaN boxing
-                val upper[FLEN] <= -1;
-                F[rd] <= (upper<<32) | zext(res, FLEN);
-            }
-        }
-	}
-}
-    

gen_input/RVM.core_desc

@@ -1,160 +0,0 @@
-import "RISCVBase.core_desc"
-
-InsructionSet RV32M extends RISCVBase {
-    constants {
-        MAXLEN:=128
-    }
-    instructions{       
-        MUL{
-            encoding: b0000001 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                val res[MAXLEN] <= zext(X[rs1], MAXLEN) * zext(X[rs2], MAXLEN);
-                X[rd]<= zext(res , XLEN);
-            }
-        }
-        MULH {
-            encoding: b0000001 | rs2[4:0] | rs1[4:0] | b001 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                val res[MAXLEN] <= sext(X[rs1], MAXLEN) * sext(X[rs2], MAXLEN);
-                X[rd]<= zext(res >> XLEN, XLEN);
-            }
-        }
-        MULHSU {
-            encoding: b0000001 | rs2[4:0] | rs1[4:0] | b010 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                val res[MAXLEN] <= sext(X[rs1], MAXLEN) * zext(X[rs2], MAXLEN);
-                X[rd]<= zext(res >> XLEN, XLEN);
-            }
-        }
-        MULHU {
-            encoding: b0000001 | rs2[4:0] | rs1[4:0] | b011 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                val res[MAXLEN] <= zext(X[rs1], MAXLEN) * zext(X[rs2], MAXLEN);
-                X[rd]<= zext(res >> XLEN, XLEN);
-            }
-        }
-        DIV {
-            encoding: b0000001 | rs2[4:0] | rs1[4:0] | b100 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                if(X[rs2]!=0){
-                    val M1[XLEN] <= -1;
-                    val XLM1[8] <= XLEN-1;
-                    val ONE[XLEN] <= 1;
-                    val MMIN[XLEN] <= ONE<<XLM1;
-                    if(X[rs1]==MMIN && X[rs2]==M1)
-                        X[rd] <= MMIN;
-                    else
-                        X[rd] <= X[rs1]s / X[rs2]s;
-                }else 
-                    X[rd] <= -1;
-            }
-        }
-        DIVU {
-            encoding: b0000001 | rs2[4:0] | rs1[4:0] | b101 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                if(X[rs2]!=0)
-                    X[rd] <= X[rs1] / X[rs2];
-                else 
-                    X[rd] <= -1;
-            }
-        }
-        REM {
-            encoding: b0000001 | rs2[4:0] | rs1[4:0] | b110 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                if(X[rs2]!=0) {
-                    val M1[XLEN] <= -1; // constant -1 
-                    val XLM1[32] <= XLEN-1;
-                    val ONE[XLEN] <= 1;
-                    val MMIN[XLEN] <= ONE<<XLM1; // -2^(XLEN-1)
-                    if(X[rs1]==MMIN && X[rs2]==M1)
-                        X[rd] <= 0;
-                    else
-                        X[rd] <= X[rs1]'s % X[rs2]'s;
-                } else 
-                    X[rd] <= X[rs1];
-            }
-        }
-        REMU {
-            encoding: b0000001 | rs2[4:0] | rs1[4:0] | b111 | rd[4:0] | b0110011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                if(X[rs2]!=0)
-                    X[rd] <= X[rs1] % X[rs2];
-                else 
-                    X[rd] <= X[rs1];
-            }
-        }
-    }
-}
-
-InsructionSet RV64M extends RV32M {
-    instructions{       
-        MULW{
-            encoding: b0000001 | rs2[4:0] | rs1[4:0] | b000 | rd[4:0] | b0111011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                X[rd]<= sext(X[rs1]{32} * X[rs2]{32});
-            }
-        }
-        DIVW {
-            encoding: b0000001 | rs2[4:0] | rs1[4:0] | b100 | rd[4:0] | b0111011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                if(X[rs2]!=0){
-                    val M1[32] <= -1;
-                    val ONE[32] <= 1;
-                    val MMIN[32] <= ONE<<31;
-                    if(X[rs1]{32}==MMIN && X[rs2]{32}==M1)
-                        X[rd] <= -1<<31;
-                    else
-                        X[rd] <= sext(X[rs1]{32}s / X[rs2]{32}s);
-                }else 
-                    X[rd] <= -1;
-            }
-        }
-        DIVUW {
-            encoding: b0000001 | rs2[4:0] | rs1[4:0] | b101 | rd[4:0] | b0111011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-	            if(X[rs2]{32}!=0)
-	                X[rd] <= sext(X[rs1]{32} / X[rs2]{32});
-	            else 
-	                X[rd] <= -1;
-	        }
-        }
-        REMW {
-            encoding: b0000001 | rs2[4:0] | rs1[4:0] | b110 | rd[4:0] | b0111011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                if(X[rs2]!=0) {
-                    val M1[32] <= -1; // constant -1 
-                    val ONE[32] <= 1;
-                    val MMIN[32] <= ONE<<31; // -2^(XLEN-1)
-                    if(X[rs1]{32}==MMIN && X[rs2]==M1)
-                        X[rd] <= 0;
-                    else
-                        X[rd] <= sext(X[rs1]{32}s % X[rs2]{32}s);
-                } else 
-                    X[rd] <= sext(X[rs1]{32});
-            }
-        }
-        REMUW {
-            encoding: b0000001 | rs2[4:0] | rs1[4:0] | b111 | rd[4:0] | b0111011;
-            args_disass:"{name(rd)}, {name(rs1)}, {name(rs2)}";
-            if(rd != 0){
-                if(X[rs2]{32}!=0)
-                    X[rd] <= sext(X[rs1]{32} % X[rs2]{32});
-                else 
-                    X[rd] <= sext(X[rs1]{32});
-            }
-        }
-    }
-}
-

gen_input/TGFS.core_desc

@@ -0,0 +1,28 @@
+import "CoreDSL-Instruction-Set-Description/RV32I.core_desc"
+import "CoreDSL-Instruction-Set-Description/RVM.core_desc"
+import "CoreDSL-Instruction-Set-Description/RVC.core_desc"
+
+Core TGF_B provides RV32I {
+	constants {
+        XLEN:=32;
+        PCLEN:=32;
+        // definitions for the architecture wrapper
+        //          XL    ZYXWVUTSRQPONMLKJIHGFEDCBA
+        MISA_VAL:=0b01000000000000000000000100000000;
+        PGSIZE := 0x1000; //1 << 12;
+        PGMASK := 0xfff; //PGSIZE-1
+	}
+}
+
+Core TGF_C provides RV32I, RV32M, RV32IC {
+    constants {
+        XLEN:=32;
+        PCLEN:=32;
+        MUL_LEN:=64;
+        // definitions for the architecture wrapper
+        //          XL    ZYXWVUTSRQPONMLKJIHGFEDCBA
+        MISA_VAL:=0b01000000000000000001000100000100;
+        PGSIZE := 0x1000; //1 << 12;
+        PGMASK := 0xfff; //PGSIZE-1
+    }
+}

gen_input/minres_rv.core_desc

@@ -6,6 +6,7 @@ import "RVC.core_desc"
 import "RVF.core_desc"
 import "RVD.core_desc"
 
+
 Core MNRV32 provides RV32I, RV32IC {
     constants {
         XLEN:=32;
@@ -17,11 +18,12 @@ Core MNRV32 provides RV32I, RV32IC {
         PGMASK := 0xfff; //PGSIZE-1
     }
 }
-/*
+
 Core RV32IMAC provides RV32I, RV32M, RV32A, RV32IC {
     constants {
         XLEN:=32;
         PCLEN:=32;
+        MUL_LEN:=64;
         // definitions for the architecture wrapper
         //          XL    ZYXWVUTSRQPONMLKJIHGFEDCBA
         MISA_VAL:=0b01000000000101000001000100000101;
@@ -35,6 +37,7 @@ Core RV32GC provides RV32I, RV32M, RV32A, RV32F, RV32D, RV32IC, RV32FC, RV32DC {
         XLEN:=32;
         FLEN:=64;
         PCLEN:=32;
+        MUL_LEN:=64;
         // definitions for the architecture wrapper
         //          XL    ZYXWVUTSRQPONMLKJIHGFEDCBA
         MISA_VAL:=0b01000000000101000001000100101101;
@@ -55,11 +58,12 @@ Core RV64I provides RV64I {
     }
 }
 
-Core RV64GC provides RV64I, RV64M, RV64A, RV64F, RV64D, RV64IC, RV32FC, RV32DC {
+Core RV64GC provides RV64I, RV64M, RV64A, RV64F, RV64D, RV32FC, RV32DC, RV64IC {
     constants {
         XLEN:=64;
         FLEN:=64;
         PCLEN:=64;
+        MUL_LEN:=128;
         // definitions for the architecture wrapper
         //          XL    ZYXWVUTSRQPONMLKJIHGFEDCBA
         MISA_VAL:=0b01000000000101000001000100101101;
@@ -67,4 +71,4 @@ Core RV64GC provides RV64I, RV64M, RV64A, RV64F, RV64D, RV64IC, RV32FC, RV32DC {
         PGMASK := 0xfff; //PGSIZE-1
     }
 }
-*/
+

gen_input/templates/interp/incl-CORENAME.h.gtl

@@ -172,6 +172,8 @@ struct ${coreDef.name.toLowerCase()}: public arch_if {
 
     inline bool should_stop() { return interrupt_sim; }
 
+    inline uint64_t stop_code() { return interrupt_sim; }
+
     inline phys_addr_t v2p(const iss::addr_t& addr){
         if (addr.space != traits<${coreDef.name.toLowerCase()}>::MEM || addr.type == iss::address_type::PHYSICAL ||
                 addr_mode[static_cast<uint16_t>(addr.access)&0x3]==address_type::PHYSICAL) {
@@ -204,7 +206,7 @@ protected:
 
     std::array<address_type, 4> addr_mode;
     
-    bool interrupt_sim=false;
+    uint64_t interrupt_sim=0;
 <%
 def fcsr = allRegs.find {it.name=='FCSR'}
 if(fcsr != null) {%>

gen_input/templates/interp/src-CORENAME.cpp.gtl

@@ -70,17 +70,7 @@ def getRegisterAliasNames(){
 %>
 #include "util/ities.h"
 #include <util/logging.h>
-
-#include <elfio/elfio.hpp>
 #include <iss/arch/${coreDef.name.toLowerCase()}.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <ihex.h>
-#ifdef __cplusplus
-}
-#endif
 #include <cstdio>
 #include <cstring>
 #include <fstream>

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

@@ -30,8 +30,9 @@
  *
  *******************************************************************************/
 
+#include "../fp_functions.h"
 #include <iss/arch/${coreDef.name.toLowerCase()}.h>
-#include <iss/arch/riscv_hart_msu_vp.h>
+#include <iss/arch/riscv_hart_m_p.h>
 #include <iss/debugger/gdb_session.h>
 #include <iss/debugger/server.h>
 #include <iss/iss.h>

gen_input/templates/llvm/incl-CORENAME.h.gtl

@@ -172,6 +172,8 @@ struct ${coreDef.name.toLowerCase()}: public arch_if {
 
     inline bool should_stop() { return interrupt_sim; }
 
+    inline uint64_t stop_code() { return interrupt_sim; }
+
     inline phys_addr_t v2p(const iss::addr_t& addr){
         if (addr.space != traits<${coreDef.name.toLowerCase()}>::MEM || addr.type == iss::address_type::PHYSICAL ||
                 addr_mode[static_cast<uint16_t>(addr.access)&0x3]==address_type::PHYSICAL) {
@@ -204,7 +206,7 @@ protected:
 
     std::array<address_type, 4> addr_mode;
     
-    bool interrupt_sim=false;
+    uint64_t interrupt_sim=0;
 <%
 def fcsr = allRegs.find {it.name=='FCSR'}
 if(fcsr != null) {%>

gen_input/templates/llvm/src-CORENAME.cpp.gtl

@@ -70,17 +70,7 @@ def getRegisterAliasNames(){
 %>
 #include "util/ities.h"
 #include <util/logging.h>
-
-#include <elfio/elfio.hpp>
 #include <iss/arch/${coreDef.name.toLowerCase()}.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <ihex.h>
-#ifdef __cplusplus
-}
-#endif
 #include <cstdio>
 #include <cstring>
 #include <fstream>

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

@@ -31,7 +31,7 @@
  *******************************************************************************/
 
 #include <iss/arch/${coreDef.name.toLowerCase()}.h>
-#include <iss/arch/riscv_hart_msu_vp.h>
+#include <iss/arch/riscv_hart_m_p.h>
 #include <iss/debugger/gdb_session.h>
 #include <iss/debugger/server.h>
 #include <iss/iss.h>
@@ -57,7 +57,7 @@ using namespace ::llvm;
 using namespace iss::arch;
 using namespace iss::debugger;
 
-template <typename ARCH> class vm_impl : public vm::llvm::vm_base<ARCH> {
+template <typename ARCH> class vm_impl : public iss::llvm::vm_base<ARCH> {
 public:
     using super = typename iss::llvm::vm_base<ARCH>;
     using virt_addr_t = typename super::virt_addr_t;

gen_input/templates/tcc/src-CORENAME.cpp.gtl

@@ -70,17 +70,7 @@ def getRegisterAliasNames(){
 %>
 #include "util/ities.h"
 #include <util/logging.h>
-
-#include <elfio/elfio.hpp>
 #include <iss/arch/${coreDef.name.toLowerCase()}.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <ihex.h>
-#ifdef __cplusplus
-}
-#endif
 #include <cstdio>
 #include <cstring>
 #include <fstream>

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

@@ -31,7 +31,7 @@
  *******************************************************************************/
 
 #include <iss/arch/${coreDef.name.toLowerCase()}.h>
-#include <iss/arch/riscv_hart_msu_vp.h>
+#include <iss/arch/riscv_hart_m_p.h>
 #include <iss/debugger/gdb_session.h>
 #include <iss/debugger/server.h>
 #include <iss/iss.h>
@@ -184,8 +184,8 @@ private:
 
     const std::array<InstructionDesriptor, ${instructions.size}> instr_descr = {{
          /* entries are: size, valid value, valid mask, function ptr */<%instructions.each{instr -> %>
-        /* instruction ${instr.instruction.name} */
-        {${instr.length}, ${instr.value}, ${instr.mask}, &this_class::__${generator.functionName(instr.name)}},<%}%>
+        /* instruction ${instr.instruction.name}, encoding '${instr.encoding}' */
+        {${instr.length}, 0b${instr.value}, 0b${instr.mask}, &this_class::__${generator.functionName(instr.name)}},<%}%>
     }};
  
     /* instruction definitions */<%instructions.eachWithIndex{instr, idx -> %>

incl/iss/arch/riscv_hart_m_p.h

@@ -43,9 +43,9 @@
 #ifndef FMT_HEADER_ONLY
 #define FMT_HEADER_ONLY
 #endif
-#include <fmt/format.h>
 #include <array>
 #include <elfio/elfio.hpp>
+#include <fmt/format.h>
 #include <iomanip>
 #include <sstream>
 #include <type_traits>
@@ -174,8 +174,6 @@ enum riscv_csr {
 
 namespace {
 
-std::array<const char, 4> lvl = {{'U', 'S', 'H', 'M'}};
-
 std::array<const char *, 16> trap_str = {{""
                                           "Instruction address misaligned", // 0
                                           "Instruction access fault",       // 1
@@ -233,14 +231,6 @@ enum {
     ISA_U = 1 << 20
 };
 
-struct vm_info {
-    int levels;
-    int idxbits;
-    int ptesize;
-    uint64_t ptbase;
-    bool is_active() { return levels; }
-};
-
 class trap_load_access_fault : public trap_access {
 public:
     trap_load_access_fault(uint64_t badaddr)
@@ -251,28 +241,12 @@ public:
     illegal_instruction_fault(uint64_t badaddr)
     : trap_access(2 << 16, badaddr) {}
 };
-class trap_instruction_page_fault : public trap_access {
-public:
-    trap_instruction_page_fault(uint64_t badaddr)
-    : trap_access(12 << 16, badaddr) {}
-};
-class trap_load_page_fault : public trap_access {
-public:
-    trap_load_page_fault(uint64_t badaddr)
-    : trap_access(13 << 16, badaddr) {}
-};
-class trap_store_page_fault : public trap_access {
-public:
-    trap_store_page_fault(uint64_t badaddr)
-    : trap_access(15 << 16, badaddr) {}
-};
-}
+} // namespace
 
-template <typename BASE> class riscv_hart_msu_vp : public BASE {
+template <typename BASE> class riscv_hart_m_p : public BASE {
 public:
     using super = BASE;
-    using this_class = riscv_hart_msu_vp<BASE>;
-    using virt_addr_t = typename super::virt_addr_t;
+    using this_class = riscv_hart_m_p<BASE>;
     using phys_addr_t = typename super::phys_addr_t;
     using reg_t = typename super::reg_t;
     using addr_t = typename super::addr_t;
@@ -326,8 +300,8 @@ public:
 
         static const reg_t mstatus_reset_val = 0;
 
-        void write_mstatus(T val, unsigned priv_lvl) {
-            auto mask = get_mask(priv_lvl);
+        void write_mstatus(T val) {
+            auto mask = get_mask();
             auto new_val = (mstatus.st.value & ~mask) | (val & mask);
             mstatus = new_val;
         }
@@ -336,156 +310,37 @@ public:
 
         static constexpr T get_misa() { return (1UL << 30) | ISA_I | ISA_M | ISA_A | ISA_U | ISA_S | ISA_M; }
 
-        static constexpr uint32_t get_mask(unsigned priv_lvl) {
-#if __cplusplus < 201402L
-            return priv_lvl == PRIV_U ? 0x80000011UL : priv_lvl == PRIV_S ? 0x800de133UL : 0x807ff9ddUL;
-#else
-            switch (priv_lvl) {
-            case PRIV_U: return 0x80000011UL; // 0b1000 0000 0000 0000 0000 0000 0001 0001
-            case PRIV_S: return 0x800de133UL; // 0b1000 0000 0000 1101 1110 0001 0011 0011
-            default:     return 0x807ff9ddUL; // 0b1000 0000 0111 1111 1111 1001 1011 1011
-            }
-#endif
-        }
-
-        static inline vm_info decode_vm_info(uint32_t state, T sptbr) {
-            if (state == PRIV_M) return {0, 0, 0, 0};
-            if (state <= PRIV_S)
-                switch (bit_sub<31, 1>(sptbr)) {
-                case 0:  return {0, 0, 0, 0}; // off
-                case 1:  return {2, 10, 4, bit_sub<0, 22>(sptbr) << PGSHIFT}; // SV32
-                default: abort();
-                }
-            abort();
-            return {0, 0, 0, 0}; // dummy
-        }
-    };
-    // specialization 64bit
-    template <typename T> class hart_state<T, typename std::enable_if<std::is_same<T, uint64_t>::value>::type> {
-    public:
-        BEGIN_BF_DECL(mstatus_t, T);
-        // SD bit is read-only and is set when either the FS or XS bits encode a Dirty state (i.e., SD=((FS==11) OR XS==11)))
-        BF_FIELD(SD, 63, 1);
-        // value of XLEN for S-mode
-        BF_FIELD(SXL, 34, 2);
-        // value of XLEN for U-mode
-        BF_FIELD(UXL, 32, 2);
-        // Trap SRET
-        BF_FIELD(TSR, 22, 1);
-        // Timeout Wait
-        BF_FIELD(TW, 21, 1);
-        // Trap Virtual Memory
-        BF_FIELD(TVM, 20, 1);
-        // Make eXecutable Readable
-        BF_FIELD(MXR, 19, 1);
-        // permit Supervisor User Memory access
-        BF_FIELD(SUM, 18, 1);
-        // Modify PRiVilege
-        BF_FIELD(MPRV, 17, 1);
-        // status of additional user-mode extensions and associated state, All off/None dirty or clean, some on/None dirty, some clean/Some dirty
-        BF_FIELD(XS, 15, 2);
-        // floating-point unit status Off/Initial/Clean/Dirty
-        BF_FIELD(FS, 13, 2);
-        // machine previous privilege
-        BF_FIELD(MPP, 11, 2);
-        // supervisor previous privilege
-        BF_FIELD(SPP, 8, 1);
-        // previous machine interrupt-enable
-        BF_FIELD(MPIE, 7, 1);
-        // previous supervisor interrupt-enable
-        BF_FIELD(SPIE, 5, 1);
-        // previous user interrupt-enable
-        BF_FIELD(UPIE, 4, 1);
-        // machine interrupt-enable
-        BF_FIELD(MIE, 3, 1);
-        // supervisor interrupt-enable
-        BF_FIELD(SIE, 1, 1);
-        // user interrupt-enable
-        BF_FIELD(UIE, 0, 1);
-        END_BF_DECL();
-
-        mstatus_t mstatus;
-
-        static const reg_t mstatus_reset_val = 0xa00000000;
-
-        void write_mstatus(T val, unsigned priv_lvl) {
-            T old_val = mstatus;
-            auto mask = get_mask(priv_lvl);
-            auto new_val = (old_val & ~mask) | (val & mask);
-            if ((new_val & mstatus.SXL.Mask) == 0) {
-                new_val |= old_val & mstatus.SXL.Mask;
-            }
-            if ((new_val & mstatus.UXL.Mask) == 0) {
-                new_val |= old_val & mstatus.UXL.Mask;
-            }
-            mstatus = new_val;
-        }
-
-        T satp;
-
-        static constexpr T get_misa() { return (2ULL << 62) | ISA_I | ISA_M | ISA_A | ISA_U | ISA_S | ISA_M; }
-
-        static constexpr T get_mask(unsigned priv_lvl) {
-            uint64_t ret;
-            switch (priv_lvl) {
-            case PRIV_U: ret = 0x8000000f00000011ULL;break; // 0b1...0 1111 0000 0000 0111 1111 1111 1001 1011 1011
-            case PRIV_S: ret = 0x8000000f000de133ULL;break; // 0b1...0 0011 0000 0000 0000 1101 1110 0001 0011 0011
-            default:     ret = 0x8000000f007ff9ddULL;break; // 0b1...0 1111 0000 0000 0111 1111 1111 1001 1011 1011
-            }
-            return ret;
-        }
-
-        static inline vm_info decode_vm_info(uint32_t state, T sptbr) {
-            if (state == PRIV_M) return {0, 0, 0, 0};
-            if (state <= PRIV_S)
-                switch (bit_sub<60, 4>(sptbr)) {
-                case 0:  return {0, 0, 0, 0}; // off
-                case 8:  return {3, 9, 8, bit_sub<0, 44>(sptbr) << PGSHIFT};// SV39
-                case 9:  return {4, 9, 8, bit_sub<0, 44>(sptbr) << PGSHIFT};// SV48
-                case 10: return {5, 9, 8, bit_sub<0, 44>(sptbr) << PGSHIFT};// SV57
-                case 11: return {6, 9, 8, bit_sub<0, 44>(sptbr) << PGSHIFT};// SV64
-                default: abort();
-                }
-            abort();
-            return {0, 0, 0, 0}; // dummy
+        static constexpr uint32_t get_mask() {
+            return 0x807ff9ddUL; // 0b1000 0000 0111 1111 1111 1001 1011 1011  // only machine mode is supported
         }
     };
 
-    const typename super::reg_t PGSIZE = 1 << PGSHIFT;
-    const typename super::reg_t PGMASK = PGSIZE - 1;
-
-    constexpr reg_t get_irq_mask(size_t mode) {
-        std::array<const reg_t, 4> m = {{
-            0b000100010001, // U mode
-            0b001100110011, // S mode
-            0,
-            0b101110111011 // M mode
-        }};
-        return m[mode];
+    constexpr reg_t get_irq_mask() {
+        return 0b101110111011; // only machine mode is supported
     }
 
-    riscv_hart_msu_vp();
-    virtual ~riscv_hart_msu_vp() = default;
+    riscv_hart_m_p();
+    virtual ~riscv_hart_m_p() = default;
 
     void reset(uint64_t address) override;
 
     std::pair<uint64_t, bool> load_file(std::string name, int type = -1) override;
 
-    virtual phys_addr_t virt2phys(const iss::addr_t &addr) override;
-
     iss::status read(const address_type type, const access_type access, const uint32_t space,
             const uint64_t addr, const unsigned length, uint8_t *const data) override;
     iss::status write(const address_type type, const access_type access, const uint32_t space,
             const uint64_t addr, const unsigned length, const uint8_t *const data) override;
 
-    virtual uint64_t enter_trap(uint64_t flags) override { return riscv_hart_msu_vp::enter_trap(flags, fault_data); }
+    virtual uint64_t enter_trap(uint64_t flags) override { return riscv_hart_m_p::enter_trap(flags, fault_data); }
     virtual uint64_t enter_trap(uint64_t flags, uint64_t addr) override;
     virtual uint64_t leave_trap(uint64_t flags) override;
-    void wait_until(uint64_t flags) override;
+
+    const reg_t& get_mhartid() const { return mhartid_reg;	}
+	void set_mhartid(reg_t mhartid) { mhartid_reg = mhartid; };
 
     void disass_output(uint64_t pc, const std::string instr) override {
-        CLOG(INFO, disass) << fmt::format("0x{:016x}    {:40} [p:{};s:0x{:x};c:{}]",
-                pc, instr, lvl[this->reg.machine_state], (reg_t)state.mstatus, this->reg.icount);
+        CLOG(INFO, disass) << fmt::format("0x{:016x}    {:40} [s:0x{:x};c:{}]",
+                pc, instr, (reg_t)state.mstatus, this->reg.icount);
     };
 
     iss::instrumentation_if *get_instrumentation_if() override { return &instr_if; }
@@ -493,7 +348,7 @@ public:
 protected:
     struct riscv_instrumentation_if : public iss::instrumentation_if {
 
-        riscv_instrumentation_if(riscv_hart_msu_vp<BASE> &arch)
+        riscv_instrumentation_if(riscv_hart_m_p<BASE> &arch)
         : arch(arch) {}
         /**
          * get the name of this architecture
@@ -508,7 +363,7 @@ protected:
 
         virtual void set_curr_instr_cycles(unsigned cycles) { arch.cycle_offset += cycles - 1; };
 
-        riscv_hart_msu_vp<BASE> &arch;
+        riscv_hart_m_p<BASE> &arch;
     };
 
     friend struct riscv_instrumentation_if;
@@ -524,7 +379,6 @@ protected:
     hart_state<reg_t> state;
     uint64_t cycle_offset;
     reg_t fault_data;
-    std::array<vm_info, 2> vm;
     uint64_t tohost = tohost_dflt;
     uint64_t fromhost = fromhost_dflt;
     unsigned to_host_wr_cnt = 0;
@@ -535,7 +389,6 @@ protected:
     using csr_page_type = typename csr_type::page_type;
     mem_type mem;
     csr_type csr;
-    void update_vm_info();
     std::stringstream uart_buf;
     std::unordered_map<reg_t, uint64_t> ptw;
     std::unordered_map<uint64_t, uint8_t> atomic_reservation;
@@ -551,17 +404,16 @@ private:
     iss::status write_ie(unsigned addr, reg_t val);
     iss::status read_ip(unsigned addr, reg_t &val);
     iss::status write_ip(unsigned addr, reg_t val);
-    iss::status read_satp(unsigned addr, reg_t &val);
-    iss::status write_satp(unsigned addr, reg_t val);
-    iss::status read_fcsr(unsigned addr, reg_t &val);
-    iss::status write_fcsr(unsigned addr, reg_t val);
+    iss::status read_hartid(unsigned addr, reg_t &val);
+
+    reg_t mhartid_reg{0xF};
 
 protected:
     void check_interrupt();
 };
 
 template <typename BASE>
-riscv_hart_msu_vp<BASE>::riscv_hart_msu_vp()
+riscv_hart_m_p<BASE>::riscv_hart_m_p()
 : state()
 , cycle_offset(0)
 , instr_if(*this) {
@@ -572,43 +424,24 @@ riscv_hart_msu_vp<BASE>::riscv_hart_msu_vp()
     for (unsigned addr = mcycle; addr <= hpmcounter31; ++addr) csr_wr_cb[addr] = nullptr;
     for (unsigned addr = mcycleh; addr <= hpmcounter31h; ++addr) csr_wr_cb[addr] = nullptr;
     // special handling
-    csr_rd_cb[time] = &riscv_hart_msu_vp<BASE>::read_time;
+    csr_rd_cb[time] = &riscv_hart_m_p<BASE>::read_time;
     csr_wr_cb[time] = nullptr;
-    csr_rd_cb[timeh] = &riscv_hart_msu_vp<BASE>::read_time;
+    csr_rd_cb[timeh] = &riscv_hart_m_p<BASE>::read_time;
     csr_wr_cb[timeh] = nullptr;
-    csr_rd_cb[mcycle] = &riscv_hart_msu_vp<BASE>::read_cycle;
-    csr_rd_cb[mcycleh] = &riscv_hart_msu_vp<BASE>::read_cycle;
-    csr_rd_cb[minstret] = &riscv_hart_msu_vp<BASE>::read_cycle;
-    csr_rd_cb[minstreth] = &riscv_hart_msu_vp<BASE>::read_cycle;
-    csr_rd_cb[mstatus] = &riscv_hart_msu_vp<BASE>::read_status;
-    csr_wr_cb[mstatus] = &riscv_hart_msu_vp<BASE>::write_status;
-    csr_rd_cb[sstatus] = &riscv_hart_msu_vp<BASE>::read_status;
-    csr_wr_cb[sstatus] = &riscv_hart_msu_vp<BASE>::write_status;
-    csr_rd_cb[ustatus] = &riscv_hart_msu_vp<BASE>::read_status;
-    csr_wr_cb[ustatus] = &riscv_hart_msu_vp<BASE>::write_status;
-    csr_rd_cb[mip] = &riscv_hart_msu_vp<BASE>::read_ip;
-    csr_wr_cb[mip] = &riscv_hart_msu_vp<BASE>::write_ip;
-    csr_rd_cb[sip] = &riscv_hart_msu_vp<BASE>::read_ip;
-    csr_wr_cb[sip] = &riscv_hart_msu_vp<BASE>::write_ip;
-    csr_rd_cb[uip] = &riscv_hart_msu_vp<BASE>::read_ip;
-    csr_wr_cb[uip] = &riscv_hart_msu_vp<BASE>::write_ip;
-    csr_rd_cb[mie] = &riscv_hart_msu_vp<BASE>::read_ie;
-    csr_wr_cb[mie] = &riscv_hart_msu_vp<BASE>::write_ie;
-    csr_rd_cb[sie] = &riscv_hart_msu_vp<BASE>::read_ie;
-    csr_wr_cb[sie] = &riscv_hart_msu_vp<BASE>::write_ie;
-    csr_rd_cb[uie] = &riscv_hart_msu_vp<BASE>::read_ie;
-    csr_wr_cb[uie] = &riscv_hart_msu_vp<BASE>::write_ie;
-    csr_rd_cb[satp] = &riscv_hart_msu_vp<BASE>::read_satp;
-    csr_wr_cb[satp] = &riscv_hart_msu_vp<BASE>::write_satp;
-    csr_rd_cb[fcsr] = &riscv_hart_msu_vp<BASE>::read_fcsr;
-    csr_wr_cb[fcsr] = &riscv_hart_msu_vp<BASE>::write_fcsr;
-    csr_rd_cb[fflags] = &riscv_hart_msu_vp<BASE>::read_fcsr;
-    csr_wr_cb[fflags] = &riscv_hart_msu_vp<BASE>::write_fcsr;
-    csr_rd_cb[frm] = &riscv_hart_msu_vp<BASE>::read_fcsr;
-    csr_wr_cb[frm] = &riscv_hart_msu_vp<BASE>::write_fcsr;
+    csr_rd_cb[mcycle] = &riscv_hart_m_p<BASE>::read_cycle;
+    csr_rd_cb[mcycleh] = &riscv_hart_m_p<BASE>::read_cycle;
+    csr_rd_cb[minstret] = &riscv_hart_m_p<BASE>::read_cycle;
+    csr_rd_cb[minstreth] = &riscv_hart_m_p<BASE>::read_cycle;
+    csr_rd_cb[mstatus] = &riscv_hart_m_p<BASE>::read_status;
+    csr_wr_cb[mstatus] = &riscv_hart_m_p<BASE>::write_status;
+    csr_rd_cb[mip] = &riscv_hart_m_p<BASE>::read_ip;
+    csr_wr_cb[mip] = &riscv_hart_m_p<BASE>::write_ip;
+    csr_rd_cb[mie] = &riscv_hart_m_p<BASE>::read_ie;
+    csr_wr_cb[mie] = &riscv_hart_m_p<BASE>::write_ie;
+    csr_rd_cb[mhartid] = &riscv_hart_m_p<BASE>::read_hartid;
 }
 
-template <typename BASE> std::pair<uint64_t, bool> riscv_hart_msu_vp<BASE>::load_file(std::string name, int type) {
+template <typename BASE> std::pair<uint64_t, bool> riscv_hart_m_p<BASE>::load_file(std::string name, int type) {
     FILE *fp = fopen(name.c_str(), "r");
     if (fp) {
         std::array<char, 5> buf;
@@ -653,7 +486,7 @@ template <typename BASE> std::pair<uint64_t, bool> riscv_hart_msu_vp<BASE>::load
 }
 
 template <typename BASE>
-iss::status riscv_hart_msu_vp<BASE>::read(const address_type type, const access_type access, const uint32_t space,
+iss::status riscv_hart_m_p<BASE>::read(const address_type type, const access_type access, const uint32_t space,
         const uint64_t addr, const unsigned length, uint8_t *const data) {
 #ifndef NDEBUG
     if (access && iss::access_type::DEBUG) {
@@ -674,17 +507,6 @@ iss::status riscv_hart_msu_vp<BASE>::read(const address_type type, const access_
                 return iss::Err;
             }
             try {
-                if (unlikely((addr & ~PGMASK) != ((addr + length - 1) & ~PGMASK))) { // we may cross a page boundary
-                    vm_info vm = hart_state<reg_t>::decode_vm_info(this->reg.machine_state, state.satp);
-                    if (vm.levels != 0) { // VM is active
-                        auto split_addr = (addr + length) & ~PGMASK;
-                        auto len1 = split_addr - addr;
-                        auto res = read(type, access, space, addr, len1, data);
-                        if (res == iss::Ok)
-                            res = read(type, access, space, split_addr, length - len1, data + len1);
-                        return res;
-                    }
-                }
                 auto res = type==iss::address_type::PHYSICAL?
                         read_mem( BASE::v2p(phys_addr_t{access, space, addr}), length, data):
                         read_mem( BASE::v2p(iss::addr_t{access, type, space, addr}), length, data);
@@ -701,18 +523,7 @@ iss::status riscv_hart_msu_vp<BASE>::read(const address_type type, const access_
         } break;
         case traits<BASE>::FENCE: {
             if ((addr + length) > mem.size()) return iss::Err;
-            switch (addr) {
-            case 2:   // SFENCE:VMA lower
-            case 3: { // SFENCE:VMA upper
-                auto tvm = state.mstatus.TVM;
-                if (this->reg.machine_state == PRIV_S & tvm != 0) {
-                    this->reg.trap_state = (1 << 31) | (2 << 16);
-                    this->fault_data = this->reg.PC;
-                    return iss::Err;
-                }
             return iss::Ok;
-            }
-            }
         } break;
         case traits<BASE>::RES: {
             auto it = atomic_reservation.find(addr);
@@ -733,7 +544,7 @@ iss::status riscv_hart_msu_vp<BASE>::read(const address_type type, const access_
 }
 
 template <typename BASE>
-iss::status riscv_hart_msu_vp<BASE>::write(const address_type type, const access_type access, const uint32_t space,
+iss::status riscv_hart_m_p<BASE>::write(const address_type type, const access_type access, const uint32_t space,
         const uint64_t addr, const unsigned length, const uint8_t *const data) {
 #ifndef NDEBUG
     const char *prefix = (access && iss::access_type::DEBUG) ? "debug " : "";
@@ -768,17 +579,6 @@ iss::status riscv_hart_msu_vp<BASE>::write(const address_type type, const access
                 return iss::Err;
             }
             try {
-                if (unlikely((addr & ~PGMASK) != ((addr + length - 1) & ~PGMASK))) { // we may cross a page boundary
-                    vm_info vm = hart_state<reg_t>::decode_vm_info(this->reg.machine_state, state.satp);
-                    if (vm.levels != 0) { // VM is active
-                        auto split_addr = (addr + length) & ~PGMASK;
-                        auto len1 = split_addr - addr;
-                        auto res = write(type, access, space, addr, len1, data);
-                        if (res == iss::Ok)
-                            res = write(type, access, space, split_addr, length - len1, data + len1);
-                        return res;
-                    }
-                }
                 auto res = type==iss::address_type::PHYSICAL?
                         write_mem(phys_addr_t{access, space, addr}, length, data):
                         write_mem(BASE::v2p(iss::addr_t{access, type, space, addr}), length, data);
@@ -833,11 +633,6 @@ iss::status riscv_hart_msu_vp<BASE>::write(const address_type type, const access
             case 3: {
                 ptw.clear();
                 auto tvm = state.mstatus.TVM;
-                if (this->reg.machine_state == PRIV_S & tvm != 0) {
-                    this->reg.trap_state = (1 << 31) | (2 << 16);
-                    this->fault_data = this->reg.PC;
-                    return iss::Err;
-                }
                 return iss::Ok;
             }
             }
@@ -855,8 +650,10 @@ iss::status riscv_hart_msu_vp<BASE>::write(const address_type type, const access
     }
 }
 
-template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::read_csr(unsigned addr, reg_t &val) {
+template <typename BASE> iss::status riscv_hart_m_p<BASE>::read_csr(unsigned addr, reg_t &val) {
     if (addr >= csr.size()) return iss::Err;
+    auto req_priv_lvl = (addr >> 8) & 0x3;
+    if (this->reg.machine_state < req_priv_lvl) throw illegal_instruction_fault(this->fault_data);
     auto it = csr_rd_cb.find(addr);
     if (it == csr_rd_cb.end()) {
         val = csr[addr & csr.page_addr_mask];
@@ -867,8 +664,13 @@ template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::read_csr(unsigned
     return (this->*f)(addr, val);
 }
 
-template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::write_csr(unsigned addr, reg_t val) {
+template <typename BASE> iss::status riscv_hart_m_p<BASE>::write_csr(unsigned addr, reg_t val) {
     if (addr >= csr.size()) return iss::Err;
+    auto req_priv_lvl = (addr >> 8) & 0x3;
+    if (this->reg.machine_state < req_priv_lvl)
+        throw illegal_instruction_fault(this->fault_data);
+    if((addr&0xc00)==0xc00)
+        throw illegal_instruction_fault(this->fault_data);
     auto it = csr_wr_cb.find(addr);
     if (it == csr_wr_cb.end()) {
         csr[addr & csr.page_addr_mask] = val;
@@ -879,7 +681,7 @@ template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::write_csr(unsigned
     return (this->*f)(addr, val);
 }
 
-template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::read_cycle(unsigned addr, reg_t &val) {
+template <typename BASE> iss::status riscv_hart_m_p<BASE>::read_cycle(unsigned addr, reg_t &val) {
     auto cycle_val = this->reg.icount + cycle_offset;
     if (addr == mcycle) {
         val = static_cast<reg_t>(cycle_val);
@@ -890,7 +692,7 @@ template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::read_cycle(unsigne
     return iss::Ok;
 }
 
-template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::read_time(unsigned addr, reg_t &val) {
+template <typename BASE> iss::status riscv_hart_m_p<BASE>::read_time(unsigned addr, reg_t &val) {
     uint64_t time_val = (this->reg.icount + cycle_offset) / (100000000 / 32768 - 1); //-> ~3052;
     if (addr == time) {
         val = static_cast<reg_t>(time_val);
@@ -901,117 +703,51 @@ template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::read_time(unsigned
     return iss::Ok;
 }
 
-template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::read_status(unsigned addr, reg_t &val) {
-    auto req_priv_lvl = addr >> 8;
-    if (this->reg.machine_state < req_priv_lvl) throw illegal_instruction_fault(this->fault_data);
-    val = state.mstatus & hart_state<reg_t>::get_mask(req_priv_lvl);
+template <typename BASE> iss::status riscv_hart_m_p<BASE>::read_status(unsigned addr, reg_t &val) {
+    val = state.mstatus & hart_state<reg_t>::get_mask();
     return iss::Ok;
 }
 
-template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::write_status(unsigned addr, reg_t val) {
-    auto req_priv_lvl = addr >> 8;
-    if (this->reg.machine_state < req_priv_lvl) throw illegal_instruction_fault(this->fault_data);
-    state.write_mstatus(val, req_priv_lvl);
+template <typename BASE> iss::status riscv_hart_m_p<BASE>::write_status(unsigned addr, reg_t val) {
+    state.write_mstatus(val);
     check_interrupt();
-    update_vm_info();
     return iss::Ok;
 }
 
-template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::read_ie(unsigned addr, reg_t &val) {
-    auto req_priv_lvl = addr >> 8;
-    if (this->reg.machine_state < req_priv_lvl) throw illegal_instruction_fault(this->fault_data);
+template <typename BASE> iss::status riscv_hart_m_p<BASE>::read_ie(unsigned addr, reg_t &val) {
     val = csr[mie];
-    if (addr < mie) val &= csr[mideleg];
-    if (addr < sie) val &= csr[sideleg];
+    val &= csr[mideleg];
     return iss::Ok;
 }
 
-template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::write_ie(unsigned addr, reg_t val) {
-    auto req_priv_lvl = addr >> 8;
-    if (this->reg.machine_state < req_priv_lvl) throw illegal_instruction_fault(this->fault_data);
-    auto mask = get_irq_mask(req_priv_lvl);
+template <typename BASE> iss::status riscv_hart_m_p<BASE>::read_hartid(unsigned addr, reg_t &val) {
+    val = mhartid_reg;
+    return iss::Ok;
+}
+
+template <typename BASE> iss::status riscv_hart_m_p<BASE>::write_ie(unsigned addr, reg_t val) {
+    auto mask = get_irq_mask();
     csr[mie] = (csr[mie] & ~mask) | (val & mask);
     check_interrupt();
     return iss::Ok;
 }
 
-template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::read_ip(unsigned addr, reg_t &val) {
-    auto req_priv_lvl = addr >> 8;
-    if (this->reg.machine_state < req_priv_lvl) throw illegal_instruction_fault(this->fault_data);
+template <typename BASE> iss::status riscv_hart_m_p<BASE>::read_ip(unsigned addr, reg_t &val) {
     val = csr[mip];
-    if (addr < mip) val &= csr[mideleg];
-    if (addr < sip) val &= csr[sideleg];
+    val &= csr[mideleg];
     return iss::Ok;
 }
 
-template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::write_ip(unsigned addr, reg_t val) {
-    auto req_priv_lvl = addr >> 8;
-    if (this->reg.machine_state < req_priv_lvl) throw illegal_instruction_fault(this->fault_data);
-    auto mask = get_irq_mask(req_priv_lvl);
+template <typename BASE> iss::status riscv_hart_m_p<BASE>::write_ip(unsigned addr, reg_t val) {
+    auto mask = get_irq_mask();
     mask &= ~(1 << 7); // MTIP is read only
     csr[mip] = (csr[mip] & ~mask) | (val & mask);
     check_interrupt();
     return iss::Ok;
 }
 
-template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::read_satp(unsigned addr, reg_t &val) {
-    reg_t tvm = state.mstatus.TVM;
-    if (this->reg.machine_state == PRIV_S & tvm != 0) {
-        this->reg.trap_state = (1 << 31) | (2 << 16);
-        this->fault_data = this->reg.PC;
-        return iss::Err;
-    }
-    val = state.satp;
-    return iss::Ok;
-}
-
-template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::write_satp(unsigned addr, reg_t val) {
-    reg_t tvm = state.mstatus.TVM;
-    if (this->reg.machine_state == PRIV_S & tvm != 0) {
-        this->reg.trap_state = (1 << 31) | (2 << 16);
-        this->fault_data = this->reg.PC;
-        return iss::Err;
-    }
-    state.satp = val;
-    update_vm_info();
-    return iss::Ok;
-}
-template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::read_fcsr(unsigned addr, reg_t &val) {
-    switch (addr) {
-    case 1: // fflags, 4:0
-        val = bit_sub<0, 5>(this->get_fcsr());
-        break;
-    case 2: // frm, 7:5
-        val = bit_sub<5, 3>(this->get_fcsr());
-        break;
-    case 3: // fcsr
-        val = this->get_fcsr();
-        break;
-    default:
-        return iss::Err;
-    }
-    return iss::Ok;
-}
-
-template <typename BASE> iss::status riscv_hart_msu_vp<BASE>::write_fcsr(unsigned addr, reg_t val) {
-    switch (addr) {
-    case 1: // fflags, 4:0
-        this->set_fcsr((this->get_fcsr() & 0xffffffe0) | (val & 0x1f));
-        break;
-    case 2: // frm, 7:5
-        this->set_fcsr((this->get_fcsr() & 0xffffff1f) | ((val & 0x7) << 5));
-        break;
-    case 3: // fcsr
-        this->set_fcsr(val & 0xff);
-        break;
-    default:
-        return iss::Err;
-    }
-    return iss::Ok;
-}
-
 template <typename BASE>
-iss::status riscv_hart_msu_vp<BASE>::read_mem(phys_addr_t paddr, unsigned length, uint8_t *const data) {
+iss::status riscv_hart_m_p<BASE>::read_mem(phys_addr_t paddr, unsigned length, uint8_t *const data) {
     if ((paddr.val + length) > mem.size()) return iss::Err;
     switch (paddr.val) {
     case 0x0200BFF8: { // CLINT base, mtime reg
@@ -1036,7 +772,7 @@ iss::status riscv_hart_msu_vp<BASE>::read_mem(phys_addr_t paddr, unsigned length
 }
 
 template <typename BASE>
-iss::status riscv_hart_msu_vp<BASE>::write_mem(phys_addr_t paddr, unsigned length, const uint8_t *const data) {
+iss::status riscv_hart_m_p<BASE>::write_mem(phys_addr_t paddr, unsigned length, const uint8_t *const data) {
     if ((paddr.val + length) > mem.size()) return iss::Err;
     switch (paddr.val) {
     case 0x10013000: // UART0 base, TXFIFO reg
@@ -1068,10 +804,9 @@ iss::status riscv_hart_msu_vp<BASE>::write_mem(phys_addr_t paddr, unsigned lengt
         std::copy(data, data + length, p.data() + (paddr.val & mem.page_addr_mask));
         // tohost handling in case of riscv-test
         if (paddr.access && iss::access_type::FUNC) {
-            auto tohost_upper = (traits<BASE>::XLEN == 32 && paddr.val == (tohost + 4)) ||
-                                (traits<BASE>::XLEN == 64 && paddr.val == tohost);
+            auto tohost_upper = (traits<BASE>::XLEN == 32 && paddr.val == (tohost + 4));
             auto tohost_lower =
-                (traits<BASE>::XLEN == 32 && paddr.val == tohost) || (traits<BASE>::XLEN == 64 && paddr.val == tohost);
+                (traits<BASE>::XLEN == 32 && paddr.val == tohost);
             if (tohost_lower || tohost_upper) {
                 uint64_t hostvar = *reinterpret_cast<uint64_t *>(p.data() + (tohost & mem.page_addr_mask));
                 if (tohost_upper || (tohost_lower && to_host_wr_cnt > 0)) {
@@ -1102,8 +837,7 @@ iss::status riscv_hart_msu_vp<BASE>::write_mem(phys_addr_t paddr, unsigned lengt
                     }
                 } else if (tohost_lower)
                     to_host_wr_cnt++;
-            } else if ((traits<BASE>::XLEN == 32 && paddr.val == fromhost + 4) ||
-                       (traits<BASE>::XLEN == 64 && paddr.val == fromhost)) {
+            } else if (traits<BASE>::XLEN == 32 && paddr.val == fromhost + 4) {
                 uint64_t fhostvar = *reinterpret_cast<uint64_t *>(p.data() + (fromhost & mem.page_addr_mask));
                 *reinterpret_cast<uint64_t *>(p.data() + (tohost & mem.page_addr_mask)) = fhostvar;
             }
@@ -1113,43 +847,23 @@ iss::status riscv_hart_msu_vp<BASE>::write_mem(phys_addr_t paddr, unsigned lengt
     return iss::Ok;
 }
 
-template <typename BASE> inline void riscv_hart_msu_vp<BASE>::reset(uint64_t address) {
+template <typename BASE> inline void riscv_hart_m_p<BASE>::reset(uint64_t address) {
     BASE::reset(address);
     state.mstatus = hart_state<reg_t>::mstatus_reset_val;
-    update_vm_info();
 }
 
-template <typename BASE> inline void riscv_hart_msu_vp<BASE>::update_vm_info() {
-    vm[1] = hart_state<reg_t>::decode_vm_info(this->reg.machine_state, state.satp);
-    BASE::addr_mode[3]=BASE::addr_mode[2] = vm[1].is_active()? iss::address_type::VIRTUAL : iss::address_type::PHYSICAL;
-    if (state.mstatus.MPRV)
-        vm[0] = hart_state<reg_t>::decode_vm_info(state.mstatus.MPP, state.satp);
-    else
-        vm[0] = vm[1];
-    BASE::addr_mode[1] = BASE::addr_mode[0]=vm[0].is_active() ? iss::address_type::VIRTUAL : iss::address_type::PHYSICAL;
-    ptw.clear();
-}
-
-template <typename BASE> void riscv_hart_msu_vp<BASE>::check_interrupt() {
-    auto status = state.mstatus;
-    auto ip = csr[mip];
-    auto ie = csr[mie];
+template <typename BASE> void riscv_hart_m_p<BASE>::check_interrupt() {
     auto ideleg = csr[mideleg];
     // Multiple simultaneous interrupts and traps at the same privilege level are
     // handled in the following decreasing priority order:
     // external interrupts, software interrupts, timer interrupts, then finally
     // any synchronous traps.
-    auto ena_irq = ip & ie;
+    auto ena_irq = csr[mip] & csr[mie];
 
     bool mie = state.mstatus.MIE;
     auto m_enabled = this->reg.machine_state < PRIV_M || (this->reg.machine_state == PRIV_M && mie);
     auto enabled_interrupts = m_enabled ? ena_irq & ~ideleg : 0;
 
-    if (enabled_interrupts == 0) {
-        auto sie = state.mstatus.SIE;
-        auto s_enabled = this->reg.machine_state < PRIV_S || (this->reg.machine_state == PRIV_S && sie);
-        enabled_interrupts = s_enabled ? ena_irq & ideleg : 0;
-    }
     if (enabled_interrupts != 0) {
         int res = 0;
         while ((enabled_interrupts & 1) == 0) enabled_interrupts >>= 1, res++;
@@ -1157,130 +871,23 @@ template <typename BASE> void riscv_hart_msu_vp<BASE>::check_interrupt() {
     }
 }
 
-template <typename BASE>
-typename riscv_hart_msu_vp<BASE>::phys_addr_t riscv_hart_msu_vp<BASE>::virt2phys(const iss::addr_t &addr) {
-    const auto type = addr.access & iss::access_type::FUNC;
-    auto it = ptw.find(addr.val >> PGSHIFT);
-    if (it != ptw.end()) {
-        const reg_t pte = it->second;
-        const reg_t ad = PTE_A | (type == iss::access_type::WRITE) * PTE_D;
-#ifdef RISCV_ENABLE_DIRTY
-        // set accessed and possibly dirty bits.
-        *(uint32_t *)ppte |= ad;
-        return {addr.getAccessType(), addr.space, (pte & (~PGMASK)) | (addr.val & PGMASK)};
-#else
-        // take exception if access or possibly dirty bit is not set.
-        if ((pte & ad) == ad)
-            return {addr.access, addr.space, (pte & (~PGMASK)) | (addr.val & PGMASK)};
-        else
-            ptw.erase(it); // throw an exception
-#endif
-    } else {
-        uint32_t mode = type != iss::access_type::FETCH && state.mstatus.MPRV ? // MPRV
-                            state.mstatus.MPP :
-                            this->reg.machine_state;
-
-        const vm_info &vm = this->vm[static_cast<uint16_t>(type) / 2];
-
-        const bool s_mode = mode == PRIV_S;
-        const bool sum = state.mstatus.SUM;
-        const bool mxr = state.mstatus.MXR;
-
-        // verify bits xlen-1:va_bits-1 are all equal
-        const int va_bits = PGSHIFT + vm.levels * vm.idxbits;
-        const reg_t mask = (reg_t(1) << (traits<BASE>::XLEN > -(va_bits - 1))) - 1;
-        const reg_t masked_msbs = (addr.val >> (va_bits - 1)) & mask;
-        const int levels = (masked_msbs != 0 && masked_msbs != mask) ? 0 : vm.levels;
-
-        reg_t base = vm.ptbase;
-        for (int i = levels - 1; i >= 0; i--) {
-            const int ptshift = i * vm.idxbits;
-            const reg_t idx = (addr.val >> (PGSHIFT + ptshift)) & ((1 << vm.idxbits) - 1);
-
-            // check that physical address of PTE is legal
-            reg_t pte = 0;
-            const uint8_t res = this->read(iss::address_type::PHYSICAL, addr.access,
-                    traits<BASE>::MEM, base + idx * vm.ptesize, vm.ptesize, (uint8_t *)&pte);
-            if (res != 0) throw trap_load_access_fault(addr.val);
-            const reg_t ppn = pte >> PTE_PPN_SHIFT;
-
-            if (PTE_TABLE(pte)) { // next level of page table
-                base = ppn << PGSHIFT;
-            } else if ((pte & PTE_U) ? s_mode && (type == iss::access_type::FETCH || !sum) : !s_mode) {
-                break;
-            } else if (!(pte & PTE_V) || (!(pte & PTE_R) && (pte & PTE_W))) {
-                break;
-            } else if (type == iss::access_type::FETCH
-                           ? !(pte & PTE_X)
-                           : type == iss::access_type::READ ? !(pte & PTE_R) && !(mxr && (pte & PTE_X))
-                                                            : !((pte & PTE_R) && (pte & PTE_W))) {
-                break;
-            } else if ((ppn & ((reg_t(1) << ptshift) - 1)) != 0) {
-                break;
-            } else {
-                const reg_t ad = PTE_A | ((type == iss::access_type::WRITE) * PTE_D);
-#ifdef RISCV_ENABLE_DIRTY
-                // set accessed and possibly dirty bits.
-                *(uint32_t *)ppte |= ad;
-#else
-                // take exception if access or possibly dirty bit is not set.
-                if ((pte & ad) != ad) break;
-#endif
-                // for superpage mappings, make a fake leaf PTE for the TLB's benefit.
-                const reg_t vpn = addr.val >> PGSHIFT;
-                const reg_t value = (ppn | (vpn & ((reg_t(1) << ptshift) - 1))) << PGSHIFT;
-                const reg_t offset = addr.val & PGMASK;
-                ptw[vpn] = value | (pte & 0xff);
-                return {addr.access, addr.space, value | offset};
-            }
-        }
-    }
-    switch (type) {
-    case access_type::FETCH:
-        this->fault_data = addr.val;
-        throw trap_instruction_page_fault(addr.val);
-    case access_type::READ:
-        this->fault_data = addr.val;
-        throw trap_load_page_fault(addr.val);
-    case access_type::WRITE:
-        this->fault_data = addr.val;
-        throw trap_store_page_fault(addr.val);
-    default:
-        abort();
-    }
-}
-
-template <typename BASE> uint64_t riscv_hart_msu_vp<BASE>::enter_trap(uint64_t flags, uint64_t addr) {
-    auto cur_priv = this->reg.machine_state;
+template <typename BASE> uint64_t riscv_hart_m_p<BASE>::enter_trap(uint64_t flags, uint64_t addr) {
     // flags are ACTIVE[31:31], CAUSE[30:16], TRAPID[15:0]
     // calculate and write mcause val
     auto trap_id = bit_sub<0, 16>(flags);
     auto cause = bit_sub<16, 15>(flags);
-    if (trap_id == 0 && cause == 11) cause = 0x8 + cur_priv; // adjust environment call cause
+    if (trap_id == 0 && cause == 11) cause = 0x8 + PRIV_M; // adjust environment call cause
     // calculate effective privilege level
-    auto new_priv = PRIV_M;
     if (trap_id == 0) { // exception
-        if (cur_priv != PRIV_M && ((csr[medeleg] >> cause) & 0x1) != 0)
-            new_priv = (csr[sedeleg] >> cause) & 0x1 ? PRIV_U : PRIV_S;
         // store ret addr in xepc register
-        csr[uepc | (new_priv << 8)] = static_cast<reg_t>(addr); // store actual address instruction of exception
-        /*
-         * write mtval if new_priv=M_MODE, spec says:
-         * When a hardware breakpoint is triggered, or an instruction-fetch, load,
-         * or store address-misaligned,
-         * access, or page-fault exception occurs, mtval is written with the
-         * faulting effective address.
-         */
-        csr[utval | (new_priv << 8)] = fault_data;
+        csr[mepc] = static_cast<reg_t>(addr); // store actual address instruction of exception
+        csr[mtval] = fault_data;
         fault_data = 0;
     } else {
-        if (cur_priv != PRIV_M && ((csr[mideleg] >> cause) & 0x1) != 0)
-            new_priv = (csr[sideleg] >> cause) & 0x1 ? PRIV_U : PRIV_S;
-        csr[uepc | (new_priv << 8)] = this->reg.NEXT_PC; // store next address if interrupt
+        csr[mepc] = this->reg.NEXT_PC; // store next address if interrupt
         this->reg.pending_trap = 0;
     }
-    size_t adr = ucause | (new_priv << 8);
-    csr[adr] = (trap_id << 31) + cause;
+    csr[mcause] = (trap_id << 31) + cause;
     // update mstatus
     // xPP field of mstatus is written with the active privilege mode at the time
     // of the trap; the x PIE field of mstatus
@@ -1288,92 +895,50 @@ template <typename BASE> uint64_t riscv_hart_msu_vp<BASE>::enter_trap(uint64_t f
     // the trap; and the x IE field of mstatus
     // is cleared
     // store the actual privilege level in yPP and store interrupt enable flags
-    switch (new_priv) {
-    case PRIV_M:
-        state.mstatus.MPP = cur_priv;
+    state.mstatus.MPP = PRIV_M;
     state.mstatus.MPIE = state.mstatus.MIE;
     state.mstatus.MIE = false;
-        break;
-    case PRIV_S:
-        state.mstatus.SPP = cur_priv;
-        state.mstatus.SPIE = state.mstatus.SIE;
-        state.mstatus.SIE = false;
-        break;
-    case PRIV_U:
-        state.mstatus.UPIE = state.mstatus.UIE;
-        state.mstatus.UIE = false;
-        break;
-    default:
-        break;
-    }
 
     // get trap vector
-    auto ivec = csr[utvec | (new_priv << 8)];
+    auto ivec = csr[mtvec];
     // calculate addr// set NEXT_PC to trap addressess to jump to based on MODE
     // bits in mtvec
     this->reg.NEXT_PC = ivec & ~0x1UL;
     if ((ivec & 0x1) == 1 && trap_id != 0) this->reg.NEXT_PC += 4 * cause;
     // reset trap state
-    this->reg.machine_state = new_priv;
+    this->reg.machine_state = PRIV_M;
     this->reg.trap_state = 0;
     std::array<char, 32> buffer;
     sprintf(buffer.data(), "0x%016lx", addr);
     if((flags&0xffffffff) != 0xffffffff)
     CLOG(INFO, disass) << (trap_id ? "Interrupt" : "Trap") << " with cause '"
                        << (trap_id ? irq_str[cause] : trap_str[cause]) << "' (" << cause << ")"
-                       << " at address " << buffer.data() << " occurred, changing privilege level from "
-                       << lvl[cur_priv] << " to " << lvl[new_priv];
-    update_vm_info();
+                       << " at address " << buffer.data() << " occurred";
     return this->reg.NEXT_PC;
 }
 
-template <typename BASE> uint64_t riscv_hart_msu_vp<BASE>::leave_trap(uint64_t flags) {
+template <typename BASE> uint64_t riscv_hart_m_p<BASE>::leave_trap(uint64_t flags) {
     auto cur_priv = this->reg.machine_state;
     auto inst_priv = flags & 0x3;
     auto status = state.mstatus;
 
-    auto tsr = state.mstatus.TSR;
-    if (cur_priv == PRIV_S && inst_priv == PRIV_S && tsr != 0) {
-        this->reg.trap_state = (1 << 31) | (2 << 16);
-        this->fault_data = this->reg.PC;
-        return this->reg.PC;
-    }
-
     // pop the relevant lower-privilege interrupt enable and privilege mode stack
     // clear respective yIE
-    switch (inst_priv) {
-    case PRIV_M:
+    if (inst_priv == PRIV_M) {
         this->reg.machine_state = state.mstatus.MPP;
         state.mstatus.MPP = 0; // clear mpp to U mode
         state.mstatus.MIE = state.mstatus.MPIE;
-        break;
-    case PRIV_S:
-        this->reg.machine_state = state.mstatus.SPP;
-        state.mstatus.SPP = 0; // clear spp to U mode
-        state.mstatus.SIE = state.mstatus.SPIE;
-        break;
-    case PRIV_U:
-        this->reg.machine_state = 0;
-        state.mstatus.UIE = state.mstatus.UPIE;
-        break;
+    } else {
+    	CLOG(ERROR, disass) << "Unsupported mode:" << inst_priv;
     }
+
     // sets the pc to the value stored in the x epc register.
-    this->reg.NEXT_PC = csr[uepc | inst_priv << 8];
-    CLOG(INFO, disass) << "Executing xRET , changing privilege level from " << lvl[cur_priv] << " to "
-                       << lvl[this->reg.machine_state];
-    update_vm_info();
+    this->reg.NEXT_PC = csr[mepc];
+    CLOG(INFO, disass) << "Executing xRET";
     return this->reg.NEXT_PC;
 }
 
-template <typename BASE> void riscv_hart_msu_vp<BASE>::wait_until(uint64_t flags) {
-    auto status = state.mstatus;
-    auto tw = status.TW;
-    if (this->reg.machine_state == PRIV_S && tw != 0) {
-        this->reg.trap_state = (1 << 31) | (2 << 16);
-        this->fault_data = this->reg.PC;
-    }
-}
-}
-}
+} // namespace arch
+} // namespace iss
 
 #endif /* _RISCV_CORE_H_ */

incl/iss/arch/rv32gc.h

@@ -1,316 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2017, 2018 MINRES Technologies GmbH
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *******************************************************************************/
-
-
-#ifndef _RV32GC_H_
-#define _RV32GC_H_
-
-#include <array>
-#include <iss/arch/traits.h>
-#include <iss/arch_if.h>
-#include <iss/vm_if.h>
-
-namespace iss {
-namespace arch {
-
-struct rv32gc;
-
-template <> struct traits<rv32gc> {
-
-	constexpr static char const* const core_type = "RV32GC";
-    
-  	static constexpr std::array<const char*, 66> reg_names{
- 		{"x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26", "x27", "x28", "x29", "x30", "x31", "pc", "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", "fcsr"}};
- 
-  	static constexpr std::array<const char*, 66> reg_aliases{
- 		{"zero", "ra", "sp", "gp", "tp", "t0", "t1", "t2", "s0", "s1", "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "s2", "s3", "s4", "s5", "s6", "s7", "s8", "s9", "s10", "s11", "t3", "t4", "t5", "t6", "pc", "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", "fcsr"}};
-
-    enum constants {XLEN=32, FLEN=64, PCLEN=32, MISA_VAL=0b1000000000101000001000100101101, PGSIZE=0x1000, PGMASK=0xfff};
-
-    constexpr static unsigned FP_REGS_SIZE = 64;
-
-    enum reg_e {
-        X0,
-        X1,
-        X2,
-        X3,
-        X4,
-        X5,
-        X6,
-        X7,
-        X8,
-        X9,
-        X10,
-        X11,
-        X12,
-        X13,
-        X14,
-        X15,
-        X16,
-        X17,
-        X18,
-        X19,
-        X20,
-        X21,
-        X22,
-        X23,
-        X24,
-        X25,
-        X26,
-        X27,
-        X28,
-        X29,
-        X30,
-        X31,
-        PC,
-        F0,
-        F1,
-        F2,
-        F3,
-        F4,
-        F5,
-        F6,
-        F7,
-        F8,
-        F9,
-        F10,
-        F11,
-        F12,
-        F13,
-        F14,
-        F15,
-        F16,
-        F17,
-        F18,
-        F19,
-        F20,
-        F21,
-        F22,
-        F23,
-        F24,
-        F25,
-        F26,
-        F27,
-        F28,
-        F29,
-        F30,
-        F31,
-        FCSR,
-        NUM_REGS,
-        NEXT_PC=NUM_REGS,
-        TRAP_STATE,
-        PENDING_TRAP,
-        MACHINE_STATE,
-        LAST_BRANCH,
-        ICOUNT,
-        ZERO = X0,
-        RA = X1,
-        SP = X2,
-        GP = X3,
-        TP = X4,
-        T0 = X5,
-        T1 = X6,
-        T2 = X7,
-        S0 = X8,
-        S1 = X9,
-        A0 = X10,
-        A1 = X11,
-        A2 = X12,
-        A3 = X13,
-        A4 = X14,
-        A5 = X15,
-        A6 = X16,
-        A7 = X17,
-        S2 = X18,
-        S3 = X19,
-        S4 = X20,
-        S5 = X21,
-        S6 = X22,
-        S7 = X23,
-        S8 = X24,
-        S9 = X25,
-        S10 = X26,
-        S11 = X27,
-        T3 = X28,
-        T4 = X29,
-        T5 = X30,
-        T6 = X31
-    };
-
-    using reg_t = uint32_t;
-
-    using addr_t = uint32_t;
-
-    using code_word_t = uint32_t; //TODO: check removal
-
-    using virt_addr_t = iss::typed_addr_t<iss::address_type::VIRTUAL>;
-
-    using phys_addr_t = iss::typed_addr_t<iss::address_type::PHYSICAL>;
-
- 	static constexpr std::array<const uint32_t, 72> reg_bit_widths{
- 		{32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,32,32,32,32,32,32,64}};
-
-    static constexpr std::array<const uint32_t, 73> reg_byte_offsets{
-    	{0,4,8,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68,72,76,80,84,88,92,96,100,104,108,112,116,120,124,128,136,144,152,160,168,176,184,192,200,208,216,224,232,240,248,256,264,272,280,288,296,304,312,320,328,336,344,352,360,368,376,384,392,396,400,404,408,412,416,424}};
-
-    static const uint64_t addr_mask = (reg_t(1) << (XLEN - 1)) | ((reg_t(1) << (XLEN - 1)) - 1);
-
-    enum sreg_flag_e { FLAGS };
-
-    enum mem_type_e { MEM, CSR, FENCE, RES };
-};
-
-struct rv32gc: public arch_if {
-
-    using virt_addr_t = typename traits<rv32gc>::virt_addr_t;
-    using phys_addr_t = typename traits<rv32gc>::phys_addr_t;
-    using reg_t =  typename traits<rv32gc>::reg_t;
-    using addr_t = typename traits<rv32gc>::addr_t;
-
-    rv32gc();
-    ~rv32gc();
-
-    void reset(uint64_t address=0) override;
-
-    uint8_t* get_regs_base_ptr() override;
-    /// deprecated
-    void get_reg(short idx, std::vector<uint8_t>& value) override {}
-    void set_reg(short idx, const std::vector<uint8_t>& value) override {}
-    /// deprecated
-    bool get_flag(int flag) override {return false;}
-    void set_flag(int, bool value) override {};
-    /// deprecated
-    void update_flags(operations op, uint64_t opr1, uint64_t opr2) override {};
-
-    inline uint64_t get_icount() { return reg.icount; }
-
-    inline bool should_stop() { return interrupt_sim; }
-
-    inline phys_addr_t v2p(const iss::addr_t& addr){
-        if (addr.space != traits<rv32gc>::MEM || addr.type == iss::address_type::PHYSICAL ||
-                addr_mode[static_cast<uint16_t>(addr.access)&0x3]==address_type::PHYSICAL) {
-            return phys_addr_t(addr.access, addr.space, addr.val&traits<rv32gc>::addr_mask);
-        } else
-            return virt2phys(addr);
-    }
-
-    virtual phys_addr_t virt2phys(const iss::addr_t& addr);
-
-    virtual iss::sync_type needed_sync() const { return iss::NO_SYNC; }
-
-    inline uint32_t get_last_branch() { return reg.last_branch; }
-
-protected:
-    struct RV32GC_regs {
-        uint32_t X0 = 0;
-        uint32_t X1 = 0;
-        uint32_t X2 = 0;
-        uint32_t X3 = 0;
-        uint32_t X4 = 0;
-        uint32_t X5 = 0;
-        uint32_t X6 = 0;
-        uint32_t X7 = 0;
-        uint32_t X8 = 0;
-        uint32_t X9 = 0;
-        uint32_t X10 = 0;
-        uint32_t X11 = 0;
-        uint32_t X12 = 0;
-        uint32_t X13 = 0;
-        uint32_t X14 = 0;
-        uint32_t X15 = 0;
-        uint32_t X16 = 0;
-        uint32_t X17 = 0;
-        uint32_t X18 = 0;
-        uint32_t X19 = 0;
-        uint32_t X20 = 0;
-        uint32_t X21 = 0;
-        uint32_t X22 = 0;
-        uint32_t X23 = 0;
-        uint32_t X24 = 0;
-        uint32_t X25 = 0;
-        uint32_t X26 = 0;
-        uint32_t X27 = 0;
-        uint32_t X28 = 0;
-        uint32_t X29 = 0;
-        uint32_t X30 = 0;
-        uint32_t X31 = 0;
-        uint32_t PC = 0;
-        uint64_t F0 = 0;
-        uint64_t F1 = 0;
-        uint64_t F2 = 0;
-        uint64_t F3 = 0;
-        uint64_t F4 = 0;
-        uint64_t F5 = 0;
-        uint64_t F6 = 0;
-        uint64_t F7 = 0;
-        uint64_t F8 = 0;
-        uint64_t F9 = 0;
-        uint64_t F10 = 0;
-        uint64_t F11 = 0;
-        uint64_t F12 = 0;
-        uint64_t F13 = 0;
-        uint64_t F14 = 0;
-        uint64_t F15 = 0;
-        uint64_t F16 = 0;
-        uint64_t F17 = 0;
-        uint64_t F18 = 0;
-        uint64_t F19 = 0;
-        uint64_t F20 = 0;
-        uint64_t F21 = 0;
-        uint64_t F22 = 0;
-        uint64_t F23 = 0;
-        uint64_t F24 = 0;
-        uint64_t F25 = 0;
-        uint64_t F26 = 0;
-        uint64_t F27 = 0;
-        uint64_t F28 = 0;
-        uint64_t F29 = 0;
-        uint64_t F30 = 0;
-        uint64_t F31 = 0;
-        uint32_t FCSR = 0;
-        uint32_t NEXT_PC = 0;
-        uint32_t trap_state = 0, pending_trap = 0, machine_state = 0, last_branch = 0;
-        uint64_t icount = 0;
-    } reg;
-
-    std::array<address_type, 4> addr_mode;
-    
-    bool interrupt_sim=false;
-
-	uint32_t get_fcsr(){return reg.FCSR;}
-	void set_fcsr(uint32_t val){reg.FCSR = val;}		
-
-};
-
-}
-}            
-#endif /* _RV32GC_H_ */

incl/iss/arch/rv64gc.h

@@ -1,316 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2017, 2018 MINRES Technologies GmbH
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *******************************************************************************/
-
-
-#ifndef _RV64GC_H_
-#define _RV64GC_H_
-
-#include <array>
-#include <iss/arch/traits.h>
-#include <iss/arch_if.h>
-#include <iss/vm_if.h>
-
-namespace iss {
-namespace arch {
-
-struct rv64gc;
-
-template <> struct traits<rv64gc> {
-
-	constexpr static char const* const core_type = "RV64GC";
-    
-  	static constexpr std::array<const char*, 66> reg_names{
- 		{"x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26", "x27", "x28", "x29", "x30", "x31", "pc", "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", "fcsr"}};
- 
-  	static constexpr std::array<const char*, 66> reg_aliases{
- 		{"zero", "ra", "sp", "gp", "tp", "t0", "t1", "t2", "s0", "s1", "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "s2", "s3", "s4", "s5", "s6", "s7", "s8", "s9", "s10", "s11", "t3", "t4", "t5", "t6", "pc", "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", "fcsr"}};
-
-    enum constants {XLEN=64, FLEN=64, PCLEN=64, MISA_VAL=0b1000000000101000001000100101101, PGSIZE=0x1000, PGMASK=0xfff};
-
-    constexpr static unsigned FP_REGS_SIZE = 64;
-
-    enum reg_e {
-        X0,
-        X1,
-        X2,
-        X3,
-        X4,
-        X5,
-        X6,
-        X7,
-        X8,
-        X9,
-        X10,
-        X11,
-        X12,
-        X13,
-        X14,
-        X15,
-        X16,
-        X17,
-        X18,
-        X19,
-        X20,
-        X21,
-        X22,
-        X23,
-        X24,
-        X25,
-        X26,
-        X27,
-        X28,
-        X29,
-        X30,
-        X31,
-        PC,
-        F0,
-        F1,
-        F2,
-        F3,
-        F4,
-        F5,
-        F6,
-        F7,
-        F8,
-        F9,
-        F10,
-        F11,
-        F12,
-        F13,
-        F14,
-        F15,
-        F16,
-        F17,
-        F18,
-        F19,
-        F20,
-        F21,
-        F22,
-        F23,
-        F24,
-        F25,
-        F26,
-        F27,
-        F28,
-        F29,
-        F30,
-        F31,
-        FCSR,
-        NUM_REGS,
-        NEXT_PC=NUM_REGS,
-        TRAP_STATE,
-        PENDING_TRAP,
-        MACHINE_STATE,
-        LAST_BRANCH,
-        ICOUNT,
-        ZERO = X0,
-        RA = X1,
-        SP = X2,
-        GP = X3,
-        TP = X4,
-        T0 = X5,
-        T1 = X6,
-        T2 = X7,
-        S0 = X8,
-        S1 = X9,
-        A0 = X10,
-        A1 = X11,
-        A2 = X12,
-        A3 = X13,
-        A4 = X14,
-        A5 = X15,
-        A6 = X16,
-        A7 = X17,
-        S2 = X18,
-        S3 = X19,
-        S4 = X20,
-        S5 = X21,
-        S6 = X22,
-        S7 = X23,
-        S8 = X24,
-        S9 = X25,
-        S10 = X26,
-        S11 = X27,
-        T3 = X28,
-        T4 = X29,
-        T5 = X30,
-        T6 = X31
-    };
-
-    using reg_t = uint64_t;
-
-    using addr_t = uint64_t;
-
-    using code_word_t = uint64_t; //TODO: check removal
-
-    using virt_addr_t = iss::typed_addr_t<iss::address_type::VIRTUAL>;
-
-    using phys_addr_t = iss::typed_addr_t<iss::address_type::PHYSICAL>;
-
- 	static constexpr std::array<const uint32_t, 72> reg_bit_widths{
- 		{64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,32,64,32,32,32,32,64}};
-
-    static constexpr std::array<const uint32_t, 73> reg_byte_offsets{
-    	{0,8,16,24,32,40,48,56,64,72,80,88,96,104,112,120,128,136,144,152,160,168,176,184,192,200,208,216,224,232,240,248,256,264,272,280,288,296,304,312,320,328,336,344,352,360,368,376,384,392,400,408,416,424,432,440,448,456,464,472,480,488,496,504,512,520,528,536,540,544,548,552,560}};
-
-    static const uint64_t addr_mask = (reg_t(1) << (XLEN - 1)) | ((reg_t(1) << (XLEN - 1)) - 1);
-
-    enum sreg_flag_e { FLAGS };
-
-    enum mem_type_e { MEM, CSR, FENCE, RES };
-};
-
-struct rv64gc: public arch_if {
-
-    using virt_addr_t = typename traits<rv64gc>::virt_addr_t;
-    using phys_addr_t = typename traits<rv64gc>::phys_addr_t;
-    using reg_t =  typename traits<rv64gc>::reg_t;
-    using addr_t = typename traits<rv64gc>::addr_t;
-
-    rv64gc();
-    ~rv64gc();
-
-    void reset(uint64_t address=0) override;
-
-    uint8_t* get_regs_base_ptr() override;
-    /// deprecated
-    void get_reg(short idx, std::vector<uint8_t>& value) override {}
-    void set_reg(short idx, const std::vector<uint8_t>& value) override {}
-    /// deprecated
-    bool get_flag(int flag) override {return false;}
-    void set_flag(int, bool value) override {};
-    /// deprecated
-    void update_flags(operations op, uint64_t opr1, uint64_t opr2) override {};
-
-    inline uint64_t get_icount() { return reg.icount; }
-
-    inline bool should_stop() { return interrupt_sim; }
-
-    inline phys_addr_t v2p(const iss::addr_t& addr){
-        if (addr.space != traits<rv64gc>::MEM || addr.type == iss::address_type::PHYSICAL ||
-                addr_mode[static_cast<uint16_t>(addr.access)&0x3]==address_type::PHYSICAL) {
-            return phys_addr_t(addr.access, addr.space, addr.val&traits<rv64gc>::addr_mask);
-        } else
-            return virt2phys(addr);
-    }
-
-    virtual phys_addr_t virt2phys(const iss::addr_t& addr);
-
-    virtual iss::sync_type needed_sync() const { return iss::NO_SYNC; }
-
-    inline uint32_t get_last_branch() { return reg.last_branch; }
-
-protected:
-    struct RV64GC_regs {
-        uint64_t X0 = 0;
-        uint64_t X1 = 0;
-        uint64_t X2 = 0;
-        uint64_t X3 = 0;
-        uint64_t X4 = 0;
-        uint64_t X5 = 0;
-        uint64_t X6 = 0;
-        uint64_t X7 = 0;
-        uint64_t X8 = 0;
-        uint64_t X9 = 0;
-        uint64_t X10 = 0;
-        uint64_t X11 = 0;
-        uint64_t X12 = 0;
-        uint64_t X13 = 0;
-        uint64_t X14 = 0;
-        uint64_t X15 = 0;
-        uint64_t X16 = 0;
-        uint64_t X17 = 0;
-        uint64_t X18 = 0;
-        uint64_t X19 = 0;
-        uint64_t X20 = 0;
-        uint64_t X21 = 0;
-        uint64_t X22 = 0;
-        uint64_t X23 = 0;
-        uint64_t X24 = 0;
-        uint64_t X25 = 0;
-        uint64_t X26 = 0;
-        uint64_t X27 = 0;
-        uint64_t X28 = 0;
-        uint64_t X29 = 0;
-        uint64_t X30 = 0;
-        uint64_t X31 = 0;
-        uint64_t PC = 0;
-        uint64_t F0 = 0;
-        uint64_t F1 = 0;
-        uint64_t F2 = 0;
-        uint64_t F3 = 0;
-        uint64_t F4 = 0;
-        uint64_t F5 = 0;
-        uint64_t F6 = 0;
-        uint64_t F7 = 0;
-        uint64_t F8 = 0;
-        uint64_t F9 = 0;
-        uint64_t F10 = 0;
-        uint64_t F11 = 0;
-        uint64_t F12 = 0;
-        uint64_t F13 = 0;
-        uint64_t F14 = 0;
-        uint64_t F15 = 0;
-        uint64_t F16 = 0;
-        uint64_t F17 = 0;
-        uint64_t F18 = 0;
-        uint64_t F19 = 0;
-        uint64_t F20 = 0;
-        uint64_t F21 = 0;
-        uint64_t F22 = 0;
-        uint64_t F23 = 0;
-        uint64_t F24 = 0;
-        uint64_t F25 = 0;
-        uint64_t F26 = 0;
-        uint64_t F27 = 0;
-        uint64_t F28 = 0;
-        uint64_t F29 = 0;
-        uint64_t F30 = 0;
-        uint64_t F31 = 0;
-        uint32_t FCSR = 0;
-        uint64_t NEXT_PC = 0;
-        uint32_t trap_state = 0, pending_trap = 0, machine_state = 0, last_branch = 0;
-        uint64_t icount = 0;
-    } reg;
-
-    std::array<address_type, 4> addr_mode;
-    
-    bool interrupt_sim=false;
-
-	uint32_t get_fcsr(){return reg.FCSR;}
-	void set_fcsr(uint32_t val){reg.FCSR = val;}		
-
-};
-
-}
-}            
-#endif /* _RV64GC_H_ */

incl/iss/arch/rv64i.h

@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2017, 2018 MINRES Technologies GmbH
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *******************************************************************************/
-
-
-#ifndef _RV64I_H_
-#define _RV64I_H_
-
-#include <array>
-#include <iss/arch/traits.h>
-#include <iss/arch_if.h>
-#include <iss/vm_if.h>
-
-namespace iss {
-namespace arch {
-
-struct rv64i;
-
-template <> struct traits<rv64i> {
-
-	constexpr static char const* const core_type = "RV64I";
-    
-  	static constexpr std::array<const char*, 33> reg_names{
- 		{"x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26", "x27", "x28", "x29", "x30", "x31", "pc"}};
- 
-  	static constexpr std::array<const char*, 33> reg_aliases{
- 		{"zero", "ra", "sp", "gp", "tp", "t0", "t1", "t2", "s0", "s1", "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "s2", "s3", "s4", "s5", "s6", "s7", "s8", "s9", "s10", "s11", "t3", "t4", "t5", "t6", "pc"}};
-
-    enum constants {XLEN=64, PCLEN=64, MISA_VAL=0b10000000000001000000000100000000, PGSIZE=0x1000, PGMASK=0xfff};
-
-    constexpr static unsigned FP_REGS_SIZE = 0;
-
-    enum reg_e {
-        X0,
-        X1,
-        X2,
-        X3,
-        X4,
-        X5,
-        X6,
-        X7,
-        X8,
-        X9,
-        X10,
-        X11,
-        X12,
-        X13,
-        X14,
-        X15,
-        X16,
-        X17,
-        X18,
-        X19,
-        X20,
-        X21,
-        X22,
-        X23,
-        X24,
-        X25,
-        X26,
-        X27,
-        X28,
-        X29,
-        X30,
-        X31,
-        PC,
-        NUM_REGS,
-        NEXT_PC=NUM_REGS,
-        TRAP_STATE,
-        PENDING_TRAP,
-        MACHINE_STATE,
-        LAST_BRANCH,
-        ICOUNT,
-        ZERO = X0,
-        RA = X1,
-        SP = X2,
-        GP = X3,
-        TP = X4,
-        T0 = X5,
-        T1 = X6,
-        T2 = X7,
-        S0 = X8,
-        S1 = X9,
-        A0 = X10,
-        A1 = X11,
-        A2 = X12,
-        A3 = X13,
-        A4 = X14,
-        A5 = X15,
-        A6 = X16,
-        A7 = X17,
-        S2 = X18,
-        S3 = X19,
-        S4 = X20,
-        S5 = X21,
-        S6 = X22,
-        S7 = X23,
-        S8 = X24,
-        S9 = X25,
-        S10 = X26,
-        S11 = X27,
-        T3 = X28,
-        T4 = X29,
-        T5 = X30,
-        T6 = X31
-    };
-
-    using reg_t = uint64_t;
-
-    using addr_t = uint64_t;
-
-    using code_word_t = uint64_t; //TODO: check removal
-
-    using virt_addr_t = iss::typed_addr_t<iss::address_type::VIRTUAL>;
-
-    using phys_addr_t = iss::typed_addr_t<iss::address_type::PHYSICAL>;
-
- 	static constexpr std::array<const uint32_t, 39> reg_bit_widths{
- 		{64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,32,32,32,32,64}};
-
-    static constexpr std::array<const uint32_t, 40> reg_byte_offsets{
-    	{0,8,16,24,32,40,48,56,64,72,80,88,96,104,112,120,128,136,144,152,160,168,176,184,192,200,208,216,224,232,240,248,256,264,272,276,280,284,288,296}};
-
-    static const uint64_t addr_mask = (reg_t(1) << (XLEN - 1)) | ((reg_t(1) << (XLEN - 1)) - 1);
-
-    enum sreg_flag_e { FLAGS };
-
-    enum mem_type_e { MEM, CSR, FENCE, RES };
-};
-
-struct rv64i: public arch_if {
-
-    using virt_addr_t = typename traits<rv64i>::virt_addr_t;
-    using phys_addr_t = typename traits<rv64i>::phys_addr_t;
-    using reg_t =  typename traits<rv64i>::reg_t;
-    using addr_t = typename traits<rv64i>::addr_t;
-
-    rv64i();
-    ~rv64i();
-
-    void reset(uint64_t address=0) override;
-
-    uint8_t* get_regs_base_ptr() override;
-    /// deprecated
-    void get_reg(short idx, std::vector<uint8_t>& value) override {}
-    void set_reg(short idx, const std::vector<uint8_t>& value) override {}
-    /// deprecated
-    bool get_flag(int flag) override {return false;}
-    void set_flag(int, bool value) override {};
-    /// deprecated
-    void update_flags(operations op, uint64_t opr1, uint64_t opr2) override {};
-
-    inline uint64_t get_icount() { return reg.icount; }
-
-    inline bool should_stop() { return interrupt_sim; }
-
-    inline phys_addr_t v2p(const iss::addr_t& addr){
-        if (addr.space != traits<rv64i>::MEM || addr.type == iss::address_type::PHYSICAL ||
-                addr_mode[static_cast<uint16_t>(addr.access)&0x3]==address_type::PHYSICAL) {
-            return phys_addr_t(addr.access, addr.space, addr.val&traits<rv64i>::addr_mask);
-        } else
-            return virt2phys(addr);
-    }
-
-    virtual phys_addr_t virt2phys(const iss::addr_t& addr);
-
-    virtual iss::sync_type needed_sync() const { return iss::NO_SYNC; }
-
-    inline uint32_t get_last_branch() { return reg.last_branch; }
-
-protected:
-    struct RV64I_regs {
-        uint64_t X0 = 0;
-        uint64_t X1 = 0;
-        uint64_t X2 = 0;
-        uint64_t X3 = 0;
-        uint64_t X4 = 0;
-        uint64_t X5 = 0;
-        uint64_t X6 = 0;
-        uint64_t X7 = 0;
-        uint64_t X8 = 0;
-        uint64_t X9 = 0;
-        uint64_t X10 = 0;
-        uint64_t X11 = 0;
-        uint64_t X12 = 0;
-        uint64_t X13 = 0;
-        uint64_t X14 = 0;
-        uint64_t X15 = 0;
-        uint64_t X16 = 0;
-        uint64_t X17 = 0;
-        uint64_t X18 = 0;
-        uint64_t X19 = 0;
-        uint64_t X20 = 0;
-        uint64_t X21 = 0;
-        uint64_t X22 = 0;
-        uint64_t X23 = 0;
-        uint64_t X24 = 0;
-        uint64_t X25 = 0;
-        uint64_t X26 = 0;
-        uint64_t X27 = 0;
-        uint64_t X28 = 0;
-        uint64_t X29 = 0;
-        uint64_t X30 = 0;
-        uint64_t X31 = 0;
-        uint64_t PC = 0;
-        uint64_t NEXT_PC = 0;
-        uint32_t trap_state = 0, pending_trap = 0, machine_state = 0, last_branch = 0;
-        uint64_t icount = 0;
-    } reg;
-
-    std::array<address_type, 4> addr_mode;
-    
-    bool interrupt_sim=false;
-
-	uint32_t get_fcsr(){return 0;}
-	void set_fcsr(uint32_t val){}
-
-};
-
-}
-}            
-#endif /* _RV64I_H_ */

incl/iss/arch/tgf_b.h

@@ -31,8 +31,8 @@
  *******************************************************************************/
 
 
-#ifndef _MNRV32_H_
-#define _MNRV32_H_
+#ifndef _TGF_B_H_
+#define _TGF_B_H_
 
 #include <array>
 #include <iss/arch/traits.h>
@@ -42,11 +42,11 @@
 namespace iss {
 namespace arch {
 
-struct mnrv32;
+struct tgf_b;
 
-template <> struct traits<mnrv32> {
+template <> struct traits<tgf_b> {
 
-	constexpr static char const* const core_type = "MNRV32";
+	constexpr static char const* const core_type = "TGF_B";
     
   	static constexpr std::array<const char*, 33> reg_names{
  		{"x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26", "x27", "x28", "x29", "x30", "x31", "pc"}};
@@ -54,7 +54,7 @@ template <> struct traits<mnrv32> {
   	static constexpr std::array<const char*, 33> reg_aliases{
  		{"zero", "ra", "sp", "gp", "tp", "t0", "t1", "t2", "s0", "s1", "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "s2", "s3", "s4", "s5", "s6", "s7", "s8", "s9", "s10", "s11", "t3", "t4", "t5", "t6", "pc"}};
 
-    enum constants {XLEN=32, PCLEN=32, MISA_VAL=0b1000000000101000001000100000101, PGSIZE=0x1000, PGMASK=0xfff};
+    enum constants {XLEN=32, PCLEN=32, MISA_VAL=0b1000000000000000000000100000000, PGSIZE=0x1000, PGMASK=0xfff};
 
     constexpr static unsigned FP_REGS_SIZE = 0;
 
@@ -156,15 +156,15 @@ template <> struct traits<mnrv32> {
     enum mem_type_e { MEM, CSR, FENCE, RES };
 };
 
-struct mnrv32: public arch_if {
+struct tgf_b: public arch_if {
 
-    using virt_addr_t = typename traits<mnrv32>::virt_addr_t;
-    using phys_addr_t = typename traits<mnrv32>::phys_addr_t;
-    using reg_t =  typename traits<mnrv32>::reg_t;
-    using addr_t = typename traits<mnrv32>::addr_t;
+    using virt_addr_t = typename traits<tgf_b>::virt_addr_t;
+    using phys_addr_t = typename traits<tgf_b>::phys_addr_t;
+    using reg_t =  typename traits<tgf_b>::reg_t;
+    using addr_t = typename traits<tgf_b>::addr_t;
 
-    mnrv32();
-    ~mnrv32();
+    tgf_b();
+    ~tgf_b();
 
     void reset(uint64_t address=0) override;
 
@@ -185,9 +185,9 @@ struct mnrv32: public arch_if {
     inline uint64_t stop_code() { return interrupt_sim; }
 
     inline phys_addr_t v2p(const iss::addr_t& addr){
-        if (addr.space != traits<mnrv32>::MEM || addr.type == iss::address_type::PHYSICAL ||
+        if (addr.space != traits<tgf_b>::MEM || addr.type == iss::address_type::PHYSICAL ||
                 addr_mode[static_cast<uint16_t>(addr.access)&0x3]==address_type::PHYSICAL) {
-            return phys_addr_t(addr.access, addr.space, addr.val&traits<mnrv32>::addr_mask);
+            return phys_addr_t(addr.access, addr.space, addr.val&traits<tgf_b>::addr_mask);
         } else
             return virt2phys(addr);
     }
@@ -199,7 +199,7 @@ struct mnrv32: public arch_if {
     inline uint32_t get_last_branch() { return reg.last_branch; }
 
 protected:
-    struct MNRV32_regs {
+    struct TGF_B_regs {
         uint32_t X0 = 0;
         uint32_t X1 = 0;
         uint32_t X2 = 0;
@@ -249,4 +249,4 @@ protected:
 
 }
 }            
-#endif /* _MNRV32_H_ */
+#endif /* _TGF_B_H_ */

incl/iss/arch/tgf_c.h

@@ -31,8 +31,8 @@
  *******************************************************************************/
 
 
-#ifndef _RV32IMAC_H_
-#define _RV32IMAC_H_
+#ifndef _TGF_C_H_
+#define _TGF_C_H_
 
 #include <array>
 #include <iss/arch/traits.h>
@@ -42,11 +42,11 @@
 namespace iss {
 namespace arch {
 
-struct rv32imac;
+struct tgf_c;
 
-template <> struct traits<rv32imac> {
+template <> struct traits<tgf_c> {
 
-	constexpr static char const* const core_type = "RV32IMAC";
+	constexpr static char const* const core_type = "TGF_C";
     
   	static constexpr std::array<const char*, 33> reg_names{
  		{"x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26", "x27", "x28", "x29", "x30", "x31", "pc"}};
@@ -54,7 +54,7 @@ template <> struct traits<rv32imac> {
   	static constexpr std::array<const char*, 33> reg_aliases{
  		{"zero", "ra", "sp", "gp", "tp", "t0", "t1", "t2", "s0", "s1", "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "s2", "s3", "s4", "s5", "s6", "s7", "s8", "s9", "s10", "s11", "t3", "t4", "t5", "t6", "pc"}};
 
-    enum constants {XLEN=32, PCLEN=32, MISA_VAL=0b1000000000101000001000100000101, PGSIZE=0x1000, PGMASK=0xfff};
+    enum constants {XLEN=32, PCLEN=32, MUL_LEN=64, MISA_VAL=0b1000000000000000001000100000100, PGSIZE=0x1000, PGMASK=0xfff};
 
     constexpr static unsigned FP_REGS_SIZE = 0;
 
@@ -156,15 +156,15 @@ template <> struct traits<rv32imac> {
     enum mem_type_e { MEM, CSR, FENCE, RES };
 };
 
-struct rv32imac: public arch_if {
+struct tgf_c: public arch_if {
 
-    using virt_addr_t = typename traits<rv32imac>::virt_addr_t;
-    using phys_addr_t = typename traits<rv32imac>::phys_addr_t;
-    using reg_t =  typename traits<rv32imac>::reg_t;
-    using addr_t = typename traits<rv32imac>::addr_t;
+    using virt_addr_t = typename traits<tgf_c>::virt_addr_t;
+    using phys_addr_t = typename traits<tgf_c>::phys_addr_t;
+    using reg_t =  typename traits<tgf_c>::reg_t;
+    using addr_t = typename traits<tgf_c>::addr_t;
 
-    rv32imac();
-    ~rv32imac();
+    tgf_c();
+    ~tgf_c();
 
     void reset(uint64_t address=0) override;
 
@@ -182,10 +182,12 @@ struct rv32imac: public arch_if {
 
     inline bool should_stop() { return interrupt_sim; }
 
+    inline uint64_t stop_code() { return interrupt_sim; }
+
     inline phys_addr_t v2p(const iss::addr_t& addr){
-        if (addr.space != traits<rv32imac>::MEM || addr.type == iss::address_type::PHYSICAL ||
+        if (addr.space != traits<tgf_c>::MEM || addr.type == iss::address_type::PHYSICAL ||
                 addr_mode[static_cast<uint16_t>(addr.access)&0x3]==address_type::PHYSICAL) {
-            return phys_addr_t(addr.access, addr.space, addr.val&traits<rv32imac>::addr_mask);
+            return phys_addr_t(addr.access, addr.space, addr.val&traits<tgf_c>::addr_mask);
         } else
             return virt2phys(addr);
     }
@@ -197,7 +199,7 @@ struct rv32imac: public arch_if {
     inline uint32_t get_last_branch() { return reg.last_branch; }
 
 protected:
-    struct RV32IMAC_regs {
+    struct TGF_C_regs {
         uint32_t X0 = 0;
         uint32_t X1 = 0;
         uint32_t X2 = 0;
@@ -238,7 +240,7 @@ protected:
 
     std::array<address_type, 4> addr_mode;
     
-    bool interrupt_sim=false;
+    uint64_t interrupt_sim=0;
 
 	uint32_t get_fcsr(){return 0;}
 	void set_fcsr(uint32_t val){}
@@ -247,4 +249,4 @@ protected:
 
 }
 }            
-#endif /* _RV32IMAC_H_ */
+#endif /* _TGF_C_H_ */

incl/iss/debugger/riscv_target_adapter.h

@@ -184,33 +184,28 @@ status riscv_target_adapter<ARCH>::read_registers(std::vector<uint8_t> &data, st
     avail.clear();
     const uint8_t *reg_base = core->get_regs_base_ptr();
     for (size_t reg_no = 0; reg_no < arch::traits<ARCH>::NUM_REGS; ++reg_no) {
-        auto reg_width = arch::traits<ARCH>::reg_bit_widths[static_cast<typename arch::traits<ARCH>::reg_e>(reg_no)] / 8;
+        auto reg_width = arch::traits<ARCH>::reg_bit_widths[reg_no] / 8;
         unsigned offset = traits<ARCH>::reg_byte_offsets[reg_no];
         for (size_t j = 0; j < reg_width; ++j) {
             data.push_back(*(reg_base + offset + j));
             avail.push_back(0xff);
         }
-        // if(arch::traits<ARCH>::XLEN < 64)
-        //     for(unsigned j=0; j<4; ++j){
-        //         data.push_back(0);
-        //         avail.push_back(0xff);
-        //     }
     }
     // work around fill with F type registers
-    if (arch::traits<ARCH>::NUM_REGS < 65) {
-        auto reg_width = sizeof(typename arch::traits<ARCH>::reg_t);
-        for (size_t reg_no = 0; reg_no < 33; ++reg_no) {
-            for (size_t j = 0; j < reg_width; ++j) {
-                data.push_back(0x0);
-                avail.push_back(0x00);
-            }
-            // if(arch::traits<ARCH>::XLEN < 64)
-            //     for(unsigned j=0; j<4; ++j){
+//    if (arch::traits<ARCH>::NUM_REGS < 65) {
+//        auto reg_width = sizeof(typename arch::traits<ARCH>::reg_t);
+//        for (size_t reg_no = 0; reg_no < 33; ++reg_no) {
+//            for (size_t j = 0; j < reg_width; ++j) {
 //                data.push_back(0x0);
 //                avail.push_back(0x00);
 //            }
-        }
-    }
+//            // if(arch::traits<ARCH>::XLEN < 64)
+//            //     for(unsigned j=0; j<4; ++j){
+//            //         data.push_back(0x0);
+//            //         avail.push_back(0x00);
+//            //     }
+//        }
+//    }
     return Ok;
 }
 

incl/sysc/core_complex.h

@@ -51,12 +51,12 @@ template <class T_begin, class T_end> class scv_tr_generator;
 namespace iss {
 class vm_if;
 namespace arch {
-template <typename BASE> class riscv_hart_msu_vp;
+template <typename BASE> class riscv_hart_m_p;
 }
 namespace debugger {
 class target_adapter_if;
 }
-}
+} // namespace iss
 
 namespace sysc {
 
@@ -75,31 +75,35 @@ class core_wrapper;
 
 class core_complex : public sc_core::sc_module, public scc::traceable {
 public:
-    scc::initiator_mixin<scv4tlm::tlm_rec_initiator_socket<32>> initiator;
+    scc::initiator_mixin<scv4tlm::tlm_rec_initiator_socket<32>> initiator{"intor"};
 
-    sc_core::sc_in<sc_core::sc_time> clk_i;
+    sc_core::sc_in<sc_core::sc_time> clk_i{"clk_i"};
 
-    sc_core::sc_in<bool> rst_i;
+    sc_core::sc_in<bool> rst_i{"rst_i"};
 
-    sc_core::sc_in<bool> global_irq_i;
+    sc_core::sc_in<bool> global_irq_i{"global_irq_i"};
 
-    sc_core::sc_in<bool> timer_irq_i;
+    sc_core::sc_in<bool> timer_irq_i{"timer_irq_i"};
 
-    sc_core::sc_in<bool> sw_irq_i;
+    sc_core::sc_in<bool> sw_irq_i{"sw_irq_i"};
 
-    sc_core::sc_vector<sc_core::sc_in<bool>> local_irq_i;
+    sc_core::sc_vector<sc_core::sc_in<bool>> local_irq_i{"local_irq_i", 16};
 
     sc_core::sc_port<tlm::tlm_peek_if<uint64_t>, 1, sc_core::SC_ZERO_OR_MORE_BOUND> mtime_o;
 
-    cci::cci_param<std::string> elf_file;
+    cci::cci_param<std::string> elf_file{"elf_file", ""};
 
-    cci::cci_param<bool> enable_disass;
+    cci::cci_param<bool> enable_disass{"enable_disass", false};
 
-    cci::cci_param<uint64_t> reset_address;
+    cci::cci_param<uint64_t> reset_address{"reset_address", 0ULL};
 
-    cci::cci_param<unsigned short> gdb_server_port;
+    cci::cci_param<std::string> backend{"backend", "tcc"};
 
-    cci::cci_param<bool> dump_ir;
+    cci::cci_param<unsigned short> gdb_server_port{"gdb_server_port", 0};
+
+    cci::cci_param<bool> dump_ir{"dump_ir", false};
+
+    cci::cci_param<uint32_t> mhartid{"mhartid", 0};
 
     core_complex(sc_core::sc_module_name name);
 

softfloat/CMakeLists.txt

@@ -2,31 +2,17 @@ cmake_minimum_required(VERSION 3.12)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) # main (top) cmake dir
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) # project specific cmake dir
 
-# CMake useful variables
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") 
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
-
 # Set the name of your project here
-project("sotfloat")
+project("sotfloat" VERSION 3.0.0)
 
 # Set the version number of your project here (format is MAJOR.MINOR.PATCHLEVEL - e.g. 1.0.0)
 set(VERSION "3e")
 
 include(Common)
+include(GNUInstallDirs)
 
 set(SPECIALIZATION RISCV)
 
-add_definitions(
-	-DSOFTFLOAT_ROUND_ODD 
-	-DINLINE_LEVEL=5 
-	-DSOFTFLOAT_FAST_DIV32TO16
-  	-DSOFTFLOAT_FAST_DIV64TO32
-  	-DSOFTFLOAT_FAST_INT64
-#  	-DTHREAD_LOCAL=__thread
-)
-
-
 set(LIB_HEADERS source/include/softfloat.h source/include/softfloat_types.h)
 set(PRIMITIVES
 	source/s_eq128.c
@@ -341,32 +327,29 @@ set(OTHERS
 
 set(LIB_SOURCES ${PRIMITIVES} ${SPECIALIZE} ${OTHERS})
 
-# Define two variables in order not to repeat ourselves.
-set(LIBRARY_NAME softfloat)
-
-# Define the library
-add_library(${LIBRARY_NAME} ${LIB_SOURCES})
-set_property(TARGET ${LIBRARY_NAME} PROPERTY C_STANDARD 99)
-target_include_directories(${LIBRARY_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/build/Linux-x86_64-GCC)
-target_include_directories(${LIBRARY_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/source/include ${CMAKE_CURRENT_SOURCE_DIR}/source/${SPECIALIZATION})
-# Set the build version. It will be used in the name of the lib, with corresponding
-# symlinks created. SOVERSION could also be specified for api version. 
-set_target_properties(${LIBRARY_NAME} PROPERTIES
+add_library(softfloat ${LIB_SOURCES})
+set_property(TARGET softfloat PROPERTY C_STANDARD 99)
+target_compile_definitions(softfloat PRIVATE 
+	SOFTFLOAT_ROUND_ODD 
+	INLINE_LEVEL=5 
+	SOFTFLOAT_FAST_DIV32TO16
+  	SOFTFLOAT_FAST_DIV64TO32
+  	SOFTFLOAT_FAST_INT64
+#  	THREAD_LOCAL=__thread
+)
+target_include_directories(softfloat PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/build/Linux-x86_64-GCC)
+target_include_directories(softfloat PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/source/include ${CMAKE_CURRENT_SOURCE_DIR}/source/${SPECIALIZATION})
+set_target_properties(softfloat PROPERTIES
   VERSION ${VERSION}
   FRAMEWORK FALSE
   PUBLIC_HEADER "${LIB_HEADERS}"
 )
 
-# Says how and where to install software
-# Targets:
-#   * <prefix>/lib/<libraries>
-#   * header location after install: <prefix>/include/<project>/*.h
-#   * headers can be included by C++ code `#<project>/Bar.hpp>`
-install(TARGETS ${LIBRARY_NAME}
+install(TARGETS softfloat
   EXPORT ${PROJECT_NAME}Targets            # for downstream dependencies
-  ARCHIVE DESTINATION lib COMPONENT libs   # static lib
-  LIBRARY DESTINATION lib COMPONENT libs   # shared lib
-  FRAMEWORK DESTINATION bin COMPONENT libs # for mac
-  PUBLIC_HEADER DESTINATION include COMPONENT devel   # headers for mac (note the different component -> different package)
-  INCLUDES DESTINATION include             # headers
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libs   # static lib
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libs   # shared lib
+  FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libs # for mac
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT devel   # headers for mac (note the different component -> different package)
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}                # headers
 )

src/iss/rv32gc.cpp

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2017, 2018 MINRES Technologies GmbH
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *******************************************************************************/
-
-#include "util/ities.h"
-#include <util/logging.h>
-
-#include <elfio/elfio.hpp>
-#include <iss/arch/rv32gc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <ihex.h>
-#ifdef __cplusplus
-}
-#endif
-#include <fstream>
-#include <cstdio>
-#include <cstring>
-
-using namespace iss::arch;
-
-constexpr std::array<const char*, 66>    iss::arch::traits<iss::arch::rv32gc>::reg_names;
-constexpr std::array<const char*, 66>    iss::arch::traits<iss::arch::rv32gc>::reg_aliases;
-constexpr std::array<const uint32_t, 72> iss::arch::traits<iss::arch::rv32gc>::reg_bit_widths;
-constexpr std::array<const uint32_t, 73> iss::arch::traits<iss::arch::rv32gc>::reg_byte_offsets;
-
-rv32gc::rv32gc() {
-    reg.icount=0;
-}
-
-rv32gc::~rv32gc(){
-}
-
-void rv32gc::reset(uint64_t address) {
-    for(size_t i=0; i<traits<rv32gc>::NUM_REGS; ++i) set_reg(i, std::vector<uint8_t>(sizeof(traits<rv32gc>::reg_t),0));
-    reg.PC=address;
-    reg.NEXT_PC=reg.PC;
-    reg.trap_state=0;
-    reg.machine_state=0x3;
-    reg.icount=0;
-}
-
-uint8_t* rv32gc::get_regs_base_ptr(){
-    return reinterpret_cast<uint8_t*>(&reg);
-}
-
-rv32gc::phys_addr_t rv32gc::virt2phys(const iss::addr_t &pc) {
-    return phys_addr_t(pc); // change logical address to physical address
-}
-

src/iss/rv32imac.cpp

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2017, 2018 MINRES Technologies GmbH
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *******************************************************************************/
-
-#include "util/ities.h"
-#include <util/logging.h>
-
-#include <elfio/elfio.hpp>
-#include <iss/arch/rv32imac.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <ihex.h>
-#ifdef __cplusplus
-}
-#endif
-#include <cstdio>
-#include <cstring>
-#include <fstream>
-
-using namespace iss::arch;
-
-constexpr std::array<const char*, 33>    iss::arch::traits<iss::arch::rv32imac>::reg_names;
-constexpr std::array<const char*, 33>    iss::arch::traits<iss::arch::rv32imac>::reg_aliases;
-constexpr std::array<const uint32_t, 39> iss::arch::traits<iss::arch::rv32imac>::reg_bit_widths;
-constexpr std::array<const uint32_t, 40> iss::arch::traits<iss::arch::rv32imac>::reg_byte_offsets;
-
-rv32imac::rv32imac() {
-    reg.icount = 0;
-    reg.machine_state = 0x3;
-}
-
-rv32imac::~rv32imac() = default;
-
-void rv32imac::reset(uint64_t address) {
-    for (size_t i = 0; i < traits<rv32imac>::NUM_REGS; ++i)
-        set_reg(i, std::vector<uint8_t>(sizeof(traits<rv32imac>::reg_t), 0));
-    reg.PC = address;
-    reg.NEXT_PC = reg.PC;
-    reg.trap_state = 0;
-    reg.machine_state = 0x3;
-}
-
-uint8_t *rv32imac::get_regs_base_ptr() { return reinterpret_cast<uint8_t *>(&reg); }
-
-rv32imac::phys_addr_t rv32imac::virt2phys(const iss::addr_t &pc) {
-    return phys_addr_t(pc); // change logical address to physical address
-}

src/iss/rv64gc.cpp

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2017, 2018 MINRES Technologies GmbH
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *******************************************************************************/
-
-
-
-#include "util/ities.h"
-#include <util/logging.h>
-
-#include <elfio/elfio.hpp>
-#include <iss/arch/rv64gc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <ihex.h>
-#ifdef __cplusplus
-}
-#endif
-#include <cstdio>
-#include <cstring>
-#include <fstream>
-
-using namespace iss::arch;
-
-constexpr std::array<const char*, 66>    iss::arch::traits<iss::arch::rv64gc>::reg_names;
-constexpr std::array<const char*, 66>    iss::arch::traits<iss::arch::rv64gc>::reg_aliases;
-constexpr std::array<const uint32_t, 72> iss::arch::traits<iss::arch::rv64gc>::reg_bit_widths;
-constexpr std::array<const uint32_t, 73> iss::arch::traits<iss::arch::rv64gc>::reg_byte_offsets;
-
-rv64gc::rv64gc() {
-    reg.icount = 0;
-}
-
-rv64gc::~rv64gc() = default;
-
-void rv64gc::reset(uint64_t address) {
-    for(size_t i=0; i<traits<rv64gc>::NUM_REGS; ++i) set_reg(i, std::vector<uint8_t>(sizeof(traits<rv64gc>::reg_t),0));
-    reg.PC=address;
-    reg.NEXT_PC=reg.PC;
-    reg.trap_state=0;
-    reg.machine_state=0x3;
-    reg.icount=0;
-}
-
-uint8_t *rv64gc::get_regs_base_ptr() {
-	return reinterpret_cast<uint8_t*>(&reg);
-}
-
-rv64gc::phys_addr_t rv64gc::virt2phys(const iss::addr_t &pc) {
-    return phys_addr_t(pc); // change logical address to physical address
-}
-

src/iss/tgf_b.cpp

@@ -32,36 +32,26 @@
  
 #include "util/ities.h"
 #include <util/logging.h>
-
-#include <elfio/elfio.hpp>
-#include <iss/arch/rv64i.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <ihex.h>
-#ifdef __cplusplus
-}
-#endif
+#include <iss/arch/tgf_b.h>
 #include <cstdio>
 #include <cstring>
 #include <fstream>
 
 using namespace iss::arch;
 
-constexpr std::array<const char*, 33>    iss::arch::traits<iss::arch::rv64i>::reg_names;
-constexpr std::array<const char*, 33>    iss::arch::traits<iss::arch::rv64i>::reg_aliases;
-constexpr std::array<const uint32_t, 39> iss::arch::traits<iss::arch::rv64i>::reg_bit_widths;
-constexpr std::array<const uint32_t, 40> iss::arch::traits<iss::arch::rv64i>::reg_byte_offsets;
+constexpr std::array<const char*, 33>    iss::arch::traits<iss::arch::tgf_b>::reg_names;
+constexpr std::array<const char*, 33>    iss::arch::traits<iss::arch::tgf_b>::reg_aliases;
+constexpr std::array<const uint32_t, 39> iss::arch::traits<iss::arch::tgf_b>::reg_bit_widths;
+constexpr std::array<const uint32_t, 40> iss::arch::traits<iss::arch::tgf_b>::reg_byte_offsets;
 
-rv64i::rv64i() {
+tgf_b::tgf_b() {
     reg.icount = 0;
 }
 
-rv64i::~rv64i() = default;
+tgf_b::~tgf_b() = default;
 
-void rv64i::reset(uint64_t address) {
-    for(size_t i=0; i<traits<rv64i>::NUM_REGS; ++i) set_reg(i, std::vector<uint8_t>(sizeof(traits<rv64i>::reg_t),0));
+void tgf_b::reset(uint64_t address) {
+    for(size_t i=0; i<traits<tgf_b>::NUM_REGS; ++i) set_reg(i, std::vector<uint8_t>(sizeof(traits<tgf_b>::reg_t),0));
     reg.PC=address;
     reg.NEXT_PC=reg.PC;
     reg.trap_state=0;
@@ -69,11 +59,11 @@ void rv64i::reset(uint64_t address) {
     reg.icount=0;
 }
 
-uint8_t *rv64i::get_regs_base_ptr() {
+uint8_t *tgf_b::get_regs_base_ptr() {
 	return reinterpret_cast<uint8_t*>(&reg);
 }
 
-rv64i::phys_addr_t rv64i::virt2phys(const iss::addr_t &pc) {
+tgf_b::phys_addr_t tgf_b::virt2phys(const iss::addr_t &pc) {
     return phys_addr_t(pc); // change logical address to physical address
 }
 

src/iss/tgf_c.cpp

@@ -32,36 +32,26 @@
  
 #include "util/ities.h"
 #include <util/logging.h>
-
-#include <elfio/elfio.hpp>
-#include <iss/arch/mnrv32.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <ihex.h>
-#ifdef __cplusplus
-}
-#endif
+#include <iss/arch/tgf_c.h>
 #include <cstdio>
 #include <cstring>
 #include <fstream>
 
 using namespace iss::arch;
 
-constexpr std::array<const char*, 33>    iss::arch::traits<iss::arch::mnrv32>::reg_names;
-constexpr std::array<const char*, 33>    iss::arch::traits<iss::arch::mnrv32>::reg_aliases;
-constexpr std::array<const uint32_t, 39> iss::arch::traits<iss::arch::mnrv32>::reg_bit_widths;
-constexpr std::array<const uint32_t, 40> iss::arch::traits<iss::arch::mnrv32>::reg_byte_offsets;
+constexpr std::array<const char*, 33>    iss::arch::traits<iss::arch::tgf_c>::reg_names;
+constexpr std::array<const char*, 33>    iss::arch::traits<iss::arch::tgf_c>::reg_aliases;
+constexpr std::array<const uint32_t, 39> iss::arch::traits<iss::arch::tgf_c>::reg_bit_widths;
+constexpr std::array<const uint32_t, 40> iss::arch::traits<iss::arch::tgf_c>::reg_byte_offsets;
 
-mnrv32::mnrv32() {
+tgf_c::tgf_c() {
     reg.icount = 0;
 }
 
-mnrv32::~mnrv32() = default;
+tgf_c::~tgf_c() = default;
 
-void mnrv32::reset(uint64_t address) {
-    for(size_t i=0; i<traits<mnrv32>::NUM_REGS; ++i) set_reg(i, std::vector<uint8_t>(sizeof(traits<mnrv32>::reg_t),0));
+void tgf_c::reset(uint64_t address) {
+    for(size_t i=0; i<traits<tgf_c>::NUM_REGS; ++i) set_reg(i, std::vector<uint8_t>(sizeof(traits<tgf_c>::reg_t),0));
     reg.PC=address;
     reg.NEXT_PC=reg.PC;
     reg.trap_state=0;
@@ -69,11 +59,11 @@ void mnrv32::reset(uint64_t address) {
     reg.icount=0;
 }
 
-uint8_t *mnrv32::get_regs_base_ptr() {
+uint8_t *tgf_c::get_regs_base_ptr() {
 	return reinterpret_cast<uint8_t*>(&reg);
 }
 
-mnrv32::phys_addr_t mnrv32::virt2phys(const iss::addr_t &pc) {
+tgf_c::phys_addr_t tgf_c::virt2phys(const iss::addr_t &pc) {
     return phys_addr_t(pc); // change logical address to physical address
 }
 

src/main.cpp

@@ -35,15 +35,35 @@
 
 #include <boost/lexical_cast.hpp>
 #include <boost/program_options.hpp>
-#include <iss/arch/riscv_hart_msu_vp.h>
-#include <iss/arch/mnrv32.h>
+#include <iss/arch/riscv_hart_m_p.h>
+#include <iss/arch/tgf_b.h>
+#include <iss/arch/tgf_c.h>
+#ifdef WITH_LLVM
 #include <iss/llvm/jit_helper.h>
+#endif
 #include <iss/log_categories.h>
 #include <iss/plugin/cycle_estimate.h>
 #include <iss/plugin/instruction_count.h>
 
 namespace po = boost::program_options;
 
+using cpu_ptr = std::unique_ptr<iss::arch_if>;
+using vm_ptr= std::unique_ptr<iss::vm_if>;
+
+template<typename CORE>
+std::tuple<cpu_ptr, vm_ptr> create_cpu(std::string const& backend, unsigned gdb_port){
+    CORE* lcpu = new iss::arch::riscv_hart_m_p<CORE>();
+    if(backend == "interp")
+        return {cpu_ptr{lcpu}, vm_ptr{iss::interp::create(lcpu, gdb_port)}};
+#ifdef WITH_LLVM
+    if(backend == "llvm")
+        return {cpu_ptr{lcpu}, vm_ptr{iss::llvm::create(lcpu, gdb_port)}};
+#endif
+    if(backend == "tcc")
+        return {cpu_ptr{lcpu}, vm_ptr{iss::tcc::create(lcpu, gdb_port)}};
+    return {nullptr, nullptr};
+}
+
 int main(int argc, char *argv[]) {
     /*
      *  Define and parse the program options
@@ -64,7 +84,7 @@ int main(int argc, char *argv[]) {
         ("mem,m", po::value<std::string>(), "the memory input file")
         ("plugin,p", po::value<std::vector<std::string>>(), "plugin to activate")
         ("backend", po::value<std::string>()->default_value("tcc"), "the memory input file")
-        ("isa", po::value<std::string>()->default_value("rv32gc"), "isa to use for simulation");
+        ("isa", po::value<std::string>()->default_value("tgf_c"), "isa to use for simulation");
     // clang-format on
     auto parsed = po::command_line_parser(argc, argv).options(desc).allow_unregistered().run();
     try {
@@ -100,24 +120,28 @@ int main(int argc, char *argv[]) {
     std::vector<iss::vm_plugin *> plugin_list;
     auto res = 0;
     try {
+#ifdef WITH_LLVM
         // application code comes here //
         iss::init_jit_debug(argc, argv);
+#endif
         bool dump = clim.count("dump-ir");
         // instantiate the simulator
-        std::unique_ptr<iss::vm_if> vm{nullptr};
-        std::unique_ptr<iss::arch_if> cpu{nullptr};
+        vm_ptr vm{nullptr};
+        cpu_ptr cpu{nullptr};
         std::string isa_opt(clim["isa"].as<std::string>());
-        iss::arch::mnrv32* lcpu = new iss::arch::riscv_hart_msu_vp<iss::arch::mnrv32>();
-        if(clim["backend"].as<std::string>() == "interp")
-            vm = iss::interp::create(lcpu, clim["gdb-port"].as<unsigned>());
-        if(clim["backend"].as<std::string>() == "llvm")
-            vm = iss::llvm::create(lcpu, clim["gdb-port"].as<unsigned>());
-        if(clim["backend"].as<std::string>() == "tcc")
-            vm = iss::tcc::create(lcpu, clim["gdb-port"].as<unsigned>());
-        cpu.reset(lcpu);
+        if (isa_opt == "tgf_b") {
+            std::tie(cpu, vm) =
+                create_cpu<iss::arch::tgf_b>(clim["backend"].as<std::string>(), clim["gdb-port"].as<unsigned>());
+        } else if (isa_opt == "tgf_c") {
+            std::tie(cpu, vm) =
+                create_cpu<iss::arch::tgf_c>(clim["backend"].as<std::string>(), clim["gdb-port"].as<unsigned>());
+        } else {
+            LOG(ERROR) << "Illegal argument value for '--isa': " << clim["isa"].as<std::string>() << std::endl;
+            return 127;
+        }
         if (clim.count("plugin")) {
-            for (std::string opt_val : clim["plugin"].as<std::vector<std::string>>()) {
-                std::string plugin_name{opt_val};
+            for (std::string const& opt_val : clim["plugin"].as<std::vector<std::string>>()) {
+                std::string plugin_name=opt_val;
                 std::string filename{"cycles.txt"};
                 std::size_t found = opt_val.find('=');
                 if (found != std::string::npos) {
@@ -150,7 +174,7 @@ int main(int argc, char *argv[]) {
         }
         uint64_t start_address = 0;
         if (clim.count("mem"))
-            vm->get_arch()->load_file(clim["mem"].as<std::string>(), iss::arch::traits<iss::arch::mnrv32>::MEM);
+            vm->get_arch()->load_file(clim["mem"].as<std::string>(), iss::arch::traits<iss::arch::tgf_b>::MEM);
         if (clim.count("elf"))
             for (std::string input : clim["elf"].as<std::vector<std::string>>()) {
                 auto start_addr = vm->get_arch()->load_file(input);

src/sysc/core_complex.cpp

@@ -31,9 +31,8 @@
  *******************************************************************************/
 
 #include "sysc/core_complex.h"
-#include "iss/arch/riscv_hart_msu_vp.h"
-//#include "iss/arch/rv32imac.h"
-#include "iss/arch/mnrv32.h"
+#include "iss/arch/riscv_hart_m_p.h"
+#include "iss/arch/tgf_c.h"
 #include "iss/debugger/encoderdecoder.h"
 #include "iss/debugger/gdb_session.h"
 #include "iss/debugger/server.h"
@@ -41,8 +40,8 @@
 #include "iss/iss.h"
 #include "iss/vm_types.h"
 #include "scc/report.h"
-#include <sstream>
 #include <iostream>
+#include <sstream>
 
 #ifdef WITH_SCV
 #include <array>
@@ -60,8 +59,7 @@ namespace {
 iss::debugger::encoder_decoder encdec;
 }
 
-//using core_type = iss::arch::rv32imac;
-using core_type = iss::arch::mnrv32;
+using core_type = iss::arch::tgf_c;
 
 namespace {
 
@@ -91,14 +89,12 @@ std::array<const char*, 12> irq_str = { {
 		"User external interrupt", "Supervisor external interrupt", "Reserved", "Machine external interrupt" } };
 }
 
-class core_wrapper : public iss::arch::riscv_hart_msu_vp<core_type> {
+class core_wrapper : public iss::arch::riscv_hart_m_p<core_type> {
 public:
-    using base_type = arch::riscv_hart_msu_vp<core_type>;
+    using base_type = arch::riscv_hart_m_p<core_type>;
     using phys_addr_t = typename arch::traits<core_type>::phys_addr_t;
     core_wrapper(core_complex *owner)
-    : owner(owner) 
-    {
-    }
+    : owner(owner) { }
 
     uint32_t get_mode() { return this->reg.machine_state; }
 
@@ -166,7 +162,7 @@ public:
     }
 
     void wait_until(uint64_t flags) override {
-        SCDEBUG(owner->name()) << "Sleeping until interrupt";
+        SCCDEBUG(owner->name()) << "Sleeping until interrupt";
         do {
             wait(wfi_evt);
         } while (this->reg.pending_trap == 0);
@@ -222,7 +218,7 @@ int cmd_sysc(int argc, char *argv[], debugger::out_func of, debugger::data_func
                 return Err;
             // no check needed as it is only called if debug server is active
             tgt_adapter->add_break_condition([t]() -> unsigned {
-                SCTRACE() << "Checking condition at " << sc_time_stamp();
+                SCCTRACE() << "Checking condition at " << sc_time_stamp();
                 return sc_time_stamp() >= t ? std::numeric_limits<unsigned>::max() : 0;
             });
             return Ok;
@@ -234,17 +230,6 @@ int cmd_sysc(int argc, char *argv[], debugger::out_func of, debugger::data_func
 
 core_complex::core_complex(sc_module_name name)
 : sc_module(name)
-, NAMED(initiator)
-, NAMED(clk_i)
-, NAMED(rst_i)
-, NAMED(global_irq_i)
-, NAMED(timer_irq_i)
-, NAMED(local_irq_i, 16)
-, NAMED(elf_file, "")
-, NAMED(enable_disass, false)
-, NAMED(reset_address, 0ULL)
-, NAMED(gdb_server_port, 0)
-, NAMED(dump_ir, false)
 , read_lut(tlm_dmi_ext())
 , write_lut(tlm_dmi_ext())
 , tgt_adapter(nullptr)
@@ -284,9 +269,25 @@ core_complex::~core_complex() = default;
 
 void core_complex::trace(sc_trace_file *trf) const {}
 
+using vm_ptr= std::unique_ptr<iss::vm_if>;
+vm_ptr create_cpu(core_wrapper* cpu, std::string const& backend, unsigned gdb_port){
+    if(backend == "interp")
+        return vm_ptr{iss::interp::create<core_type>(cpu, gdb_port)};
+#ifdef WITH_LLVM
+    if(backend == "llvm")
+        return vm_ptr{iss::llvm::create(lcpu, gdb_port)};
+#endif
+    if(backend == "tcc")
+        return vm_ptr{iss::tcc::create<core_type>(cpu, gdb_port)};
+    return {nullptr};
+}
+
 void core_complex::before_end_of_elaboration() {
+    SCCDEBUG(SCMOD)<<"instantiating iss::arch::tgf with "<<backend.get_value()<<" backend";
     cpu = scc::make_unique<core_wrapper>(this);
-    vm = llvm::create<core_type>(cpu.get(), gdb_server_port.get_value(), dump_ir.get_value());
+    cpu->set_mhartid(mhartid.get_value());
+
+    vm = create_cpu(cpu.get(), backend.get_value(), gdb_server_port.get_value());
 #ifdef WITH_SCV
     vm->setDisassEnabled(enable_disass.get_value() || m_db != nullptr);
 #else
@@ -392,7 +393,7 @@ bool core_complex::read_mem(uint64_t addr, unsigned length, uint8_t *const data,
         }
 #endif
         initiator->b_transport(gp, delay);
-        SCTRACE(this->name()) << "read_mem(0x" << std::hex << addr << ") : " << data;
+        SCCTRACE(this->name()) << "read_mem(0x" << std::hex << addr << ") : " << data;
         if (gp.get_response_status() != tlm::TLM_OK_RESPONSE) {
             return false;
         }
@@ -439,7 +440,7 @@ bool core_complex::write_mem(uint64_t addr, unsigned length, const uint8_t *cons
 #endif
         initiator->b_transport(gp, delay);
         quantum_keeper.set(delay);
-        SCTRACE() << "write_mem(0x" << std::hex << addr << ") : " << data;
+        SCCTRACE() << "write_mem(0x" << std::hex << addr << ") : " << data;
         if (gp.get_response_status() != tlm::TLM_OK_RESPONSE) {
             return false;
         }

src/vm/fp_functions.cpp

@@ -32,8 +32,7 @@
 //       eyck@minres.com - initial API and implementation
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <iss/iss.h>
-#include <iss/llvm/vm_base.h>
+#include "fp_functions.h"
 
 extern "C" {
 #include <softfloat.h>
@@ -43,71 +42,6 @@ extern "C" {
 
 #include <limits>
 
-namespace iss {
-namespace llvm {
-namespace fp_impl {
-
-using namespace std;
-using namespace ::llvm;
-
-#define INT_TYPE(L)   Type::getIntNTy(mod->getContext(), L)
-#define FLOAT_TYPE    Type::getFloatTy(mod->getContext())
-#define DOUBLE_TYPE   Type::getDoubleTy(mod->getContext())
-#define VOID_TYPE     Type::getVoidTy(mod->getContext())
-#define THIS_PTR_TYPE Type::getIntNPtrTy(mod->getContext(), 8)
-#define FDECLL(NAME, RET, ...)                                                                                         \
-    Function *NAME##_func = CurrentModule->getFunction(#NAME);                                                         \
-    if (!NAME##_func) {                                                                                                \
-        std::vector<Type *> NAME##_args{__VA_ARGS__};                                                                  \
-        FunctionType *NAME##_type = FunctionType::get(RET, NAME##_args, false);                                        \
-        NAME##_func = Function::Create(NAME##_type, GlobalValue::ExternalLinkage, #NAME, CurrentModule);               \
-        NAME##_func->setCallingConv(CallingConv::C);                                                                   \
-    }
-
-#define FDECL(NAME, RET, ...)                                                                                          \
-    std::vector<Type *> NAME##_args{__VA_ARGS__};                                                                      \
-    FunctionType *NAME##_type = FunctionType::get(RET, NAME##_args, false);                                      \
-    mod->getOrInsertFunction(#NAME, NAME##_type);
-
-
-void add_fp_functions_2_module(Module *mod, uint32_t flen, uint32_t xlen) {
-    if(flen){
-        FDECL(fget_flags, INT_TYPE(32));
-        FDECL(fadd_s,     INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
-        FDECL(fsub_s,     INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
-        FDECL(fmul_s,     INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
-        FDECL(fdiv_s,     INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
-        FDECL(fsqrt_s,    INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
-        FDECL(fcmp_s,     INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(32));
-        FDECL(fcvt_s,     INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
-        FDECL(fmadd_s,    INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
-        FDECL(fsel_s,     INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(32));
-        FDECL(fclass_s,   INT_TYPE(32), INT_TYPE(32));
-        FDECL(fcvt_32_64,     INT_TYPE(64), INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
-        FDECL(fcvt_64_32,     INT_TYPE(32), INT_TYPE(64), INT_TYPE(32), INT_TYPE(8));
-        if(flen>32){
-            FDECL(fconv_d2f,  INT_TYPE(32), INT_TYPE(64), INT_TYPE(8));
-            FDECL(fconv_f2d,  INT_TYPE(64), INT_TYPE(32), INT_TYPE(8));
-            FDECL(fadd_d,     INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(8));
-            FDECL(fsub_d,     INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(8));
-            FDECL(fmul_d,     INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(8));
-            FDECL(fdiv_d,     INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(8));
-            FDECL(fsqrt_d,    INT_TYPE(64), INT_TYPE(64), INT_TYPE(8));
-            FDECL(fcmp_d,     INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(32));
-            FDECL(fcvt_d,     INT_TYPE(64), INT_TYPE(64), INT_TYPE(32), INT_TYPE(8));
-            FDECL(fmadd_d,    INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(32), INT_TYPE(8));
-            FDECL(fsel_d,     INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(32));
-            FDECL(fclass_d,   INT_TYPE(64), INT_TYPE(64));
-            FDECL(unbox_s,      INT_TYPE(32), INT_TYPE(64));
-
-        }
-    }
-}
-
-}
-}
-}
-
 using this_t = uint8_t *;
 const uint8_t rmm_map[] = {
         softfloat_round_near_even /*RNE*/,

src/vm/fp_functions.h

@@ -0,0 +1,68 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2020, MINRES Technologies GmbH
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation
+//    and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors
+//    may be used to endorse or promote products derived from this software
+//    without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Contributors:
+//       eyck@minres.com - initial API and implementation
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef _VM_FP_FUNCTIONS_H_
+#define _VM_FP_FUNCTIONS_H_
+
+#include <stdint.h>
+
+extern "C" {
+uint32_t fget_flags();
+uint32_t fadd_s(uint32_t v1, uint32_t v2, uint8_t mode);
+uint32_t fsub_s(uint32_t v1, uint32_t v2, uint8_t mode);
+uint32_t fmul_s(uint32_t v1, uint32_t v2, uint8_t mode);
+uint32_t fdiv_s(uint32_t v1, uint32_t v2, uint8_t mode);
+uint32_t fsqrt_s(uint32_t v1, uint8_t mode);
+uint32_t fcmp_s(uint32_t v1, uint32_t v2, uint32_t op) ;
+uint32_t fcvt_s(uint32_t v1, uint32_t op, uint8_t mode);
+uint32_t fmadd_s(uint32_t v1, uint32_t v2, uint32_t v3, uint32_t op, uint8_t mode);
+uint32_t fsel_s(uint32_t v1, uint32_t v2, uint32_t op);
+uint32_t fclass_s( uint32_t v1 );
+uint32_t fconv_d2f(uint64_t v1, uint8_t mode);
+uint64_t fconv_f2d(uint32_t v1, uint8_t mode);
+uint64_t fadd_d(uint64_t v1, uint64_t v2, uint8_t mode);
+uint64_t fsub_d(uint64_t v1, uint64_t v2, uint8_t mode);
+uint64_t fmul_d(uint64_t v1, uint64_t v2, uint8_t mode);
+uint64_t fdiv_d(uint64_t v1, uint64_t v2, uint8_t mode);
+uint64_t fsqrt_d(uint64_t v1, uint8_t mode);
+uint64_t fcmp_d(uint64_t v1, uint64_t v2, uint32_t op);
+uint64_t fcvt_d(uint64_t v1, uint32_t op, uint8_t mode);
+uint64_t fmadd_d(uint64_t v1, uint64_t v2, uint64_t v3, uint32_t op, uint8_t mode);
+uint64_t fsel_d(uint64_t v1, uint64_t v2, uint32_t op) ;
+uint64_t fclass_d(uint64_t v1  );
+uint64_t fcvt_32_64(uint32_t v1, uint32_t op, uint8_t mode);
+uint32_t fcvt_64_32(uint64_t v1, uint32_t op, uint8_t mode);
+uint32_t unbox_s(uint64_t v);
+}
+#endif /* RISCV_SRC_VM_FP_FUNCTIONS_H_ */

src/vm/interp/vm_tgf_c.cpp

@@ -30,8 +30,9 @@
  *
  *******************************************************************************/
 
-#include <iss/arch/mnrv32.h>
-#include <iss/arch/riscv_hart_msu_vp.h>
+#include "../fp_functions.h"
+#include <iss/arch/tgf_c.h>
+#include <iss/arch/riscv_hart_m_p.h>
 #include <iss/debugger/gdb_session.h>
 #include <iss/debugger/server.h>
 #include <iss/iss.h>
@@ -49,7 +50,7 @@
 
 namespace iss {
 namespace interp {
-namespace mnrv32 {
+namespace tgf_c {
 using namespace iss::arch;
 using namespace iss::debugger;
 
@@ -166,7 +167,7 @@ private:
         compile_func op;
     };
 
-    const std::array<InstructionDesriptor, 80> instr_descr = {{
+    const std::array<InstructionDesriptor, 88> instr_descr = {{
          /* entries are: size, valid value, valid mask, function ptr */
         /* instruction LUI */
         {32, 0b00000000000000000000000000110111, 0b00000000000000000000000001111111, &this_class::__lui},
@@ -272,6 +273,22 @@ private:
         {32, 0b00000000000000000110000001110011, 0b00000000000000000111000001111111, &this_class::__csrrsi},
         /* instruction CSRRCI */
         {32, 0b00000000000000000111000001110011, 0b00000000000000000111000001111111, &this_class::__csrrci},
+        /* instruction MUL */
+        {32, 0b00000010000000000000000000110011, 0b11111110000000000111000001111111, &this_class::__mul},
+        /* instruction MULH */
+        {32, 0b00000010000000000001000000110011, 0b11111110000000000111000001111111, &this_class::__mulh},
+        /* instruction MULHSU */
+        {32, 0b00000010000000000010000000110011, 0b11111110000000000111000001111111, &this_class::__mulhsu},
+        /* instruction MULHU */
+        {32, 0b00000010000000000011000000110011, 0b11111110000000000111000001111111, &this_class::__mulhu},
+        /* instruction DIV */
+        {32, 0b00000010000000000100000000110011, 0b11111110000000000111000001111111, &this_class::__div},
+        /* instruction DIVU */
+        {32, 0b00000010000000000101000000110011, 0b11111110000000000111000001111111, &this_class::__divu},
+        /* instruction REM */
+        {32, 0b00000010000000000110000000110011, 0b11111110000000000111000001111111, &this_class::__rem},
+        /* instruction REMU */
+        {32, 0b00000010000000000111000000110011, 0b11111110000000000111000001111111, &this_class::__remu},
         /* instruction C.ADDI4SPN */
         {16, 0b0000000000000000, 0b1110000000000011, &this_class::__c_addi4spn},
         /* instruction C.LW */
@@ -2051,10 +2068,334 @@ private:
         return pc;
     }
     
-    /* instruction 52: C.ADDI4SPN */
-    compile_ret_t __c_addi4spn(virt_addr_t& pc, code_word_t instr){
+    /* instruction 52: MUL */
+    compile_ret_t __mul(virt_addr_t& pc, code_word_t instr){
         this->do_sync(PRE_SYNC, 52);
         
+        uint8_t rd = ((bit_sub<7,5>(instr)));
+        uint8_t rs1 = ((bit_sub<15,5>(instr)));
+        uint8_t rs2 = ((bit_sub<20,5>(instr)));
+        if(this->disass_enabled){
+            /* generate console output when executing the command */
+            auto mnemonic = fmt::format(
+                "{mnemonic:10} {rd}, {rs1}, {rs2}", fmt::arg("mnemonic", "mul"),
+            	fmt::arg("rd", name(rd)), fmt::arg("rs1", name(rs1)), fmt::arg("rs2", name(rs2)));
+            this->core.disass_output(pc.val, mnemonic);
+        }
+        
+        auto cur_pc_val = pc.val;
+        super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 4;
+        if(rd != 0){
+            auto res_val = (super::template zext<uint64_t>(super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0)) * super::template zext<uint64_t>(super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0)));
+            auto Xtmp0_val = super::template zext<uint32_t>(res_val);
+            super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp0_val;
+        }
+        this->do_sync(POST_SYNC, 52);
+        auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
+        // trap check
+        if(trap_state!=0){
+            auto& last_br = super::template get_reg<uint32_t>(arch::traits<ARCH>::LAST_BRANCH);
+            last_br = std::numeric_limits<uint32_t>::max();
+            super::core.enter_trap(trap_state, cur_pc_val);
+        }
+        pc.val=super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC);
+        return pc;
+    }
+    
+    /* instruction 53: MULH */
+    compile_ret_t __mulh(virt_addr_t& pc, code_word_t instr){
+        this->do_sync(PRE_SYNC, 53);
+        
+        uint8_t rd = ((bit_sub<7,5>(instr)));
+        uint8_t rs1 = ((bit_sub<15,5>(instr)));
+        uint8_t rs2 = ((bit_sub<20,5>(instr)));
+        if(this->disass_enabled){
+            /* generate console output when executing the command */
+            auto mnemonic = fmt::format(
+                "{mnemonic:10} {rd}, {rs1}, {rs2}", fmt::arg("mnemonic", "mulh"),
+            	fmt::arg("rd", name(rd)), fmt::arg("rs1", name(rs1)), fmt::arg("rs2", name(rs2)));
+            this->core.disass_output(pc.val, mnemonic);
+        }
+        
+        auto cur_pc_val = pc.val;
+        super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 4;
+        if(rd != 0){
+            auto res_val = (super::template sext<int64_t>(super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0)) * super::template sext<int64_t>(super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0)));
+            auto Xtmp0_val = super::template zext<uint32_t>((res_val >> (32)));
+            super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp0_val;
+        }
+        this->do_sync(POST_SYNC, 53);
+        auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
+        // trap check
+        if(trap_state!=0){
+            auto& last_br = super::template get_reg<uint32_t>(arch::traits<ARCH>::LAST_BRANCH);
+            last_br = std::numeric_limits<uint32_t>::max();
+            super::core.enter_trap(trap_state, cur_pc_val);
+        }
+        pc.val=super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC);
+        return pc;
+    }
+    
+    /* instruction 54: MULHSU */
+    compile_ret_t __mulhsu(virt_addr_t& pc, code_word_t instr){
+        this->do_sync(PRE_SYNC, 54);
+        
+        uint8_t rd = ((bit_sub<7,5>(instr)));
+        uint8_t rs1 = ((bit_sub<15,5>(instr)));
+        uint8_t rs2 = ((bit_sub<20,5>(instr)));
+        if(this->disass_enabled){
+            /* generate console output when executing the command */
+            auto mnemonic = fmt::format(
+                "{mnemonic:10} {rd}, {rs1}, {rs2}", fmt::arg("mnemonic", "mulhsu"),
+            	fmt::arg("rd", name(rd)), fmt::arg("rs1", name(rs1)), fmt::arg("rs2", name(rs2)));
+            this->core.disass_output(pc.val, mnemonic);
+        }
+        
+        auto cur_pc_val = pc.val;
+        super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 4;
+        if(rd != 0){
+            auto res_val = (super::template sext<int64_t>(super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0)) * super::template zext<uint64_t>(super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0)));
+            auto Xtmp0_val = super::template zext<uint32_t>((res_val >> (32)));
+            super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp0_val;
+        }
+        this->do_sync(POST_SYNC, 54);
+        auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
+        // trap check
+        if(trap_state!=0){
+            auto& last_br = super::template get_reg<uint32_t>(arch::traits<ARCH>::LAST_BRANCH);
+            last_br = std::numeric_limits<uint32_t>::max();
+            super::core.enter_trap(trap_state, cur_pc_val);
+        }
+        pc.val=super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC);
+        return pc;
+    }
+    
+    /* instruction 55: MULHU */
+    compile_ret_t __mulhu(virt_addr_t& pc, code_word_t instr){
+        this->do_sync(PRE_SYNC, 55);
+        
+        uint8_t rd = ((bit_sub<7,5>(instr)));
+        uint8_t rs1 = ((bit_sub<15,5>(instr)));
+        uint8_t rs2 = ((bit_sub<20,5>(instr)));
+        if(this->disass_enabled){
+            /* generate console output when executing the command */
+            auto mnemonic = fmt::format(
+                "{mnemonic:10} {rd}, {rs1}, {rs2}", fmt::arg("mnemonic", "mulhu"),
+            	fmt::arg("rd", name(rd)), fmt::arg("rs1", name(rs1)), fmt::arg("rs2", name(rs2)));
+            this->core.disass_output(pc.val, mnemonic);
+        }
+        
+        auto cur_pc_val = pc.val;
+        super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 4;
+        if(rd != 0){
+            auto res_val = (super::template zext<uint64_t>(super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0)) * super::template zext<uint64_t>(super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0)));
+            auto Xtmp0_val = super::template zext<uint32_t>((res_val >> (32)));
+            super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp0_val;
+        }
+        this->do_sync(POST_SYNC, 55);
+        auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
+        // trap check
+        if(trap_state!=0){
+            auto& last_br = super::template get_reg<uint32_t>(arch::traits<ARCH>::LAST_BRANCH);
+            last_br = std::numeric_limits<uint32_t>::max();
+            super::core.enter_trap(trap_state, cur_pc_val);
+        }
+        pc.val=super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC);
+        return pc;
+    }
+    
+    /* instruction 56: DIV */
+    compile_ret_t __div(virt_addr_t& pc, code_word_t instr){
+        this->do_sync(PRE_SYNC, 56);
+        
+        uint8_t rd = ((bit_sub<7,5>(instr)));
+        uint8_t rs1 = ((bit_sub<15,5>(instr)));
+        uint8_t rs2 = ((bit_sub<20,5>(instr)));
+        if(this->disass_enabled){
+            /* generate console output when executing the command */
+            auto mnemonic = fmt::format(
+                "{mnemonic:10} {rd}, {rs1}, {rs2}", fmt::arg("mnemonic", "div"),
+            	fmt::arg("rd", name(rd)), fmt::arg("rs1", name(rs1)), fmt::arg("rs2", name(rs2)));
+            this->core.disass_output(pc.val, mnemonic);
+        }
+        
+        auto cur_pc_val = pc.val;
+        super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 4;
+        if(rd != 0){
+            {
+                if((super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0) != 0)) {
+                    uint32_t M1_val = - 1;
+                    uint8_t XLM1_val = 32 - 1;
+                    uint32_t ONE_val = 1;
+                    uint32_t MMIN_val = ONE_val << XLM1_val;
+                    {
+                        if(((super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0) == MMIN_val) && (super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0) == M1_val))) {
+                            auto Xtmp0_val = MMIN_val;
+                            super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp0_val;
+                        }
+                        else {
+                            auto Xtmp1_val = (static_cast<int32_t>(super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0)) / static_cast<int32_t>(super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0)));
+                            super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp1_val;
+                        }
+                    }
+                }
+                else {
+                    auto Xtmp2_val = -(1);
+                    super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp2_val;
+                }
+            }
+        }
+        this->do_sync(POST_SYNC, 56);
+        auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
+        // trap check
+        if(trap_state!=0){
+            auto& last_br = super::template get_reg<uint32_t>(arch::traits<ARCH>::LAST_BRANCH);
+            last_br = std::numeric_limits<uint32_t>::max();
+            super::core.enter_trap(trap_state, cur_pc_val);
+        }
+        pc.val=super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC);
+        return pc;
+    }
+    
+    /* instruction 57: DIVU */
+    compile_ret_t __divu(virt_addr_t& pc, code_word_t instr){
+        this->do_sync(PRE_SYNC, 57);
+        
+        uint8_t rd = ((bit_sub<7,5>(instr)));
+        uint8_t rs1 = ((bit_sub<15,5>(instr)));
+        uint8_t rs2 = ((bit_sub<20,5>(instr)));
+        if(this->disass_enabled){
+            /* generate console output when executing the command */
+            auto mnemonic = fmt::format(
+                "{mnemonic:10} {rd}, {rs1}, {rs2}", fmt::arg("mnemonic", "divu"),
+            	fmt::arg("rd", name(rd)), fmt::arg("rs1", name(rs1)), fmt::arg("rs2", name(rs2)));
+            this->core.disass_output(pc.val, mnemonic);
+        }
+        
+        auto cur_pc_val = pc.val;
+        super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 4;
+        if(rd != 0){
+            {
+                if((super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0) != 0)) {
+                    auto Xtmp0_val = (super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0) / super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0));
+                    super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp0_val;
+                }
+                else {
+                    auto Xtmp1_val = -(1);
+                    super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp1_val;
+                }
+            }
+        }
+        this->do_sync(POST_SYNC, 57);
+        auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
+        // trap check
+        if(trap_state!=0){
+            auto& last_br = super::template get_reg<uint32_t>(arch::traits<ARCH>::LAST_BRANCH);
+            last_br = std::numeric_limits<uint32_t>::max();
+            super::core.enter_trap(trap_state, cur_pc_val);
+        }
+        pc.val=super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC);
+        return pc;
+    }
+    
+    /* instruction 58: REM */
+    compile_ret_t __rem(virt_addr_t& pc, code_word_t instr){
+        this->do_sync(PRE_SYNC, 58);
+        
+        uint8_t rd = ((bit_sub<7,5>(instr)));
+        uint8_t rs1 = ((bit_sub<15,5>(instr)));
+        uint8_t rs2 = ((bit_sub<20,5>(instr)));
+        if(this->disass_enabled){
+            /* generate console output when executing the command */
+            auto mnemonic = fmt::format(
+                "{mnemonic:10} {rd}, {rs1}, {rs2}", fmt::arg("mnemonic", "rem"),
+            	fmt::arg("rd", name(rd)), fmt::arg("rs1", name(rs1)), fmt::arg("rs2", name(rs2)));
+            this->core.disass_output(pc.val, mnemonic);
+        }
+        
+        auto cur_pc_val = pc.val;
+        super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 4;
+        if(rd != 0){
+            {
+                if((super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0) != 0)) {
+                    uint32_t M1_val = - 1;
+                    uint32_t XLM1_val = 32 - 1;
+                    uint32_t ONE_val = 1;
+                    uint32_t MMIN_val = ONE_val << XLM1_val;
+                    {
+                        if(((super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0) == MMIN_val) && (super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0) == M1_val))) {
+                            auto Xtmp0_val = 0;
+                            super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp0_val;
+                        }
+                        else {
+                            auto Xtmp1_val = (static_cast<int32_t>(super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0)) % static_cast<int32_t>(super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0)));
+                            super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp1_val;
+                        }
+                    }
+                }
+                else {
+                    auto Xtmp2_val = super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0);
+                    super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp2_val;
+                }
+            }
+        }
+        this->do_sync(POST_SYNC, 58);
+        auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
+        // trap check
+        if(trap_state!=0){
+            auto& last_br = super::template get_reg<uint32_t>(arch::traits<ARCH>::LAST_BRANCH);
+            last_br = std::numeric_limits<uint32_t>::max();
+            super::core.enter_trap(trap_state, cur_pc_val);
+        }
+        pc.val=super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC);
+        return pc;
+    }
+    
+    /* instruction 59: REMU */
+    compile_ret_t __remu(virt_addr_t& pc, code_word_t instr){
+        this->do_sync(PRE_SYNC, 59);
+        
+        uint8_t rd = ((bit_sub<7,5>(instr)));
+        uint8_t rs1 = ((bit_sub<15,5>(instr)));
+        uint8_t rs2 = ((bit_sub<20,5>(instr)));
+        if(this->disass_enabled){
+            /* generate console output when executing the command */
+            auto mnemonic = fmt::format(
+                "{mnemonic:10} {rd}, {rs1}, {rs2}", fmt::arg("mnemonic", "remu"),
+            	fmt::arg("rd", name(rd)), fmt::arg("rs1", name(rs1)), fmt::arg("rs2", name(rs2)));
+            this->core.disass_output(pc.val, mnemonic);
+        }
+        
+        auto cur_pc_val = pc.val;
+        super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 4;
+        if(rd != 0){
+            {
+                if((super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0) != 0)) {
+                    auto Xtmp0_val = (super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0) % super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0));
+                    super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp0_val;
+                }
+                else {
+                    auto Xtmp1_val = super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0);
+                    super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp1_val;
+                }
+            }
+        }
+        this->do_sync(POST_SYNC, 59);
+        auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
+        // trap check
+        if(trap_state!=0){
+            auto& last_br = super::template get_reg<uint32_t>(arch::traits<ARCH>::LAST_BRANCH);
+            last_br = std::numeric_limits<uint32_t>::max();
+            super::core.enter_trap(trap_state, cur_pc_val);
+        }
+        pc.val=super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC);
+        return pc;
+    }
+    
+    /* instruction 60: C.ADDI4SPN */
+    compile_ret_t __c_addi4spn(virt_addr_t& pc, code_word_t instr){
+        this->do_sync(PRE_SYNC, 60);
+        
         uint8_t rd = ((bit_sub<2,3>(instr)));
         uint16_t imm = ((bit_sub<5,1>(instr) << 3) | (bit_sub<6,1>(instr) << 2) | (bit_sub<7,4>(instr) << 6) | (bit_sub<11,2>(instr) << 4));
         if(this->disass_enabled){
@@ -2072,7 +2413,7 @@ private:
         }
         auto Xtmp0_val = (super::template get_reg<reg_t>(2 + traits<ARCH>::X0) + (imm));
         super::template get_reg<reg_t>(rd + 8 + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 52);
+        this->do_sync(POST_SYNC, 60);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2084,9 +2425,9 @@ private:
         return pc;
     }
     
-    /* instruction 53: C.LW */
+    /* instruction 61: C.LW */
     compile_ret_t __c_lw(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 53);
+        this->do_sync(PRE_SYNC, 61);
         
         uint8_t rd = ((bit_sub<2,3>(instr)));
         uint8_t uimm = ((bit_sub<5,1>(instr) << 6) | (bit_sub<6,1>(instr) << 2) | (bit_sub<10,3>(instr) << 3));
@@ -2104,7 +2445,7 @@ private:
         auto offs_val = (super::template get_reg<reg_t>(rs1 + 8 + traits<ARCH>::X0) + (uimm));
         auto Xtmp0_val = super::template sext<int32_t>(super::template read_mem<uint32_t>(traits<ARCH>::MEM, offs_val));
         super::template get_reg<reg_t>(rd + 8 + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 53);
+        this->do_sync(POST_SYNC, 61);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2116,9 +2457,9 @@ private:
         return pc;
     }
     
-    /* instruction 54: C.SW */
+    /* instruction 62: C.SW */
     compile_ret_t __c_sw(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 54);
+        this->do_sync(PRE_SYNC, 62);
         
         uint8_t rs2 = ((bit_sub<2,3>(instr)));
         uint8_t uimm = ((bit_sub<5,1>(instr) << 6) | (bit_sub<6,1>(instr) << 2) | (bit_sub<10,3>(instr) << 3));
@@ -2136,7 +2477,7 @@ private:
         auto offs_val = (super::template get_reg<reg_t>(rs1 + 8 + traits<ARCH>::X0) + (uimm));
         auto MEMtmp0_val = super::template get_reg<reg_t>(rs2 + 8 + traits<ARCH>::X0);
         super::write_mem(traits<ARCH>::MEM, offs_val, static_cast<uint32_t>(MEMtmp0_val));
-        this->do_sync(POST_SYNC, 54);
+        this->do_sync(POST_SYNC, 62);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2148,9 +2489,9 @@ private:
         return pc;
     }
     
-    /* instruction 55: C.ADDI */
+    /* instruction 63: C.ADDI */
     compile_ret_t __c_addi(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 55);
+        this->do_sync(PRE_SYNC, 63);
         
         int8_t imm = signextend<int8_t,6>((bit_sub<2,5>(instr)) | (bit_sub<12,1>(instr) << 5));
         uint8_t rs1 = ((bit_sub<7,5>(instr)));
@@ -2166,7 +2507,7 @@ private:
         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 2;
         auto Xtmp0_val = (static_cast<int32_t>(super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0)) + (imm));
         super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 55);
+        this->do_sync(POST_SYNC, 63);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2178,9 +2519,9 @@ private:
         return pc;
     }
     
-    /* instruction 56: C.NOP */
+    /* instruction 64: C.NOP */
     compile_ret_t __c_nop(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 56);
+        this->do_sync(PRE_SYNC, 64);
         
         if(this->disass_enabled){
             /* generate console output when executing the command */
@@ -2190,7 +2531,7 @@ private:
         auto cur_pc_val = pc.val;
         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 2;
         /* TODO: describe operations for C.NOP ! */
-        this->do_sync(POST_SYNC, 56);
+        this->do_sync(POST_SYNC, 64);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2202,9 +2543,9 @@ private:
         return pc;
     }
     
-    /* instruction 57: C.JAL */
+    /* instruction 65: C.JAL */
     compile_ret_t __c_jal(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 57);
+        this->do_sync(PRE_SYNC, 65);
         
         int16_t imm = signextend<int16_t,12>((bit_sub<2,1>(instr) << 5) | (bit_sub<3,3>(instr) << 1) | (bit_sub<6,1>(instr) << 7) | (bit_sub<7,1>(instr) << 6) | (bit_sub<8,1>(instr) << 10) | (bit_sub<9,2>(instr) << 8) | (bit_sub<11,1>(instr) << 4) | (bit_sub<12,1>(instr) << 11));
         if(this->disass_enabled){
@@ -2223,7 +2564,7 @@ private:
         super::template get_reg(traits<ARCH>::NEXT_PC) = PC_val;
         auto is_cont_v = PC_val !=pc.val;
         super::template get_reg(traits<ARCH>::LAST_BRANCH) = is_cont_v?1:0;
-        this->do_sync(POST_SYNC, 57);
+        this->do_sync(POST_SYNC, 65);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2235,9 +2576,9 @@ private:
         return pc;
     }
     
-    /* instruction 58: C.LI */
+    /* instruction 66: C.LI */
     compile_ret_t __c_li(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 58);
+        this->do_sync(PRE_SYNC, 66);
         
         int8_t imm = signextend<int8_t,6>((bit_sub<2,5>(instr)) | (bit_sub<12,1>(instr) << 5));
         uint8_t rd = ((bit_sub<7,5>(instr)));
@@ -2256,7 +2597,7 @@ private:
         }
         auto Xtmp0_val = (imm);
         super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 58);
+        this->do_sync(POST_SYNC, 66);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2268,9 +2609,9 @@ private:
         return pc;
     }
     
-    /* instruction 59: C.LUI */
+    /* instruction 67: C.LUI */
     compile_ret_t __c_lui(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 59);
+        this->do_sync(PRE_SYNC, 67);
         
         int32_t imm = signextend<int32_t,18>((bit_sub<2,5>(instr) << 12) | (bit_sub<12,1>(instr) << 17));
         uint8_t rd = ((bit_sub<7,5>(instr)));
@@ -2292,7 +2633,7 @@ private:
         }
         auto Xtmp0_val = (imm);
         super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 59);
+        this->do_sync(POST_SYNC, 67);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2304,9 +2645,9 @@ private:
         return pc;
     }
     
-    /* instruction 60: C.ADDI16SP */
+    /* instruction 68: C.ADDI16SP */
     compile_ret_t __c_addi16sp(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 60);
+        this->do_sync(PRE_SYNC, 68);
         
         int16_t imm = signextend<int16_t,10>((bit_sub<2,1>(instr) << 5) | (bit_sub<3,2>(instr) << 7) | (bit_sub<5,1>(instr) << 6) | (bit_sub<6,1>(instr) << 4) | (bit_sub<12,1>(instr) << 9));
         if(this->disass_enabled){
@@ -2321,7 +2662,7 @@ private:
         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 2;
         auto Xtmp0_val = (static_cast<int32_t>(super::template get_reg<reg_t>(2 + traits<ARCH>::X0)) + (imm));
         super::template get_reg<reg_t>(2 + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 60);
+        this->do_sync(POST_SYNC, 68);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2333,9 +2674,9 @@ private:
         return pc;
     }
     
-    /* instruction 61: C.SRLI */
+    /* instruction 69: C.SRLI */
     compile_ret_t __c_srli(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 61);
+        this->do_sync(PRE_SYNC, 69);
         
         uint8_t shamt = ((bit_sub<2,5>(instr)));
         uint8_t rs1 = ((bit_sub<7,3>(instr)));
@@ -2352,7 +2693,7 @@ private:
         uint8_t rs1_idx_val = rs1 + 8;
         auto Xtmp0_val = (static_cast<uint32_t>(super::template get_reg<reg_t>(rs1_idx_val + traits<ARCH>::X0))>>(shamt));
         super::template get_reg<reg_t>(rs1_idx_val + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 61);
+        this->do_sync(POST_SYNC, 69);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2364,9 +2705,9 @@ private:
         return pc;
     }
     
-    /* instruction 62: C.SRAI */
+    /* instruction 70: C.SRAI */
     compile_ret_t __c_srai(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 62);
+        this->do_sync(PRE_SYNC, 70);
         
         uint8_t shamt = ((bit_sub<2,5>(instr)));
         uint8_t rs1 = ((bit_sub<7,3>(instr)));
@@ -2383,7 +2724,7 @@ private:
         uint8_t rs1_idx_val = rs1 + 8;
         auto Xtmp0_val = (static_cast<int32_t>(super::template get_reg<reg_t>(rs1_idx_val + traits<ARCH>::X0))>>(shamt));
         super::template get_reg<reg_t>(rs1_idx_val + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 62);
+        this->do_sync(POST_SYNC, 70);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2395,9 +2736,9 @@ private:
         return pc;
     }
     
-    /* instruction 63: C.ANDI */
+    /* instruction 71: C.ANDI */
     compile_ret_t __c_andi(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 63);
+        this->do_sync(PRE_SYNC, 71);
         
         int8_t imm = signextend<int8_t,6>((bit_sub<2,5>(instr)) | (bit_sub<12,1>(instr) << 5));
         uint8_t rs1 = ((bit_sub<7,3>(instr)));
@@ -2414,7 +2755,7 @@ private:
         uint8_t rs1_idx_val = rs1 + 8;
         auto Xtmp0_val = (static_cast<int32_t>(super::template get_reg<reg_t>(rs1_idx_val + traits<ARCH>::X0)) & (imm));
         super::template get_reg<reg_t>(rs1_idx_val + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 63);
+        this->do_sync(POST_SYNC, 71);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2426,9 +2767,9 @@ private:
         return pc;
     }
     
-    /* instruction 64: C.SUB */
+    /* instruction 72: C.SUB */
     compile_ret_t __c_sub(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 64);
+        this->do_sync(PRE_SYNC, 72);
         
         uint8_t rs2 = ((bit_sub<2,3>(instr)));
         uint8_t rd = ((bit_sub<7,3>(instr)));
@@ -2445,7 +2786,7 @@ private:
         uint8_t rd_idx_val = rd + 8;
         auto Xtmp0_val = (super::template get_reg<reg_t>(rd_idx_val + traits<ARCH>::X0) - super::template get_reg<reg_t>(rs2 + 8 + traits<ARCH>::X0));
         super::template get_reg<reg_t>(rd_idx_val + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 64);
+        this->do_sync(POST_SYNC, 72);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2457,9 +2798,9 @@ private:
         return pc;
     }
     
-    /* instruction 65: C.XOR */
+    /* instruction 73: C.XOR */
     compile_ret_t __c_xor(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 65);
+        this->do_sync(PRE_SYNC, 73);
         
         uint8_t rs2 = ((bit_sub<2,3>(instr)));
         uint8_t rd = ((bit_sub<7,3>(instr)));
@@ -2476,7 +2817,7 @@ private:
         uint8_t rd_idx_val = rd + 8;
         auto Xtmp0_val = (super::template get_reg<reg_t>(rd_idx_val + traits<ARCH>::X0) ^ super::template get_reg<reg_t>(rs2 + 8 + traits<ARCH>::X0));
         super::template get_reg<reg_t>(rd_idx_val + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 65);
+        this->do_sync(POST_SYNC, 73);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2488,9 +2829,9 @@ private:
         return pc;
     }
     
-    /* instruction 66: C.OR */
+    /* instruction 74: C.OR */
     compile_ret_t __c_or(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 66);
+        this->do_sync(PRE_SYNC, 74);
         
         uint8_t rs2 = ((bit_sub<2,3>(instr)));
         uint8_t rd = ((bit_sub<7,3>(instr)));
@@ -2507,7 +2848,7 @@ private:
         uint8_t rd_idx_val = rd + 8;
         auto Xtmp0_val = (super::template get_reg<reg_t>(rd_idx_val + traits<ARCH>::X0) | super::template get_reg<reg_t>(rs2 + 8 + traits<ARCH>::X0));
         super::template get_reg<reg_t>(rd_idx_val + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 66);
+        this->do_sync(POST_SYNC, 74);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2519,9 +2860,9 @@ private:
         return pc;
     }
     
-    /* instruction 67: C.AND */
+    /* instruction 75: C.AND */
     compile_ret_t __c_and(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 67);
+        this->do_sync(PRE_SYNC, 75);
         
         uint8_t rs2 = ((bit_sub<2,3>(instr)));
         uint8_t rd = ((bit_sub<7,3>(instr)));
@@ -2538,7 +2879,7 @@ private:
         uint8_t rd_idx_val = rd + 8;
         auto Xtmp0_val = (super::template get_reg<reg_t>(rd_idx_val + traits<ARCH>::X0) & super::template get_reg<reg_t>(rs2 + 8 + traits<ARCH>::X0));
         super::template get_reg<reg_t>(rd_idx_val + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 67);
+        this->do_sync(POST_SYNC, 75);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2550,9 +2891,9 @@ private:
         return pc;
     }
     
-    /* instruction 68: C.J */
+    /* instruction 76: C.J */
     compile_ret_t __c_j(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 68);
+        this->do_sync(PRE_SYNC, 76);
         
         int16_t imm = signextend<int16_t,12>((bit_sub<2,1>(instr) << 5) | (bit_sub<3,3>(instr) << 1) | (bit_sub<6,1>(instr) << 7) | (bit_sub<7,1>(instr) << 6) | (bit_sub<8,1>(instr) << 10) | (bit_sub<9,2>(instr) << 8) | (bit_sub<11,1>(instr) << 4) | (bit_sub<12,1>(instr) << 11));
         if(this->disass_enabled){
@@ -2569,7 +2910,7 @@ private:
         super::template get_reg(traits<ARCH>::NEXT_PC) = PC_val;
         auto is_cont_v = PC_val !=pc.val;
         super::template get_reg(traits<ARCH>::LAST_BRANCH) = is_cont_v?1:0;
-        this->do_sync(POST_SYNC, 68);
+        this->do_sync(POST_SYNC, 76);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2581,9 +2922,9 @@ private:
         return pc;
     }
     
-    /* instruction 69: C.BEQZ */
+    /* instruction 77: C.BEQZ */
     compile_ret_t __c_beqz(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 69);
+        this->do_sync(PRE_SYNC, 77);
         
         int16_t imm = signextend<int16_t,9>((bit_sub<2,1>(instr) << 5) | (bit_sub<3,2>(instr) << 1) | (bit_sub<5,2>(instr) << 6) | (bit_sub<10,2>(instr) << 3) | (bit_sub<12,1>(instr) << 8));
         uint8_t rs1 = ((bit_sub<7,3>(instr)));
@@ -2603,7 +2944,7 @@ private:
         super::template get_reg(traits<ARCH>::NEXT_PC) = PC_val;
         auto is_cont_v = PC_val !=pc.val;
         super::template get_reg(traits<ARCH>::LAST_BRANCH) = is_cont_v?1:0;
-        this->do_sync(POST_SYNC, 69);
+        this->do_sync(POST_SYNC, 77);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2615,9 +2956,9 @@ private:
         return pc;
     }
     
-    /* instruction 70: C.BNEZ */
+    /* instruction 78: C.BNEZ */
     compile_ret_t __c_bnez(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 70);
+        this->do_sync(PRE_SYNC, 78);
         
         int16_t imm = signextend<int16_t,9>((bit_sub<2,1>(instr) << 5) | (bit_sub<3,2>(instr) << 1) | (bit_sub<5,2>(instr) << 6) | (bit_sub<10,2>(instr) << 3) | (bit_sub<12,1>(instr) << 8));
         uint8_t rs1 = ((bit_sub<7,3>(instr)));
@@ -2637,7 +2978,7 @@ private:
         super::template get_reg(traits<ARCH>::NEXT_PC) = PC_val;
         auto is_cont_v = PC_val !=pc.val;
         super::template get_reg(traits<ARCH>::LAST_BRANCH) = is_cont_v?1:0;
-        this->do_sync(POST_SYNC, 70);
+        this->do_sync(POST_SYNC, 78);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2649,9 +2990,9 @@ private:
         return pc;
     }
     
-    /* instruction 71: C.SLLI */
+    /* instruction 79: C.SLLI */
     compile_ret_t __c_slli(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 71);
+        this->do_sync(PRE_SYNC, 79);
         
         uint8_t shamt = ((bit_sub<2,5>(instr)));
         uint8_t rs1 = ((bit_sub<7,5>(instr)));
@@ -2670,7 +3011,7 @@ private:
         }
         auto Xtmp0_val = (super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0)<<(shamt));
         super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 71);
+        this->do_sync(POST_SYNC, 79);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2682,9 +3023,9 @@ private:
         return pc;
     }
     
-    /* instruction 72: C.LWSP */
+    /* instruction 80: C.LWSP */
     compile_ret_t __c_lwsp(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 72);
+        this->do_sync(PRE_SYNC, 80);
         
         uint8_t uimm = ((bit_sub<2,2>(instr) << 6) | (bit_sub<4,3>(instr) << 2) | (bit_sub<12,1>(instr) << 5));
         uint8_t rd = ((bit_sub<7,5>(instr)));
@@ -2701,7 +3042,7 @@ private:
         auto offs_val = (super::template get_reg<reg_t>(2 + traits<ARCH>::X0) + (uimm));
         auto Xtmp0_val = super::template sext<int32_t>(super::template read_mem<uint32_t>(traits<ARCH>::MEM, offs_val));
         super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 72);
+        this->do_sync(POST_SYNC, 80);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2713,9 +3054,9 @@ private:
         return pc;
     }
     
-    /* instruction 73: C.MV */
+    /* instruction 81: C.MV */
     compile_ret_t __c_mv(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 73);
+        this->do_sync(PRE_SYNC, 81);
         
         uint8_t rs2 = ((bit_sub<2,5>(instr)));
         uint8_t rd = ((bit_sub<7,5>(instr)));
@@ -2731,7 +3072,7 @@ private:
         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 2;
         auto Xtmp0_val = super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0);
         super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 73);
+        this->do_sync(POST_SYNC, 81);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2743,9 +3084,9 @@ private:
         return pc;
     }
     
-    /* instruction 74: C.JR */
+    /* instruction 82: C.JR */
     compile_ret_t __c_jr(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 74);
+        this->do_sync(PRE_SYNC, 82);
         
         uint8_t rs1 = ((bit_sub<7,5>(instr)));
         if(this->disass_enabled){
@@ -2761,7 +3102,7 @@ private:
         auto PC_val = super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0);
         super::template get_reg(traits<ARCH>::NEXT_PC) = PC_val;
         super::template get_reg(traits<ARCH>::LAST_BRANCH) = std::numeric_limits<uint32_t>::max();
-        this->do_sync(POST_SYNC, 74);
+        this->do_sync(POST_SYNC, 82);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2773,9 +3114,9 @@ private:
         return pc;
     }
     
-    /* instruction 75: C.ADD */
+    /* instruction 83: C.ADD */
     compile_ret_t __c_add(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 75);
+        this->do_sync(PRE_SYNC, 83);
         
         uint8_t rs2 = ((bit_sub<2,5>(instr)));
         uint8_t rd = ((bit_sub<7,5>(instr)));
@@ -2791,7 +3132,7 @@ private:
         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 2;
         auto Xtmp0_val = (super::template get_reg<reg_t>(rd + traits<ARCH>::X0) + super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0));
         super::template get_reg<reg_t>(rd + traits<ARCH>::X0)=Xtmp0_val;
-        this->do_sync(POST_SYNC, 75);
+        this->do_sync(POST_SYNC, 83);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2803,9 +3144,9 @@ private:
         return pc;
     }
     
-    /* instruction 76: C.JALR */
+    /* instruction 84: C.JALR */
     compile_ret_t __c_jalr(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 76);
+        this->do_sync(PRE_SYNC, 84);
         
         uint8_t rs1 = ((bit_sub<7,5>(instr)));
         if(this->disass_enabled){
@@ -2823,7 +3164,7 @@ private:
         auto PC_val = super::template get_reg<reg_t>(rs1 + traits<ARCH>::X0);
         super::template get_reg(traits<ARCH>::NEXT_PC) = PC_val;
         super::template get_reg(traits<ARCH>::LAST_BRANCH) = std::numeric_limits<uint32_t>::max();
-        this->do_sync(POST_SYNC, 76);
+        this->do_sync(POST_SYNC, 84);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2835,9 +3176,9 @@ private:
         return pc;
     }
     
-    /* instruction 77: C.EBREAK */
+    /* instruction 85: C.EBREAK */
     compile_ret_t __c_ebreak(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 77);
+        this->do_sync(PRE_SYNC, 85);
         
         if(this->disass_enabled){
             /* generate console output when executing the command */
@@ -2847,7 +3188,7 @@ private:
         auto cur_pc_val = pc.val;
         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 2;
         raise_trap(0, 3);
-        this->do_sync(POST_SYNC, 77);
+        this->do_sync(POST_SYNC, 85);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2859,9 +3200,9 @@ private:
         return pc;
     }
     
-    /* instruction 78: C.SWSP */
+    /* instruction 86: C.SWSP */
     compile_ret_t __c_swsp(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 78);
+        this->do_sync(PRE_SYNC, 86);
         
         uint8_t rs2 = ((bit_sub<2,5>(instr)));
         uint8_t uimm = ((bit_sub<7,2>(instr) << 6) | (bit_sub<9,4>(instr) << 2));
@@ -2878,7 +3219,7 @@ private:
         auto offs_val = (super::template get_reg<reg_t>(2 + traits<ARCH>::X0) + (uimm));
         auto MEMtmp0_val = super::template get_reg<reg_t>(rs2 + traits<ARCH>::X0);
         super::write_mem(traits<ARCH>::MEM, offs_val, static_cast<uint32_t>(MEMtmp0_val));
-        this->do_sync(POST_SYNC, 78);
+        this->do_sync(POST_SYNC, 86);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2890,9 +3231,9 @@ private:
         return pc;
     }
     
-    /* instruction 79: DII */
+    /* instruction 87: DII */
     compile_ret_t __dii(virt_addr_t& pc, code_word_t instr){
-        this->do_sync(PRE_SYNC, 79);
+        this->do_sync(PRE_SYNC, 87);
         
         if(this->disass_enabled){
             /* generate console output when executing the command */
@@ -2902,7 +3243,7 @@ private:
         auto cur_pc_val = pc.val;
         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = cur_pc_val + 2;
         raise_trap(0, 2);
-        this->do_sync(POST_SYNC, 79);
+        this->do_sync(POST_SYNC, 87);
         auto& trap_state = super::template get_reg<uint32_t>(arch::traits<ARCH>::TRAP_STATE);
         // trap check
         if(trap_state!=0){
@@ -2973,8 +3314,8 @@ typename vm_base<ARCH>::virt_addr_t vm_impl<ARCH>::execute_inst(virt_addr_t star
 } // namespace mnrv32
 
 template <>
-std::unique_ptr<vm_if> create<arch::mnrv32>(arch::mnrv32 *core, unsigned short port, bool dump) {
-    auto ret = new mnrv32::vm_impl<arch::mnrv32>(*core, dump);
+std::unique_ptr<vm_if> create<arch::tgf_c>(arch::tgf_c *core, unsigned short port, bool dump) {
+    auto ret = new tgf_c::vm_impl<arch::tgf_c>(*core, dump);
     if (port != 0) debugger::server<debugger::gdb_session>::run_server(ret, port);
     return std::unique_ptr<vm_if>(ret);
 }

src/vm/llvm/fp_impl.cpp

@@ -0,0 +1,109 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2017, MINRES Technologies GmbH
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation
+//    and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors
+//    may be used to endorse or promote products derived from this software
+//    without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Contributors:
+//       eyck@minres.com - initial API and implementation
+////////////////////////////////////////////////////////////////////////////////
+
+#include <iss/iss.h>
+#include <iss/llvm/vm_base.h>
+
+extern "C" {
+#include <softfloat.h>
+#include "internals.h"
+#include "specialize.h"
+}
+
+#include <limits>
+
+namespace iss {
+namespace llvm {
+namespace fp_impl {
+
+using namespace std;
+using namespace ::llvm;
+
+#define INT_TYPE(L)   Type::getIntNTy(mod->getContext(), L)
+#define FLOAT_TYPE    Type::getFloatTy(mod->getContext())
+#define DOUBLE_TYPE   Type::getDoubleTy(mod->getContext())
+#define VOID_TYPE     Type::getVoidTy(mod->getContext())
+#define THIS_PTR_TYPE Type::getIntNPtrTy(mod->getContext(), 8)
+#define FDECLL(NAME, RET, ...)                                                                                         \
+    Function *NAME##_func = CurrentModule->getFunction(#NAME);                                                         \
+    if (!NAME##_func) {                                                                                                \
+        std::vector<Type *> NAME##_args{__VA_ARGS__};                                                                  \
+        FunctionType *NAME##_type = FunctionType::get(RET, NAME##_args, false);                                        \
+        NAME##_func = Function::Create(NAME##_type, GlobalValue::ExternalLinkage, #NAME, CurrentModule);               \
+        NAME##_func->setCallingConv(CallingConv::C);                                                                   \
+    }
+
+#define FDECL(NAME, RET, ...)                                                                                          \
+    std::vector<Type *> NAME##_args{__VA_ARGS__};                                                                      \
+    FunctionType *NAME##_type = FunctionType::get(RET, NAME##_args, false);                                      \
+    mod->getOrInsertFunction(#NAME, NAME##_type);
+
+
+void add_fp_functions_2_module(Module *mod, uint32_t flen, uint32_t xlen) {
+    if(flen){
+        FDECL(fget_flags, INT_TYPE(32));
+        FDECL(fadd_s,     INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
+        FDECL(fsub_s,     INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
+        FDECL(fmul_s,     INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
+        FDECL(fdiv_s,     INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
+        FDECL(fsqrt_s,    INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
+        FDECL(fcmp_s,     INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(32));
+        FDECL(fcvt_s,     INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
+        FDECL(fmadd_s,    INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
+        FDECL(fsel_s,     INT_TYPE(32), INT_TYPE(32), INT_TYPE(32), INT_TYPE(32));
+        FDECL(fclass_s,   INT_TYPE(32), INT_TYPE(32));
+        FDECL(fcvt_32_64,     INT_TYPE(64), INT_TYPE(32), INT_TYPE(32), INT_TYPE(8));
+        FDECL(fcvt_64_32,     INT_TYPE(32), INT_TYPE(64), INT_TYPE(32), INT_TYPE(8));
+        if(flen>32){
+            FDECL(fconv_d2f,  INT_TYPE(32), INT_TYPE(64), INT_TYPE(8));
+            FDECL(fconv_f2d,  INT_TYPE(64), INT_TYPE(32), INT_TYPE(8));
+            FDECL(fadd_d,     INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(8));
+            FDECL(fsub_d,     INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(8));
+            FDECL(fmul_d,     INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(8));
+            FDECL(fdiv_d,     INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(8));
+            FDECL(fsqrt_d,    INT_TYPE(64), INT_TYPE(64), INT_TYPE(8));
+            FDECL(fcmp_d,     INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(32));
+            FDECL(fcvt_d,     INT_TYPE(64), INT_TYPE(64), INT_TYPE(32), INT_TYPE(8));
+            FDECL(fmadd_d,    INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(32), INT_TYPE(8));
+            FDECL(fsel_d,     INT_TYPE(64), INT_TYPE(64), INT_TYPE(64), INT_TYPE(32));
+            FDECL(fclass_d,   INT_TYPE(64), INT_TYPE(64));
+            FDECL(unbox_s,      INT_TYPE(32), INT_TYPE(64));
+
+        }
+    }
+}
+
+}
+}
+}

src/vm/llvm/vm_tgf_b.cpp

@@ -30,8 +30,8 @@
  *
  *******************************************************************************/
 
-#include <iss/arch/mnrv32.h>
-#include <iss/arch/riscv_hart_msu_vp.h>
+#include <iss/arch/tgf_b.h>
+#include <iss/arch/riscv_hart_m_p.h>
 #include <iss/debugger/gdb_session.h>
 #include <iss/debugger/server.h>
 #include <iss/iss.h>
@@ -52,7 +52,7 @@ namespace fp_impl {
 void add_fp_functions_2_module(::llvm::Module *, unsigned, unsigned);
 }
 
-namespace mnrv32 {
+namespace tgf_b {
 using namespace ::llvm;
 using namespace iss::arch;
 using namespace iss::debugger;
@@ -2570,11 +2570,11 @@ template <typename ARCH> inline void vm_impl<ARCH>::gen_trap_check(BasicBlock *b
                           bb, this->trap_blk, 1);
 }
 
-} // namespace mnrv32
+} // namespace tgf_b
 
 template <>
-std::unique_ptr<vm_if> create<arch::mnrv32>(arch::mnrv32 *core, unsigned short port, bool dump) {
-    auto ret = new mnrv32::vm_impl<arch::mnrv32>(*core, dump);
+std::unique_ptr<vm_if> create<arch::tgf_b>(arch::tgf_b *core, unsigned short port, bool dump) {
+    auto ret = new tgf_b::vm_impl<arch::tgf_b>(*core, dump);
     if (port != 0) debugger::server<debugger::gdb_session>::run_server(ret, port);
     return std::unique_ptr<vm_if>(ret);
 }

src/vm/tcc/vm_rv32imac.cpp

@@ -1,913 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2020 MINRES Technologies GmbH
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *******************************************************************************/
-
-#include <iss/arch/rv32imac.h>
-#include <iss/arch/riscv_hart_msu_vp.h>
-#include <iss/debugger/gdb_session.h>
-#include <iss/debugger/server.h>
-#include <iss/iss.h>
-#include <iss/llvm/vm_base.h>
-#include <util/logging.h>
-
-#ifndef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY
-#endif
-#include <fmt/format.h>
-
-#include <array>
-#include <iss/debugger/riscv_target_adapter.h>
-
-namespace iss {
-namespace vm {
-namespace fp_impl {
-void add_fp_functions_2_module(llvm::Module *, unsigned, unsigned);
-}
-}
-
-namespace tcc {
-namespace rv32imac {
-using namespace iss::arch;
-using namespace iss::debugger;
-using namespace iss::vm::llvm;
-
-template <typename ARCH> class vm_impl : public vm_base<ARCH> {
-public:
-    using super = typename iss::vm::llvm::vm_base<ARCH>;
-    using virt_addr_t = typename super::virt_addr_t;
-    using phys_addr_t = typename super::phys_addr_t;
-    using code_word_t = typename super::code_word_t;
-    using addr_t = typename super::addr_t;
-
-    vm_impl();
-
-    vm_impl(ARCH &core, unsigned core_id = 0, unsigned cluster_id = 0);
-
-    void enableDebug(bool enable) { super::sync_exec = super::ALL_SYNC; }
-
-    target_adapter_if *accquire_target_adapter(server_if *srv) override {
-        debugger_if::dbg_enabled = true;
-        if (vm_base<ARCH>::tgt_adapter == nullptr)
-            vm_base<ARCH>::tgt_adapter = new riscv_target_adapter<ARCH>(srv, this->get_arch());
-        return vm_base<ARCH>::tgt_adapter;
-    }
-
-protected:
-    using vm_base<ARCH>::get_reg_ptr;
-
-    using this_class = vm_impl<ARCH>;
-    using compile_ret_t = std::tuple<continuation_e>;
-    using compile_func = compile_ret_t (this_class::*)(virt_addr_t &pc, code_word_t instr, std::ostringstream&);
-
-    inline const char *name(size_t index){return traits<ARCH>::reg_aliases.at(index);}
-
-    template <typename T> inline ConstantInt *size(T type) {
-        return ConstantInt::get(getContext(), APInt(32, type->getType()->getScalarSizeInBits()));
-    }
-
-    void setup_module(Module* m) override {
-        super::setup_module(m);
-        iss::vm::fp_impl::add_fp_functions_2_module(m, traits<ARCH>::FP_REGS_SIZE, traits<ARCH>::XLEN);
-    }
-
-    inline Value *gen_choose(Value *cond, Value *trueVal, Value *falseVal, unsigned size) {
-        return super::gen_cond_assign(cond, this->gen_ext(trueVal, size), this->gen_ext(falseVal, size));
-    }
-
-    compile_ret_t gen_single_inst_behavior(virt_addr_t &, unsigned int &, std::ostringstream&) override;
-
-    void gen_leave_behavior(BasicBlock *leave_blk) override;
-
-    void gen_raise_trap(uint16_t trap_id, uint16_t cause);
-
-    void gen_leave_trap(unsigned lvl);
-
-    void gen_wait(unsigned type);
-
-    void gen_trap_behavior(BasicBlock *) override;
-
-    void gen_trap_check(BasicBlock *bb);
-
-    inline Value *gen_reg_load(unsigned i, unsigned level = 0) {
-        return this->builder.CreateLoad(get_reg_ptr(i), false);
-    }
-
-    inline void gen_set_pc(virt_addr_t pc, unsigned reg_num) {
-        Value *next_pc_v = this->builder.CreateSExtOrTrunc(this->gen_const(traits<ARCH>::XLEN, pc.val),
-                                                           this->get_type(traits<ARCH>::XLEN));
-        this->builder.CreateStore(next_pc_v, get_reg_ptr(reg_num), true);
-    }
-
-    // some compile time constants
-    // enum { MASK16 = 0b1111110001100011, MASK32 = 0b11111111111100000111000001111111 };
-    enum { MASK16 = 0b1111111111111111, MASK32 = 0b11111111111100000111000001111111 };
-    enum { EXTR_MASK16 = MASK16 >> 2, EXTR_MASK32 = MASK32 >> 2 };
-    enum { LUT_SIZE = 1 << util::bit_count(EXTR_MASK32), LUT_SIZE_C = 1 << util::bit_count(EXTR_MASK16) };
-
-    std::array<compile_func, LUT_SIZE> lut;
-
-    std::array<compile_func, LUT_SIZE_C> lut_00, lut_01, lut_10;
-    std::array<compile_func, LUT_SIZE> lut_11;
-
-	std::array<compile_func *, 4> qlut;
-
-	std::array<const uint32_t, 4> lutmasks = {{EXTR_MASK16, EXTR_MASK16, EXTR_MASK16, EXTR_MASK32}};
-
-    void expand_bit_mask(int pos, uint32_t mask, uint32_t value, uint32_t valid, uint32_t idx, compile_func lut[],
-                         compile_func f) {
-        if (pos < 0) {
-            lut[idx] = f;
-        } else {
-            auto bitmask = 1UL << pos;
-            if ((mask & bitmask) == 0) {
-                expand_bit_mask(pos - 1, mask, value, valid, idx, lut, f);
-            } else {
-                if ((valid & bitmask) == 0) {
-                    expand_bit_mask(pos - 1, mask, value, valid, (idx << 1), lut, f);
-                    expand_bit_mask(pos - 1, mask, value, valid, (idx << 1) + 1, lut, f);
-                } else {
-                    auto new_val = idx << 1;
-                    if ((value & bitmask) != 0) new_val++;
-                    expand_bit_mask(pos - 1, mask, value, valid, new_val, lut, f);
-                }
-            }
-        }
-    }
-
-    inline uint32_t extract_fields(uint32_t val) { return extract_fields(29, val >> 2, lutmasks[val & 0x3], 0); }
-
-    uint32_t extract_fields(int pos, uint32_t val, uint32_t mask, uint32_t lut_val) {
-        if (pos >= 0) {
-            auto bitmask = 1UL << pos;
-            if ((mask & bitmask) == 0) {
-                lut_val = extract_fields(pos - 1, val, mask, lut_val);
-            } else {
-                auto new_val = lut_val << 1;
-                if ((val & bitmask) != 0) new_val++;
-                lut_val = extract_fields(pos - 1, val, mask, new_val);
-            }
-        }
-        return lut_val;
-    }
-
-private:
-    /****************************************************************************
-     * start opcode definitions
-     ****************************************************************************/
-    struct InstructionDesriptor {
-        size_t length;
-        uint32_t value;
-        uint32_t mask;
-        compile_func op;
-    };
-
-    const std::array<InstructionDesriptor, 99> instr_descr = {{
-         /* entries are: size, valid value, valid mask, function ptr */
-        /* instruction JALR */
-        {32, 0b00000000000000000000000001100111, 0b00000000000000000111000001111111, &this_class::__jalr},
-        /* instruction C.ADDI4SPN */
-        {16, 0b0000000000000000, 0b1110000000000011, &this_class::__c_addi4spn},
-        /* instruction C.LW */
-        {16, 0b0100000000000000, 0b1110000000000011, &this_class::__c_lw},
-        /* instruction C.SW */
-        {16, 0b1100000000000000, 0b1110000000000011, &this_class::__c_sw},
-        /* instruction C.ADDI */
-        {16, 0b0000000000000001, 0b1110000000000011, &this_class::__c_addi},
-        /* instruction C.NOP */
-        {16, 0b0000000000000001, 0b1111111111111111, &this_class::__c_nop},
-        /* instruction C.JAL */
-        {16, 0b0010000000000001, 0b1110000000000011, &this_class::__c_jal},
-        /* instruction C.LI */
-        {16, 0b0100000000000001, 0b1110000000000011, &this_class::__c_li},
-        /* instruction C.LUI */
-        {16, 0b0110000000000001, 0b1110000000000011, &this_class::__c_lui},
-        /* instruction C.ADDI16SP */
-        {16, 0b0110000100000001, 0b1110111110000011, &this_class::__c_addi16sp},
-        /* instruction C.SRLI */
-        {16, 0b1000000000000001, 0b1111110000000011, &this_class::__c_srli},
-        /* instruction C.SRAI */
-        {16, 0b1000010000000001, 0b1111110000000011, &this_class::__c_srai},
-        /* instruction C.ANDI */
-        {16, 0b1000100000000001, 0b1110110000000011, &this_class::__c_andi},
-        /* instruction C.SUB */
-        {16, 0b1000110000000001, 0b1111110001100011, &this_class::__c_sub},
-        /* instruction C.XOR */
-        {16, 0b1000110000100001, 0b1111110001100011, &this_class::__c_xor},
-        /* instruction C.OR */
-        {16, 0b1000110001000001, 0b1111110001100011, &this_class::__c_or},
-        /* instruction C.AND */
-        {16, 0b1000110001100001, 0b1111110001100011, &this_class::__c_and},
-        /* instruction C.J */
-        {16, 0b1010000000000001, 0b1110000000000011, &this_class::__c_j},
-        /* instruction C.BEQZ */
-        {16, 0b1100000000000001, 0b1110000000000011, &this_class::__c_beqz},
-        /* instruction C.BNEZ */
-        {16, 0b1110000000000001, 0b1110000000000011, &this_class::__c_bnez},
-        /* instruction C.SLLI */
-        {16, 0b0000000000000010, 0b1111000000000011, &this_class::__c_slli},
-        /* instruction C.LWSP */
-        {16, 0b0100000000000010, 0b1110000000000011, &this_class::__c_lwsp},
-        /* instruction C.MV */
-        {16, 0b1000000000000010, 0b1111000000000011, &this_class::__c_mv},
-        /* instruction C.JR */
-        {16, 0b1000000000000010, 0b1111000001111111, &this_class::__c_jr},
-        /* instruction C.ADD */
-        {16, 0b1001000000000010, 0b1111000000000011, &this_class::__c_add},
-        /* instruction C.JALR */
-        {16, 0b1001000000000010, 0b1111000001111111, &this_class::__c_jalr},
-        /* instruction C.EBREAK */
-        {16, 0b1001000000000010, 0b1111111111111111, &this_class::__c_ebreak},
-        /* instruction C.SWSP */
-        {16, 0b1100000000000010, 0b1110000000000011, &this_class::__c_swsp},
-        /* instruction DII */
-        {16, 0b0000000000000000, 0b1111111111111111, &this_class::__dii},
-        /* instruction LR.W */
-        {32, 0b00010000000000000010000000101111, 0b11111001111100000111000001111111, &this_class::__lr_w},
-        /* instruction SC.W */
-        {32, 0b00011000000000000010000000101111, 0b11111000000000000111000001111111, &this_class::__sc_w},
-        /* instruction AMOSWAP.W */
-        {32, 0b00001000000000000010000000101111, 0b11111000000000000111000001111111, &this_class::__amoswap_w},
-        /* instruction AMOADD.W */
-        {32, 0b00000000000000000010000000101111, 0b11111000000000000111000001111111, &this_class::__amoadd_w},
-        /* instruction AMOXOR.W */
-        {32, 0b00100000000000000010000000101111, 0b11111000000000000111000001111111, &this_class::__amoxor_w},
-        /* instruction AMOAND.W */
-        {32, 0b01100000000000000010000000101111, 0b11111000000000000111000001111111, &this_class::__amoand_w},
-        /* instruction AMOOR.W */
-        {32, 0b01000000000000000010000000101111, 0b11111000000000000111000001111111, &this_class::__amoor_w},
-        /* instruction AMOMIN.W */
-        {32, 0b10000000000000000010000000101111, 0b11111000000000000111000001111111, &this_class::__amomin_w},
-        /* instruction AMOMAX.W */
-        {32, 0b10100000000000000010000000101111, 0b11111000000000000111000001111111, &this_class::__amomax_w},
-        /* instruction AMOMINU.W */
-        {32, 0b11000000000000000010000000101111, 0b11111000000000000111000001111111, &this_class::__amominu_w},
-        /* instruction AMOMAXU.W */
-        {32, 0b11100000000000000010000000101111, 0b11111000000000000111000001111111, &this_class::__amomaxu_w},
-        /* instruction MUL */
-        {32, 0b00000010000000000000000000110011, 0b11111110000000000111000001111111, &this_class::__mul},
-        /* instruction MULH */
-        {32, 0b00000010000000000001000000110011, 0b11111110000000000111000001111111, &this_class::__mulh},
-        /* instruction MULHSU */
-        {32, 0b00000010000000000010000000110011, 0b11111110000000000111000001111111, &this_class::__mulhsu},
-        /* instruction MULHU */
-        {32, 0b00000010000000000011000000110011, 0b11111110000000000111000001111111, &this_class::__mulhu},
-        /* instruction DIV */
-        {32, 0b00000010000000000100000000110011, 0b11111110000000000111000001111111, &this_class::__div},
-        /* instruction DIVU */
-        {32, 0b00000010000000000101000000110011, 0b11111110000000000111000001111111, &this_class::__divu},
-        /* instruction REM */
-        {32, 0b00000010000000000110000000110011, 0b11111110000000000111000001111111, &this_class::__rem},
-        /* instruction REMU */
-        {32, 0b00000010000000000111000000110011, 0b11111110000000000111000001111111, &this_class::__remu},
-        /* instruction LUI */
-        {32, 0b00000000000000000000000000110111, 0b00000000000000000000000001111111, &this_class::__lui},
-        /* instruction AUIPC */
-        {32, 0b00000000000000000000000000010111, 0b00000000000000000000000001111111, &this_class::__auipc},
-        /* instruction JAL */
-        {32, 0b00000000000000000000000001101111, 0b00000000000000000000000001111111, &this_class::__jal},
-        /* instruction BEQ */
-        {32, 0b00000000000000000000000001100011, 0b00000000000000000111000001111111, &this_class::__beq},
-        /* instruction BNE */
-        {32, 0b00000000000000000001000001100011, 0b00000000000000000111000001111111, &this_class::__bne},
-        /* instruction BLT */
-        {32, 0b00000000000000000100000001100011, 0b00000000000000000111000001111111, &this_class::__blt},
-        /* instruction BGE */
-        {32, 0b00000000000000000101000001100011, 0b00000000000000000111000001111111, &this_class::__bge},
-        /* instruction BLTU */
-        {32, 0b00000000000000000110000001100011, 0b00000000000000000111000001111111, &this_class::__bltu},
-        /* instruction BGEU */
-        {32, 0b00000000000000000111000001100011, 0b00000000000000000111000001111111, &this_class::__bgeu},
-        /* instruction LB */
-        {32, 0b00000000000000000000000000000011, 0b00000000000000000111000001111111, &this_class::__lb},
-        /* instruction LH */
-        {32, 0b00000000000000000001000000000011, 0b00000000000000000111000001111111, &this_class::__lh},
-        /* instruction LW */
-        {32, 0b00000000000000000010000000000011, 0b00000000000000000111000001111111, &this_class::__lw},
-        /* instruction LBU */
-        {32, 0b00000000000000000100000000000011, 0b00000000000000000111000001111111, &this_class::__lbu},
-        /* instruction LHU */
-        {32, 0b00000000000000000101000000000011, 0b00000000000000000111000001111111, &this_class::__lhu},
-        /* instruction SB */
-        {32, 0b00000000000000000000000000100011, 0b00000000000000000111000001111111, &this_class::__sb},
-        /* instruction SH */
-        {32, 0b00000000000000000001000000100011, 0b00000000000000000111000001111111, &this_class::__sh},
-        /* instruction SW */
-        {32, 0b00000000000000000010000000100011, 0b00000000000000000111000001111111, &this_class::__sw},
-        /* instruction ADDI */
-        {32, 0b00000000000000000000000000010011, 0b00000000000000000111000001111111, &this_class::__addi},
-        /* instruction SLTI */
-        {32, 0b00000000000000000010000000010011, 0b00000000000000000111000001111111, &this_class::__slti},
-        /* instruction SLTIU */
-        {32, 0b00000000000000000011000000010011, 0b00000000000000000111000001111111, &this_class::__sltiu},
-        /* instruction XORI */
-        {32, 0b00000000000000000100000000010011, 0b00000000000000000111000001111111, &this_class::__xori},
-        /* instruction ORI */
-        {32, 0b00000000000000000110000000010011, 0b00000000000000000111000001111111, &this_class::__ori},
-        /* instruction ANDI */
-        {32, 0b00000000000000000111000000010011, 0b00000000000000000111000001111111, &this_class::__andi},
-        /* instruction SLLI */
-        {32, 0b00000000000000000001000000010011, 0b11111110000000000111000001111111, &this_class::__slli},
-        /* instruction SRLI */
-        {32, 0b00000000000000000101000000010011, 0b11111110000000000111000001111111, &this_class::__srli},
-        /* instruction SRAI */
-        {32, 0b01000000000000000101000000010011, 0b11111110000000000111000001111111, &this_class::__srai},
-        /* instruction ADD */
-        {32, 0b00000000000000000000000000110011, 0b11111110000000000111000001111111, &this_class::__add},
-        /* instruction SUB */
-        {32, 0b01000000000000000000000000110011, 0b11111110000000000111000001111111, &this_class::__sub},
-        /* instruction SLL */
-        {32, 0b00000000000000000001000000110011, 0b11111110000000000111000001111111, &this_class::__sll},
-        /* instruction SLT */
-        {32, 0b00000000000000000010000000110011, 0b11111110000000000111000001111111, &this_class::__slt},
-        /* instruction SLTU */
-        {32, 0b00000000000000000011000000110011, 0b11111110000000000111000001111111, &this_class::__sltu},
-        /* instruction XOR */
-        {32, 0b00000000000000000100000000110011, 0b11111110000000000111000001111111, &this_class::__xor},
-        /* instruction SRL */
-        {32, 0b00000000000000000101000000110011, 0b11111110000000000111000001111111, &this_class::__srl},
-        /* instruction SRA */
-        {32, 0b01000000000000000101000000110011, 0b11111110000000000111000001111111, &this_class::__sra},
-        /* instruction OR */
-        {32, 0b00000000000000000110000000110011, 0b11111110000000000111000001111111, &this_class::__or},
-        /* instruction AND */
-        {32, 0b00000000000000000111000000110011, 0b11111110000000000111000001111111, &this_class::__and},
-        /* instruction FENCE */
-        {32, 0b00000000000000000000000000001111, 0b11110000000000000111000001111111, &this_class::__fence},
-        /* instruction FENCE_I */
-        {32, 0b00000000000000000001000000001111, 0b00000000000000000111000001111111, &this_class::__fence_i},
-        /* instruction ECALL */
-        {32, 0b00000000000000000000000001110011, 0b11111111111111111111111111111111, &this_class::__ecall},
-        /* instruction EBREAK */
-        {32, 0b00000000000100000000000001110011, 0b11111111111111111111111111111111, &this_class::__ebreak},
-        /* instruction URET */
-        {32, 0b00000000001000000000000001110011, 0b11111111111111111111111111111111, &this_class::__uret},
-        /* instruction SRET */
-        {32, 0b00010000001000000000000001110011, 0b11111111111111111111111111111111, &this_class::__sret},
-        /* instruction MRET */
-        {32, 0b00110000001000000000000001110011, 0b11111111111111111111111111111111, &this_class::__mret},
-        /* instruction WFI */
-        {32, 0b00010000010100000000000001110011, 0b11111111111111111111111111111111, &this_class::__wfi},
-        /* instruction SFENCE.VMA */
-        {32, 0b00010010000000000000000001110011, 0b11111110000000000111111111111111, &this_class::__sfence_vma},
-        /* instruction CSRRW */
-        {32, 0b00000000000000000001000001110011, 0b00000000000000000111000001111111, &this_class::__csrrw},
-        /* instruction CSRRS */
-        {32, 0b00000000000000000010000001110011, 0b00000000000000000111000001111111, &this_class::__csrrs},
-        /* instruction CSRRC */
-        {32, 0b00000000000000000011000001110011, 0b00000000000000000111000001111111, &this_class::__csrrc},
-        /* instruction CSRRWI */
-        {32, 0b00000000000000000101000001110011, 0b00000000000000000111000001111111, &this_class::__csrrwi},
-        /* instruction CSRRSI */
-        {32, 0b00000000000000000110000001110011, 0b00000000000000000111000001111111, &this_class::__csrrsi},
-        /* instruction CSRRCI */
-        {32, 0b00000000000000000111000001110011, 0b00000000000000000111000001111111, &this_class::__csrrci},
-    }};
- 
-    /* instruction definitions */
-    /* instruction 0: JALR */
-    compile_ret_t __jalr(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 1: C.ADDI4SPN */
-    compile_ret_t __c_addi4spn(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 2: C.LW */
-    compile_ret_t __c_lw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 3: C.SW */
-    compile_ret_t __c_sw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 4: C.ADDI */
-    compile_ret_t __c_addi(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 5: C.NOP */
-    compile_ret_t __c_nop(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 6: C.JAL */
-    compile_ret_t __c_jal(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 7: C.LI */
-    compile_ret_t __c_li(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 8: C.LUI */
-    compile_ret_t __c_lui(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 9: C.ADDI16SP */
-    compile_ret_t __c_addi16sp(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 10: C.SRLI */
-    compile_ret_t __c_srli(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 11: C.SRAI */
-    compile_ret_t __c_srai(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 12: C.ANDI */
-    compile_ret_t __c_andi(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 13: C.SUB */
-    compile_ret_t __c_sub(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 14: C.XOR */
-    compile_ret_t __c_xor(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 15: C.OR */
-    compile_ret_t __c_or(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 16: C.AND */
-    compile_ret_t __c_and(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 17: C.J */
-    compile_ret_t __c_j(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 18: C.BEQZ */
-    compile_ret_t __c_beqz(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 19: C.BNEZ */
-    compile_ret_t __c_bnez(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 20: C.SLLI */
-    compile_ret_t __c_slli(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 21: C.LWSP */
-    compile_ret_t __c_lwsp(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 22: C.MV */
-    compile_ret_t __c_mv(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 23: C.JR */
-    compile_ret_t __c_jr(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 24: C.ADD */
-    compile_ret_t __c_add(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 25: C.JALR */
-    compile_ret_t __c_jalr(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 26: C.EBREAK */
-    compile_ret_t __c_ebreak(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 27: C.SWSP */
-    compile_ret_t __c_swsp(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 28: DII */
-    compile_ret_t __dii(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 29: LR.W */
-    compile_ret_t __lr_w(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 30: SC.W */
-    compile_ret_t __sc_w(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 31: AMOSWAP.W */
-    compile_ret_t __amoswap_w(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 32: AMOADD.W */
-    compile_ret_t __amoadd_w(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 33: AMOXOR.W */
-    compile_ret_t __amoxor_w(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 34: AMOAND.W */
-    compile_ret_t __amoand_w(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 35: AMOOR.W */
-    compile_ret_t __amoor_w(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 36: AMOMIN.W */
-    compile_ret_t __amomin_w(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 37: AMOMAX.W */
-    compile_ret_t __amomax_w(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 38: AMOMINU.W */
-    compile_ret_t __amominu_w(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 39: AMOMAXU.W */
-    compile_ret_t __amomaxu_w(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 40: MUL */
-    compile_ret_t __mul(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 41: MULH */
-    compile_ret_t __mulh(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 42: MULHSU */
-    compile_ret_t __mulhsu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 43: MULHU */
-    compile_ret_t __mulhu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 44: DIV */
-    compile_ret_t __div(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 45: DIVU */
-    compile_ret_t __divu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 46: REM */
-    compile_ret_t __rem(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 47: REMU */
-    compile_ret_t __remu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 48: LUI */
-    compile_ret_t __lui(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 49: AUIPC */
-    compile_ret_t __auipc(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 50: JAL */
-    compile_ret_t __jal(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 51: BEQ */
-    compile_ret_t __beq(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 52: BNE */
-    compile_ret_t __bne(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 53: BLT */
-    compile_ret_t __blt(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 54: BGE */
-    compile_ret_t __bge(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 55: BLTU */
-    compile_ret_t __bltu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 56: BGEU */
-    compile_ret_t __bgeu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 57: LB */
-    compile_ret_t __lb(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 58: LH */
-    compile_ret_t __lh(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 59: LW */
-    compile_ret_t __lw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 60: LBU */
-    compile_ret_t __lbu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 61: LHU */
-    compile_ret_t __lhu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 62: SB */
-    compile_ret_t __sb(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 63: SH */
-    compile_ret_t __sh(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 64: SW */
-    compile_ret_t __sw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 65: ADDI */
-    compile_ret_t __addi(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 66: SLTI */
-    compile_ret_t __slti(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 67: SLTIU */
-    compile_ret_t __sltiu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 68: XORI */
-    compile_ret_t __xori(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 69: ORI */
-    compile_ret_t __ori(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 70: ANDI */
-    compile_ret_t __andi(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 71: SLLI */
-    compile_ret_t __slli(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 72: SRLI */
-    compile_ret_t __srli(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 73: SRAI */
-    compile_ret_t __srai(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 74: ADD */
-    compile_ret_t __add(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 75: SUB */
-    compile_ret_t __sub(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 76: SLL */
-    compile_ret_t __sll(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 77: SLT */
-    compile_ret_t __slt(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 78: SLTU */
-    compile_ret_t __sltu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 79: XOR */
-    compile_ret_t __xor(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 80: SRL */
-    compile_ret_t __srl(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 81: SRA */
-    compile_ret_t __sra(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 82: OR */
-    compile_ret_t __or(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 83: AND */
-    compile_ret_t __and(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 84: FENCE */
-    compile_ret_t __fence(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 85: FENCE_I */
-    compile_ret_t __fence_i(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 86: ECALL */
-    compile_ret_t __ecall(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 87: EBREAK */
-    compile_ret_t __ebreak(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 88: URET */
-    compile_ret_t __uret(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 89: SRET */
-    compile_ret_t __sret(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 90: MRET */
-    compile_ret_t __mret(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 91: WFI */
-    compile_ret_t __wfi(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 92: SFENCE.VMA */
-    compile_ret_t __sfence_vma(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 93: CSRRW */
-    compile_ret_t __csrrw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 94: CSRRS */
-    compile_ret_t __csrrs(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 95: CSRRC */
-    compile_ret_t __csrrc(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 96: CSRRWI */
-    compile_ret_t __csrrwi(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 97: CSRRSI */
-    compile_ret_t __csrrsi(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 98: CSRRCI */
-    compile_ret_t __csrrci(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /****************************************************************************
-     * end opcode definitions
-     ****************************************************************************/
-    compile_ret_t illegal_intruction(virt_addr_t &pc, code_word_t instr, std::stringstream& os) {
-		this->gen_sync(iss::PRE_SYNC, instr_descr.size());
-        this->builder.CreateStore(this->builder.CreateLoad(get_reg_ptr(traits<ARCH>::NEXT_PC), true),
-                                   get_reg_ptr(traits<ARCH>::PC), true);
-        this->builder.CreateStore(
-            this->builder.CreateAdd(this->builder.CreateLoad(get_reg_ptr(traits<ARCH>::ICOUNT), true),
-                                     this->gen_const(64U, 1)),
-            get_reg_ptr(traits<ARCH>::ICOUNT), true);
-        pc = pc + ((instr & 3) == 3 ? 4 : 2);
-        this->gen_raise_trap(0, 2);     // illegal instruction trap
-		this->gen_sync(iss::POST_SYNC, instr_descr.size());
-        this->gen_trap_check(this->leave_blk);
-        return BRANCH;
-    }
-};
-
-template <typename CODE_WORD> void debug_fn(CODE_WORD insn) {
-    volatile CODE_WORD x = insn;
-    insn = 2 * x;
-}
-
-template <typename ARCH> vm_impl<ARCH>::vm_impl() { this(new ARCH()); }
-
-template <typename ARCH>
-vm_impl<ARCH>::vm_impl(ARCH &core, unsigned core_id, unsigned cluster_id)
-: vm_base<ARCH>(core, core_id, cluster_id) {
-    qlut[0] = lut_00.data();
-    qlut[1] = lut_01.data();
-    qlut[2] = lut_10.data();
-    qlut[3] = lut_11.data();
-    for (auto instr : instr_descr) {
-        auto quantrant = instr.value & 0x3;
-        expand_bit_mask(29, lutmasks[quantrant], instr.value >> 2, instr.mask >> 2, 0, qlut[quantrant], instr.op);
-    }
-}
-
-template <typename ARCH>
-std::tuple<continuation_e>
-vm_impl<ARCH>::gen_single_inst_behavior(virt_addr_t &pc, unsigned int &inst_cnt, std::ostringstrem& os) {
-    // we fetch at max 4 byte, alignment is 2
-    enum {TRAP_ID=1<<16};
-    code_word_t insn = 0;
-    const typename traits<ARCH>::addr_t upper_bits = ~traits<ARCH>::PGMASK;
-    phys_addr_t paddr(pc);
-    auto *const data = (uint8_t *)&insn;
-    paddr = this->core.v2p(pc);
-    if ((pc.val & upper_bits) != ((pc.val + 2) & upper_bits)) { // we may cross a page boundary
-        auto res = this->core.read(paddr, 2, data);
-        if (res != iss::Ok) throw trap_access(TRAP_ID, pc.val);
-        if ((insn & 0x3) == 0x3) { // this is a 32bit instruction
-            res = this->core.read(this->core.v2p(pc + 2), 2, data + 2);
-        }
-    } else {
-        auto res = this->core.read(paddr, 4, data);
-        if (res != iss::Ok) throw trap_access(TRAP_ID, pc.val);
-    }
-    if (insn == 0x0000006f || (insn&0xffff)==0xa001) throw simulation_stopped(0); // 'J 0' or 'C.J 0'
-    // curr pc on stack
-    ++inst_cnt;
-    auto lut_val = extract_fields(insn);
-    auto f = qlut[insn & 0x3][lut_val];
-    if (f == nullptr) {
-        f = &this_class::illegal_intruction;
-    }
-    return (this->*f)(pc, insn, this_block);
-}
-
-template <typename ARCH> void vm_impl<ARCH>::gen_leave_behavior(BasicBlock *leave_blk) {
-    this->builder.SetInsertPoint(leave_blk);
-    this->builder.CreateRet(this->builder.CreateLoad(get_reg_ptr(arch::traits<ARCH>::NEXT_PC), false));
-}
-
-template <typename ARCH> void vm_impl<ARCH>::gen_raise_trap(uint16_t trap_id, uint16_t cause) {
-    auto *TRAP_val = this->gen_const(32, 0x80 << 24 | (cause << 16) | trap_id);
-    this->builder.CreateStore(TRAP_val, get_reg_ptr(traits<ARCH>::TRAP_STATE), true);
-    this->builder.CreateStore(this->gen_const(32U, std::numeric_limits<uint32_t>::max()), get_reg_ptr(traits<ARCH>::LAST_BRANCH), false);
-}
-
-template <typename ARCH> void vm_impl<ARCH>::gen_leave_trap(unsigned lvl) {
-    std::vector<Value *> args{ this->core_ptr, ConstantInt::get(getContext(), APInt(64, lvl)) };
-    this->builder.CreateCall(this->mod->getFunction("leave_trap"), args);
-    auto *PC_val = this->gen_read_mem(traits<ARCH>::CSR, (lvl << 8) + 0x41, traits<ARCH>::XLEN / 8);
-    this->builder.CreateStore(PC_val, get_reg_ptr(traits<ARCH>::NEXT_PC), false);
-    this->builder.CreateStore(this->gen_const(32U, std::numeric_limits<uint32_t>::max()), get_reg_ptr(traits<ARCH>::LAST_BRANCH), false);
-}
-
-template <typename ARCH> void vm_impl<ARCH>::gen_wait(unsigned type) {
-    std::vector<Value *> args{ this->core_ptr, ConstantInt::get(getContext(), APInt(64, type)) };
-    this->builder.CreateCall(this->mod->getFunction("wait"), args);
-}
-
-template <typename ARCH> void vm_impl<ARCH>::gen_trap_behavior(BasicBlock *trap_blk) {
-    this->builder.SetInsertPoint(trap_blk);
-    auto *trap_state_val = this->builder.CreateLoad(get_reg_ptr(traits<ARCH>::TRAP_STATE), true);
-    this->builder.CreateStore(this->gen_const(32U, std::numeric_limits<uint32_t>::max()),
-                              get_reg_ptr(traits<ARCH>::LAST_BRANCH), false);
-    std::vector<Value *> args{this->core_ptr, this->adj_to64(trap_state_val),
-                              this->adj_to64(this->builder.CreateLoad(get_reg_ptr(traits<ARCH>::PC), false))};
-    this->builder.CreateCall(this->mod->getFunction("enter_trap"), args);
-    auto *trap_addr_val = this->builder.CreateLoad(get_reg_ptr(traits<ARCH>::NEXT_PC), false);
-    this->builder.CreateRet(trap_addr_val);
-}
-
-template <typename ARCH> inline void vm_impl<ARCH>::gen_trap_check(BasicBlock *bb) {
-    auto *v = this->builder.CreateLoad(get_reg_ptr(arch::traits<ARCH>::TRAP_STATE), true);
-    this->gen_cond_branch(this->builder.CreateICmp(
-                              ICmpInst::ICMP_EQ, v,
-                              ConstantInt::get(getContext(), APInt(v->getType()->getIntegerBitWidth(), 0))),
-                          bb, this->trap_blk, 1);
-}
-} // namespace rv32imac
-
-template <>
-std::unique_ptr<vm_if> create<arch::rv32imac>(arch::rv32imac *core, unsigned short port, bool dump) {
-    auto ret = new rv32imac::vm_impl<arch::rv32imac>(*core, dump);
-    if (port != 0) debugger::server<debugger::gdb_session>::run_server(ret, port);
-    return std::unique_ptr<vm_if>(ret);
-}
-}
-} // namespace iss

src/vm/tcc/vm_rv64i.cpp

@@ -1,724 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2020 MINRES Technologies GmbH
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *******************************************************************************/
-
-#include <iss/arch/rv64i.h>
-#include <iss/arch/riscv_hart_msu_vp.h>
-#include <iss/debugger/gdb_session.h>
-#include <iss/debugger/server.h>
-#include <iss/iss.h>
-#include <iss/tcc/vm_base.h>
-#include <util/logging.h>
-
-#ifndef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY
-#endif
-#include <fmt/format.h>
-
-#include <array>
-#include <iss/debugger/riscv_target_adapter.h>
-
-namespace iss {
-namespace vm {
-namespace fp_impl {
-void add_fp_functions_2_module(llvm::Module *, unsigned, unsigned);
-}
-}
-
-namespace tcc {
-namespace rv64i {
-using namespace iss::arch;
-using namespace iss::debugger;
-
-template <typename ARCH> class vm_impl : public vm_base<ARCH> {
-public:
-    using super = typename iss::tcc::vm_base<ARCH>;
-    using virt_addr_t = typename super::virt_addr_t;
-    using phys_addr_t = typename super::phys_addr_t;
-    using code_word_t = typename super::code_word_t;
-    using addr_t = typename super::addr_t;
-
-    vm_impl();
-
-    vm_impl(ARCH &core, unsigned core_id = 0, unsigned cluster_id = 0);
-
-    void enableDebug(bool enable) { super::sync_exec = super::ALL_SYNC; }
-
-    target_adapter_if *accquire_target_adapter(server_if *srv) override {
-        debugger_if::dbg_enabled = true;
-        if (vm_base<ARCH>::tgt_adapter == nullptr)
-            vm_base<ARCH>::tgt_adapter = new riscv_target_adapter<ARCH>(srv, this->get_arch());
-        return vm_base<ARCH>::tgt_adapter;
-    }
-
-protected:
-    using vm_base<ARCH>::get_reg_ptr;
-
-    using this_class = vm_impl<ARCH>;
-    using compile_ret_t = std::tuple<continuation_e>;
-    using compile_func = compile_ret_t (this_class::*)(virt_addr_t &pc, code_word_t instr, std::ostringstream&);
-
-    inline const char *name(size_t index){return traits<ARCH>::reg_aliases.at(index);}
-
-    template <typename T> inline ConstantInt *size(T type) {
-        return ConstantInt::get(getContext(), APInt(32, type->getType()->getScalarSizeInBits()));
-    }
-
-    void setup_module(Module* m) override {
-        super::setup_module(m);
-        iss::vm::fp_impl::add_fp_functions_2_module(m, traits<ARCH>::FP_REGS_SIZE, traits<ARCH>::XLEN);
-    }
-
-    inline Value *gen_choose(Value *cond, Value *trueVal, Value *falseVal, unsigned size) {
-        return super::gen_cond_assign(cond, this->gen_ext(trueVal, size), this->gen_ext(falseVal, size));
-    }
-
-    compile_ret_t gen_single_inst_behavior(virt_addr_t &, unsigned int &, std::ostringstream&) override;
-
-    void gen_leave_behavior(BasicBlock *leave_blk) override;
-
-    void gen_raise_trap(uint16_t trap_id, uint16_t cause);
-
-    void gen_leave_trap(unsigned lvl);
-
-    void gen_wait(unsigned type);
-
-    void gen_trap_behavior(BasicBlock *) override;
-
-    std::string gen_trap_check(BasicBlock *bb);
-
-    inline Value *gen_reg_load(unsigned i, unsigned level = 0) {
-        return this->builder.CreateLoad(get_reg_ptr(i), false);
-    }
-
-    inline std::string gen_set_pc(virt_addr_t pc, unsigned reg_num) {
-        return fmt::format("*((uint64_t*){}) = {}\n", get_reg_ptr(reg_num), next_pc_v.val);
-    }
-
-    // some compile time constants
-    // enum { MASK16 = 0b1111110001100011, MASK32 = 0b11111111111100000111000001111111 };
-    enum { MASK16 = 0b1111111111111111, MASK32 = 0b11111111111100000111000001111111 };
-    enum { EXTR_MASK16 = MASK16 >> 2, EXTR_MASK32 = MASK32 >> 2 };
-    enum { LUT_SIZE = 1 << util::bit_count(EXTR_MASK32), LUT_SIZE_C = 1 << util::bit_count(EXTR_MASK16) };
-
-    std::array<compile_func, LUT_SIZE> lut;
-
-    std::array<compile_func, LUT_SIZE_C> lut_00, lut_01, lut_10;
-    std::array<compile_func, LUT_SIZE> lut_11;
-
-	std::array<compile_func *, 4> qlut;
-
-	std::array<const uint32_t, 4> lutmasks = {{EXTR_MASK16, EXTR_MASK16, EXTR_MASK16, EXTR_MASK32}};
-
-    void expand_bit_mask(int pos, uint32_t mask, uint32_t value, uint32_t valid, uint32_t idx, compile_func lut[],
-                         compile_func f) {
-        if (pos < 0) {
-            lut[idx] = f;
-        } else {
-            auto bitmask = 1UL << pos;
-            if ((mask & bitmask) == 0) {
-                expand_bit_mask(pos - 1, mask, value, valid, idx, lut, f);
-            } else {
-                if ((valid & bitmask) == 0) {
-                    expand_bit_mask(pos - 1, mask, value, valid, (idx << 1), lut, f);
-                    expand_bit_mask(pos - 1, mask, value, valid, (idx << 1) + 1, lut, f);
-                } else {
-                    auto new_val = idx << 1;
-                    if ((value & bitmask) != 0) new_val++;
-                    expand_bit_mask(pos - 1, mask, value, valid, new_val, lut, f);
-                }
-            }
-        }
-    }
-
-    inline uint32_t extract_fields(uint32_t val) { return extract_fields(29, val >> 2, lutmasks[val & 0x3], 0); }
-
-    uint32_t extract_fields(int pos, uint32_t val, uint32_t mask, uint32_t lut_val) {
-        if (pos >= 0) {
-            auto bitmask = 1UL << pos;
-            if ((mask & bitmask) == 0) {
-                lut_val = extract_fields(pos - 1, val, mask, lut_val);
-            } else {
-                auto new_val = lut_val << 1;
-                if ((val & bitmask) != 0) new_val++;
-                lut_val = extract_fields(pos - 1, val, mask, new_val);
-            }
-        }
-        return lut_val;
-    }
-
-private:
-    /****************************************************************************
-     * start opcode definitions
-     ****************************************************************************/
-    struct InstructionDesriptor {
-        size_t length;
-        uint32_t value;
-        uint32_t mask;
-        compile_func op;
-    };
-
-    const std::array<InstructionDesriptor, 64> instr_descr = {{
-         /* entries are: size, valid value, valid mask, function ptr */
-        /* instruction LUI */
-        {32, 0b00000000000000000000000000110111, 0b00000000000000000000000001111111, &this_class::__lui},
-        /* instruction AUIPC */
-        {32, 0b00000000000000000000000000010111, 0b00000000000000000000000001111111, &this_class::__auipc},
-        /* instruction JAL */
-        {32, 0b00000000000000000000000001101111, 0b00000000000000000000000001111111, &this_class::__jal},
-        /* instruction JALR */
-        {32, 0b00000000000000000000000001100111, 0b00000000000000000111000001111111, &this_class::__jalr},
-        /* instruction BEQ */
-        {32, 0b00000000000000000000000001100011, 0b00000000000000000111000001111111, &this_class::__beq},
-        /* instruction BNE */
-        {32, 0b00000000000000000001000001100011, 0b00000000000000000111000001111111, &this_class::__bne},
-        /* instruction BLT */
-        {32, 0b00000000000000000100000001100011, 0b00000000000000000111000001111111, &this_class::__blt},
-        /* instruction BGE */
-        {32, 0b00000000000000000101000001100011, 0b00000000000000000111000001111111, &this_class::__bge},
-        /* instruction BLTU */
-        {32, 0b00000000000000000110000001100011, 0b00000000000000000111000001111111, &this_class::__bltu},
-        /* instruction BGEU */
-        {32, 0b00000000000000000111000001100011, 0b00000000000000000111000001111111, &this_class::__bgeu},
-        /* instruction LB */
-        {32, 0b00000000000000000000000000000011, 0b00000000000000000111000001111111, &this_class::__lb},
-        /* instruction LH */
-        {32, 0b00000000000000000001000000000011, 0b00000000000000000111000001111111, &this_class::__lh},
-        /* instruction LW */
-        {32, 0b00000000000000000010000000000011, 0b00000000000000000111000001111111, &this_class::__lw},
-        /* instruction LBU */
-        {32, 0b00000000000000000100000000000011, 0b00000000000000000111000001111111, &this_class::__lbu},
-        /* instruction LHU */
-        {32, 0b00000000000000000101000000000011, 0b00000000000000000111000001111111, &this_class::__lhu},
-        /* instruction SB */
-        {32, 0b00000000000000000000000000100011, 0b00000000000000000111000001111111, &this_class::__sb},
-        /* instruction SH */
-        {32, 0b00000000000000000001000000100011, 0b00000000000000000111000001111111, &this_class::__sh},
-        /* instruction SW */
-        {32, 0b00000000000000000010000000100011, 0b00000000000000000111000001111111, &this_class::__sw},
-        /* instruction ADDI */
-        {32, 0b00000000000000000000000000010011, 0b00000000000000000111000001111111, &this_class::__addi},
-        /* instruction SLTI */
-        {32, 0b00000000000000000010000000010011, 0b00000000000000000111000001111111, &this_class::__slti},
-        /* instruction SLTIU */
-        {32, 0b00000000000000000011000000010011, 0b00000000000000000111000001111111, &this_class::__sltiu},
-        /* instruction XORI */
-        {32, 0b00000000000000000100000000010011, 0b00000000000000000111000001111111, &this_class::__xori},
-        /* instruction ORI */
-        {32, 0b00000000000000000110000000010011, 0b00000000000000000111000001111111, &this_class::__ori},
-        /* instruction ANDI */
-        {32, 0b00000000000000000111000000010011, 0b00000000000000000111000001111111, &this_class::__andi},
-        /* instruction SLLI */
-        {32, 0b00000000000000000001000000010011, 0b11111100000000000111000001111111, &this_class::__slli},
-        /* instruction SRLI */
-        {32, 0b00000000000000000101000000010011, 0b11111100000000000111000001111111, &this_class::__srli},
-        /* instruction SRAI */
-        {32, 0b01000000000000000101000000010011, 0b11111100000000000111000001111111, &this_class::__srai},
-        /* instruction ADD */
-        {32, 0b00000000000000000000000000110011, 0b11111110000000000111000001111111, &this_class::__add},
-        /* instruction SUB */
-        {32, 0b01000000000000000000000000110011, 0b11111110000000000111000001111111, &this_class::__sub},
-        /* instruction SLL */
-        {32, 0b00000000000000000001000000110011, 0b11111110000000000111000001111111, &this_class::__sll},
-        /* instruction SLT */
-        {32, 0b00000000000000000010000000110011, 0b11111110000000000111000001111111, &this_class::__slt},
-        /* instruction SLTU */
-        {32, 0b00000000000000000011000000110011, 0b11111110000000000111000001111111, &this_class::__sltu},
-        /* instruction XOR */
-        {32, 0b00000000000000000100000000110011, 0b11111110000000000111000001111111, &this_class::__xor},
-        /* instruction SRL */
-        {32, 0b00000000000000000101000000110011, 0b11111110000000000111000001111111, &this_class::__srl},
-        /* instruction SRA */
-        {32, 0b01000000000000000101000000110011, 0b11111110000000000111000001111111, &this_class::__sra},
-        /* instruction OR */
-        {32, 0b00000000000000000110000000110011, 0b11111110000000000111000001111111, &this_class::__or},
-        /* instruction AND */
-        {32, 0b00000000000000000111000000110011, 0b11111110000000000111000001111111, &this_class::__and},
-        /* instruction FENCE */
-        {32, 0b00000000000000000000000000001111, 0b11110000000000000111000001111111, &this_class::__fence},
-        /* instruction FENCE_I */
-        {32, 0b00000000000000000001000000001111, 0b00000000000000000111000001111111, &this_class::__fence_i},
-        /* instruction ECALL */
-        {32, 0b00000000000000000000000001110011, 0b11111111111111111111111111111111, &this_class::__ecall},
-        /* instruction EBREAK */
-        {32, 0b00000000000100000000000001110011, 0b11111111111111111111111111111111, &this_class::__ebreak},
-        /* instruction URET */
-        {32, 0b00000000001000000000000001110011, 0b11111111111111111111111111111111, &this_class::__uret},
-        /* instruction SRET */
-        {32, 0b00010000001000000000000001110011, 0b11111111111111111111111111111111, &this_class::__sret},
-        /* instruction MRET */
-        {32, 0b00110000001000000000000001110011, 0b11111111111111111111111111111111, &this_class::__mret},
-        /* instruction WFI */
-        {32, 0b00010000010100000000000001110011, 0b11111111111111111111111111111111, &this_class::__wfi},
-        /* instruction SFENCE.VMA */
-        {32, 0b00010010000000000000000001110011, 0b11111110000000000111111111111111, &this_class::__sfence_vma},
-        /* instruction CSRRW */
-        {32, 0b00000000000000000001000001110011, 0b00000000000000000111000001111111, &this_class::__csrrw},
-        /* instruction CSRRS */
-        {32, 0b00000000000000000010000001110011, 0b00000000000000000111000001111111, &this_class::__csrrs},
-        /* instruction CSRRC */
-        {32, 0b00000000000000000011000001110011, 0b00000000000000000111000001111111, &this_class::__csrrc},
-        /* instruction CSRRWI */
-        {32, 0b00000000000000000101000001110011, 0b00000000000000000111000001111111, &this_class::__csrrwi},
-        /* instruction CSRRSI */
-        {32, 0b00000000000000000110000001110011, 0b00000000000000000111000001111111, &this_class::__csrrsi},
-        /* instruction CSRRCI */
-        {32, 0b00000000000000000111000001110011, 0b00000000000000000111000001111111, &this_class::__csrrci},
-        /* instruction LWU */
-        {32, 0b00000000000000000110000000000011, 0b00000000000000000111000001111111, &this_class::__lwu},
-        /* instruction LD */
-        {32, 0b00000000000000000011000000000011, 0b00000000000000000111000001111111, &this_class::__ld},
-        /* instruction SD */
-        {32, 0b00000000000000000011000000100011, 0b00000000000000000111000001111111, &this_class::__sd},
-        /* instruction ADDIW */
-        {32, 0b00000000000000000000000000011011, 0b00000000000000000111000001111111, &this_class::__addiw},
-        /* instruction SLLIW */
-        {32, 0b00000000000000000001000000011011, 0b11111110000000000111000001111111, &this_class::__slliw},
-        /* instruction SRLIW */
-        {32, 0b00000000000000000101000000011011, 0b11111110000000000111000001111111, &this_class::__srliw},
-        /* instruction SRAIW */
-        {32, 0b01000000000000000101000000011011, 0b11111110000000000111000001111111, &this_class::__sraiw},
-        /* instruction ADDW */
-        {32, 0b00000000000000000000000000111011, 0b11111110000000000111000001111111, &this_class::__addw},
-        /* instruction SUBW */
-        {32, 0b01000000000000000000000000111011, 0b11111110000000000111000001111111, &this_class::__subw},
-        /* instruction SLLW */
-        {32, 0b00000000000000000001000000111011, 0b11111110000000000111000001111111, &this_class::__sllw},
-        /* instruction SRLW */
-        {32, 0b00000000000000000101000000111011, 0b11111110000000000111000001111111, &this_class::__srlw},
-        /* instruction SRAW */
-        {32, 0b01000000000000000101000000111011, 0b11111110000000000111000001111111, &this_class::__sraw},
-    }};
- 
-    /* instruction definitions */
-    /* instruction 0: LUI */
-    compile_ret_t __lui(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 1: AUIPC */
-    compile_ret_t __auipc(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-        os<<fmt::format("AUIPC-{:%08x}:\n", pc.val);
-
-        os<<this->gen_sync(PRE_SYNC, 1);
-
-        uint8_t rd = ((bit_sub<7,5>(instr)));
-        int32_t imm = signextend<int32_t,32>((bit_sub<12,20>(instr) << 12));
-        if(this->disass_enabled){
-            /* generate console output when executing the command */
-            auto mnemonic = fmt::format(
-                "{mnemonic:10} {rd}, {imm:#08x}", fmt::arg("mnemonic", "auipc"),
-                fmt::arg("rd", name(rd)), fmt::arg("imm", imm));
-            this->builder.CreateCall(this->mod->getFunction("print_disass"), args);
-            os<<fmt::format("\tprint_disass((void*){}, {}, {});\n", this->core_ptr, pc.val, mnemonic);
-        }
-
-        Value* cur_pc_val = this->gen_const(64, pc.val);
-        pc=pc+4;
-
-        if(rd != 0){
-            os<<fmt::format("uint64_t res = {} + {};\n", cur_pc_val, imm);
-            os<<fmt::format("*((uint64_t*){}) = ret\n", get_reg_ptr(rd + traits<ARCH>::X0));
-        }
-        os<<this->gen_set_pc(pc, traits<ARCH>::NEXT_PC);
-        os<<this->gen_sync(POST_SYNC, 1);
-        os<<this->gen_trap_check(bb);
-        return std::make_tuple(CONT);
-
-    }
-    
-    /* instruction 2: JAL */
-    compile_ret_t __jal(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 3: JALR */
-    compile_ret_t __jalr(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 4: BEQ */
-    compile_ret_t __beq(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 5: BNE */
-    compile_ret_t __bne(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 6: BLT */
-    compile_ret_t __blt(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 7: BGE */
-    compile_ret_t __bge(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 8: BLTU */
-    compile_ret_t __bltu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 9: BGEU */
-    compile_ret_t __bgeu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 10: LB */
-    compile_ret_t __lb(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 11: LH */
-    compile_ret_t __lh(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 12: LW */
-    compile_ret_t __lw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 13: LBU */
-    compile_ret_t __lbu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 14: LHU */
-    compile_ret_t __lhu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 15: SB */
-    compile_ret_t __sb(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 16: SH */
-    compile_ret_t __sh(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 17: SW */
-    compile_ret_t __sw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 18: ADDI */
-    compile_ret_t __addi(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 19: SLTI */
-    compile_ret_t __slti(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 20: SLTIU */
-    compile_ret_t __sltiu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 21: XORI */
-    compile_ret_t __xori(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 22: ORI */
-    compile_ret_t __ori(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 23: ANDI */
-    compile_ret_t __andi(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 24: SLLI */
-    compile_ret_t __slli(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 25: SRLI */
-    compile_ret_t __srli(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 26: SRAI */
-    compile_ret_t __srai(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 27: ADD */
-    compile_ret_t __add(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 28: SUB */
-    compile_ret_t __sub(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 29: SLL */
-    compile_ret_t __sll(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 30: SLT */
-    compile_ret_t __slt(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 31: SLTU */
-    compile_ret_t __sltu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 32: XOR */
-    compile_ret_t __xor(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 33: SRL */
-    compile_ret_t __srl(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 34: SRA */
-    compile_ret_t __sra(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 35: OR */
-    compile_ret_t __or(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 36: AND */
-    compile_ret_t __and(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 37: FENCE */
-    compile_ret_t __fence(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 38: FENCE_I */
-    compile_ret_t __fence_i(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 39: ECALL */
-    compile_ret_t __ecall(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 40: EBREAK */
-    compile_ret_t __ebreak(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 41: URET */
-    compile_ret_t __uret(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 42: SRET */
-    compile_ret_t __sret(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 43: MRET */
-    compile_ret_t __mret(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 44: WFI */
-    compile_ret_t __wfi(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 45: SFENCE.VMA */
-    compile_ret_t __sfence_vma(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 46: CSRRW */
-    compile_ret_t __csrrw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 47: CSRRS */
-    compile_ret_t __csrrs(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 48: CSRRC */
-    compile_ret_t __csrrc(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 49: CSRRWI */
-    compile_ret_t __csrrwi(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 50: CSRRSI */
-    compile_ret_t __csrrsi(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 51: CSRRCI */
-    compile_ret_t __csrrci(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 52: LWU */
-    compile_ret_t __lwu(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 53: LD */
-    compile_ret_t __ld(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 54: SD */
-    compile_ret_t __sd(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 55: ADDIW */
-    compile_ret_t __addiw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 56: SLLIW */
-    compile_ret_t __slliw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 57: SRLIW */
-    compile_ret_t __srliw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 58: SRAIW */
-    compile_ret_t __sraiw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 59: ADDW */
-    compile_ret_t __addw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 60: SUBW */
-    compile_ret_t __subw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 61: SLLW */
-    compile_ret_t __sllw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 62: SRLW */
-    compile_ret_t __srlw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /* instruction 63: SRAW */
-    compile_ret_t __sraw(virt_addr_t& pc, code_word_t instr, std::ostringstream& os){
-    }
-    
-    /****************************************************************************
-     * end opcode definitions
-     ****************************************************************************/
-    compile_ret_t illegal_intruction(virt_addr_t &pc, code_word_t instr, std::stringstream& os) {
-		this->gen_sync(iss::PRE_SYNC, instr_descr.size());
-        this->builder.CreateStore(this->builder.CreateLoad(get_reg_ptr(traits<ARCH>::NEXT_PC), true),
-                                   get_reg_ptr(traits<ARCH>::PC), true);
-        this->builder.CreateStore(
-            this->builder.CreateAdd(this->builder.CreateLoad(get_reg_ptr(traits<ARCH>::ICOUNT), true),
-                                     this->gen_const(64U, 1)),
-            get_reg_ptr(traits<ARCH>::ICOUNT), true);
-        pc = pc + ((instr & 3) == 3 ? 4 : 2);
-        this->gen_raise_trap(0, 2);     // illegal instruction trap
-		this->gen_sync(iss::POST_SYNC, instr_descr.size());
-        this->gen_trap_check(this->leave_blk);
-        return BRANCH;
-    }
-};
-
-template <typename CODE_WORD> void debug_fn(CODE_WORD insn) {
-    volatile CODE_WORD x = insn;
-    insn = 2 * x;
-}
-
-template <typename ARCH> vm_impl<ARCH>::vm_impl() { this(new ARCH()); }
-
-template <typename ARCH>
-vm_impl<ARCH>::vm_impl(ARCH &core, unsigned core_id, unsigned cluster_id)
-: vm_base<ARCH>(core, core_id, cluster_id) {
-    qlut[0] = lut_00.data();
-    qlut[1] = lut_01.data();
-    qlut[2] = lut_10.data();
-    qlut[3] = lut_11.data();
-    for (auto instr : instr_descr) {
-        auto quantrant = instr.value & 0x3;
-        expand_bit_mask(29, lutmasks[quantrant], instr.value >> 2, instr.mask >> 2, 0, qlut[quantrant], instr.op);
-    }
-}
-
-template <typename ARCH>
-std::tuple<continuation_e>
-vm_impl<ARCH>::gen_single_inst_behavior(virt_addr_t &pc, unsigned int &inst_cnt, std::ostringstrem& os) {
-    // we fetch at max 4 byte, alignment is 2
-    enum {TRAP_ID=1<<16};
-    code_word_t insn = 0;
-    const typename traits<ARCH>::addr_t upper_bits = ~traits<ARCH>::PGMASK;
-    phys_addr_t paddr(pc);
-    auto *const data = (uint8_t *)&insn;
-    paddr = this->core.v2p(pc);
-    if ((pc.val & upper_bits) != ((pc.val + 2) & upper_bits)) { // we may cross a page boundary
-        auto res = this->core.read(paddr, 2, data);
-        if (res != iss::Ok) throw trap_access(TRAP_ID, pc.val);
-        if ((insn & 0x3) == 0x3) { // this is a 32bit instruction
-            res = this->core.read(this->core.v2p(pc + 2), 2, data + 2);
-        }
-    } else {
-        auto res = this->core.read(paddr, 4, data);
-        if (res != iss::Ok) throw trap_access(TRAP_ID, pc.val);
-    }
-    if (insn == 0x0000006f || (insn&0xffff)==0xa001) throw simulation_stopped(0); // 'J 0' or 'C.J 0'
-    // curr pc on stack
-    ++inst_cnt;
-    auto lut_val = extract_fields(insn);
-    auto f = qlut[insn & 0x3][lut_val];
-    if (f == nullptr) {
-        f = &this_class::illegal_intruction;
-    }
-    return (this->*f)(pc, insn, this_block);
-}
-
-template <typename ARCH> void vm_impl<ARCH>::gen_leave_behavior(BasicBlock *leave_blk) {
-    this->builder.SetInsertPoint(leave_blk);
-    this->builder.CreateRet(this->builder.CreateLoad(get_reg_ptr(arch::traits<ARCH>::NEXT_PC), false));
-}
-
-template <typename ARCH> void vm_impl<ARCH>::gen_raise_trap(uint16_t trap_id, uint16_t cause) {
-    auto *TRAP_val = this->gen_const(32, 0x80 << 24 | (cause << 16) | trap_id);
-    this->builder.CreateStore(TRAP_val, get_reg_ptr(traits<ARCH>::TRAP_STATE), true);
-    this->builder.CreateStore(this->gen_const(32U, std::numeric_limits<uint32_t>::max()), get_reg_ptr(traits<ARCH>::LAST_BRANCH), false);
-}
-
-template <typename ARCH> void vm_impl<ARCH>::gen_leave_trap(unsigned lvl) {
-    std::vector<Value *> args{ this->core_ptr, ConstantInt::get(getContext(), APInt(64, lvl)) };
-    this->builder.CreateCall(this->mod->getFunction("leave_trap"), args);
-    auto *PC_val = this->gen_read_mem(traits<ARCH>::CSR, (lvl << 8) + 0x41, traits<ARCH>::XLEN / 8);
-    this->builder.CreateStore(PC_val, get_reg_ptr(traits<ARCH>::NEXT_PC), false);
-    this->builder.CreateStore(this->gen_const(32U, std::numeric_limits<uint32_t>::max()), get_reg_ptr(traits<ARCH>::LAST_BRANCH), false);
-}
-
-template <typename ARCH> void vm_impl<ARCH>::gen_wait(unsigned type) {
-    std::vector<Value *> args{ this->core_ptr, ConstantInt::get(getContext(), APInt(64, type)) };
-    this->builder.CreateCall(this->mod->getFunction("wait"), args);
-}
-
-template <typename ARCH> void vm_impl<ARCH>::gen_trap_behavior(BasicBlock *trap_blk) {
-    this->builder.SetInsertPoint(trap_blk);
-    auto *trap_state_val = this->builder.CreateLoad(get_reg_ptr(traits<ARCH>::TRAP_STATE), true);
-    this->builder.CreateStore(this->gen_const(32U, std::numeric_limits<uint32_t>::max()),
-                              get_reg_ptr(traits<ARCH>::LAST_BRANCH), false);
-    std::vector<Value *> args{this->core_ptr, this->adj_to64(trap_state_val),
-                              this->adj_to64(this->builder.CreateLoad(get_reg_ptr(traits<ARCH>::PC), false))};
-    this->builder.CreateCall(this->mod->getFunction("enter_trap"), args);
-    auto *trap_addr_val = this->builder.CreateLoad(get_reg_ptr(traits<ARCH>::NEXT_PC), false);
-    this->builder.CreateRet(trap_addr_val);
-}
-
-template <typename ARCH> inline std::string vm_impl<ARCH>::gen_trap_check(BasicBlock *bb) {
-    return fmt::format("if(*(uint32_t){})!=0) goto trap_blk;\n", get_reg_ptr(arch::traits<ARCH>::TRAP_STATE));
-
-}
-} // namespace rv64i
-
-template <>
-std::unique_ptr<vm_if> create<arch::rv64i>(arch::rv64i *core, unsigned short port, bool dump) {
-    auto ret = new rv64i::vm_impl<arch::rv64i>(*core, dump);
-    if (port != 0) debugger::server<debugger::gdb_session>::run_server(ret, port);
-    return std::unique_ptr<vm_if>(ret);
-}
-}
-} // namespace iss