Compare commits
	
		
			4 Commits
		
	
	
		
			337f1634c0
			...
			1668df0531
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 1668df0531 | |||
| d8e009c72b | |||
| d07c8679ed | |||
| 3d5b61f301 | 
| @@ -57,6 +57,7 @@ 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) | ||||
| target_link_libraries(tgfs PUBLIC ${Boost_LIBRARIES} ) | ||||
| set_target_properties(tgfs PROPERTIES | ||||
|   VERSION ${PROJECT_VERSION} | ||||
|   FRAMEWORK FALSE | ||||
| @@ -76,7 +77,6 @@ if(SystemC_FOUND) | ||||
| 	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 | ||||
|   | ||||
 Submodule gen_input/CoreDSL-Instruction-Set-Description updated: 67dbc5535d...3cfac1d86f
									
								
							| @@ -31,21 +31,28 @@ | ||||
|  *******************************************************************************/ | ||||
| <%  | ||||
| def getRegisterSizes(){ | ||||
| 	def regs = registers.collect{it.size} | ||||
| 	regs[-1]=pc.size // correct for NEXT_PC | ||||
| 	regs+=[32, 32, 32, 32, 64] // append TRAP_STATE, PENDING_TRAP, MACHINE_STATE, LAST_BRANCH, ICOUNT | ||||
|     def regs = registers.collect{it.size} | ||||
|     regs[-1]=pc.size // correct for NEXT_PC | ||||
|     regs+=[32, 32, 32, 32, 64] // append TRAP_STATE, PENDING_TRAP, MACHINE_STATE, LAST_BRANCH, ICOUNT | ||||
|     return regs | ||||
| } | ||||
| def getRegisterOffsets(){ | ||||
| 	def regs = registers.collect{it.offset} | ||||
| 	def offs= regs[-1] | ||||
| 	 // append TRAP_STATE, PENDING_TRAP, MACHINE_STATE, LAST_BRANCH, ICOUNT offsets starting with NEXT_PC size | ||||
| 	[pc.size/8, 4, 4, 4, 4].each{ sz -> | ||||
| 		regs+=offs+sz | ||||
| 		offs+=sz | ||||
| 	} | ||||
|     def regs = registers.collect{it.offset} | ||||
|     def offs= regs[-1] | ||||
|      // append TRAP_STATE, PENDING_TRAP, MACHINE_STATE, LAST_BRANCH, ICOUNT offsets starting with NEXT_PC size | ||||
|     [pc.size/8, 4, 4, 4, 4].each{ sz -> | ||||
|         regs+=offs+sz | ||||
|         offs+=sz | ||||
|     } | ||||
|     return regs | ||||
| } | ||||
| def byteSize(int size){ | ||||
|     if(size<=8) return 8; | ||||
|     if(size<=16) return 16; | ||||
|     if(size<=32) return 32; | ||||
|     if(size<=64) return 64; | ||||
|     return 128; | ||||
| } | ||||
| %> | ||||
| #ifndef _${coreDef.name.toUpperCase()}_H_ | ||||
| #define _${coreDef.name.toUpperCase()}_H_ | ||||
| @@ -62,20 +69,20 @@ struct ${coreDef.name.toLowerCase()}; | ||||
|  | ||||
| template <> struct traits<${coreDef.name.toLowerCase()}> { | ||||
|  | ||||
| 	constexpr static char const* const core_type = "${coreDef.name}"; | ||||
|     constexpr static char const* const core_type = "${coreDef.name}"; | ||||
|      | ||||
|   	static constexpr std::array<const char*, ${registers.size}> reg_names{ | ||||
|  		{"${registers.collect{it.name}.join('", "')}"}}; | ||||
|     static constexpr std::array<const char*, ${registers.size}> reg_names{ | ||||
|         {"${registers.collect{it.name}.join('", "')}"}}; | ||||
|   | ||||
|   	static constexpr std::array<const char*, ${registers.size}> reg_aliases{ | ||||
|  		{"${registers.collect{it.alias}.join('", "')}"}}; | ||||
|     static constexpr std::array<const char*, ${registers.size}> reg_aliases{ | ||||
|         {"${registers.collect{it.alias}.join('", "')}"}}; | ||||
|  | ||||
|     enum constants {${constants.collect{c -> c.name+"="+c.value}.join(', ')}}; | ||||
|  | ||||
|     constexpr static unsigned FP_REGS_SIZE = ${constants.find {it.name=='FLEN'}?.value?:0}; | ||||
|  | ||||
|     enum reg_e {<% | ||||
|      	registers.each { reg -> %> | ||||
|         registers.each { reg -> %> | ||||
|         ${reg.name},<%   | ||||
|         }%> | ||||
|         NEXT_${pc.name}=NUM_REGS, | ||||
| @@ -96,17 +103,22 @@ template <> struct traits<${coreDef.name.toLowerCase()}> { | ||||
|  | ||||
|     using phys_addr_t = iss::typed_addr_t<iss::address_type::PHYSICAL>; | ||||
|  | ||||
|  	static constexpr std::array<const uint32_t, ${getRegisterSizes().size}> reg_bit_widths{ | ||||
|  		{${getRegisterSizes().join(',')}}}; | ||||
|     static constexpr std::array<const uint32_t, ${getRegisterSizes().size}> reg_bit_widths{ | ||||
|         {${getRegisterSizes().join(',')}}}; | ||||
|  | ||||
|     static constexpr std::array<const uint32_t, ${getRegisterOffsets().size}> reg_byte_offsets{ | ||||
|  		{${getRegisterOffsets().join(',')}}}; | ||||
|         {${getRegisterOffsets().join(',')}}}; | ||||
|  | ||||
|     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 { ${spaces.collect{it.name}.join(', ')} }; | ||||
|      | ||||
|     enum class opcode_e : unsigned short {<%instructions.eachWithIndex{instr, index -> %> | ||||
|         ${instr.instruction.name} = ${index},<%}%> | ||||
|         MAX_OPCODE | ||||
|     }; | ||||
| }; | ||||
|  | ||||
| struct ${coreDef.name.toLowerCase()}: public arch_if { | ||||
| @@ -153,10 +165,10 @@ struct ${coreDef.name.toLowerCase()}: public arch_if { | ||||
|  | ||||
| protected: | ||||
|     struct ${coreDef.name}_regs {<% | ||||
|      	registers.each { reg -> if(reg.size>0) {%>  | ||||
|         uint${reg.size}_t ${reg.name} = 0;<% | ||||
|         registers.each { reg -> if(reg.size>0) {%>  | ||||
|         uint${byteSize(reg.size)}_t ${reg.name} = 0;<% | ||||
|         }}%> | ||||
|         uint${pc.size}_t NEXT_${pc.name} = 0; | ||||
|         uint${byteSize(pc.size)}_t NEXT_${pc.name} = 0; | ||||
|         uint32_t trap_state = 0, pending_trap = 0, machine_state = 0, last_branch = 0; | ||||
|         uint64_t icount = 0; | ||||
|     } reg; | ||||
| @@ -167,11 +179,11 @@ protected: | ||||
| <% | ||||
| def fcsr = registers.find {it.name=='FCSR'} | ||||
| if(fcsr != null) {%> | ||||
| 	uint${fcsr.size}_t get_fcsr(){return reg.FCSR;} | ||||
| 	void set_fcsr(uint${fcsr.size}_t val){reg.FCSR = val;}		 | ||||
|     uint${fcsr.size}_t get_fcsr(){return reg.FCSR;} | ||||
|     void set_fcsr(uint${fcsr.size}_t val){reg.FCSR = val;}       | ||||
| <%} else { %> | ||||
| 	uint32_t get_fcsr(){return 0;} | ||||
| 	void set_fcsr(uint32_t val){} | ||||
|     uint32_t get_fcsr(){return 0;} | ||||
|     void set_fcsr(uint32_t val){} | ||||
| <%}%> | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| /******************************************************************************* | ||||
|  * Copyright (C) 2017, 2018 MINRES Technologies GmbH | ||||
|  * Copyright (C) 2017 - 2020 MINRES Technologies GmbH | ||||
|  * All rights reserved. | ||||
|  * | ||||
|  * Redistribution and use in source and binary forms, with or without | ||||
| @@ -30,7 +30,6 @@ | ||||
|  * | ||||
|  *******************************************************************************/ | ||||
|  | ||||
|  | ||||
| #ifndef _TGF_B_H_ | ||||
| #define _TGF_B_H_ | ||||
|  | ||||
| @@ -46,15 +45,15 @@ struct tgf_b; | ||||
|  | ||||
| template <> struct traits<tgf_b> { | ||||
|  | ||||
| 	constexpr static char const* const core_type = "TGF_B"; | ||||
|     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"}}; | ||||
|     static constexpr std::array<const char*, 35> 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", "PRIV", "NUM_REGS"}}; | ||||
|   | ||||
|   	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"}}; | ||||
|     static constexpr std::array<const char*, 35> reg_aliases{ | ||||
|         {"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", "PRIV", "NUM_REGS"}}; | ||||
|  | ||||
|     enum constants {XLEN=32, PCLEN=32, MISA_VAL=0b1000000000000000000000100000000, PGSIZE=0x1000, PGMASK=0xfff}; | ||||
|     enum constants {XLEN=32, PCLEN=32, MISA_VAL=0b1000000000000000000000100000000, PGSIZE=0x1000, PGMASK=0xfff, CSR_SIZE=4096, fence=0, fencei=1, fencevmal=2, fencevmau=3}; | ||||
|  | ||||
|     constexpr static unsigned FP_REGS_SIZE = 0; | ||||
|  | ||||
| @@ -92,45 +91,14 @@ template <> struct traits<tgf_b> { | ||||
|         X30, | ||||
|         X31, | ||||
|         PC, | ||||
|         PRIV, | ||||
|         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 | ||||
|         ICOUNT | ||||
|     }; | ||||
|  | ||||
|     using reg_t = uint32_t; | ||||
| @@ -143,17 +111,73 @@ template <> struct traits<tgf_b> { | ||||
|  | ||||
|     using phys_addr_t = iss::typed_addr_t<iss::address_type::PHYSICAL>; | ||||
|  | ||||
|  	static constexpr std::array<const uint32_t, 39> 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,32,32,32,32,32,64}}; | ||||
|     static constexpr std::array<const uint32_t, 40> 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,2,32,32,32,32,32,64}}; | ||||
|  | ||||
|     static constexpr std::array<const uint32_t, 40> 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,132,136,140,144,148,152,160}}; | ||||
|         {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,132,133,137,141,145,149,153}}; | ||||
|  | ||||
|     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 }; | ||||
|      | ||||
|     enum class opcode_e : unsigned short { | ||||
|         LUI = 0, | ||||
|         AUIPC = 1, | ||||
|         JAL = 2, | ||||
|         JALR = 3, | ||||
|         BEQ = 4, | ||||
|         BNE = 5, | ||||
|         BLT = 6, | ||||
|         BGE = 7, | ||||
|         BLTU = 8, | ||||
|         BGEU = 9, | ||||
|         LB = 10, | ||||
|         LH = 11, | ||||
|         LW = 12, | ||||
|         LBU = 13, | ||||
|         LHU = 14, | ||||
|         SB = 15, | ||||
|         SH = 16, | ||||
|         SW = 17, | ||||
|         ADDI = 18, | ||||
|         SLTI = 19, | ||||
|         SLTIU = 20, | ||||
|         XORI = 21, | ||||
|         ORI = 22, | ||||
|         ANDI = 23, | ||||
|         SLLI = 24, | ||||
|         SRLI = 25, | ||||
|         SRAI = 26, | ||||
|         ADD = 27, | ||||
|         SUB = 28, | ||||
|         SLL = 29, | ||||
|         SLT = 30, | ||||
|         SLTU = 31, | ||||
|         XOR = 32, | ||||
|         SRL = 33, | ||||
|         SRA = 34, | ||||
|         OR = 35, | ||||
|         AND = 36, | ||||
|         FENCE = 37, | ||||
|         FENCE_I = 38, | ||||
|         ECALL = 39, | ||||
|         EBREAK = 40, | ||||
|         URET = 41, | ||||
|         SRET = 42, | ||||
|         MRET = 43, | ||||
|         WFI = 44, | ||||
|         SFENCE_VMA = 45, | ||||
|         CSRRW = 46, | ||||
|         CSRRS = 47, | ||||
|         CSRRC = 48, | ||||
|         CSRRWI = 49, | ||||
|         CSRRSI = 50, | ||||
|         CSRRCI = 51, | ||||
|         MAX_OPCODE | ||||
|     }; | ||||
| }; | ||||
|  | ||||
| struct tgf_b: public arch_if { | ||||
| @@ -199,40 +223,41 @@ struct tgf_b: public arch_if { | ||||
|     inline uint32_t get_last_branch() { return reg.last_branch; } | ||||
|  | ||||
| protected: | ||||
|     struct TGF_B_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; | ||||
|     struct TGF_B_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;  | ||||
|         uint8_t PRIV = 0; | ||||
|         uint32_t NEXT_PC = 0; | ||||
|         uint32_t trap_state = 0, pending_trap = 0, machine_state = 0, last_branch = 0; | ||||
|         uint64_t icount = 0; | ||||
| @@ -242,8 +267,8 @@ protected: | ||||
|      | ||||
|     uint64_t interrupt_sim=0; | ||||
|  | ||||
| 	uint32_t get_fcsr(){return 0;} | ||||
| 	void set_fcsr(uint32_t val){} | ||||
|     uint32_t get_fcsr(){return 0;} | ||||
|     void set_fcsr(uint32_t val){} | ||||
|  | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -45,13 +45,13 @@ struct tgf_c; | ||||
|  | ||||
| template <> struct traits<tgf_c> { | ||||
|  | ||||
| 	constexpr static char const* const core_type = "TGF_C"; | ||||
|     constexpr static char const* const core_type = "TGF_C"; | ||||
|      | ||||
|   	static constexpr std::array<const char*, 35> 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", "PRIV", "NUM_REGS"}}; | ||||
|     static constexpr std::array<const char*, 35> 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", "PRIV", "NUM_REGS"}}; | ||||
|   | ||||
|   	static constexpr std::array<const char*, 35> reg_aliases{ | ||||
|  		{"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", "PRIV", "NUM_REGS"}}; | ||||
|     static constexpr std::array<const char*, 35> reg_aliases{ | ||||
|         {"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", "PRIV", "NUM_REGS"}}; | ||||
|  | ||||
|     enum constants {XLEN=32, PCLEN=32, MISA_VAL=0b1000000000000000001000100000100, PGSIZE=0x1000, PGMASK=0xfff, CSR_SIZE=4096, fence=0, fencei=1, fencevmal=2, fencevmau=3, MUL_LEN=64}; | ||||
|  | ||||
| @@ -111,17 +111,109 @@ template <> struct traits<tgf_c> { | ||||
|  | ||||
|     using phys_addr_t = iss::typed_addr_t<iss::address_type::PHYSICAL>; | ||||
|  | ||||
|  	static constexpr std::array<const uint32_t, 40> 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,2,32,32,32,32,32,64}}; | ||||
|     static constexpr std::array<const uint32_t, 40> 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,2,32,32,32,32,32,64}}; | ||||
|  | ||||
|     static constexpr std::array<const uint32_t, 40> 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,132,133,137,141,145,149,153}}; | ||||
|         {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,132,133,137,141,145,149,153}}; | ||||
|  | ||||
|     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 }; | ||||
|      | ||||
|     enum class opcode_e : unsigned short { | ||||
|         LUI = 0, | ||||
|         AUIPC = 1, | ||||
|         JAL = 2, | ||||
|         JALR = 3, | ||||
|         BEQ = 4, | ||||
|         BNE = 5, | ||||
|         BLT = 6, | ||||
|         BGE = 7, | ||||
|         BLTU = 8, | ||||
|         BGEU = 9, | ||||
|         LB = 10, | ||||
|         LH = 11, | ||||
|         LW = 12, | ||||
|         LBU = 13, | ||||
|         LHU = 14, | ||||
|         SB = 15, | ||||
|         SH = 16, | ||||
|         SW = 17, | ||||
|         ADDI = 18, | ||||
|         SLTI = 19, | ||||
|         SLTIU = 20, | ||||
|         XORI = 21, | ||||
|         ORI = 22, | ||||
|         ANDI = 23, | ||||
|         SLLI = 24, | ||||
|         SRLI = 25, | ||||
|         SRAI = 26, | ||||
|         ADD = 27, | ||||
|         SUB = 28, | ||||
|         SLL = 29, | ||||
|         SLT = 30, | ||||
|         SLTU = 31, | ||||
|         XOR = 32, | ||||
|         SRL = 33, | ||||
|         SRA = 34, | ||||
|         OR = 35, | ||||
|         AND = 36, | ||||
|         FENCE = 37, | ||||
|         FENCE_I = 38, | ||||
|         ECALL = 39, | ||||
|         EBREAK = 40, | ||||
|         URET = 41, | ||||
|         SRET = 42, | ||||
|         MRET = 43, | ||||
|         WFI = 44, | ||||
|         SFENCE_VMA = 45, | ||||
|         CSRRW = 46, | ||||
|         CSRRS = 47, | ||||
|         CSRRC = 48, | ||||
|         CSRRWI = 49, | ||||
|         CSRRSI = 50, | ||||
|         CSRRCI = 51, | ||||
|         MUL = 52, | ||||
|         MULH = 53, | ||||
|         MULHSU = 54, | ||||
|         MULHU = 55, | ||||
|         DIV = 56, | ||||
|         DIVU = 57, | ||||
|         REM = 58, | ||||
|         REMU = 59, | ||||
|         CADDI4SPN = 60, | ||||
|         CLW = 61, | ||||
|         CSW = 62, | ||||
|         CADDI = 63, | ||||
|         CNOP = 64, | ||||
|         CJAL = 65, | ||||
|         CLI = 66, | ||||
|         CLUI = 67, | ||||
|         CADDI16SP = 68, | ||||
|         CSRLI = 69, | ||||
|         CSRAI = 70, | ||||
|         CANDI = 71, | ||||
|         CSUB = 72, | ||||
|         CXOR = 73, | ||||
|         COR = 74, | ||||
|         CAND = 75, | ||||
|         CJ = 76, | ||||
|         CBEQZ = 77, | ||||
|         CBNEZ = 78, | ||||
|         CSLLI = 79, | ||||
|         CLWSP = 80, | ||||
|         CMV = 81, | ||||
|         CJR = 82, | ||||
|         CADD = 83, | ||||
|         CJALR = 84, | ||||
|         CEBREAK = 85, | ||||
|         CSWSP = 86, | ||||
|         DII = 87, | ||||
|         MAX_OPCODE | ||||
|     }; | ||||
| }; | ||||
|  | ||||
| struct tgf_c: public arch_if { | ||||
| @@ -201,7 +293,7 @@ protected: | ||||
|         uint32_t X30 = 0;  | ||||
|         uint32_t X31 = 0;  | ||||
|         uint32_t PC = 0;  | ||||
|         uint2_t PRIV = 0; | ||||
|         uint8_t PRIV = 0; | ||||
|         uint32_t NEXT_PC = 0; | ||||
|         uint32_t trap_state = 0, pending_trap = 0, machine_state = 0, last_branch = 0; | ||||
|         uint64_t icount = 0; | ||||
| @@ -211,8 +303,8 @@ protected: | ||||
|      | ||||
|     uint64_t interrupt_sim=0; | ||||
|  | ||||
| 	uint32_t get_fcsr(){return 0;} | ||||
| 	void set_fcsr(uint32_t val){} | ||||
|     uint32_t get_fcsr(){return 0;} | ||||
|     void set_fcsr(uint32_t val){} | ||||
|  | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| /******************************************************************************* | ||||
|  * Copyright (C) 2017, 2018 MINRES Technologies GmbH | ||||
|  * Copyright (C) 2017 - 2020 MINRES Technologies GmbH | ||||
|  * All rights reserved. | ||||
|  * | ||||
|  * Redistribution and use in source and binary forms, with or without | ||||
| @@ -29,7 +29,7 @@ | ||||
|  * POSSIBILITY OF SUCH DAMAGE. | ||||
|  * | ||||
|  *******************************************************************************/ | ||||
|   | ||||
|  | ||||
| #include "util/ities.h" | ||||
| #include <util/logging.h> | ||||
| #include <iss/arch/tgf_b.h> | ||||
| @@ -39,9 +39,9 @@ | ||||
|  | ||||
| using namespace iss::arch; | ||||
|  | ||||
| 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 char*, 35>    iss::arch::traits<iss::arch::tgf_b>::reg_names; | ||||
| constexpr std::array<const char*, 35>    iss::arch::traits<iss::arch::tgf_b>::reg_aliases; | ||||
| constexpr std::array<const uint32_t, 40> 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; | ||||
|  | ||||
| tgf_b::tgf_b() { | ||||
|   | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -516,7 +516,7 @@ private: | ||||
|         uint32_t* X = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::X0]); | ||||
|         uint32_t* PC = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::PC]); | ||||
|         // execute instruction | ||||
|         *PC = *(X+rs1) == *(X+rs2)? *PC + imm : *PC + 4; | ||||
|         if(*(X+rs1) == *(X+rs2)) *PC = *PC + imm;  | ||||
|         // post execution stuff | ||||
|         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = super::template get_reg<reg_t>(arch::traits<ARCH>::PC); | ||||
|         if(this->sync_exec && POST_SYNC) this->do_sync(POST_SYNC, 4); | ||||
| @@ -550,7 +550,7 @@ private: | ||||
|         uint32_t* X = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::X0]); | ||||
|         uint32_t* PC = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::PC]); | ||||
|         // execute instruction | ||||
|         *PC = *(X+rs1) != *(X+rs2)? *PC + imm : *PC + 4; | ||||
|         if(*(X+rs1) != *(X+rs2)) *PC = *PC + imm;  | ||||
|         // post execution stuff | ||||
|         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = super::template get_reg<reg_t>(arch::traits<ARCH>::PC); | ||||
|         if(this->sync_exec && POST_SYNC) this->do_sync(POST_SYNC, 5); | ||||
| @@ -584,7 +584,7 @@ private: | ||||
|         uint32_t* X = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::X0]); | ||||
|         uint32_t* PC = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::PC]); | ||||
|         // execute instruction | ||||
|         *PC = *(X+rs1) < *(X+rs2)? *PC + imm : *PC + 4; | ||||
|         if(*(X+rs1) < *(X+rs2)) *PC = *PC + imm;  | ||||
|         // post execution stuff | ||||
|         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = super::template get_reg<reg_t>(arch::traits<ARCH>::PC); | ||||
|         if(this->sync_exec && POST_SYNC) this->do_sync(POST_SYNC, 6); | ||||
| @@ -618,7 +618,7 @@ private: | ||||
|         uint32_t* X = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::X0]); | ||||
|         uint32_t* PC = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::PC]); | ||||
|         // execute instruction | ||||
|         *PC = *(X+rs1) >= *(X+rs2)? *PC + imm : *PC + 4; | ||||
|         if(*(X+rs1) >= *(X+rs2)) *PC = *PC + imm;  | ||||
|         // post execution stuff | ||||
|         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = super::template get_reg<reg_t>(arch::traits<ARCH>::PC); | ||||
|         if(this->sync_exec && POST_SYNC) this->do_sync(POST_SYNC, 7); | ||||
| @@ -652,7 +652,7 @@ private: | ||||
|         uint32_t* X = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::X0]); | ||||
|         uint32_t* PC = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::PC]); | ||||
|         // execute instruction | ||||
|         *PC = *(X+rs1) < *(X+rs2)? *PC + imm : *PC + 4; | ||||
|         if(*(X+rs1) < *(X+rs2)) *PC = *PC + imm;  | ||||
|         // post execution stuff | ||||
|         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = super::template get_reg<reg_t>(arch::traits<ARCH>::PC); | ||||
|         if(this->sync_exec && POST_SYNC) this->do_sync(POST_SYNC, 8); | ||||
| @@ -686,7 +686,7 @@ private: | ||||
|         uint32_t* X = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::X0]); | ||||
|         uint32_t* PC = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::PC]); | ||||
|         // execute instruction | ||||
|         *PC = *(X+rs1) >= *(X+rs2)? *PC + imm : *PC + 4; | ||||
|         if(*(X+rs1) >= *(X+rs2)) *PC = *PC + imm;  | ||||
|         // post execution stuff | ||||
|         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = super::template get_reg<reg_t>(arch::traits<ARCH>::PC); | ||||
|         if(this->sync_exec && POST_SYNC) this->do_sync(POST_SYNC, 9); | ||||
| @@ -788,7 +788,7 @@ private: | ||||
|         uint32_t* X = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::X0]); | ||||
|         uint32_t* PC = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::PC]); | ||||
|         // execute instruction | ||||
|         if(rd != 0) *(X+rd) = (int32_t)readSpace4(traits::MEM, *(X+rs1) + imm);  | ||||
|         if(rd != 0) *(X+rd) = (uint32_t)readSpace4(traits::MEM, *(X+rs1) + imm);  | ||||
|         // post execution stuff | ||||
|         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = pc.val + 4; | ||||
|         if(this->sync_exec && POST_SYNC) this->do_sync(POST_SYNC, 12); | ||||
| @@ -3076,7 +3076,7 @@ private: | ||||
|         uint32_t* X = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::X0]); | ||||
|         uint32_t* PC = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::PC]); | ||||
|         // execute instruction | ||||
|         *PC = *(X+(rs1 + 8)) == 0? (int8_t)*PC + imm : *PC + 2; | ||||
|         if(*(X+(rs1 + 8)) == 0) *PC = (int8_t)*PC + imm;  | ||||
|         // post execution stuff | ||||
|         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = super::template get_reg<reg_t>(arch::traits<ARCH>::PC); | ||||
|         if(this->sync_exec && POST_SYNC) this->do_sync(POST_SYNC, 77); | ||||
| @@ -3109,7 +3109,7 @@ private: | ||||
|         uint32_t* X = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::X0]); | ||||
|         uint32_t* PC = reinterpret_cast<uint32_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::PC]); | ||||
|         // execute instruction | ||||
|         *PC = *(X+(rs1 + 8)) != 0? (int8_t)*PC + imm : *PC + 2; | ||||
|         if(*(X+(rs1 + 8)) != 0) *PC = (int8_t)*PC + imm;  | ||||
|         // post execution stuff | ||||
|         super::template get_reg<reg_t>(arch::traits<ARCH>::NEXT_PC) = super::template get_reg<reg_t>(arch::traits<ARCH>::PC); | ||||
|         if(this->sync_exec && POST_SYNC) this->do_sync(POST_SYNC, 78); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user