[gem5-dev] changeset in gem5: misc: Remove assertions ensuring unsigned val...

[Andreas Hansson via gem5-dev]

changeset 342348537a53 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=342348537a53
description:
        misc: Remove assertions ensuring unsigned values >= 0

diffstat:

 src/base/chunk_generator.hh          |  1 -
 src/base/statistics.hh               |  2 +-
 src/base/vnc/vncserver.cc            |  2 +-
 src/mem/cache/tags/base_set_assoc.cc |  2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r 0a810481d511 -r 342348537a53 src/base/chunk_generator.hh
--- a/src/base/chunk_generator.hh       Fri Sep 19 10:35:06 2014 -0400
+++ b/src/base/chunk_generator.hh       Fri Sep 19 10:35:07 2014 -0400
@@ -83,7 +83,6 @@
     {
         // chunkSize must be a power of two
         assert(chunkSize == 0 || isPowerOf2(chunkSize));
-        assert(totalSize >= 0);
 
         // set up initial chunk.
         curAddr = startAddr;
diff -r 0a810481d511 -r 342348537a53 src/base/statistics.hh
--- a/src/base/statistics.hh    Fri Sep 19 10:35:06 2014 -0400
+++ b/src/base/statistics.hh    Fri Sep 19 10:35:07 2014 -0400
@@ -1567,7 +1567,7 @@
         size_type index =
             (int64_t)std::floor((val - min_bucket) / bucket_size);
 
-        assert(index >= 0 && index < size());
+        assert(index < size());
         cvec[index] += number;
 
         sum += val * number;
diff -r 0a810481d511 -r 342348537a53 src/base/vnc/vncserver.cc
--- a/src/base/vnc/vncserver.cc Fri Sep 19 10:35:06 2014 -0400
+++ b/src/base/vnc/vncserver.cc Fri Sep 19 10:35:07 2014 -0400
@@ -593,8 +593,8 @@
         size_t bytes_to_read = data_len > 1024 ? 1024 : data_len;
         len = read((uint8_t*)&str, bytes_to_read);
         str[bytes_to_read] = 0;
+        assert(len >= data_len);
         data_len -= len;
-        assert(data_len >= 0);
         DPRINTF(VNC, "Buffer: %s\n", str);
     }
 
diff -r 0a810481d511 -r 342348537a53 src/mem/cache/tags/base_set_assoc.cc
--- a/src/mem/cache/tags/base_set_assoc.cc      Fri Sep 19 10:35:06 2014 -0400
+++ b/src/mem/cache/tags/base_set_assoc.cc      Fri Sep 19 10:35:07 2014 -0400
@@ -181,8 +181,8 @@
         if (blks[i].isValid()) {
             assert(blks[i].task_id < ContextSwitchTaskId::NumTaskId);
             occupanciesTaskId[blks[i].task_id]++;
+            assert(blks[i].tickInserted <= curTick());
             Tick age = curTick() - blks[i].tickInserted;
-            assert(age >= 0);
 
             int age_index;
             if (age / SimClock::Int::us < 10) { // <10us
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev