Smaller fixes and add variant to decode

Author: wallento

riscvmodel/code.py

@@ -11,7 +11,7 @@ def __init__(self, word):
     def __str__(self):
         return "Invalid instruction word: {:08x}".format(self.word)
 
-def decode(word: int):
+def decode(word: int, variant: Variant=RV32I):
     if word & 0x3 != 3:
         # compact
         for icls in get_insns(cls=InstructionCType):
@@ -21,7 +21,7 @@ def decode(word: int):
                 return i
         raise MachineDecodeError(word)
     opcode = word & 0x7F
-    for icls in get_insns():
+    for icls in get_insns(variant=variant):
         if icls.field_opcode.value == opcode and icls.match(word):
             i = icls()
             i.decode(word)

riscvmodel/insn.py

@@ -30,7 +30,7 @@ def execute(self, model: Model):
 class InstructionJAL(InstructionJType):
     def execute(self, model: Model):
         model.state.intreg[self.rd] = model.state.pc + 4
-        model.state.pc = self.imm
+        model.state.pc += self.imm
 
 
 @isa("jalr", RV32I, opcode=0b1100111, funct3=0b000)

riscvmodel/isa.py

@@ -265,11 +265,6 @@ def __str__(self):
         return "{} x{}, x{}, x{}".format(self.mnemonic, self.rd, self.rs1,
                                          self.rs2)
 
-    def __eq__(self, other):
-        if not super().__eq__(other):
-            return False
-        return self.rs1 == other.rs1 and self.rs2 == other.rs2 and self.rd == other.rd
-
 
 class InstructionIType(InstructionFunct3Type, metaclass=ABCMeta):
     """
@@ -392,12 +387,6 @@ def __str__(self):
         return "{} x{}, x{}, 0x{:02x}".format(self.mnemonic, self.rd, self.rs1,
                                               self.shamt)
 
-    def __eq__(self, other):
-        if not super().__eq__(other):
-            return False
-        return (self.rd == other.rd and self.rs1 == other.rs1
-                and self.shamt == other.shamt)
-
 
 class InstructionSType(InstructionFunct3Type, metaclass=ABCMeta):
     """
@@ -539,13 +528,21 @@ class InstructionJType(Instruction, metaclass=ABCMeta):
     :param imm: Immediate for the jump (21-bit, signed, 16-bit aligned)
     :type imm: int
     """
+
+    field_rd = Field(name="rd", base=7, size=5, description="")
+    field_imm = Field(name="imm", base=[21,20,12,31], size=[10,1,8,1], description="")
+
     def __init__(self, rd: int = None, imm: int = None):
         super(InstructionJType, self).__init__()
         self.rd = rd  # pylint: disable=invalid-name
         self.imm = Immediate(bits=21, signed=True, lsb0=True)
         if imm is not None:
             self.imm.set(imm)
 
+    def ops_from_list(self, ops):
+        self.rd = int(ops[0][1:])
+        self.imm.set(int(ops[1]))
+
     def randomize(self, variant: Variant):
         self.rd = randrange(0, variant.xlen)
         self.imm.randomize()