changeset f07df23e1fc8 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=f07df23e1fc8
description:
flags: Change naming of functions to be clearer
diffstat:
2 files changed, 2 insertions(+), 7 deletions(-)
src/base/flags.hh | 5 -----
src/mem/packet.hh | 4 ++--
diffs (truncated from 447 to 300 lines):
diff -r 4b44fe535d05 -r f07df23e1fc8 src/arch/alpha/faults.cc
--- a/src/arch/alpha/faults.cc Fri Dec 05 13:58:22 2008 -0500
+++ b/src/arch/alpha/faults.cc Sat Dec 06 14:18:18 2008 -0800
@@ -144,7 +144,7 @@
// read, like the EV5). The EV6 approach is cleaner and seems to
// work with EV5 PAL code, but not the other way around.
if (!tc->misspeculating() &&
- reqFlags.none(Request::VPTE|Request::NO_FAULT)) {
+ reqFlags.noneSet(Request::VPTE|Request::NO_FAULT)) {
// set VA register with faulting address
tc->setMiscRegNoEffect(IPR_VA, vaddr);
diff -r 4b44fe535d05 -r f07df23e1fc8 src/base/flags.hh
--- a/src/base/flags.hh Fri Dec 05 13:58:22 2008 -0500
+++ b/src/base/flags.hh Sat Dec 06 14:18:18 2008 -0800
@@ -59,12 +59,12 @@
return *this;
}
- bool any() const { return _flags; }
- bool any(Type flags) const { return (_flags & flags); }
- bool all() const { return !(~_flags); }
- bool all(Type flags) const { return (_flags & flags) == flags; }
- bool none() const { return _flags == 0; }
- bool none(Type flags) const { return (_flags & flags) == 0; }
+ bool isSet() const { return _flags; }
+ bool isSet(Type flags) const { return (_flags & flags); }
+ bool allSet() const { return !(~_flags); }
+ bool allSet(Type flags) const { return (_flags & flags) == flags; }
+ bool noneSet() const { return _flags == 0; }
+ bool noneSet(Type flags) const { return (_flags & flags) == 0; }
void clear() { _flags = 0; }
void clear(Type flags) { _flags &= ~flags; }
void set(Type flags) { _flags |= flags; }
diff -r 4b44fe535d05 -r f07df23e1fc8 src/mem/packet.hh
--- a/src/mem/packet.hh Fri Dec 05 13:58:22 2008 -0500
+++ b/src/mem/packet.hh Sat Dec 06 14:18:18 2008 -0800
@@ -407,15 +407,15 @@
// Snoop flags
void assertMemInhibit() { flags.set(MEM_INHIBIT); }
- bool memInhibitAsserted() { return flags.any(MEM_INHIBIT); }
+ bool memInhibitAsserted() { return flags.isSet(MEM_INHIBIT); }
void assertShared() { flags.set(SHARED); }
- bool sharedAsserted() { return flags.any(SHARED); }
+ bool sharedAsserted() { return flags.isSet(SHARED); }
// Special control flags
void setExpressSnoop() { flags.set(EXPRESS_SNOOP); }
- bool isExpressSnoop() { return flags.any(EXPRESS_SNOOP); }
+ bool isExpressSnoop() { return flags.isSet(EXPRESS_SNOOP); }
void setSupplyExclusive() { flags.set(SUPPLY_EXCLUSIVE); }
- bool isSupplyExclusive() { return flags.any(SUPPLY_EXCLUSIVE); }
+ bool isSupplyExclusive() { return flags.isSet(SUPPLY_EXCLUSIVE); }
// Network error conditions... encapsulate them as methods since
// their encoding keeps changing (from result field to command
@@ -439,19 +439,19 @@
void copyError(Packet *pkt) { assert(pkt->isError()); cmd = pkt->cmd; }
/// Accessor function to get the source index of the packet.
- NodeID getSrc() const { assert(flags.any(VALID_SRC)); return src; }
+ NodeID getSrc() const { assert(flags.isSet(VALID_SRC)); return src; }
/// Accessor function to set the source index of the packet.
void setSrc(NodeID _src) { src = _src; flags.set(VALID_SRC); }
/// Reset source field, e.g. to retransmit packet on different bus.
void clearSrc() { flags.clear(VALID_SRC); }
/// Accessor function for the destination index of the packet.
- NodeID getDest() const { assert(flags.any(VALID_DST)); return dest; }
+ NodeID getDest() const { assert(flags.isSet(VALID_DST)); return dest; }
/// Accessor function to set the destination index of the packet.
void setDest(NodeID _dest) { dest = _dest; flags.set(VALID_DST); }
- Addr getAddr() const { assert(flags.all(VALID_ADDR)); return addr; }
- int getSize() const { assert(flags.all(VALID_SIZE)); return size; }
+ Addr getAddr() const { assert(flags.isSet(VALID_ADDR)); return addr; }
+ int getSize() const { assert(flags.isSet(VALID_SIZE)); return size; }
Addr getOffset(int blkSize) const { return getAddr() & (Addr)(blkSize -
1); }
/**
@@ -465,7 +465,7 @@
addr(_req->paddr), size(_req->size), dest(_dest), time(curTick),
senderState(NULL)
{
- if (req->flags.any(Request::VALID_PADDR))
+ if (req->flags.isSet(Request::VALID_PADDR))
flags.set(VALID_ADDR|VALID_SIZE);
}
@@ -479,7 +479,7 @@
addr(_req->paddr & ~(_blkSize - 1)), size(_blkSize), dest(_dest),
time(curTick), senderState(NULL)
{
- if (req->flags.any(Request::VALID_PADDR))
+ if (req->flags.isSet(Request::VALID_PADDR))
flags.set(VALID_ADDR|VALID_SIZE);
}
@@ -492,7 +492,7 @@
*/
Packet(Packet *pkt, bool clearFlags = false)
: cmd(pkt->cmd), req(pkt->req),
- data(pkt->flags.any(STATIC_DATA) ? pkt->data : NULL),
+ data(pkt->flags.isSet(STATIC_DATA) ? pkt->data : NULL),
addr(pkt->addr), size(pkt->size), src(pkt->src), dest(pkt->dest),
time(curTick), senderState(pkt->senderState)
{
@@ -526,7 +526,7 @@
void
reinitFromRequest()
{
- assert(req->flags.any(Request::VALID_PADDR));
+ assert(req->flags.isSet(Request::VALID_PADDR));
flags = 0;
addr = req->paddr;
size = req->size;
@@ -551,7 +551,7 @@
cmd = cmd.responseCommand();
dest = src;
- flags.set(VALID_DST, flags.any(VALID_SRC));
+ flags.set(VALID_DST, flags.isSet(VALID_SRC));
flags.clear(VALID_SRC);
}
@@ -590,7 +590,7 @@
void
dataStatic(T *p)
{
- assert(flags.none(STATIC_DATA|DYNAMIC_DATA|ARRAY_DATA));
+ assert(flags.noneSet(STATIC_DATA|DYNAMIC_DATA|ARRAY_DATA));
data = (PacketDataPtr)p;
flags.set(STATIC_DATA);
}
@@ -603,7 +603,7 @@
void
dataDynamicArray(T *p)
{
- assert(flags.none(STATIC_DATA|DYNAMIC_DATA|ARRAY_DATA));
+ assert(flags.noneSet(STATIC_DATA|DYNAMIC_DATA|ARRAY_DATA));
data = (PacketDataPtr)p;
flags.set(DYNAMIC_DATA|ARRAY_DATA);
}
@@ -616,7 +616,7 @@
void
dataDynamic(T *p)
{
- assert(flags.none(STATIC_DATA|DYNAMIC_DATA|ARRAY_DATA));
+ assert(flags.noneSet(STATIC_DATA|DYNAMIC_DATA|ARRAY_DATA));
data = (PacketDataPtr)p;
flags.set(DYNAMIC_DATA);
}
@@ -628,7 +628,7 @@
T*
getPtr()
{
- assert(flags.any(STATIC_DATA|DYNAMIC_DATA));
+ assert(flags.isSet(STATIC_DATA|DYNAMIC_DATA));
return (T*)data;
}
@@ -689,9 +689,9 @@
void
deleteData()
{
- if (flags.any(ARRAY_DATA))
+ if (flags.isSet(ARRAY_DATA))
delete [] data;
- else if (flags.any(DYNAMIC_DATA))
+ else if (flags.isSet(DYNAMIC_DATA))
delete data;
flags.clear(STATIC_DATA|DYNAMIC_DATA|ARRAY_DATA);
@@ -703,11 +703,11 @@
allocate()
{
if (data) {
- assert(flags.any(STATIC_DATA|DYNAMIC_DATA));
+ assert(flags.isSet(STATIC_DATA|DYNAMIC_DATA));
return;
}
- assert(flags.none(STATIC_DATA|DYNAMIC_DATA));
+ assert(flags.noneSet(STATIC_DATA|DYNAMIC_DATA));
flags.set(DYNAMIC_DATA|ARRAY_DATA);
data = new uint8_t[getSize()];
}
diff -r 4b44fe535d05 -r f07df23e1fc8 src/mem/packet_access.hh
--- a/src/mem/packet_access.hh Fri Dec 05 13:58:22 2008 -0500
+++ b/src/mem/packet_access.hh Sat Dec 06 14:18:18 2008 -0800
@@ -46,7 +46,7 @@
inline T
Packet::get()
{
- assert(flags.any(STATIC_DATA|DYNAMIC_DATA));
+ assert(flags.isSet(STATIC_DATA|DYNAMIC_DATA));
assert(sizeof(T) <= size);
return TheISA::gtoh(*(T*)data);
}
@@ -56,7 +56,7 @@
inline void
Packet::set(T v)
{
- assert(flags.any(STATIC_DATA|DYNAMIC_DATA));
+ assert(flags.isSet(STATIC_DATA|DYNAMIC_DATA));
assert(sizeof(T) <= size);
*(T*)data = TheISA::htog(v);
}
diff -r 4b44fe535d05 -r f07df23e1fc8 src/mem/request.hh
--- a/src/mem/request.hh Fri Dec 05 13:58:22 2008 -0500
+++ b/src/mem/request.hh Sat Dec 06 14:18:18 2008 -0800
@@ -230,7 +230,7 @@
void
setPaddr(Addr _paddr)
{
- assert(flags.any(VALID_VADDR));
+ assert(flags.isSet(VALID_VADDR));
paddr = _paddr;
flags.set(VALID_PADDR);
}
@@ -241,8 +241,8 @@
*/
void splitOnVaddr(Addr split_addr, RequestPtr &req1, RequestPtr &req2)
{
- assert(flags.any(VALID_VADDR));
- assert(flags.none(VALID_PADDR));
+ assert(flags.isSet(VALID_VADDR));
+ assert(flags.noneSet(VALID_PADDR));
assert(split_addr > vaddr && split_addr < vaddr + size);
req1 = new Request;
*req1 = *this;
@@ -259,7 +259,7 @@
Addr
getPaddr()
{
- assert(flags.any(VALID_PADDR));
+ assert(flags.isSet(VALID_PADDR));
return paddr;
}
@@ -269,7 +269,7 @@
int
getSize()
{
- assert(flags.any(VALID_SIZE));
+ assert(flags.isSet(VALID_SIZE));
return size;
}
@@ -277,64 +277,62 @@
Tick
getTime()
{
- assert(flags.any(VALID_PADDR|VALID_VADDR));
+ assert(flags.isSet(VALID_PADDR|VALID_VADDR));
return time;
}
void
setTime(Tick when)
{
- assert(flags.any(VALID_PADDR|VALID_VADDR));
+ assert(flags.isSet(VALID_PADDR|VALID_VADDR));
time = when;
}
-
- void resetTime() { setTime(curTick); }
/** Accessor for flags. */
Flags
getFlags()
{
- assert(flags.any(VALID_PADDR|VALID_VADDR));
+ assert(flags.isSet(VALID_PADDR|VALID_VADDR));
return flags & PUBLIC_FLAGS;
}
Flags
anyFlags(Flags _flags)
{
- assert(flags.any(VALID_PADDR|VALID_VADDR));
- assert(_flags.none(~PUBLIC_FLAGS));
- return flags.any(_flags);
+ assert(flags.isSet(VALID_PADDR|VALID_VADDR));
+ assert(_flags.noneSet(~PUBLIC_FLAGS));
+ return flags.isSet(_flags);
}
Flags
allFlags(Flags _flags)
{
- assert(flags.any(VALID_PADDR|VALID_VADDR));
- assert(_flags.none(~PUBLIC_FLAGS));
- return flags.all(_flags);
+ assert(flags.isSet(VALID_PADDR|VALID_VADDR));
+ assert(_flags.noneSet(~PUBLIC_FLAGS));
+ return flags.allSet(_flags);
}
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
