From 548987217f836c6f6531aa155fbf394b2dfb955d Mon Sep 17 00:00:00 2001
From: Gabe Black <gabeblack@google.com>
Date: Fri, 27 Aug 2021 00:06:02 -0700
Subject: [PATCH] mem,base: Fix signed/unsigned comparison warnings/errors.

Change-Id: Icf477f4b0c162f0174216e511960d0e76db313ae
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49616
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 src/base/addr_range.hh | 14 +++++++-------
 src/mem/packet.hh      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/base/addr_range.hh b/src/base/addr_range.hh
index 640f692f48..04dc8ecda2 100644
--- a/src/base/addr_range.hh
+++ b/src/base/addr_range.hh
@@ -334,7 +334,7 @@ class AddrRange
     {
         if (interleaved()) {
             std::string str;
-            for (int i = 0; i < masks.size(); i++) {
+            for (unsigned int i = 0; i < masks.size(); i++) {
                 str += " ";
                 Addr mask = masks[i];
                 while (mask) {
@@ -443,7 +443,7 @@ class AddrRange
         bool in_range = a >= _start && a < _end;
         if (in_range) {
             auto sel = 0;
-            for (int i = 0; i < masks.size(); i++) {
+            for (unsigned int i = 0; i < masks.size(); i++) {
                 Addr masked = a & masks[i];
                 // The result of an xor operation is 1 if the number
                 // of bits set is odd or 0 othersize, thefore it
@@ -490,7 +490,7 @@ class AddrRange
 
         // Get the LSB set from each mask
         int masks_lsb[masks.size()];
-        for (int i = 0; i < masks.size(); i++) {
+        for (unsigned int i = 0; i < masks.size(); i++) {
             masks_lsb[i] = ctz64(masks[i]);
         }
 
@@ -498,7 +498,7 @@ class AddrRange
         // discard them one by one starting.
         std::sort(masks_lsb, masks_lsb + masks.size());
 
-        for (int i = 0; i < masks.size(); i++) {
+        for (unsigned int i = 0; i < masks.size(); i++) {
             const int intlv_bit = masks_lsb[i];
             if (intlv_bit > 0) {
                 // on every iteration we remove one bit from the input
@@ -528,13 +528,13 @@ class AddrRange
 
         // Get the LSB set from each mask
         int masks_lsb[masks.size()];
-        for (int i = 0; i < masks.size(); i++) {
+        for (unsigned int i = 0; i < masks.size(); i++) {
             masks_lsb[i] = ctz64(masks[i]);
         }
 
         // Add bits one-by-one from the LSB side.
         std::sort(masks_lsb, masks_lsb + masks.size());
-        for (int i = 0; i < masks.size(); i++) {
+        for (unsigned int i = 0; i < masks.size(); i++) {
             const int intlv_bit = masks_lsb[i];
             if (intlv_bit > 0) {
                 // on every iteration we add one bit from the input
@@ -547,7 +547,7 @@ class AddrRange
             }
         }
 
-        for (int i = 0; i < masks.size(); i++) {
+        for (unsigned int i = 0; i < masks.size(); i++) {
             const int lsb = ctz64(masks[i]);
             const Addr intlv_bit = bits(intlvMatch, i);
             // Calculate the mask ignoring the LSB
diff --git a/src/mem/packet.hh b/src/mem/packet.hh
index 1283ac98e2..88995f17c4 100644
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@ -1286,7 +1286,7 @@ class Packet : public Printable
             assert(req->getByteEnable().size() == getSize());
             // Write only the enabled bytes
             const uint8_t *base = getConstPtr<uint8_t>();
-            for (int i = 0; i < getSize(); i++) {
+            for (unsigned int i = 0; i < getSize(); i++) {
                 if (req->getByteEnable()[i]) {
                     p[i] = *(base + i);
                 }