219c219
< fault = xc->read(EA, (uint%(mem_acc_size)d_t&)Mem, memAccessFlags);
---
> fault = readMemAtomic(xc, traceData, EA, Mem, memAccessFlags);
251c251
< fault = xc->read(EA, (uint%(mem_acc_size)d_t &)Mem, memAccessFlags);
---
> fault = readMemTiming(xc, traceData, EA, Mem, memAccessFlags);
275c275
< Mem = pkt->get<typeof(Mem)>();
---
> getMem(pkt, Mem, traceData);
306,307c306,307
< fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA,
< memAccessFlags, NULL);
---
> fault = writeMemAtomic(xc, traceData, Mem, EA, memAccessFlags,
> NULL);
342,343c342,343
< fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA,
< memAccessFlags, NULL);
---
> fault = writeMemAtomic(xc, traceData, Mem, EA, memAccessFlags,
> NULL);
376,377c376,377
< fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA,
< memAccessFlags, &write_result);
---
> fault = writeMemAtomic(xc, traceData, Mem, EA, memAccessFlags,
> &write_result);
409,410c409,410
< fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA,
< memAccessFlags, NULL);
---
> fault = writeMemTiming(xc, traceData, Mem, EA, memAccessFlags,
> NULL);
562,569c562,570
< decl_code = 'uint32_t mem_word = 0;\n'
< decl_code += 'uint32_t unaligned_addr = Rs + disp;\n'
< decl_code += 'uint32_t byte_offset = unaligned_addr & 3;\n'
< decl_code += '#if BYTE_ORDER == BIG_ENDIAN\n'
< decl_code += '\tbyte_offset ^= 3;\n'
< decl_code += '#endif\n'
< decl_code += 'fault = xc->read(EA, (uint32_t&)mem_word, memAccessFlags);\n'
< #decl_code += 'xc->readFunctional(EA,(uint32_t&)mem_word);'
---
> decl_code = '''
> uint32_t mem_word = 0;
> uint32_t unaligned_addr = Rs + disp;
> uint32_t byte_offset = unaligned_addr & 3;
> #if BYTE_ORDER == BIG_ENDIAN
> byte_offset ^= 3;
> #endif
> fault = readMemAtomic(xc, traceData, EA, mem_word, memAccessFlags);
> '''