340c340
< memcpy(pkt->getPtr<uint8_t>(), hostAddr, pkt->getSize());
---
> pkt->setData(hostAddr);
348,349c348,349
< if (!pmemAddr)
< panic("Swap only works if there is real memory (i.e. null=False)");
---
> panic_if(!pmemAddr, "Swap only works if there is real memory " \
> "(i.e. null=False)");
354,356c354,355
< std::memcpy(&overwrite_val[0], pkt->getConstPtr<uint8_t>(),
< pkt->getSize());
< std::memcpy(pkt->getPtr<uint8_t>(), hostAddr, pkt->getSize());
---
> pkt->writeData(&overwrite_val[0]);
> pkt->setData(hostAddr);
386,387c385,387
< if (pmemAddr)
< memcpy(pkt->getPtr<uint8_t>(), hostAddr, pkt->getSize());
---
> if (pmemAddr) {
> pkt->setData(hostAddr);
> }
402c402
< memcpy(hostAddr, pkt->getConstPtr<uint8_t>(), pkt->getSize());
---
> pkt->writeData(hostAddr);
429,430c429,431
< if (pmemAddr)
< memcpy(pkt->getPtr<uint8_t>(), hostAddr, pkt->getSize());
---
> if (pmemAddr) {
> pkt->setData(hostAddr);
> }
434,435c435,437
< if (pmemAddr)
< memcpy(hostAddr, pkt->getConstPtr<uint8_t>(), pkt->getSize());
---
> if (pmemAddr) {
> pkt->writeData(hostAddr);
> }