diff --git a/parse.py b/parse.py index 8a50caf4..4553e060 100755 --- a/parse.py +++ b/parse.py @@ -941,6 +941,7 @@ def make_go(instr_dict): type inst struct { opcode uint32 funct3 uint32 + rs1 uint32 rs2 uint32 csr int64 funct7 uint32 @@ -960,11 +961,12 @@ def make_go(instr_dict): enc_match = int(instr_dict[i]['match'],0) opcode = (enc_match >> 0) & ((1<<7)-1) funct3 = (enc_match >> 12) & ((1<<3)-1) + rs1 = (enc_match >> 15) & ((1<<5)-1) rs2 = (enc_match >> 20) & ((1<<5)-1) csr = (enc_match >> 20) & ((1<<12)-1) funct7 = (enc_match >> 25) & ((1<<7)-1) instr_str += f''' case A{i.upper().replace("_","")}: - return &inst{{ {hex(opcode)}, {hex(funct3)}, {hex(rs2)}, {signed(csr,12)}, {hex(funct7)} }} + return &inst{{ {hex(opcode)}, {hex(funct3)}, {hex(rs1)}, {hex(rs2)}, {signed(csr,12)}, {hex(funct7)} }} ''' with open('inst.go','w') as file: