From 8d645b148455ec3a8dd1ee85cc07f2259689b451 Mon Sep 17 00:00:00 2001
From: Anusha <anushar2191@gmail.com>
Date: Tue, 1 Oct 2024 14:41:23 +0530
Subject: [PATCH] Updated the code with respect to  Zdinx

---
 riscv_isac/InstructionObject.py     |  16 +-
 riscv_isac/data/rvopcodesdecoder.py | 239 ++++++++++++----------------
 2 files changed, 113 insertions(+), 142 deletions(-)

diff --git a/riscv_isac/InstructionObject.py b/riscv_isac/InstructionObject.py
index 9396e6a..2fd69f5 100644
--- a/riscv_isac/InstructionObject.py
+++ b/riscv_isac/InstructionObject.py
@@ -525,6 +525,10 @@ def evaluate_rs1_val_p_ext(self, instr_vars, arch_state):
     def evaluate_rs1_val_sgn(self, instr_vars, arch_state):
         return self.evaluate_reg_val_sgn(self.rs1[0], instr_vars['xlen'], arch_state)
 
+    @evaluator_func("rs1_val", lambda **params: not params['instr_name'] in unsgn_rs1 and not params['is_rvp'] and params['rs1'] is not None and (params['rs1'][1] == 'f' or params['inxFlag']))
+    def evaluate_rs1_val_fsgn(self, instr_vars, arch_state):
+        return self.evaluate_reg_val_zdinx32_ext(self.rs1[0], self.rs1_nregs,instr_vars['flen'],instr_vars['xlen'],arch_state)
+        
     @evaluator_func("rs1_val", lambda **params: not params['instr_name'] in unsgn_rs1 and not params['is_rvp'] and params['rs1'] is not None and (params['rs1'][1] == 'f' or params['inxFlag']))
     def evaluate_rs1_val_fsgn(self, instr_vars, arch_state):
         return self.evaluate_reg_val_fsgn(self.rs1[0], instr_vars['flen'], instr_vars['xlen'],arch_state)
@@ -549,7 +553,10 @@ def evaluate_rs2_val_p_ext(self, instr_vars, arch_state):
     @evaluator_func("rs2_val", lambda **params: not params['instr_name'] in unsgn_rs2 and not params['is_rvp'] and params['rs2'] is not None and params['rs2'][1] == 'x'  and not params['inxFlag'])
     def evaluate_rs2_val_sgn(self, instr_vars, arch_state):
         return self.evaluate_reg_val_sgn(self.rs2[0], instr_vars['xlen'], arch_state)
-
+    
+    @evaluator_func("rs2_val", lambda **params: params['is_rvp'] and params['rs2'] is not None)
+    def evaluate_rs2_val_fsgn(self, instr_vars, arch_state):
+        return self.evaluate_reg_val_zdinx32_ext(self.rs2[0],instr_vars['flen'], instr_vars['xlen'], self.rs2_nregs, arch_state)
 
     @evaluator_func("rs2_val", lambda **params: not params['instr_name'] in unsgn_rs2 and not params['is_rvp'] and params['rs2'] is not None and (params['rs2'][1] == 'f' or params['inxFlag']))
     def evaluate_rs2_val_fsgn(self, instr_vars, arch_state):
@@ -636,6 +643,13 @@ def evaluate_reg_val_p_ext(self, reg_idx, nregs, arch_state):
             reg_val = (reg_hi_val << 32) | reg_val
         return reg_val
     
+    def evaluate_reg_val_zdinx32_ext(self, reg_idx, nregs, flen,arch_state,xlen):
+        reg_val = self.evaluate_reg_val_fsgn(reg_idx,flen,arch_state,xlen)
+        if nregs == 2:
+            reg_hi_val = self.evaluate_reg_val_fsgn(reg_idx+1,flen,arch_state,xlen)
+            reg_val = (reg_hi_val << 32) | reg_val
+        return reg_val
+        
     def sign_extend(self, value, e_bits, v_bits ):
         return bin(value | ((1<<e_bits) - (1<<v_bits)))
     
