Clean up the Range class and associated usages. The code was

never clear about whether the end of the range was inclusive
or exclusive.  Make it inclusive, but also provide a RangeSize()
function that will generate a Range based on a start and a size.
This, in combination with using the comparison operators, makes
almost all usages of the range not care how it is stored.

base/range.cc:
    Make the end of the range inclusive.

    start/end -> first/last
    (end seems too much like end() in stl)
base/range.hh:
    Make the end of the range inclusive.

    Fix all comparison operators so that they work correctly with
    an inclusive range.  Also, when comparing one range to another
    with <, <=, >, >=, we only look at the beginning of the range
    beacuse x <= y should be the same as x < y || x == y.  (This wasn't
    the case before.)

    Add a few functions for making a range:
    RangeSize is start and size
    RangeEx is start and end where end is exclusive
    RangeIn is start and end where end is inclusive

    start/end -> first/last
    (end seems too much like end() in stl)
dev/alpha_console.cc:
dev/baddev.cc:
dev/ide_ctrl.cc:
dev/ns_gige.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
dev/uart.cc:
    Use the RangeSize function to create a range.

--HG--
extra : convert_revision : 29a7eb7fce745680f1c77fefff456c2144bc3994

1 files changed, 4 insertions, 6 deletions

diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc
index 9238a7c7e..8eb41e5cc 100644
--- a/dev/ns_gige.cc
+++ b/dev/ns_gige.cc
@@ -344,8 +344,7 @@ NSGigE::WriteConfig(int offset, int size, uint32_t data)
       case PCI0_BASE_ADDR0:
         if (BARAddrs[0] != 0) {
             if (pioInterface)
-                pioInterface->addAddrRange(BARAddrs[0],
-                                           BARAddrs[0] + BARSize[0] - 1);
+                pioInterface->addAddrRange(RangeSize(BARAddrs[0], BARSize[0]));
 
             BARAddrs[0] &= PA_UNCACHED_MASK;
         }
@@ -353,8 +352,7 @@ NSGigE::WriteConfig(int offset, int size, uint32_t data)
       case PCI0_BASE_ADDR1:
         if (BARAddrs[1] != 0) {
             if (pioInterface)
-                pioInterface->addAddrRange(BARAddrs[1],
-                                           BARAddrs[1] + BARSize[1] - 1);
+                pioInterface->addAddrRange(RangeSize(BARAddrs[1], BARSize[1]));
 
             BARAddrs[1] &= PA_UNCACHED_MASK;
         }
@@ -2410,8 +2408,8 @@ NSGigE::unserialize(Checkpoint *cp, const std::string &section)
      * re-add addrRanges to bus bridges
      */
     if (pioInterface) {
-        pioInterface->addAddrRange(BARAddrs[0], BARAddrs[0] + BARSize[0] - 1);
-        pioInterface->addAddrRange(BARAddrs[1], BARAddrs[1] + BARSize[1] - 1);
+        pioInterface->addAddrRange(RangeSize(BARAddrs[0], BARSize[0]));
+        pioInterface->addAddrRange(RangeSize(BARAddrs[1], BARSize[1]));
     }
 }