55,56c55,57
< : MemObject(p), pmemAddr(NULL), lat(p->latency),
< lat_var(p->latency_var)
---
> : MemObject(p), pmemAddr(NULL), pagePtr(0),
> lat(p->latency), lat_var(p->latency_var),
> cachedSize(params()->range.size()), cachedStart(params()->range.start)
60a62,64
> if (params()->null)
> return;
>
73,78d76
<
< pagePtr = 0;
<
< cachedSize = params()->range.size();
< cachedStart = params()->range.start;
<
259a258,259
> if (!pmemAddr)
> panic("Swap only works if there is real memory (i.e. null=False)");
290c290,291
< memcpy(pkt->getPtr<uint8_t>(), hostAddr, pkt->getSize());
---
> if (pmemAddr)
> memcpy(pkt->getPtr<uint8_t>(), hostAddr, pkt->getSize());
294c295,296
< memcpy(hostAddr, pkt->getPtr<uint8_t>(), pkt->getSize());
---
> if (pmemAddr)
> memcpy(hostAddr, pkt->getPtr<uint8_t>(), pkt->getSize());
323c325,326
< memcpy(pkt->getPtr<uint8_t>(), hostAddr, pkt->getSize());
---
> if (pmemAddr)
> memcpy(pkt->getPtr<uint8_t>(), hostAddr, pkt->getSize());
327c330,331
< memcpy(hostAddr, pkt->getPtr<uint8_t>(), pkt->getSize());
---
> if (pmemAddr)
> memcpy(hostAddr, pkt->getPtr<uint8_t>(), pkt->getSize());
450a455,457
> if (!pmemAddr)
> return;
>
482a490,492
> if (!pmemAddr)
> return;
>
490d499
<