diff --git a/riscv_isac/data/rvopcodesdecoder.py b/riscv_isac/data/rvopcodesdecoder.py
index eb83592..98bd3b8 100644
--- a/riscv_isac/data/rvopcodesdecoder.py
+++ b/riscv_isac/data/rvopcodesdecoder.py
@@ -346,7 +346,6 @@ def decode(self, instrObj_temp):
             # Fill arguments
             args = name_args[1]
             imm = ''
-            uimm = ''
             # Get extension
             file_name = args[-1]
             # If instruction from P extension
@@ -362,19 +361,19 @@ def decode(self, instrObj_temp):
                 reg_type = 'f'
             if file_name in ['rv_zfh','rv_d_zfh','rv64_zfh'] and temp_instrobj.inxFlg == True:
                 reg_type = 'x'
+            if file_name in ['rv_d','rv64_d'] and temp_instrobj.inxFlg == True:
+                reg_type = 'x'
             for arg in args[:-1]:
                 if 'rd' in arg:
                     treg = reg_type
-
                     if any([instr_name.startswith(x) for x in [
                             'fcvt.w','fcvt.l','fmv.s','fmv.d','flt','feq','fle','fclass','fmv.x']]):
                         treg = 'x'
                     temp_instrobj.rd = (int(get_arg_val(arg)(mcode), 2), treg)
-
                 if 'rd' in arg and self.inxFlag == True:
                     treg = reg_type
                     if any([instr_name.startswith(x) for x in [
-                            'fcvt.w','fcvt.l','fmv.s','fmv.d','flt','feq','fle','fclass','fmv.x','fsqrt','fmax','fmin','fadd','fsub','feq','flt','fle','fmul','fdiv','fsgnj','fsgnjn','fsgnjx','fcvt.lu','fcvt.wu']]):
+                            'fcvt.w','fcvt.l','fmv.s','fmv.d','flt','feq','fle','fclass','fmv.x','fsqrt','fmax','fmin','fadd','fsub','feq','flt','fle','fmul','fdiv','fsgnj','fsgnjn','fsgnjx','fcvt.lu','fcvt.wu','fmadd']]):
                         treg = 'x'
                     temp_instrobj.rd = (int(get_arg_val(arg)(mcode), 2), treg)
 
@@ -384,11 +383,10 @@ def decode(self, instrObj_temp):
                             'fsh', 'fsw','fsd','fcvt.s','fcvt.d','fmv.w','fmv.l','fcvt.h','fmv.h','flh']]):
                         treg = 'x'
                     temp_instrobj.rs1 = (int(get_arg_val(arg)(mcode), 2), treg)
-                    
                 if 'rs1' in arg and self.inxFlag == True:
                     treg = reg_type
                     if any([instr_name.startswith(x) for x in [
-                            'fsh', 'fsw','fsd','fcvt.s','fcvt.d','fmv.w','fmv.l','fcvt.h','fmv.h','flh','fclass','fsqrt','fmax','fmin','fadd','fsub','feq','fle','flt','fmul','fdiv','fsgnj','fsgnjn','fsgnjx','fcvt.lu','fcvt.w','fcvt.wu']]):
+                            'fsh', 'fsw','fsd','fcvt.s','fcvt.d','fmv.w','fmv.l','fcvt.h','fmv.h','flh','fclass','fsqrt','fmax','fmin','fadd','fsub','feq','fle','flt','fmul','fdiv','fsgnj','fsgnjn','fsgnjx','fcvt.lu','fcvt.w','fcvt.wu','fmadd']]):
                         treg = 'x'
                     temp_instrobj.rs1 = (int(get_arg_val(arg)(mcode), 2), treg)
 
@@ -398,38 +396,18 @@ def decode(self, instrObj_temp):
                 if 'rs2' in arg and self.inxFlag == True:
                     treg = reg_type
                     if any([instr_name.startswith(x) for x in [
-                            'fsh', 'fsw','fsd','fcvt.s','fcvt.d','fmv.w','fmv.l','fcvt.h','fmv.h','flh','fclass','fsqrt','fmax','fmin','fadd','fsub','feq','fle','flt','fmul','fdiv','fsgnj','fsgnjn','fsgnjx']]):
+                            'fsh', 'fsw','fsd','fcvt.s','fcvt.d','fmv.w','fmv.l','fcvt.h','fmv.h','flh','fclass','fsqrt','fmax','fmin','fadd','fsub','feq','fle','flt','fmul','fdiv','fsgnj','fsgnjn','fsgnjx','fmadd']]):
                         treg = 'x'
