320,322c320,321
< if (traceData) {
< traceData->setAddr(addr);
< }
---
> if (traceData)
> traceData->setMem(addr, size, flags);
416,418c415,416
< if (traceData) {
< traceData->setAddr(addr);
< }
---
> if (traceData)
> traceData->setMem(addr, size, flags);