53,54c53,54
< fault = xc->write((uint%(mem_acc_size)s_t)Mem,
< EA, %(asi_val)s, &mem_data);
---
> fault = writeMemAtomic(xc, traceData, Mem, EA,
> %(asi_val)s, &mem_data);
90,91c90,91
< fault = xc->write((uint%(mem_acc_size)s_t)Mem,
< EA, %(asi_val)s, &mem_data);
---
> fault = writeMemTiming(xc, traceData, Mem, EA, %(asi_val)s,
> &mem_data);
106c106,107
< uint64_t mem_data = pkt->get<uint%(mem_acc_size)s_t>();
---
> getMem(pkt, Mem, traceData);
> uint64_t mem_data = Mem;