2c2
< * Copyright (c) 2012 ARM Limited
---
> * Copyright (c) 2012-2013 ARM Limited
67,68c67,68
< inService(false), isForward(false), threadNum(InvalidThreadID),
< data(NULL)
---
> isSecure(false), inService(false), isForward(false),
> threadNum(InvalidThreadID), data(NULL)
204,205c204,205
< MSHR::allocate(Addr _addr, int _size, PacketPtr target,
< Tick whenReady, Counter _order)
---
> MSHR::allocate(Addr _addr, int _size, PacketPtr target, Tick whenReady,
> Counter _order)
208a209
> isSecure = target->isSecure();
443c444
< pkt->checkFunctional(this, addr, size, NULL);
---
> pkt->checkFunctional(this, addr, isSecure, size, NULL);
455c456
< ccprintf(os, "%s[%x:%x] %s %s %s state: %s %s %s %s %s\n",
---
> ccprintf(os, "%s[%x:%x](%s) %s %s %s state: %s %s %s %s %s\n",
456a458
> isSecure ? "s" : "ns",