bug fix of AxiMemoryModel.write_word()

Author: shtaxxx

tests/extension/thread_/memorymodel_readwrite_narrow/thread_memorymodel_readwrite_narrow.py

@@ -132,12 +132,13 @@ def ctrl():
 
         for i in range(16):
             # word addressing
-            v = memory.read_word(i, 0, datawidth)
-            print('read:  mem[%d] -> %x' % (i, v))
-            v = v + 1024
+            r = memory.read_word(i, 0, datawidth)
+            print('read:  mem[%d] -> %x' % (i, r))
+
             # word addressing
-            memory.write_word(i, 0, datawidth)
-            print('write: mem[%d] <- %x' % (i, v))
+            w = (r + i + 100) % (2 ** datawidth - 1)
+            memory.write_word(i, 0, w, datawidth)
+            print('write: mem[%d] <- %x' % (i, w))
 
         awaddr = 0
         _saxi.write(awaddr, 1)

veriloggen/types/axi.py

@@ -1709,7 +1709,7 @@ def write_word(self, fsm, word_index, byte_offset, wdata, bits=8):
         mask.assign(vtypes.Unot(inv_mask))
 
         raw_data = vtypes.Or(wdata_wire << shift,
-                             vtypes.Or(mem_data_wire, mask))
+                             vtypes.And(mem_data_wire, mask))
         raw_data_wire = self.m.TmpWire(8 * num_bytes)
         raw_data_wire.assign(raw_data)