changeset a5f937d152bf in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=a5f937d152bf
description:
clang: Fix issues identified by the clang static analyzer
This patch addresses a few minor issues reported by the clang static
analyzer.
The analysis was run with:
scan-build -disable-checker deadcode \
-enable-checker experimental.core \
-disable-checker experimental.core.CastToStruct \
-enable-checker experimental.cpluscplus
diffstat:
src/mem/cache/tags/iic.cc | 33 ++++++++++++++++-----------------
src/mem/ruby/system/Sequencer.cc | 3 ++-
2 files changed, 18 insertions(+), 18 deletions(-)
diffs (67 lines):
diff -r a67412670f37 -r a5f937d152bf src/mem/cache/tags/iic.cc
--- a/src/mem/cache/tags/iic.cc Tue Sep 11 14:14:51 2012 -0400
+++ b/src/mem/cache/tags/iic.cc Tue Sep 11 14:15:47 2012 -0400
@@ -352,33 +352,32 @@
unsigned long data_ptr;
/* consult replacement policy */
tag_ptr = &tagStore[repl->getRepl()];
+ assert(tag_ptr != NULL);
assert(tag_ptr->isValid());
DPRINTF(Cache, "Replacing %x in IIC: %s\n",
regenerateBlkAddr(tag_ptr->tag,0),
tag_ptr->isDirty() ? "writeback" : "clean");
/* write back replaced block data */
- if (tag_ptr && (tag_ptr->isValid())) {
- replacements[0]++;
- totalRefs += tag_ptr->refCount;
- ++sampledRefs;
- tag_ptr->refCount = 0;
+ replacements[0]++;
+ totalRefs += tag_ptr->refCount;
+ ++sampledRefs;
+ tag_ptr->refCount = 0;
- if (tag_ptr->isDirty()) {
+ if (tag_ptr->isDirty()) {
/* PacketPtr writeback =
- buildWritebackReq(regenerateBlkAddr(tag_ptr->tag, 0),
- tag_ptr->req->asid, tag_ptr->xc, blkSize,
- tag_ptr->data,
- tag_ptr->size);
+ buildWritebackReq(regenerateBlkAddr(tag_ptr->tag, 0),
+ tag_ptr->req->asid, tag_ptr->xc, blkSize,
+ tag_ptr->data,
+ tag_ptr->size);
*/
- Request *writebackReq = new
Request(regenerateBlkAddr(tag_ptr->tag, 0),
- blkSize, 0, Request::wbMasterId);
- PacketPtr writeback = new Packet(writebackReq, MemCmd::Writeback);
- writeback->allocate();
- memcpy(writeback->getPtr<uint8_t>(), tag_ptr->data, blkSize);
+ Request *writebackReq = new Request(regenerateBlkAddr(tag_ptr->tag, 0),
+ blkSize, 0, Request::wbMasterId);
+ PacketPtr writeback = new Packet(writebackReq, MemCmd::Writeback);
+ writeback->allocate();
+ memcpy(writeback->getPtr<uint8_t>(), tag_ptr->data, blkSize);
- writebacks.push_back(writeback);
- }
+ writebacks.push_back(writeback);
}
// free the data blocks
diff -r a67412670f37 -r a5f937d152bf src/mem/ruby/system/Sequencer.cc
--- a/src/mem/ruby/system/Sequencer.cc Tue Sep 11 14:14:51 2012 -0400
+++ b/src/mem/ruby/system/Sequencer.cc Tue Sep 11 14:15:47 2012 -0400
@@ -645,8 +645,9 @@
void
Sequencer::issueRequest(PacketPtr pkt, RubyRequestType secondary_type)
{
+ assert(pkt != NULL);
int proc_id = -1;
- if (pkt != NULL && pkt->req->hasContextId()) {
+ if (pkt->req->hasContextId()) {
proc_id = pkt->req->contextId();
}
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
