Yu-hsin Wang has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/38456 )
Change subject: mem: Change assert to use flag test functions in Request
......................................................................
mem: Change assert to use flag test functions in Request
Change-Id: Id999d39959557196877be9b6469be332391c7dae
---
M src/mem/request.hh
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/mem/request.hh b/src/mem/request.hh
index fbcf89b..b2326fd 100644
--- a/src/mem/request.hh
+++ b/src/mem/request.hh
@@ -491,7 +491,7 @@
void
setSubStreamId(uint32_t ssid)
{
- assert(privateFlags.isSet(VALID_STREAM_ID));
+ assert(hasStreamId());
_substreamId = ssid;
privateFlags.set(VALID_SUBSTREAM_ID);
}
@@ -541,8 +541,8 @@
// mem. accesses
void splitOnVaddr(Addr split_addr, RequestPtr &req1, RequestPtr &req2)
{
- assert(privateFlags.isSet(VALID_VADDR));
- assert(privateFlags.noneSet(VALID_PADDR));
+ assert(hasVaddr());
+ assert(!hasPaddr());
assert(split_addr > _vaddr && split_addr < _vaddr + _size);
req1 = std::make_shared<Request>(*this);
req2 = std::make_shared<Request>(*this);
@@ -569,7 +569,7 @@
Addr
getPaddr() const
{
- assert(privateFlags.isSet(VALID_PADDR));
+ assert(hasPaddr());
return _paddr;
}
@@ -584,7 +584,7 @@
Counter getInstCount() const
{
- assert(privateFlags.isSet(VALID_INST_COUNT));
+ assert(hasInstCount());
return _instCount;
}
@@ -623,7 +623,7 @@
unsigned
getSize() const
{
- assert(privateFlags.isSet(VALID_SIZE));
+ assert(hasSize());
return _size;
}
@@ -658,7 +658,7 @@
Tick
time() const
{
- assert(privateFlags.isSet(VALID_PADDR|VALID_VADDR));
+ assert(hasPaddr() || hasVaddr());
return _time;
}
@@ -701,7 +701,7 @@
HtmFailureFaultCause
getHtmAbortCause() const
{
- assert(privateFlags.isSet(VALID_HTM_ABORT_CAUSE));
+ assert(hasHtmAbortCause());
return _htmAbortCause;
}
@@ -717,7 +717,7 @@
Flags
getFlags()
{
- assert(privateFlags.isSet(VALID_PADDR|VALID_VADDR));
+ assert(hasPaddr() || hasVaddr());
return _flags;
}
@@ -728,7 +728,7 @@
void
setFlags(Flags flags)
{
- assert(privateFlags.isSet(VALID_PADDR|VALID_VADDR));
+ assert(hasPaddr() || hasVaddr());
_flags.set(flags);
}
@@ -736,7 +736,7 @@
setCacheCoherenceFlags(CacheCoherenceFlags extraFlags)
{
// TODO: do mem_sync_op requests have valid paddr/vaddr?
- assert(privateFlags.isSet(VALID_PADDR | VALID_VADDR));
+ assert(hasPaddr() || hasVaddr());
_cacheCoherenceFlags.set(extraFlags);
}
@@ -776,7 +776,7 @@
ArchFlagsType
getArchFlags() const
{
- assert(privateFlags.isSet(VALID_PADDR|VALID_VADDR));
+ assert(hasPaddr() || hasVaddr());
return _flags & ARCH_BITS;
}
@@ -791,7 +791,7 @@
uint64_t
getExtraData() const
{
- assert(privateFlags.isSet(VALID_EXTRA_DATA));
+ assert(extraDataValid());
return _extraData;
}
@@ -813,7 +813,7 @@
ContextID
contextId() const
{
- assert(privateFlags.isSet(VALID_CONTEXT_ID));
+ assert(hasContextId());
return _contextId;
}
@@ -826,7 +826,7 @@
uint32_t
streamId() const
{
- assert(privateFlags.isSet(VALID_STREAM_ID));
+ assert(hasStreamId());
return _streamId;
}
@@ -839,7 +839,7 @@
uint32_t
substreamId() const
{
- assert(privateFlags.isSet(VALID_SUBSTREAM_ID));
+ assert(hasSubstreamId());
return _substreamId;
}
@@ -860,7 +860,7 @@
Addr
getPC() const
{
- assert(privateFlags.isSet(VALID_PC));
+ assert(hasPC());
return _pc;
}
@@ -897,7 +897,7 @@
InstSeqNum
getReqInstSeqNum() const
{
- assert(privateFlags.isSet(VALID_INST_SEQ_NUM));
+ assert(hasInstSeqNum());
return _reqInstSeqNum;
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38456
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Id999d39959557196877be9b6469be332391c7dae
Gerrit-Change-Number: 38456
Gerrit-PatchSet: 1
Gerrit-Owner: Yu-hsin Wang <yuhsi...@google.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s