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, 14 insertions, 18 deletions

diff --git a/dev/ide_ctrl.cc b/dev/ide_ctrl.cc
index e40248461..dbec6d743 100644
--- a/dev/ide_ctrl.cc
+++ b/dev/ide_ctrl.cc
@@ -377,8 +377,8 @@ IdeController::WriteConfig(int offset, int size, uint32_t data)
         if (BARAddrs[0] != 0) {
             pri_cmd_addr = BARAddrs[0];
             if (pioInterface)
-                pioInterface->addAddrRange(pri_cmd_addr,
-                                           pri_cmd_addr + pri_cmd_size - 1);
+                pioInterface->addAddrRange(RangeSize(pri_cmd_addr,
+                                                     pri_cmd_size));
 
             pri_cmd_addr &= PA_UNCACHED_MASK;
         }
@@ -388,8 +388,8 @@ IdeController::WriteConfig(int offset, int size, uint32_t data)
         if (BARAddrs[1] != 0) {
             pri_ctrl_addr = BARAddrs[1];
             if (pioInterface)
-                pioInterface->addAddrRange(pri_ctrl_addr,
-                                           pri_ctrl_addr + pri_ctrl_size - 1);
+                pioInterface->addAddrRange(RangeSize(pri_ctrl_addr,
+                                                     pri_ctrl_size));
 
             pri_ctrl_addr &= PA_UNCACHED_MASK;
         }
@@ -399,8 +399,8 @@ IdeController::WriteConfig(int offset, int size, uint32_t data)
         if (BARAddrs[2] != 0) {
             sec_cmd_addr = BARAddrs[2];
             if (pioInterface)
-                pioInterface->addAddrRange(sec_cmd_addr,
-                                           sec_cmd_addr + sec_cmd_size - 1);
+                pioInterface->addAddrRange(RangeSize(sec_cmd_addr,
+                                                     sec_cmd_size));
 
             sec_cmd_addr &= PA_UNCACHED_MASK;
         }
@@ -410,8 +410,8 @@ IdeController::WriteConfig(int offset, int size, uint32_t data)
         if (BARAddrs[3] != 0) {
             sec_ctrl_addr = BARAddrs[3];
             if (pioInterface)
-                pioInterface->addAddrRange(sec_ctrl_addr,
-                                           sec_ctrl_addr + sec_ctrl_size - 1);
+                pioInterface->addAddrRange(RangeSize(sec_ctrl_addr,
+                                                     sec_ctrl_size));
 
             sec_ctrl_addr &= PA_UNCACHED_MASK;
         }
@@ -421,7 +421,7 @@ IdeController::WriteConfig(int offset, int size, uint32_t data)
         if (BARAddrs[4] != 0) {
             bmi_addr = BARAddrs[4];
             if (pioInterface)
-                pioInterface->addAddrRange(bmi_addr, bmi_addr + bmi_size - 1);
+                pioInterface->addAddrRange(RangeSize(bmi_addr, bmi_size));
 
             bmi_addr &= PA_UNCACHED_MASK;
         }
@@ -675,15 +675,11 @@ IdeController::unserialize(Checkpoint *cp, const std::string &section)
     UNSERIALIZE_ARRAY(cmd_in_progress, 4);
 
     if (pioInterface) {
-        pioInterface->addAddrRange(pri_cmd_addr, pri_cmd_addr +
-                                   pri_cmd_size - 1);
-        pioInterface->addAddrRange(pri_ctrl_addr, pri_ctrl_addr +
-                                   pri_ctrl_size - 1);
-        pioInterface->addAddrRange(sec_cmd_addr, sec_cmd_addr +
-                                   sec_cmd_size - 1);
-        pioInterface->addAddrRange(sec_ctrl_addr, sec_ctrl_addr +
-                                   sec_ctrl_size - 1);
-        pioInterface->addAddrRange(bmi_addr, bmi_addr + bmi_size - 1);
+        pioInterface->addAddrRange(RangeSize(pri_cmd_addr, pri_cmd_size));
+        pioInterface->addAddrRange(RangeSize(pri_ctrl_addr, pri_ctrl_size));
+        pioInterface->addAddrRange(RangeSize(sec_cmd_addr, sec_cmd_size));
+        pioInterface->addAddrRange(RangeSize(sec_ctrl_addr, sec_ctrl_size));
+        pioInterface->addAddrRange(RangeSize(bmi_addr, bmi_size));
    }
 }