Fix memory functions

Author: wallento

riscvmodel/model.py

@@ -83,16 +83,13 @@ def changes(self):
 
     def commit(self):
         for update in self.memory_updates:
-            address = update[1]
+            address = update.addr
             base = address >> 2
             offset = address & 0x3
             if base not in self.memory:
                 self.memory[base] = randrange(0, 1 << 32)
-            data = update[2]
-            if update[0] == 1:
-                mask = ~(0xFF << (offset*8)) & 0xFFFFFFFF
-                data = (self.memory[base] & mask) | (data << (offset*8))
-            elif update[0] == 2:
+            data = update.data
+            if update.gran == TraceMemory.GRANULARITY.BYTE:
                 mask = ~(0xFF << (offset*8)) & 0xFFFFFFFF
                 data = (self.memory[base] & mask) | (data << (offset*8))
             self.memory[base] = data
@@ -135,4 +132,4 @@ def check(self, traces, exp=None):
             if isinstance(t, TraceIntegerRegister):
                 if int(self.state.intreg[t.id]) != int(t.value):
                     return False
-        return True
+        return True

riscvmodel/variant.py

@@ -24,4 +24,4 @@
 RV64IMAFD = Variant(intregs=32, xlen=64, extensions = Extensions(M=True, A=True, F=True, D=True))
 RV64G = RV64IMAFD
 RV64IMAFDC = Variant(intregs=32, xlen=64, extensions = Extensions(M=True, A=True, F=True, D=True, C=True))
-RV64GC = RV64IMAFDC
+RV64GC = RV64IMAFDC