-                    temp_instrobj.rs2 = (int(get_arg_val(arg)(mcode), 2), treg
-                    if 'p' in arg:
-                        temp_instrobj.rd = (8+int(get_arg_val(arg)(mcode), 2), treg)
-                    else:
-                        if any([instr_name.startswith(x) for x in [
-                                'fcvt.w','fcvt.l','fmv.s','fmv.d','flt','feq','fle','fclass']]):
-                            treg = 'x'
-                        temp_instrobj.rd = (int(get_arg_val(arg)(mcode), 2), treg)
-                if 'rs1' in arg:
-                    treg = reg_type
-                    if 'p' in arg:
-                        temp_instrobj.rs1 = (8+int(get_arg_val(arg)(mcode), 2), treg)
-                    else:
-                        if any([instr_name.startswith(x) for x in [
-                                'fsw','fsd','fcvt.s','fcvt.d','fmv.w','fmv.l']]):
-                            treg = 'x'
-                        temp_instrobj.rs1 = (int(get_arg_val(arg)(mcode), 2), treg)
-                if 'rs2' in arg:
-                    treg = reg_type
-                    if 'p' in arg:
-                        temp_instrobj.rs2 = (8+int(get_arg_val(arg)(mcode), 2), treg)
-                    else:
-                        temp_instrobj.rs2 = (int(get_arg_val(arg)(mcode), 2), treg)
-
+                    temp_instrobj.rs2 = (int(get_arg_val(arg)(mcode), 2), treg)
                 if 'rs3' in arg:
                     treg = reg_type
-                    if 'p' in arg:
-                        temp_instrobj.rs3 = (8+int(get_arg_val(arg)(mcode), 2), treg)
-                    else:
-                        temp_instrobj.rs3 = (int(get_arg_val(arg)(mcode), 2), treg)
+                    temp_instrobj.rs3 = (int(get_arg_val(arg)(mcode), 2), treg)
+                if 'rs3' in arg and self.inxFlag == True:
+                    treg = reg_type
+                    if any([instr_name.startswith(x) for x in [
+                            'fsh', 'fsw','fsd','fcvt.s','fcvt.d','fmv.w','fmv.l','fcvt.h','fmv.h','flh','fclass','fsqrt','fmax','fmin','fadd','fsub','feq','fle','flt','fmul','fdiv','fsgnj','fsgnjn','fsgnjx','fmadd']]):
+                        treg = 'x'
+                    temp_instrobj.rs3 = (int(get_arg_val(arg)(mcode), 2), treg)
                 if 'csr' in arg:
                     temp_instrobj.csr = int(get_arg_val(arg)(mcode), 2)
                 if arg == 'shamt':
@@ -477,219 +455,198 @@ def decode(self, instrObj_temp):
                             imm = imm[0] + imm_temp[-1] + imm[1:] + imm_temp[0:4] + '0'
                         else:
                             imm = imm + imm_temp
-    
-                    if arg == 'c_uimm7hi': # zero extended
-                        # offset[5:3] 
+                    if arg == 'c_uimm7hi':
                         imm_temp = get_arg_val(arg)(mcode)
                         if imm:
-                            # scalling by factor 4 ('00') if lower 2 bits are got already
                             imm = imm[-1] + imm_temp + imm[0] + '00'
                         else:
                             imm = imm_temp + imm
-                    if arg == 'c_uimm7lo': 
-                        # offest[2|6]
+                    if arg == 'c_uimm7lo':
                         imm_temp = get_arg_val(arg)(mcode)
                         if imm:
-                            # scalling by factor 4 ('00') if higher 3 bits are got already
                             imm = imm_temp[-1] + imm + imm_temp[0] + '00'
                         else:
                             imm = imm + imm_temp
 
-                    if arg == 'c_uimm8lo': 
-                        # offest[7:6]
+                    if arg == 'c_uimm8lo':
                         imm_temp = get_arg_val(arg)(mcode)
                         if imm:
-                            # scalling by factor 8 ('000') if higher 3 bits are got already
-                            imm = imm_temp + imm + '000'
+                            imm = imm_temp[-1] + imm + imm_temp[0] + '00'
                         else:
                             imm = imm + imm_temp
-                    if arg == 'c_uimm8hi': # zero extended
+                    if arg == 'c_uimm8hi':
                         imm_temp = get_arg_val(arg)(mcode)
-                        # offest[5:3]
                         if imm:
-                            # scalling by factor 8 ('000') if lower 2 bits are got already
-                            imm = imm + imm_temp + '000'
+                            imm = imm[-1] + imm_temp + imm[0] + '00'
                         else:
                             imm = imm_temp + imm
 
                     if arg == 'c_uimm9lo':
-                        # offest[7:6]
                         imm_temp = get_arg_val(arg)(mcode)
                         if imm:
-                            # scalling by factor 16 ('0000') if higher 3 bits are got already
-                            imm = imm[-1] + imm_temp + imm[0:2] +'0000'
+                            imm = imm_temp[-1] + imm + imm_temp[0] + '00'
                         else:
                             imm = imm + imm_temp
-                    elif arg == 'c_uimm9hi': # zero extended
-                        # offest[5:4|8]
+                    elif arg == 'c_uimm9hi':
                         imm_temp = get_arg_val(arg)(mcode)
                         if imm:
-                            # scalling by factor 16 ('0000') if lower 2 bits are got already
-                            imm = imm_temp[-1] + imm + imm_temp[0:2] +'0000'
+                            imm = imm[-1] + imm_temp + imm[0] + '00'
                         else:
                             imm = imm_temp + imm
 
-                    if arg == 'c_nzimm6lo':
-                        # offest[4:0] 
+                    elif arg == 'c_nzimm6lo':
                         imm_temp = get_arg_val(arg)(mcode)
-                        # concatenate offset[5] to offset[4:0]
-                        imm = imm + imm_temp
-                    if arg == 'c_nzimm6hi':
-                        # offest[5]
+                        if imm:
+                            imm = imm_temp[-1] + imm + imm_temp[0] + '00'
+                        else:
+                            imm = imm + imm_temp
+                    elif arg == 'c_nzimm6hi':
                         imm_temp = get_arg_val(arg)(mcode)
-                        # concatenate offset[4:0] to offset[5]
-                        imm = imm_temp + imm
+                        if imm:
+                            imm = imm[-1] + imm_temp + imm[0] + '00'
+                        else:
+                            imm = imm_temp + imm
 
-                    if arg == 'c_imm6lo':
-                        # offest[4:0]
+                    elif arg == 'c_imm6lo':
                         imm_temp = get_arg_val(arg)(mcode)
-                        # concatenate offset[5] to offset[4:0]
-                        imm = imm + imm_temp
-                    if arg == 'c_imm6hi':
-                        # offest[5]
+                        if imm:
+                            imm = imm_temp[-1] + imm + imm_temp[0] + '00'
+                        else:
+                            imm = imm + imm_temp
+                    elif arg == 'c_imm6hi':
                         imm_temp = get_arg_val(arg)(mcode)
-                        # concatenate offset[4:0] to offset[5]
-                        imm = imm_temp + imm
+                        if imm:
+                            imm = imm[-1] + imm_temp + imm[0] + '00'
+                        else:
+                            imm = imm_temp + imm
 
-                    if arg == 'c_nzimm10hi':
-                        # offset[9]
+                    elif arg == 'c_nzimm10hi':
                         imm_temp = get_arg_val(arg)(mcode)
                         if imm:
-                            imm = imm_temp + imm[2:4] + imm[1] + imm[4] + imm[0]
+                            imm = imm[-1] + imm_temp + imm[0] + '00'
                         else:
                             imm = imm_temp + imm
-                    if arg == 'c_nzimm10lo':
-                        # offset[4|6|8:7|5]
+                    elif arg == 'c_nzimm10lo':
                         imm_temp = get_arg_val(arg)(mcode)
                         if imm:
-                            imm = imm + imm_temp[2:4] + imm_temp[1] + imm_temp[4] + imm_temp[0]
+                            imm = imm_temp[-1] + imm + imm_temp[0] + '00'
                         else:
                             imm = imm + imm_temp
 
-                    if arg == 'c_nzimm18hi':
-                        # offest[17]
+                    elif arg == 'c_nzimm18hi':
                         imm_temp = get_arg_val(arg)(mcode)
-                        # concatenate offset[16:12] to offset[17]
-                        imm = imm_temp + imm
-                    if arg == 'c_nzimm18lo':
-                        # offest[16:12]
+                        if imm:
+                            imm = imm[-1] + imm_temp + imm[0] + '00'
+                        else:
+                            imm = imm_temp + imm
+                    elif arg == 'c_nzimm18lo':
                         imm_temp = get_arg_val(arg)(mcode)
-                        # concatenate offset[17] to offset[16:12]
-                        imm = imm + imm_temp
+                        if imm:
+                            imm = imm_temp[-1] + imm + imm_temp[0] + '00'
+                        else:
+                            imm = imm + imm_temp
 
-                    if arg == 'c_imm12':
+                    elif arg == 'c_imm12':
                         imm_temp = get_arg_val(arg)(mcode)
-                        # offset[11|4|9:8|10|6|7|3:1|5] + '0' (jump)
-                        imm = imm_temp[0] + imm_temp[4] + imm_temp[2:4] + imm_temp[6] + imm_temp[5] + imm_temp[10] + imm_temp[1] +imm_temp[7:11] + '0'
-                    if arg == 'c_bimm9lo':
+                        if imm:
+                            imm = imm[-1] + imm_temp + imm[0] + '00'
+                        else:
+                            imm = imm_temp + imm
+
+                    elif arg == 'c_bimm9lo':
                         imm_temp = get_arg_val(arg)(mcode)
-                        # offset[7:6|2:1|5] + '0' (branch)
                         if imm:
-                            imm = imm[0] + imm_temp[0:2] + imm_temp[4] + imm[1:3] + imm_temp[2:4] + '0' 
+                            imm = imm_temp[-1] + imm + imm_temp[0] + '00'
                         else:
                             imm = imm + imm_temp
-                    if arg == 'c_bimm9hi':
-                        # offset[8|4:3]
+                    elif arg == 'c_bimm9hi':
                         imm_temp = get_arg_val(arg)(mcode)
                         if imm:
-                            imm = imm_temp[0] + imm[0:2] + imm[4] + imm_temp[1:3] + imm[2:4] + '0'
+                            imm = imm[-1] + imm_temp + imm[0] + '00'
                         else:
                             imm = imm_temp + imm
 
-                    if arg == 'c_nzuimm5':
+                    elif arg == 'c_nzuimm5':
                         imm_temp = get_arg_val(arg)(mcode)
                         imm = imm_temp + imm
 
-                    if arg == 'c_nzuimm6lo':
-                        # offest[4:0]
+                    elif arg == 'c_nzuimm6lo':
                         imm_temp = get_arg_val(arg)(mcode)
-                        imm = imm + imm_temp
+                        if imm:
+                            imm = imm_temp[-1] + imm + imm_temp[0] + '00'
+                        else:
+                            imm = imm + imm_temp
 
 
-                    if arg == 'c_nzuimm6hi':
-                        # offest[5]
+                    elif arg == 'c_nzuimm6hi':
                         imm_temp = get_arg_val(arg)(mcode)
-                        imm = imm_temp + imm
+                        if imm:
+                            imm = imm[-1] + imm_temp + imm[0] + '00'
+                        else:
+                            imm = imm_temp + imm
 
-                    if arg == 'c_uimm8splo':
-                        # offset[4:2|7:6] and scalling by 4 ('00')
+                    elif arg == 'c_uimm8splo':
                         imm_temp = get_arg_val(arg)(mcode)
                         if imm:
-                            imm = imm_temp[3:5] + imm + imm_temp[0:3] + '00'
+                            imm = imm_temp[-1] + imm + imm_temp[0] + '00'
                         else:
                             imm = imm + imm_temp
 
-                    if arg == 'c_uimm8sphi': # zero extended
-                        # offset[5] and scalling by 4 ('00')
+                    elif arg == 'c_uimm8sphi':
                         imm_temp = get_arg_val(arg)(mcode)
                         if imm:
-                            imm = imm[3:5] + imm_temp + imm[0:3] + '00'
+                            imm = imm[-1] + imm_temp + imm[0] + '00'
                         else:
                             imm = imm_temp + imm
 
-                    if arg == 'c_uimm8sp_s': # zero extended
-                        # offset[5:2|7:6] and scalling by 4 ('00')
+                    elif arg == 'c_uimm8sp_s':
                         imm_temp = get_arg_val(arg)(mcode)
-                        imm = imm_temp[4:] + imm_temp[0:4] + '00'
+                        imm = imm[-1] + imm_temp + imm[0] + '00'
 
-                    if arg == 'c_uimm10splo': 
-                        # offset[4|9:6]
+                    elif arg == 'c_uimm10splo':
                         imm_temp = get_arg_val(arg)(mcode)
-                        # scalling by 16 ('0000')
                         if imm:
-                            imm = imm_temp[1:] + imm + imm_temp[0] + '0000'
+                            imm = imm_temp[-1] + imm + imm_temp[0] + '00'
                         else:
                             imm = imm + imm_temp
 
-                    if arg == 'c_uimm10sphi': # zero extended
-                        # offset[5]
+                    elif arg == 'c_uimm10sphi':
                         imm_temp = get_arg_val(arg)(mcode)
                         if imm:
-                            imm = imm[1:] + imm_temp + imm[0] + '0000'
+                            imm = imm[-1] + imm_temp + imm[0] + '00'
                         else:
                             imm = imm_temp + imm
 
-                    if arg == 'c_uimm9splo':
-                        # offset[4:3|8:6]
+                    elif arg == 'c_uimm9splo':
                         imm_temp = get_arg_val(arg)(mcode)
-                        # scalling by 8 ('000')
                         if imm:
-                            imm = imm_temp[2:] + imm + imm_temp[0:2] + '000'
+                            imm = imm_temp[-1] + imm + imm_temp[0] + '00'
                         else:
                             imm = imm + imm_temp
 
-                    if arg == 'c_uimm9sphi': # zero extended
-                        # offset[5]
+                    elif arg == 'c_uimm9sphi':
                         imm_temp = get_arg_val(arg)(mcode)
                         if imm:
-                            imm = imm[2:] + imm_temp + imm[0:2] + '000'
+                            imm = imm[-1] + imm_temp + imm[0] + '00'
                         else:
                             imm = imm_temp + imm
 
-                    if arg == 'c_uimm10sp_s': # zero extended
-                        # offset[5:4|9:6] and scalling by 16 ('0000')
+                    elif arg == 'c_uimm10sp_s':
                         imm_temp = get_arg_val(arg)(mcode)
-                        imm = imm_temp[2:] + imm_temp[0:2] + '0000'
+                        imm = imm_temp + imm
 
-                    if arg == 'c_uimm9sp_s': # zero extended
-                        # offset[5:3|8:6] and scalling by 8 ('000')
-                        imm_temp = get_arg_val(arg)(mcode)
-                        imm = imm_temp[3:] + imm_temp[0:3] + '000'
-                        
-                    if arg == 'c_uimm2':
+                    elif arg == 'c_uimm9sp_s':
                         imm_temp = get_arg_val(arg)(mcode)
-                        uimm = imm_temp[1] + imm_temp[0]
-                        
-                    if arg == 'c_uimm1':
+                        imm = imm_temp + imm
+
+                    elif arg == 'c_nzuimm10':
                         imm_temp = get_arg_val(arg)(mcode)
-                        uimm = imm_temp + '0'
+                        imm = imm_temp + imm
 
             if imm:
                 numbits = len(imm)
                 temp_instrobj.imm = disassembler.twos_comp(int(imm, 2), numbits)
                 temp_instrobj.inxFlg = self.inxFlag
-            elif uimm:
-                temp_instrobj.imm = int(uimm, 2)
             return temp_instrobj
         else:
             return None