Compare commits
	
		
			7 Commits
		
	
	
		
			1fb7e8fcea
			...
			feature/ev
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 7ea3a6261d | |||
| a6a6f51f0b | |||
| 21e1f791ad | |||
| be6f5791fa | |||
| ac818f304d | |||
| ad60449073 | |||
| b45b3589fa | 
| @@ -109,15 +109,14 @@ if(TARGET yaml-cpp::yaml-cpp) | ||||
|     target_link_libraries(${PROJECT_NAME} PUBLIC yaml-cpp::yaml-cpp) | ||||
| endif() | ||||
|  | ||||
| if(WITH_LLVM) | ||||
|     find_package(LLVM) | ||||
|     target_compile_definitions(${PROJECT_NAME} PUBLIC ${LLVM_DEFINITIONS}) | ||||
|     target_include_directories(${PROJECT_NAME} PUBLIC ${LLVM_INCLUDE_DIRS}) | ||||
| # if(WITH_LLVM) | ||||
| #     target_compile_definitions(${PROJECT_NAME} PUBLIC ${LLVM_DEFINITIONS}) | ||||
| #     target_include_directories(${PROJECT_NAME} PUBLIC ${LLVM_INCLUDE_DIRS}) | ||||
|  | ||||
|     if(BUILD_SHARED_LIBS) | ||||
|         target_link_libraries(${PROJECT_NAME} PUBLIC ${LLVM_LIBRARIES}) | ||||
|     endif() | ||||
| endif() | ||||
| #     if(BUILD_SHARED_LIBS) | ||||
| #         target_link_libraries(${PROJECT_NAME} PUBLIC ${LLVM_LIBRARIES}) | ||||
| #     endif() | ||||
| # endif() | ||||
|  | ||||
| set_target_properties(${PROJECT_NAME} PROPERTIES | ||||
|     VERSION ${PROJECT_VERSION} | ||||
|   | ||||
| @@ -131,8 +131,6 @@ struct ${coreDef.name.toLowerCase()}: public arch_if { | ||||
|  | ||||
|     uint8_t* get_regs_base_ptr() override; | ||||
|  | ||||
|     inline uint64_t get_icount() { return reg.icount; } | ||||
|  | ||||
|     inline bool should_stop() { return interrupt_sim; } | ||||
|  | ||||
|     inline uint64_t stop_code() { return interrupt_sim; } | ||||
| @@ -141,8 +139,6 @@ struct ${coreDef.name.toLowerCase()}: public arch_if { | ||||
|  | ||||
|     virtual iss::sync_type needed_sync() const { return iss::NO_SYNC; } | ||||
|  | ||||
|     inline uint32_t get_last_branch() { return reg.last_branch; } | ||||
|  | ||||
|  | ||||
| #pragma pack(push, 1) | ||||
|     struct ${coreDef.name}_regs {<% | ||||
|   | ||||
| @@ -45,17 +45,17 @@ namespace interp { | ||||
| using namespace sysc; | ||||
| volatile std::array<bool, ${array_count}> ${coreDef.name.toLowerCase()}_init = { | ||||
|         iss_factory::instance().register_creator("${coreDef.name.toLowerCase()}|m_p|interp", [](unsigned gdb_port, void* data) -> iss_factory::base_t { | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex*>(data); | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex_if*>(data); | ||||
|             auto* cpu = new sc_core_adapter<arch::riscv_hart_m_p<arch::${coreDef.name.toLowerCase()}>>(cc); | ||||
|             return {sysc::sc_cpu_ptr{cpu}, vm_ptr{create(static_cast<arch::${coreDef.name.toLowerCase()}*>(cpu), gdb_port)}}; | ||||
|         }), | ||||
|         iss_factory::instance().register_creator("${coreDef.name.toLowerCase()}|mu_p|interp", [](unsigned gdb_port, void* data) -> iss_factory::base_t { | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex*>(data); | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex_if*>(data); | ||||
|             auto* cpu = new sc_core_adapter<arch::riscv_hart_mu_p<arch::${coreDef.name.toLowerCase()}>>(cc); | ||||
|             return {sysc::sc_cpu_ptr{cpu}, vm_ptr{create(static_cast<arch::${coreDef.name.toLowerCase()}*>(cpu), gdb_port)}}; | ||||
|         })<%if(coreDef.name.toLowerCase()=="tgc5d" || coreDef.name.toLowerCase()=="tgc5e") {%>, | ||||
|         iss_factory::instance().register_creator("${coreDef.name.toLowerCase()}|mu_p_clic_pmp|interp", [](unsigned gdb_port, void* data) -> iss_factory::base_t { | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex*>(data); | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex_if*>(data); | ||||
|             auto* cpu = new sc_core_adapter<arch::riscv_hart_mu_p<arch::${coreDef.name.toLowerCase()}, (iss::arch::features_e)(iss::arch::FEAT_PMP | iss::arch::FEAT_EXT_N | iss::arch::FEAT_CLIC)>>(cc); | ||||
|             return {sysc::sc_cpu_ptr{cpu}, vm_ptr{create(static_cast<arch::${coreDef.name.toLowerCase()}*>(cpu), gdb_port)}}; | ||||
|         })<%}%> | ||||
| @@ -66,17 +66,17 @@ namespace llvm { | ||||
| using namespace sysc; | ||||
| volatile std::array<bool, ${array_count}> ${coreDef.name.toLowerCase()}_init = { | ||||
|         iss_factory::instance().register_creator("${coreDef.name.toLowerCase()}|m_p|llvm", [](unsigned gdb_port, void* data) -> iss_factory::base_t { | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex*>(data); | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex_if*>(data); | ||||
|             auto* cpu = new sc_core_adapter<arch::riscv_hart_m_p<arch::${coreDef.name.toLowerCase()}>>(cc); | ||||
|             return {sysc::sc_cpu_ptr{cpu}, vm_ptr{create(static_cast<arch::${coreDef.name.toLowerCase()}*>(cpu), gdb_port)}}; | ||||
|         }), | ||||
|         iss_factory::instance().register_creator("${coreDef.name.toLowerCase()}|mu_p|llvm", [](unsigned gdb_port, void* data) -> iss_factory::base_t { | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex*>(data); | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex_if*>(data); | ||||
|             auto* cpu = new sc_core_adapter<arch::riscv_hart_mu_p<arch::${coreDef.name.toLowerCase()}>>(cc); | ||||
|             return {sysc::sc_cpu_ptr{cpu}, vm_ptr{create(static_cast<arch::${coreDef.name.toLowerCase()}*>(cpu), gdb_port)}}; | ||||
|         })<%if(coreDef.name.toLowerCase()=="tgc5d" || coreDef.name.toLowerCase()=="tgc5e") {%>, | ||||
|         iss_factory::instance().register_creator("${coreDef.name.toLowerCase()}|mu_p_clic_pmp|llvm", [](unsigned gdb_port, void* data) -> iss_factory::base_t { | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex*>(data); | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex_if*>(data); | ||||
|             auto* cpu = new sc_core_adapter<arch::riscv_hart_mu_p<arch::${coreDef.name.toLowerCase()}, (iss::arch::features_e)(iss::arch::FEAT_PMP | iss::arch::FEAT_EXT_N | iss::arch::FEAT_CLIC)>>(cc); | ||||
|             return {sysc::sc_cpu_ptr{cpu}, vm_ptr{create(static_cast<arch::${coreDef.name.toLowerCase()}*>(cpu), gdb_port)}}; | ||||
|         })<%}%> | ||||
| @@ -88,17 +88,17 @@ namespace tcc { | ||||
| using namespace sysc; | ||||
| volatile std::array<bool, ${array_count}> ${coreDef.name.toLowerCase()}_init = { | ||||
|         iss_factory::instance().register_creator("${coreDef.name.toLowerCase()}|m_p|tcc", [](unsigned gdb_port, void* data) -> iss_factory::base_t { | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex*>(data); | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex_if*>(data); | ||||
|             auto* cpu = new sc_core_adapter<arch::riscv_hart_m_p<arch::${coreDef.name.toLowerCase()}>>(cc); | ||||
|             return {sysc::sc_cpu_ptr{cpu}, vm_ptr{create(static_cast<arch::${coreDef.name.toLowerCase()}*>(cpu), gdb_port)}}; | ||||
|         }), | ||||
|         iss_factory::instance().register_creator("${coreDef.name.toLowerCase()}|mu_p|tcc", [](unsigned gdb_port, void* data) -> iss_factory::base_t { | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex*>(data); | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex_if*>(data); | ||||
|             auto* cpu = new sc_core_adapter<arch::riscv_hart_mu_p<arch::${coreDef.name.toLowerCase()}>>(cc); | ||||
|             return {sysc::sc_cpu_ptr{cpu}, vm_ptr{create(static_cast<arch::${coreDef.name.toLowerCase()}*>(cpu), gdb_port)}}; | ||||
|         })<%if(coreDef.name.toLowerCase()=="tgc5d" || coreDef.name.toLowerCase()=="tgc5e") {%>, | ||||
|         iss_factory::instance().register_creator("${coreDef.name.toLowerCase()}|mu_p_clic_pmp|tcc", [](unsigned gdb_port, void* data) -> iss_factory::base_t { | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex*>(data); | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex_if*>(data); | ||||
|             auto* cpu = new sc_core_adapter<arch::riscv_hart_mu_p<arch::${coreDef.name.toLowerCase()}, (iss::arch::features_e)(iss::arch::FEAT_PMP | iss::arch::FEAT_EXT_N | iss::arch::FEAT_CLIC)>>(cc); | ||||
|             return {sysc::sc_cpu_ptr{cpu}, vm_ptr{create(static_cast<arch::${coreDef.name.toLowerCase()}*>(cpu), gdb_port)}}; | ||||
|         })<%}%> | ||||
| @@ -110,17 +110,17 @@ namespace asmjit { | ||||
| using namespace sysc; | ||||
| volatile std::array<bool, ${array_count}> ${coreDef.name.toLowerCase()}_init = { | ||||
|         iss_factory::instance().register_creator("${coreDef.name.toLowerCase()}|m_p|asmjit", [](unsigned gdb_port, void* data) -> iss_factory::base_t { | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex*>(data); | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex_if*>(data); | ||||
|             auto* cpu = new sc_core_adapter<arch::riscv_hart_m_p<arch::${coreDef.name.toLowerCase()}>>(cc); | ||||
|             return {sysc::sc_cpu_ptr{cpu}, vm_ptr{create(static_cast<arch::${coreDef.name.toLowerCase()}*>(cpu), gdb_port)}}; | ||||
|         }), | ||||
|         iss_factory::instance().register_creator("${coreDef.name.toLowerCase()}|mu_p|asmjit", [](unsigned gdb_port, void* data) -> iss_factory::base_t { | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex*>(data); | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex_if*>(data); | ||||
|             auto* cpu = new sc_core_adapter<arch::riscv_hart_mu_p<arch::${coreDef.name.toLowerCase()}>>(cc); | ||||
|             return {sysc::sc_cpu_ptr{cpu}, vm_ptr{create(static_cast<arch::${coreDef.name.toLowerCase()}*>(cpu), gdb_port)}}; | ||||
|         })<%if(coreDef.name.toLowerCase()=="tgc5d" || coreDef.name.toLowerCase()=="tgc5e") {%>, | ||||
|         iss_factory::instance().register_creator("${coreDef.name.toLowerCase()}|mu_p_clic_pmp|asmjit", [](unsigned gdb_port, void* data) -> iss_factory::base_t { | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex*>(data); | ||||
|             auto* cc = reinterpret_cast<sysc::tgfs::core_complex_if*>(data); | ||||
|             auto* cpu = new sc_core_adapter<arch::riscv_hart_mu_p<arch::${coreDef.name.toLowerCase()}, (iss::arch::features_e)(iss::arch::FEAT_PMP | iss::arch::FEAT_EXT_N | iss::arch::FEAT_CLIC)>>(cc); | ||||
|             return {sysc::sc_cpu_ptr{cpu}, vm_ptr{create(static_cast<arch::${coreDef.name.toLowerCase()}*>(cpu), gdb_port)}}; | ||||
|         })<%}%> | ||||
|   | ||||
| @@ -263,6 +263,7 @@ void vm_impl<ARCH>::gen_instr_epilogue(jit_holder& jh) { | ||||
|     cmp(cc, current_trap_state, 0); | ||||
|     cc.jne(jh.trap_entry); | ||||
|     cc.inc(get_ptr_for(jh, traits::ICOUNT)); | ||||
|     cc.inc(get_ptr_for(jh, traits::CYCLE)); | ||||
| } | ||||
| template <typename ARCH> | ||||
| void vm_impl<ARCH>::gen_block_prologue(jit_holder& jh){ | ||||
| @@ -308,6 +309,7 @@ inline void vm_impl<ARCH>::gen_raise(jit_holder& jh, uint16_t trap_id, uint16_t | ||||
|     auto tmp1 = get_reg_for(cc, traits::TRAP_STATE); | ||||
|     mov(cc, tmp1, 0x80ULL << 24 | (cause << 16) | trap_id); | ||||
|     mov(cc, get_ptr_for(jh, traits::TRAP_STATE), tmp1); | ||||
|     cc.jmp(jh.trap_entry); | ||||
| } | ||||
| template <typename ARCH> | ||||
| template <typename T, typename> | ||||
|   | ||||
| @@ -279,6 +279,7 @@ 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::TRAP_STATE), true); | ||||
|     this->builder.CreateBr(this->trap_blk); | ||||
| } | ||||
|  | ||||
| template <typename ARCH> | ||||
|   | ||||
| @@ -83,21 +83,21 @@ protected: | ||||
|     using vm_base<ARCH>::get_reg_ptr; | ||||
|  | ||||
|     using this_class = vm_impl<ARCH>; | ||||
|     using compile_ret_t = std::tuple<continuation_e>; | ||||
|     using compile_ret_t = continuation_e; | ||||
|     using compile_func = compile_ret_t (this_class::*)(virt_addr_t &pc, code_word_t instr, tu_builder&); | ||||
|  | ||||
|     inline const char *name(size_t index){return traits::reg_aliases.at(index);} | ||||
| <% | ||||
| if(fcsr != null) {%> | ||||
|     inline const char *fname(size_t index){return index < 32?name(index+traits::F0):"illegal";}    | ||||
|  | ||||
|     void add_prologue(tu_builder& tu) override; | ||||
| <%}%> | ||||
|     void add_prologue(tu_builder& tu) override; | ||||
|  | ||||
|     void setup_module(std::string m) override { | ||||
|         super::setup_module(m); | ||||
|     } | ||||
|  | ||||
|     compile_ret_t gen_single_inst_behavior(virt_addr_t &, unsigned int &, tu_builder&) override; | ||||
|     compile_ret_t gen_single_inst_behavior(virt_addr_t &, tu_builder&) override; | ||||
|  | ||||
|     void gen_trap_behavior(tu_builder& tu) override; | ||||
|  | ||||
| @@ -225,8 +225,8 @@ vm_impl<ARCH>::vm_impl(ARCH &core, unsigned core_id, unsigned cluster_id) | ||||
|     }()) {} | ||||
|  | ||||
| template <typename ARCH> | ||||
| std::tuple<continuation_e> | ||||
| vm_impl<ARCH>::gen_single_inst_behavior(virt_addr_t &pc, unsigned int &inst_cnt, tu_builder& tu) { | ||||
| continuation_e | ||||
| vm_impl<ARCH>::gen_single_inst_behavior(virt_addr_t &pc, tu_builder& tu) { | ||||
|     // we fetch at max 4 byte, alignment is 2 | ||||
|     enum {TRAP_ID=1<<16}; | ||||
|     code_word_t instr = 0; | ||||
| @@ -238,7 +238,6 @@ vm_impl<ARCH>::gen_single_inst_behavior(virt_addr_t &pc, unsigned int &inst_cnt, | ||||
|         return ILLEGAL_FETCH; | ||||
|     if (instr == 0x0000006f || (instr&0xffff)==0xa001)  | ||||
|         return JUMP_TO_SELF; | ||||
|     ++inst_cnt; | ||||
|     uint32_t inst_index = instr_decoder.decode_instr(instr); | ||||
|     compile_func f = nullptr; | ||||
|     if(inst_index < instr_descr.size()) | ||||
| @@ -274,9 +273,12 @@ template <typename ARCH> void vm_impl<ARCH>::gen_trap_behavior(tu_builder& tu) { | ||||
|     tu("return *next_pc;"); | ||||
| } | ||||
| <% | ||||
| if(fcsr != null) {%> | ||||
|  | ||||
| template <typename ARCH> void vm_impl<ARCH>::add_prologue(tu_builder& tu){ | ||||
|     std::ostringstream os; | ||||
|     os << add_reg_ptr("trap_state", arch::traits<ARCH>::TRAP_STATE); | ||||
|     os << add_reg_ptr("pending_trap", arch::traits<ARCH>::PENDING_TRAP); | ||||
| if(fcsr != null) {%> | ||||
|     os << "uint32_t (*fget_flags)()=" << (uintptr_t)&fget_flags << ";\\n"; | ||||
|     os << "uint32_t (*fadd_s)(uint32_t v1, uint32_t v2, uint8_t mode)=" << (uintptr_t)&fadd_s << ";\\n"; | ||||
|     os << "uint32_t (*fsub_s)(uint32_t v1, uint32_t v2, uint8_t mode)=" << (uintptr_t)&fsub_s << ";\\n"; | ||||
| @@ -303,9 +305,10 @@ template <typename ARCH> void vm_impl<ARCH>::add_prologue(tu_builder& tu){ | ||||
|     os << "uint64_t (*fcvt_32_64)(uint32_t v1, uint32_t op, uint8_t mode)=" << (uintptr_t)&fcvt_32_64 << ";\\n"; | ||||
|     os << "uint32_t (*fcvt_64_32)(uint64_t v1, uint32_t op, uint8_t mode)=" << (uintptr_t)&fcvt_64_32 << ";\\n"; | ||||
|     os << "uint32_t (*unbox_s)(uint64_t v)=" << (uintptr_t)&unbox_s << ";\\n"; | ||||
|     <%}%> | ||||
|     tu.add_prologue(os.str()); | ||||
| } | ||||
| <%}%> | ||||
|  | ||||
|  | ||||
| } // namespace ${coreDef.name.toLowerCase()} | ||||
|  | ||||
|   | ||||
| @@ -3,34 +3,33 @@ | ||||
| #define ELFIO_NO_INTTYPES | ||||
| #endif | ||||
|  | ||||
| #include <iostream> | ||||
| #include <elfio/elfio_dump.hpp> | ||||
| #include <iostream> | ||||
|  | ||||
| using namespace ELFIO; | ||||
|  | ||||
| int main( int argc, char** argv ) | ||||
| { | ||||
|     if ( argc != 2 ) { | ||||
|         printf( "Usage: elfdump <file_name>\n" ); | ||||
| int main(int argc, char** argv) { | ||||
|     if(argc != 2) { | ||||
|         printf("Usage: elfdump <file_name>\n"); | ||||
|         return 1; | ||||
|     } | ||||
|  | ||||
|     elfio reader; | ||||
|  | ||||
|     if ( !reader.load( argv[1] ) ) { | ||||
|         printf( "File %s is not found or it is not an ELF file\n", argv[1] ); | ||||
|     if(!reader.load(argv[1])) { | ||||
|         printf("File %s is not found or it is not an ELF file\n", argv[1]); | ||||
|         return 1; | ||||
|     } | ||||
|  | ||||
|     dump::header( std::cout, reader ); | ||||
|     dump::section_headers( std::cout, reader ); | ||||
|     dump::segment_headers( std::cout, reader ); | ||||
|     dump::symbol_tables( std::cout, reader ); | ||||
|     dump::notes( std::cout, reader ); | ||||
|     dump::modinfo( std::cout, reader ); | ||||
|     dump::dynamic_tags( std::cout, reader ); | ||||
|     dump::section_datas( std::cout, reader ); | ||||
|     dump::segment_datas( std::cout, reader ); | ||||
|     dump::header(std::cout, reader); | ||||
|     dump::section_headers(std::cout, reader); | ||||
|     dump::segment_headers(std::cout, reader); | ||||
|     dump::symbol_tables(std::cout, reader); | ||||
|     dump::notes(std::cout, reader); | ||||
|     dump::modinfo(std::cout, reader); | ||||
|     dump::dynamic_tags(std::cout, reader); | ||||
|     dump::section_datas(std::cout, reader); | ||||
|     dump::segment_datas(std::cout, reader); | ||||
|  | ||||
|     return 0; | ||||
| } | ||||
| @@ -189,7 +189,7 @@ struct tgc5c: public arch_if { | ||||
|  | ||||
|     uint8_t* get_regs_base_ptr() override; | ||||
|  | ||||
|     inline uint64_t get_icount() { return reg.icount; } | ||||
|     inline uint64_t get_icount() { return reg.icount; } //This should not be accessible, only through the instrumentation_if | ||||
|  | ||||
|     inline bool should_stop() { return interrupt_sim; } | ||||
|  | ||||
| @@ -199,7 +199,7 @@ struct tgc5c: public arch_if { | ||||
|  | ||||
|     virtual iss::sync_type needed_sync() const { return iss::NO_SYNC; } | ||||
|  | ||||
|     inline uint32_t get_last_branch() { return reg.last_branch; } | ||||
|     inline uint32_t get_last_branch() { return reg.last_branch; }  //This should also only be accessible through the instrumentation_if | ||||
|  | ||||
|  | ||||
| #pragma pack(push, 1) | ||||
|   | ||||
							
								
								
									
										12
									
								
								src/main.cpp
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								src/main.cpp
									
									
									
									
									
								
							| @@ -206,13 +206,21 @@ int main(int argc, char* argv[]) { | ||||
|         if(clim.count("elf")) | ||||
|             for(std::string input : clim["elf"].as<std::vector<std::string>>()) { | ||||
|                 auto start_addr = vm->get_arch()->load_file(input); | ||||
|                 if(start_addr.second) // FIXME: this always evaluates to true as load file always returns <sth, true> | ||||
|                 if(start_addr.second) | ||||
|                     start_address = start_addr.first; | ||||
|                 else { | ||||
|                     LOG(ERR) << "Error occured while loading file " << input << std::endl; | ||||
|                     return 1; | ||||
|                 } | ||||
|             } | ||||
|         for(std::string input : args) { | ||||
|             auto start_addr = vm->get_arch()->load_file(input); // treat remaining arguments as elf files | ||||
|             if(start_addr.second) // FIXME: this always evaluates to true as load file always returns <sth, true> | ||||
|             if(start_addr.second) | ||||
|                 start_address = start_addr.first; | ||||
|             else { | ||||
|                 LOG(ERR) << "Error occured while loading file " << input << std::endl; | ||||
|                 return 1; | ||||
|             } | ||||
|         } | ||||
|         if(clim.count("reset")) { | ||||
|             auto str = clim["reset"].as<std::string>(); | ||||
|   | ||||
| @@ -62,12 +62,12 @@ using namespace sysc; | ||||
| volatile std::array<bool, 2> tgc_init = { | ||||
|     iss_factory::instance().register_creator("tgc5c|m_p|llvm", | ||||
|                                              [](unsigned gdb_port, void* data) -> iss_factory::base_t { | ||||
|                                                  auto cc = reinterpret_cast<sysc::tgfs::core_complex*>(data); | ||||
|                                                  auto cc = reinterpret_cast<sysc::tgfs::core_complex_if*>(data); | ||||
|                                                  auto* cpu = new sc_core_adapter<arch::riscv_hart_m_p<arch::tgc5c>>(cc); | ||||
|                                                  return {sysc::sc_cpu_ptr{cpu}, vm_ptr{create(static_cast<arch::tgc5c*>(cpu), gdb_port)}}; | ||||
|                                              }), | ||||
|     iss_factory::instance().register_creator("tgc5c|mu_p|llvm", [](unsigned gdb_port, void* data) -> iss_factory::base_t { | ||||
|         auto cc = reinterpret_cast<sysc::tgfs::core_complex*>(data); | ||||
|         auto cc = reinterpret_cast<sysc::tgfs::core_complex_if*>(data); | ||||
|         auto* cpu = new sc_core_adapter<arch::riscv_hart_mu_p<arch::tgc5c>>(cc); | ||||
|         return {sysc::sc_cpu_ptr{cpu}, vm_ptr{create(static_cast<arch::tgc5c*>(cpu), gdb_port)}}; | ||||
|     })}; | ||||
|   | ||||
| @@ -1421,23 +1421,21 @@ private: | ||||
|         } | ||||
|         else{ | ||||
|             if(rd!=0){ | ||||
|                 { | ||||
|                 auto label_then = cc.newLabel(); | ||||
|                 auto label_merge = cc.newLabel(); | ||||
|                 auto tmp_reg = get_reg_for(cc, 1); | ||||
|                 auto label_then11 = cc.newLabel(); | ||||
|                 auto label_merge11 = cc.newLabel(); | ||||
|                 auto tmp_reg11 = get_reg(cc, 8, false); | ||||
|                 cmp(cc, gen_ext(cc,  | ||||
|                     load_reg_from_mem(jh, traits::X0 + rs1), 32, true), (int16_t)sext<12>(imm)); | ||||
|                 cc.jl(label_then); | ||||
|                 mov(cc, tmp_reg,0); | ||||
|                 cc.jmp(label_merge); | ||||
|                 cc.bind(label_then); | ||||
|                 mov(cc, tmp_reg,1); | ||||
|                 cc.bind(label_merge); | ||||
|                 cc.jl(label_then11); | ||||
|                 mov(cc, tmp_reg11,0); | ||||
|                 cc.jmp(label_merge11); | ||||
|                 cc.bind(label_then11); | ||||
|                 mov(cc, tmp_reg11, 1); | ||||
|                 cc.bind(label_merge11); | ||||
|                 mov(cc, get_ptr_for(jh, traits::X0+ rd), | ||||
|                       gen_ext(cc, tmp_reg | ||||
|                       gen_ext(cc, tmp_reg11 | ||||
|                       , 32, false) | ||||
|                 ); | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|         auto returnValue = CONT; | ||||
| @@ -1484,22 +1482,20 @@ private: | ||||
|         } | ||||
|         else{ | ||||
|             if(rd!=0){ | ||||
|                 { | ||||
|                 auto label_then = cc.newLabel(); | ||||
|                 auto label_merge = cc.newLabel(); | ||||
|                 auto tmp_reg = get_reg_for(cc, 1); | ||||
|                 auto label_then12 = cc.newLabel(); | ||||
|                 auto label_merge12 = cc.newLabel(); | ||||
|                 auto tmp_reg12 = get_reg(cc, 8, false); | ||||
|                 cmp(cc, load_reg_from_mem(jh, traits::X0 + rs1), (uint32_t)((int16_t)sext<12>(imm))); | ||||
|                 cc.jb(label_then); | ||||
|                 mov(cc, tmp_reg,0); | ||||
|                 cc.jmp(label_merge); | ||||
|                 cc.bind(label_then); | ||||
|                 mov(cc, tmp_reg,1); | ||||
|                 cc.bind(label_merge); | ||||
|                 cc.jb(label_then12); | ||||
|                 mov(cc, tmp_reg12,0); | ||||
|                 cc.jmp(label_merge12); | ||||
|                 cc.bind(label_then12); | ||||
|                 mov(cc, tmp_reg12, 1); | ||||
|                 cc.bind(label_merge12); | ||||
|                 mov(cc, get_ptr_for(jh, traits::X0+ rd), | ||||
|                       gen_ext(cc, tmp_reg | ||||
|                       gen_ext(cc, tmp_reg12 | ||||
|                       , 32, false) | ||||
|                 ); | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|         auto returnValue = CONT; | ||||
| @@ -1992,24 +1988,22 @@ private: | ||||
|         } | ||||
|         else{ | ||||
|             if(rd!=0){ | ||||
|                 { | ||||
|                 auto label_then = cc.newLabel(); | ||||
|                 auto label_merge = cc.newLabel(); | ||||
|                 auto tmp_reg = get_reg_for(cc, 1); | ||||
|                 auto label_then13 = cc.newLabel(); | ||||
|                 auto label_merge13 = cc.newLabel(); | ||||
|                 auto tmp_reg13 = get_reg(cc, 8, false); | ||||
|                 cmp(cc, gen_ext(cc,  | ||||
|                     load_reg_from_mem(jh, traits::X0 + rs1), 32, true), gen_ext(cc,  | ||||
|                     load_reg_from_mem(jh, traits::X0 + rs2), 32, true)); | ||||
|                 cc.jl(label_then); | ||||
|                 mov(cc, tmp_reg,0); | ||||
|                 cc.jmp(label_merge); | ||||
|                 cc.bind(label_then); | ||||
|                 mov(cc, tmp_reg,1); | ||||
|                 cc.bind(label_merge); | ||||
|                 cc.jl(label_then13); | ||||
|                 mov(cc, tmp_reg13,0); | ||||
|                 cc.jmp(label_merge13); | ||||
|                 cc.bind(label_then13); | ||||
|                 mov(cc, tmp_reg13, 1); | ||||
|                 cc.bind(label_merge13); | ||||
|                 mov(cc, get_ptr_for(jh, traits::X0+ rd), | ||||
|                       gen_ext(cc, tmp_reg | ||||
|                       gen_ext(cc, tmp_reg13 | ||||
|                       , 32, false) | ||||
|                 ); | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|         auto returnValue = CONT; | ||||
| @@ -2056,22 +2050,20 @@ private: | ||||
|         } | ||||
|         else{ | ||||
|             if(rd!=0){ | ||||
|                 { | ||||
|                 auto label_then = cc.newLabel(); | ||||
|                 auto label_merge = cc.newLabel(); | ||||
|                 auto tmp_reg = get_reg_for(cc, 1); | ||||
|                 auto label_then14 = cc.newLabel(); | ||||
|                 auto label_merge14 = cc.newLabel(); | ||||
|                 auto tmp_reg14 = get_reg(cc, 8, false); | ||||
|                 cmp(cc, load_reg_from_mem(jh, traits::X0 + rs1), load_reg_from_mem(jh, traits::X0 + rs2)); | ||||
|                 cc.jb(label_then); | ||||
|                 mov(cc, tmp_reg,0); | ||||
|                 cc.jmp(label_merge); | ||||
|                 cc.bind(label_then); | ||||
|                 mov(cc, tmp_reg,1); | ||||
|                 cc.bind(label_merge); | ||||
|                 cc.jb(label_then14); | ||||
|                 mov(cc, tmp_reg14,0); | ||||
|                 cc.jmp(label_merge14); | ||||
|                 cc.bind(label_then14); | ||||
|                 mov(cc, tmp_reg14, 1); | ||||
|                 cc.bind(label_merge14); | ||||
|                 mov(cc, get_ptr_for(jh, traits::X0+ rd), | ||||
|                       gen_ext(cc, tmp_reg | ||||
|                       gen_ext(cc, tmp_reg14 | ||||
|                       , 32, false) | ||||
|                 ); | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|         auto returnValue = CONT; | ||||
| @@ -2511,10 +2503,10 @@ private: | ||||
|         gen_instr_prologue(jh); | ||||
|         cc.comment("//behavior:"); | ||||
|         /*generate behavior*/ | ||||
|         InvokeNode* call_wait; | ||||
|         InvokeNode* call_wait_15; | ||||
|         jh.cc.comment("//call_wait"); | ||||
|         jh.cc.invoke(&call_wait, &wait, FuncSignature::build<void, int32_t>()); | ||||
|         setArg(call_wait, 0, 1); | ||||
|         jh.cc.invoke(&call_wait_15, &wait, FuncSignature::build<void, int32_t>()); | ||||
|         setArg(call_wait_15, 0, 1); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         gen_sync(jh, POST_SYNC, 41); | ||||
| @@ -4830,6 +4822,7 @@ void vm_impl<ARCH>::gen_instr_epilogue(jit_holder& jh) { | ||||
|     cmp(cc, current_trap_state, 0); | ||||
|     cc.jne(jh.trap_entry); | ||||
|     cc.inc(get_ptr_for(jh, traits::ICOUNT)); | ||||
|     cc.inc(get_ptr_for(jh, traits::CYCLE)); | ||||
| } | ||||
| template <typename ARCH> | ||||
| void vm_impl<ARCH>::gen_block_prologue(jit_holder& jh){ | ||||
| @@ -4875,6 +4868,7 @@ inline void vm_impl<ARCH>::gen_raise(jit_holder& jh, uint16_t trap_id, uint16_t | ||||
|     auto tmp1 = get_reg_for(cc, traits::TRAP_STATE); | ||||
|     mov(cc, tmp1, 0x80ULL << 24 | (cause << 16) | trap_id); | ||||
|     mov(cc, get_ptr_for(jh, traits::TRAP_STATE), tmp1); | ||||
|     cc.jmp(jh.trap_entry); | ||||
| } | ||||
| template <typename ARCH> | ||||
| template <typename T, typename> | ||||
|   | ||||
| @@ -275,9 +275,6 @@ 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()); } | ||||
|  | ||||
| // according to | ||||
| // https://stackoverflow.com/questions/8871204/count-number-of-1s-in-binary-representation | ||||
| #ifdef __GCC__ | ||||
|   | ||||
| @@ -1490,7 +1490,7 @@ private: | ||||
|                 ), | ||||
|                 this->gen_const(8,1), | ||||
|                 this->gen_const(8,0), | ||||
|                 1), 32), | ||||
|                 8), 32), | ||||
|                 get_reg_ptr(rd + traits::X0), false); | ||||
|             } | ||||
|         } | ||||
| @@ -1543,7 +1543,7 @@ private: | ||||
|                 ), | ||||
|                 this->gen_const(8,1), | ||||
|                 this->gen_const(8,0), | ||||
|                 1), 32), | ||||
|                 8), 32), | ||||
|                 get_reg_ptr(rd + traits::X0), false); | ||||
|             } | ||||
|         } | ||||
| @@ -2057,7 +2057,7 @@ private: | ||||
|                 , | ||||
|                 this->gen_const(8,1), | ||||
|                 this->gen_const(8,0), | ||||
|                 1), 32), | ||||
|                 8), 32), | ||||
|                 get_reg_ptr(rd + traits::X0), false); | ||||
|             } | ||||
|         } | ||||
| @@ -2110,7 +2110,7 @@ private: | ||||
|                 , | ||||
|                 this->gen_const(8,1), | ||||
|                 this->gen_const(8,0), | ||||
|                 1), 32), | ||||
|                 8), 32), | ||||
|                 get_reg_ptr(rd + traits::X0), false); | ||||
|             } | ||||
|         } | ||||
| @@ -2553,10 +2553,10 @@ private: | ||||
|          | ||||
|         this->gen_instr_prologue(); | ||||
|         /*generate behavior*/ | ||||
|         std::vector<Value*> wait_args{ | ||||
|         std::vector<Value*> wait_231_args{ | ||||
|             this->gen_ext(this->gen_const(8,1), 32) | ||||
|         }; | ||||
|         this->builder.CreateCall(this->mod->getFunction("wait"), wait_args); | ||||
|         this->builder.CreateCall(this->mod->getFunction("wait"), wait_231_args); | ||||
|         bb = BasicBlock::Create(this->mod->getContext(), "entry", this->func, this->leave_blk); | ||||
|         auto returnValue = std::make_tuple(CONT,bb); | ||||
|          | ||||
| @@ -4897,7 +4897,7 @@ private: | ||||
|             }; | ||||
|             this->builder.CreateCall(this->mod->getFunction("print_disass"), args); | ||||
|         } | ||||
| 		this->gen_sync(iss::PRE_SYNC, instr_descr.size()); | ||||
|         this->gen_sync(iss::PRE_SYNC, instr_descr.size()); | ||||
|         this->builder.CreateStore(this->builder.CreateLoad(this->get_typeptr(traits::NEXT_PC), get_reg_ptr(traits::NEXT_PC), true), | ||||
|                                    get_reg_ptr(traits::PC), true); | ||||
|         this->builder.CreateStore( | ||||
| @@ -4972,6 +4972,7 @@ 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::TRAP_STATE), true); | ||||
|     this->builder.CreateBr(this->trap_blk); | ||||
| } | ||||
|  | ||||
| template <typename ARCH> | ||||
|   | ||||
| @@ -81,16 +81,18 @@ protected: | ||||
|     using vm_base<ARCH>::get_reg_ptr; | ||||
|  | ||||
|     using this_class = vm_impl<ARCH>; | ||||
|     using compile_ret_t = std::tuple<continuation_e>; | ||||
|     using compile_ret_t = continuation_e; | ||||
|     using compile_func = compile_ret_t (this_class::*)(virt_addr_t &pc, code_word_t instr, tu_builder&); | ||||
|  | ||||
|     inline const char *name(size_t index){return traits::reg_aliases.at(index);} | ||||
|  | ||||
|     void add_prologue(tu_builder& tu) override; | ||||
|  | ||||
|     void setup_module(std::string m) override { | ||||
|         super::setup_module(m); | ||||
|     } | ||||
|  | ||||
|     compile_ret_t gen_single_inst_behavior(virt_addr_t &, unsigned int &, tu_builder&) override; | ||||
|     compile_ret_t gen_single_inst_behavior(virt_addr_t &,tu_builder&) override; | ||||
|  | ||||
|     void gen_trap_behavior(tu_builder& tu) override; | ||||
|  | ||||
| @@ -352,7 +354,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, tu.constant((uint32_t)((int32_t)imm),32)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,0); | ||||
| @@ -387,7 +389,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, tu.constant((uint32_t)(PC+(int32_t)imm),32)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,1); | ||||
| @@ -432,7 +434,7 @@ private: | ||||
|         		tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(KNOWN_JUMP), 2)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(BRANCH); | ||||
|         auto returnValue = BRANCH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,2); | ||||
| @@ -474,18 +476,22 @@ private: | ||||
|         	tu.open_if(tu.urem( | ||||
|         	   new_pc, | ||||
|         	   tu.constant(static_cast<uint32_t>(traits:: INSTR_ALIGNMENT),32))); | ||||
|         	{ | ||||
|         	this->gen_set_tval(tu, new_pc); | ||||
|         	this->gen_raise_trap(tu, 0, 0); | ||||
|         	} | ||||
|         	tu.open_else(); | ||||
|         	{ | ||||
|         	if(rd!=0) { | ||||
|         	    tu.store(rd + traits::X0, tu.constant((uint32_t)(PC+4),32)); | ||||
|         	} | ||||
|         	auto PC_val_v = tu.assignment("PC_val", new_pc,32); | ||||
|         	tu.store(traits::NEXT_PC, PC_val_v); | ||||
|         	tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(UNKNOWN_JUMP), 2)); | ||||
|         	} | ||||
|         	tu.close_scope(); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(BRANCH); | ||||
|         auto returnValue = BRANCH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,3); | ||||
| @@ -521,6 +527,7 @@ private: | ||||
|         	tu.open_if(tu.icmp(ICmpInst::ICMP_EQ, | ||||
|         	   tu.load(rs1 + traits::X0, 0), | ||||
|         	   tu.load(rs2 + traits::X0, 0))); | ||||
|         	{ | ||||
|         	auto new_pc = (uint32_t)(PC+(int16_t)sext<13>(imm)); | ||||
|         	if(new_pc%static_cast<uint32_t>(traits:: INSTR_ALIGNMENT)){ this->gen_set_tval(tu, new_pc); | ||||
|         	this->gen_raise_trap(tu, 0, 0); | ||||
| @@ -530,9 +537,10 @@ private: | ||||
|         		tu.store(traits::NEXT_PC, PC_val_v); | ||||
|         		tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(KNOWN_JUMP), 2)); | ||||
|         	} | ||||
|         	} | ||||
|         	tu.close_scope(); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(BRANCH); | ||||
|         auto returnValue = BRANCH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,4); | ||||
| @@ -568,6 +576,7 @@ private: | ||||
|         	tu.open_if(tu.icmp(ICmpInst::ICMP_NE, | ||||
|         	   tu.load(rs1 + traits::X0, 0), | ||||
|         	   tu.load(rs2 + traits::X0, 0))); | ||||
|         	{ | ||||
|         	auto new_pc = (uint32_t)(PC+(int16_t)sext<13>(imm)); | ||||
|         	if(new_pc%static_cast<uint32_t>(traits:: INSTR_ALIGNMENT)){ this->gen_set_tval(tu, new_pc); | ||||
|         	this->gen_raise_trap(tu, 0, 0); | ||||
| @@ -577,9 +586,10 @@ private: | ||||
|         		tu.store(traits::NEXT_PC, PC_val_v); | ||||
|         		tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(KNOWN_JUMP), 2)); | ||||
|         	} | ||||
|         	} | ||||
|         	tu.close_scope(); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(BRANCH); | ||||
|         auto returnValue = BRANCH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,5); | ||||
| @@ -615,6 +625,7 @@ private: | ||||
|         	tu.open_if(tu.icmp(ICmpInst::ICMP_SLT, | ||||
|         	   tu.ext(tu.load(rs1 + traits::X0, 0),32,true), | ||||
|         	   tu.ext(tu.load(rs2 + traits::X0, 0),32,true))); | ||||
|         	{ | ||||
|         	auto new_pc = (uint32_t)(PC+(int16_t)sext<13>(imm)); | ||||
|         	if(new_pc%static_cast<uint32_t>(traits:: INSTR_ALIGNMENT)){ this->gen_set_tval(tu, new_pc); | ||||
|         	this->gen_raise_trap(tu, 0, 0); | ||||
| @@ -624,9 +635,10 @@ private: | ||||
|         		tu.store(traits::NEXT_PC, PC_val_v); | ||||
|         		tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(KNOWN_JUMP), 2)); | ||||
|         	} | ||||
|         	} | ||||
|         	tu.close_scope(); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(BRANCH); | ||||
|         auto returnValue = BRANCH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,6); | ||||
| @@ -662,6 +674,7 @@ private: | ||||
|         	tu.open_if(tu.icmp(ICmpInst::ICMP_SGE, | ||||
|         	   tu.ext(tu.load(rs1 + traits::X0, 0),32,true), | ||||
|         	   tu.ext(tu.load(rs2 + traits::X0, 0),32,true))); | ||||
|         	{ | ||||
|         	auto new_pc = (uint32_t)(PC+(int16_t)sext<13>(imm)); | ||||
|         	if(new_pc%static_cast<uint32_t>(traits:: INSTR_ALIGNMENT)){ this->gen_set_tval(tu, new_pc); | ||||
|         	this->gen_raise_trap(tu, 0, 0); | ||||
| @@ -671,9 +684,10 @@ private: | ||||
|         		tu.store(traits::NEXT_PC, PC_val_v); | ||||
|         		tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(KNOWN_JUMP), 2)); | ||||
|         	} | ||||
|         	} | ||||
|         	tu.close_scope(); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(BRANCH); | ||||
|         auto returnValue = BRANCH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,7); | ||||
| @@ -709,6 +723,7 @@ private: | ||||
|         	tu.open_if(tu.icmp(ICmpInst::ICMP_ULT, | ||||
|         	   tu.load(rs1 + traits::X0, 0), | ||||
|         	   tu.load(rs2 + traits::X0, 0))); | ||||
|         	{ | ||||
|         	auto new_pc = (uint32_t)(PC+(int16_t)sext<13>(imm)); | ||||
|         	if(new_pc%static_cast<uint32_t>(traits:: INSTR_ALIGNMENT)){ this->gen_set_tval(tu, new_pc); | ||||
|         	this->gen_raise_trap(tu, 0, 0); | ||||
| @@ -718,9 +733,10 @@ private: | ||||
|         		tu.store(traits::NEXT_PC, PC_val_v); | ||||
|         		tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(KNOWN_JUMP), 2)); | ||||
|         	} | ||||
|         	} | ||||
|         	tu.close_scope(); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(BRANCH); | ||||
|         auto returnValue = BRANCH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,8); | ||||
| @@ -756,6 +772,7 @@ private: | ||||
|         	tu.open_if(tu.icmp(ICmpInst::ICMP_UGE, | ||||
|         	   tu.load(rs1 + traits::X0, 0), | ||||
|         	   tu.load(rs2 + traits::X0, 0))); | ||||
|         	{ | ||||
|         	auto new_pc = (uint32_t)(PC+(int16_t)sext<13>(imm)); | ||||
|         	if(new_pc%static_cast<uint32_t>(traits:: INSTR_ALIGNMENT)){ this->gen_set_tval(tu, new_pc); | ||||
|         	this->gen_raise_trap(tu, 0, 0); | ||||
| @@ -765,9 +782,10 @@ private: | ||||
|         		tu.store(traits::NEXT_PC, PC_val_v); | ||||
|         		tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(KNOWN_JUMP), 2)); | ||||
|         	} | ||||
|         	} | ||||
|         	tu.close_scope(); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(BRANCH); | ||||
|         auto returnValue = BRANCH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,9); | ||||
| @@ -807,7 +825,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, tu.ext(res,32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,10); | ||||
| @@ -847,7 +865,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, tu.ext(res,32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,11); | ||||
| @@ -887,7 +905,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, tu.ext(res,32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,12); | ||||
| @@ -927,7 +945,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, tu.ext(res,32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,13); | ||||
| @@ -967,7 +985,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, tu.ext(res,32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,14); | ||||
| @@ -1004,7 +1022,7 @@ private: | ||||
|         	   tu.constant((int16_t)sext<12>(imm),16))),32,false),32); | ||||
|         	tu.write_mem(traits::MEM, store_address, tu.ext(tu.load(rs2 + traits::X0, 0),8,false)); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,15); | ||||
| @@ -1041,7 +1059,7 @@ private: | ||||
|         	   tu.constant((int16_t)sext<12>(imm),16))),32,false),32); | ||||
|         	tu.write_mem(traits::MEM, store_address, tu.ext(tu.load(rs2 + traits::X0, 0),16,false)); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,16); | ||||
| @@ -1078,7 +1096,7 @@ private: | ||||
|         	   tu.constant((int16_t)sext<12>(imm),16))),32,false),32); | ||||
|         	tu.write_mem(traits::MEM, store_address, tu.ext(tu.load(rs2 + traits::X0, 0),32,false)); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,17); | ||||
| @@ -1116,7 +1134,7 @@ private: | ||||
|         	       tu.constant((int16_t)sext<12>(imm),16))),32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,18); | ||||
| @@ -1154,7 +1172,7 @@ private: | ||||
|         	       tu.constant((int16_t)sext<12>(imm),16))), tu.constant(1,8),tu.constant(0,8))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,19); | ||||
| @@ -1192,7 +1210,7 @@ private: | ||||
|         	       tu.constant((uint32_t)((int16_t)sext<12>(imm)),32))), tu.constant(1,8),tu.constant(0,8))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,20); | ||||
| @@ -1230,7 +1248,7 @@ private: | ||||
|         	       tu.constant((uint32_t)((int16_t)sext<12>(imm)),32))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,21); | ||||
| @@ -1268,7 +1286,7 @@ private: | ||||
|         	       tu.constant((uint32_t)((int16_t)sext<12>(imm)),32))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,22); | ||||
| @@ -1306,7 +1324,7 @@ private: | ||||
|         	       tu.constant((uint32_t)((int16_t)sext<12>(imm)),32))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,23); | ||||
| @@ -1344,7 +1362,7 @@ private: | ||||
|         	       tu.constant(shamt,8))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,24); | ||||
| @@ -1382,7 +1400,7 @@ private: | ||||
|         	       tu.constant(shamt,8))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,25); | ||||
| @@ -1420,7 +1438,7 @@ private: | ||||
|         	       tu.constant(shamt,8))),32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,26); | ||||
| @@ -1458,7 +1476,7 @@ private: | ||||
|         	       tu.load(rs2 + traits::X0, 0))),32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,27); | ||||
| @@ -1496,7 +1514,7 @@ private: | ||||
|         	       tu.load(rs2 + traits::X0, 0))),32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,28); | ||||
| @@ -1536,7 +1554,7 @@ private: | ||||
|         	          tu.constant((static_cast<uint32_t>(traits:: XLEN)-1),64))))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,29); | ||||
| @@ -1574,7 +1592,7 @@ private: | ||||
|         	       tu.ext(tu.load(rs2 + traits::X0, 0),32,true)), tu.constant(1,8),tu.constant(0,8))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,30); | ||||
| @@ -1612,7 +1630,7 @@ private: | ||||
|         	       tu.load(rs2 + traits::X0, 0)), tu.constant(1,8),tu.constant(0,8))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,31); | ||||
| @@ -1650,7 +1668,7 @@ private: | ||||
|         	       tu.load(rs2 + traits::X0, 0))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,32); | ||||
| @@ -1690,7 +1708,7 @@ private: | ||||
|         	          tu.constant((static_cast<uint32_t>(traits:: XLEN)-1),64))))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,33); | ||||
| @@ -1730,7 +1748,7 @@ private: | ||||
|         	          tu.constant((static_cast<uint32_t>(traits:: XLEN)-1),64))))),32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,34); | ||||
| @@ -1768,7 +1786,7 @@ private: | ||||
|         	       tu.load(rs2 + traits::X0, 0))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,35); | ||||
| @@ -1806,7 +1824,7 @@ private: | ||||
|         	       tu.load(rs2 + traits::X0, 0))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,36); | ||||
| @@ -1837,7 +1855,7 @@ private: | ||||
|         tu.open_scope(); | ||||
|         this->gen_set_tval(tu, instr); | ||||
|         tu.write_mem(traits::FENCE, static_cast<uint32_t>(traits:: fence), tu.constant((uint8_t)pred<<4|succ,8)); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,37); | ||||
| @@ -1863,7 +1881,7 @@ private: | ||||
|         this->gen_set_tval(tu, instr); | ||||
|         tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(NO_JUMP),32)); | ||||
|         this->gen_raise_trap(tu, 0, 11); | ||||
|         auto returnValue = std::make_tuple(TRAP); | ||||
|         auto returnValue = TRAP; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,38); | ||||
| @@ -1889,7 +1907,7 @@ private: | ||||
|         this->gen_set_tval(tu, instr); | ||||
|         tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(NO_JUMP),32)); | ||||
|         this->gen_raise_trap(tu, 0, 3); | ||||
|         auto returnValue = std::make_tuple(TRAP); | ||||
|         auto returnValue = TRAP; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,39); | ||||
| @@ -1915,7 +1933,7 @@ private: | ||||
|         this->gen_set_tval(tu, instr); | ||||
|         tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(NO_JUMP),32)); | ||||
|         this->gen_leave_trap(tu, 3); | ||||
|         auto returnValue = std::make_tuple(TRAP); | ||||
|         auto returnValue = TRAP; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,40); | ||||
| @@ -1940,7 +1958,7 @@ private: | ||||
|         tu.open_scope(); | ||||
|         this->gen_set_tval(tu, instr); | ||||
|         tu.callf("wait", tu.constant(1,8)); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,41); | ||||
| @@ -1981,7 +1999,7 @@ private: | ||||
|         		tu.write_mem(traits::CSR, csr, xrs1); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,42); | ||||
| @@ -2024,7 +2042,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, xrd); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,43); | ||||
| @@ -2067,7 +2085,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, xrd); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,44); | ||||
| @@ -2105,7 +2123,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, xrd); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,45); | ||||
| @@ -2147,7 +2165,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, xrd); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,46); | ||||
| @@ -2189,7 +2207,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, xrd); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,47); | ||||
| @@ -2218,7 +2236,7 @@ private: | ||||
|         tu.open_scope(); | ||||
|         this->gen_set_tval(tu, instr); | ||||
|         tu.write_mem(traits::FENCE, static_cast<uint32_t>(traits:: fencei), tu.constant(imm,16)); | ||||
|         auto returnValue = std::make_tuple(FLUSH); | ||||
|         auto returnValue = FLUSH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,48); | ||||
| @@ -2257,7 +2275,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, tu.ext(res,32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,49); | ||||
| @@ -2298,7 +2316,7 @@ private: | ||||
|         	       tu.constant(static_cast<uint32_t>(traits:: XLEN),32))),32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,50); | ||||
| @@ -2339,7 +2357,7 @@ private: | ||||
|         	       tu.constant(static_cast<uint32_t>(traits:: XLEN),32))),32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,51); | ||||
| @@ -2380,7 +2398,7 @@ private: | ||||
|         	       tu.constant(static_cast<uint32_t>(traits:: XLEN),32))),32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,52); | ||||
| @@ -2417,6 +2435,7 @@ private: | ||||
|         	if(rd!=0){ tu.open_if(tu.icmp(ICmpInst::ICMP_NE, | ||||
|         	   divisor, | ||||
|         	   tu.constant(0,8))); | ||||
|         	{ | ||||
|         	auto MMIN = ((uint32_t)1)<<(static_cast<uint32_t>(traits:: XLEN)-1); | ||||
|         	tu.open_if(tu.logical_and( | ||||
|         	   tu.icmp(ICmpInst::ICMP_EQ, | ||||
| @@ -2425,18 +2444,25 @@ private: | ||||
|         	   tu.icmp(ICmpInst::ICMP_EQ, | ||||
|         	      divisor, | ||||
|         	      tu.constant(- 1,8)))); | ||||
|         	{ | ||||
|         	tu.store(rd + traits::X0, tu.constant(MMIN,32)); | ||||
|         	} | ||||
|         	tu.open_else(); | ||||
|         	{ | ||||
|         	tu.store(rd + traits::X0, tu.ext((tu.sdiv( | ||||
|         	   dividend, | ||||
|         	   divisor)),32,false)); | ||||
|         	} | ||||
|         	tu.close_scope(); | ||||
|         	} | ||||
|         	tu.open_else(); | ||||
|         	{ | ||||
|         	tu.store(rd + traits::X0, tu.constant((uint32_t)- 1,32)); | ||||
|         	} | ||||
|         	tu.close_scope(); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,53); | ||||
| @@ -2471,18 +2497,22 @@ private: | ||||
|         	tu.open_if(tu.icmp(ICmpInst::ICMP_NE, | ||||
|         	   tu.load(rs2 + traits::X0, 0), | ||||
|         	   tu.constant(0,8))); | ||||
|         	{ | ||||
|         	if(rd!=0) { | ||||
|         	    tu.store(rd + traits::X0, tu.udiv( | ||||
|         	       tu.load(rs1 + traits::X0, 0), | ||||
|         	       tu.load(rs2 + traits::X0, 0))); | ||||
|         	} | ||||
|         	} | ||||
|         	tu.open_else(); | ||||
|         	{ | ||||
|         	if(rd!=0) { | ||||
|         	    tu.store(rd + traits::X0, tu.constant((uint32_t)- 1,32)); | ||||
|         	} | ||||
|         	} | ||||
|         	tu.close_scope(); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,54); | ||||
| @@ -2517,6 +2547,7 @@ private: | ||||
|         	tu.open_if(tu.icmp(ICmpInst::ICMP_NE, | ||||
|         	   tu.load(rs2 + traits::X0, 0), | ||||
|         	   tu.constant(0,8))); | ||||
|         	{ | ||||
|         	auto MMIN = (uint32_t)1<<(static_cast<uint32_t>(traits:: XLEN)-1); | ||||
|         	tu.open_if(tu.logical_and( | ||||
|         	   tu.icmp(ICmpInst::ICMP_EQ, | ||||
| @@ -2525,23 +2556,30 @@ private: | ||||
|         	   tu.icmp(ICmpInst::ICMP_EQ, | ||||
|         	      tu.ext(tu.load(rs2 + traits::X0, 0),32,true), | ||||
|         	      tu.constant(- 1,8)))); | ||||
|         	{ | ||||
|         	if(rd!=0) { | ||||
|         	    tu.store(rd + traits::X0, tu.constant(0,8)); | ||||
|         	} | ||||
|         	} | ||||
|         	tu.open_else(); | ||||
|         	{ | ||||
|         	if(rd!=0) { | ||||
|         	    tu.store(rd + traits::X0, tu.ext((tu.srem( | ||||
|         	       tu.ext(tu.load(rs1 + traits::X0, 0),32,true), | ||||
|         	       tu.ext(tu.load(rs2 + traits::X0, 0),32,true))),32,false)); | ||||
|         	} | ||||
|         	} | ||||
|         	tu.close_scope(); | ||||
|         	} | ||||
|         	tu.open_else(); | ||||
|         	{ | ||||
|         	if(rd!=0) { | ||||
|         	    tu.store(rd + traits::X0, tu.load(rs1 + traits::X0, 0)); | ||||
|         	} | ||||
|         	} | ||||
|         	tu.close_scope(); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,55); | ||||
| @@ -2576,18 +2614,22 @@ private: | ||||
|         	tu.open_if(tu.icmp(ICmpInst::ICMP_NE, | ||||
|         	   tu.load(rs2 + traits::X0, 0), | ||||
|         	   tu.constant(0,8))); | ||||
|         	{ | ||||
|         	if(rd!=0) { | ||||
|         	    tu.store(rd + traits::X0, tu.urem( | ||||
|         	       tu.load(rs1 + traits::X0, 0), | ||||
|         	       tu.load(rs2 + traits::X0, 0))); | ||||
|         	} | ||||
|         	} | ||||
|         	tu.open_else(); | ||||
|         	{ | ||||
|         	if(rd!=0) { | ||||
|         	    tu.store(rd + traits::X0, tu.load(rs1 + traits::X0, 0)); | ||||
|         	} | ||||
|         	} | ||||
|         	tu.close_scope(); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,56); | ||||
| @@ -2622,7 +2664,7 @@ private: | ||||
|         else{ | ||||
|         	this->gen_raise_trap(tu, 0, static_cast<int32_t>(traits:: RV_CAUSE_ILLEGAL_INSTRUCTION)); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,57); | ||||
| @@ -2654,7 +2696,7 @@ private: | ||||
|            tu.load(rs1+8 + traits::X0, 0), | ||||
|            tu.constant(uimm,8))),32,false),32); | ||||
|         tu.store(rd+8 + traits::X0, tu.ext(tu.ext(tu.read_mem(traits::MEM, offs, 32),32,true),32,false)); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,58); | ||||
| @@ -2686,7 +2728,7 @@ private: | ||||
|            tu.load(rs1+8 + traits::X0, 0), | ||||
|            tu.constant(uimm,8))),32,false),32); | ||||
|         tu.write_mem(traits::MEM, offs, tu.ext(tu.load(rs2+8 + traits::X0, 0),32,false)); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,59); | ||||
| @@ -2723,7 +2765,7 @@ private: | ||||
|         	       tu.constant((int8_t)sext<6>(imm),8))),32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,60); | ||||
| @@ -2748,7 +2790,7 @@ private: | ||||
|         gen_set_pc(tu, pc, traits::NEXT_PC); | ||||
|         tu.open_scope(); | ||||
|         this->gen_set_tval(tu, instr); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,61); | ||||
| @@ -2779,7 +2821,7 @@ private: | ||||
|         auto PC_val_v = tu.assignment("PC_val", (uint32_t)(PC+(int16_t)sext<12>(imm)),32); | ||||
|         tu.store(traits::NEXT_PC, PC_val_v); | ||||
|         tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(KNOWN_JUMP), 2)); | ||||
|         auto returnValue = std::make_tuple(BRANCH); | ||||
|         auto returnValue = BRANCH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,62); | ||||
| @@ -2814,7 +2856,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, tu.constant((uint32_t)((int8_t)sext<6>(imm)),32)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,63); | ||||
| @@ -2847,7 +2889,7 @@ private: | ||||
|         if(rd!=0) { | ||||
|             tu.store(rd + traits::X0, tu.constant((uint32_t)((int32_t)sext<18>(imm)),32)); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,64); | ||||
| @@ -2881,7 +2923,7 @@ private: | ||||
|         else{ | ||||
|         	this->gen_raise_trap(tu, 0, static_cast<int32_t>(traits:: RV_CAUSE_ILLEGAL_INSTRUCTION)); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,65); | ||||
| @@ -2907,7 +2949,7 @@ private: | ||||
|         tu.open_scope(); | ||||
|         this->gen_set_tval(tu, instr); | ||||
|         this->gen_raise_trap(tu, 0, static_cast<int32_t>(traits:: RV_CAUSE_ILLEGAL_INSTRUCTION)); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,66); | ||||
| @@ -2937,7 +2979,7 @@ private: | ||||
|         tu.store(rs1+8 + traits::X0, tu.lshr( | ||||
|            tu.load(rs1+8 + traits::X0, 0), | ||||
|            tu.constant(shamt,8))); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,67); | ||||
| @@ -2974,7 +3016,7 @@ private: | ||||
|         	   tu.constant(64,8))),32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,68); | ||||
| @@ -3004,7 +3046,7 @@ private: | ||||
|         tu.store(rs1+8 + traits::X0, tu.ext((tu.bitwise_and( | ||||
|            tu.load(rs1+8 + traits::X0, 0), | ||||
|            tu.constant((int8_t)sext<6>(imm),8))),32,false)); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,69); | ||||
| @@ -3034,7 +3076,7 @@ private: | ||||
|         tu.store(rd+8 + traits::X0, tu.ext((tu.sub( | ||||
|            tu.load(rd+8 + traits::X0, 0), | ||||
|            tu.load(rs2+8 + traits::X0, 0))),32,false)); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,70); | ||||
| @@ -3064,7 +3106,7 @@ private: | ||||
|         tu.store(rd+8 + traits::X0, tu.bitwise_xor( | ||||
|            tu.load(rd+8 + traits::X0, 0), | ||||
|            tu.load(rs2+8 + traits::X0, 0))); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,71); | ||||
| @@ -3094,7 +3136,7 @@ private: | ||||
|         tu.store(rd+8 + traits::X0, tu.bitwise_or( | ||||
|            tu.load(rd+8 + traits::X0, 0), | ||||
|            tu.load(rs2+8 + traits::X0, 0))); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,72); | ||||
| @@ -3124,7 +3166,7 @@ private: | ||||
|         tu.store(rd+8 + traits::X0, tu.bitwise_and( | ||||
|            tu.load(rd+8 + traits::X0, 0), | ||||
|            tu.load(rs2+8 + traits::X0, 0))); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,73); | ||||
| @@ -3154,7 +3196,7 @@ private: | ||||
|         auto PC_val_v = tu.assignment("PC_val", (uint32_t)(PC+(int16_t)sext<12>(imm)),32); | ||||
|         tu.store(traits::NEXT_PC, PC_val_v); | ||||
|         tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(KNOWN_JUMP), 2)); | ||||
|         auto returnValue = std::make_tuple(BRANCH); | ||||
|         auto returnValue = BRANCH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,74); | ||||
| @@ -3185,11 +3227,13 @@ private: | ||||
|         tu.open_if(tu.icmp(ICmpInst::ICMP_EQ, | ||||
|            tu.load(rs1+8 + traits::X0, 0), | ||||
|            tu.constant(0,8))); | ||||
|         { | ||||
|         auto PC_val_v = tu.assignment("PC_val", (uint32_t)(PC+(int16_t)sext<9>(imm)),32); | ||||
|         tu.store(traits::NEXT_PC, PC_val_v); | ||||
|         tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(KNOWN_JUMP), 2)); | ||||
|         } | ||||
|         tu.close_scope(); | ||||
|         auto returnValue = std::make_tuple(BRANCH); | ||||
|         auto returnValue = BRANCH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,75); | ||||
| @@ -3220,11 +3264,13 @@ private: | ||||
|         tu.open_if(tu.icmp(ICmpInst::ICMP_NE, | ||||
|            tu.load(rs1+8 + traits::X0, 0), | ||||
|            tu.constant(0,8))); | ||||
|         { | ||||
|         auto PC_val_v = tu.assignment("PC_val", (uint32_t)(PC+(int16_t)sext<9>(imm)),32); | ||||
|         tu.store(traits::NEXT_PC, PC_val_v); | ||||
|         tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(KNOWN_JUMP), 2)); | ||||
|         } | ||||
|         tu.close_scope(); | ||||
|         auto returnValue = std::make_tuple(BRANCH); | ||||
|         auto returnValue = BRANCH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,76); | ||||
| @@ -3261,7 +3307,7 @@ private: | ||||
|         	       tu.constant(nzuimm,8))); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,77); | ||||
| @@ -3297,7 +3343,7 @@ private: | ||||
|         	   tu.constant(uimm,8))),32,false),32); | ||||
|         	tu.store(rd + traits::X0, tu.ext(tu.ext(tu.read_mem(traits::MEM, offs, 32),32,true),32,false)); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,78); | ||||
| @@ -3332,7 +3378,7 @@ private: | ||||
|         	    tu.store(rd + traits::X0, tu.load(rs2 + traits::X0, 0)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,79); | ||||
| @@ -3369,7 +3415,7 @@ private: | ||||
|         else{ | ||||
|         	this->gen_raise_trap(tu, 0, 2); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(BRANCH); | ||||
|         auto returnValue = BRANCH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,80); | ||||
| @@ -3394,7 +3440,7 @@ private: | ||||
|         tu.open_scope(); | ||||
|         this->gen_set_tval(tu, instr); | ||||
|         this->gen_raise_trap(tu, 0, 2); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,81); | ||||
| @@ -3431,7 +3477,7 @@ private: | ||||
|         	       tu.load(rs2 + traits::X0, 0))),32,false)); | ||||
|         	} | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,82); | ||||
| @@ -3471,7 +3517,7 @@ private: | ||||
|         	tu.store(traits::NEXT_PC, PC_val_v); | ||||
|         	tu.store(traits::LAST_BRANCH, tu.constant(static_cast<int>(UNKNOWN_JUMP), 2)); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(BRANCH); | ||||
|         auto returnValue = BRANCH; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,83); | ||||
| @@ -3496,7 +3542,7 @@ private: | ||||
|         tu.open_scope(); | ||||
|         this->gen_set_tval(tu, instr); | ||||
|         this->gen_raise_trap(tu, 0, 3); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,84); | ||||
| @@ -3532,7 +3578,7 @@ private: | ||||
|         	   tu.constant(uimm,8))),32,false),32); | ||||
|         	tu.write_mem(traits::MEM, offs, tu.ext(tu.load(rs2 + traits::X0, 0),32,false)); | ||||
|         } | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,85); | ||||
| @@ -3557,7 +3603,7 @@ private: | ||||
|         tu.open_scope(); | ||||
|         this->gen_set_tval(tu, instr); | ||||
|         this->gen_raise_trap(tu, 0, static_cast<int32_t>(traits:: RV_CAUSE_ILLEGAL_INSTRUCTION)); | ||||
|         auto returnValue = std::make_tuple(CONT); | ||||
|         auto returnValue = CONT; | ||||
|          | ||||
|         tu.close_scope(); | ||||
|         vm_base<ARCH>::gen_sync(tu, POST_SYNC,86); | ||||
| @@ -3604,8 +3650,8 @@ vm_impl<ARCH>::vm_impl(ARCH &core, unsigned core_id, unsigned cluster_id) | ||||
|     }()) {} | ||||
|  | ||||
| template <typename ARCH> | ||||
| std::tuple<continuation_e> | ||||
| vm_impl<ARCH>::gen_single_inst_behavior(virt_addr_t &pc, unsigned int &inst_cnt, tu_builder& tu) { | ||||
| continuation_e | ||||
| vm_impl<ARCH>::gen_single_inst_behavior(virt_addr_t &pc, tu_builder& tu) { | ||||
|     // we fetch at max 4 byte, alignment is 2 | ||||
|     enum {TRAP_ID=1<<16}; | ||||
|     code_word_t instr = 0; | ||||
| @@ -3617,7 +3663,6 @@ vm_impl<ARCH>::gen_single_inst_behavior(virt_addr_t &pc, unsigned int &inst_cnt, | ||||
|         return ILLEGAL_FETCH; | ||||
|     if (instr == 0x0000006f || (instr&0xffff)==0xa001)  | ||||
|         return JUMP_TO_SELF; | ||||
|     ++inst_cnt; | ||||
|     uint32_t inst_index = instr_decoder.decode_instr(instr); | ||||
|     compile_func f = nullptr; | ||||
|     if(inst_index < instr_descr.size()) | ||||
| @@ -3653,7 +3698,12 @@ template <typename ARCH> void vm_impl<ARCH>::gen_trap_behavior(tu_builder& tu) { | ||||
|     tu("return *next_pc;"); | ||||
| } | ||||
|  | ||||
|  | ||||
| template <typename ARCH> void vm_impl<ARCH>::add_prologue(tu_builder& tu){ | ||||
|     std::ostringstream os; | ||||
|     os << tu.add_reg_ptr("trap_state", arch::traits<ARCH>::TRAP_STATE, this->regs_base_ptr); | ||||
|     os << tu.add_reg_ptr("pending_trap", arch::traits<ARCH>::PENDING_TRAP, this->regs_base_ptr); | ||||
|     tu.add_prologue(os.str()); | ||||
| } | ||||
| } // namespace tgc5c | ||||
|  | ||||
| template <> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user