tool: fix memory ranges overlapping checks

Previously, ranges_overlap() returns true if two inclusive ranges
overlap. But builder.rs was passing half-open ranges which caused the
tool to report that two memory regions are overlapping when in reality
they were not.

This commit changed ranges_overlap() to work on half-open ranges instead

Signed-off-by: Bill Nguyen <bill.nguyen@unsw.edu.au>

Author: dreamliner787-9

tool/microkit/src/sdf.rs

@@ -1845,11 +1845,11 @@ pub fn parse(filename: &str, xml: &str, config: &Config) -> Result<SystemDescrip
     for pd in &pds {
         for this_ioport in &pd.ioports {
             for (seen_pd_name, seen_ioport) in &seen_ioports {
-                let left_range = this_ioport.addr..this_ioport.addr + this_ioport.size - 1;
-                let right_range = seen_ioport.addr..seen_ioport.addr + seen_ioport.size - 1;
+                let left_range = this_ioport.addr..this_ioport.addr + this_ioport.size;
+                let right_range = seen_ioport.addr..seen_ioport.addr + seen_ioport.size;
                 if ranges_overlap(&left_range, &right_range) {
                     return Err(format!(
-                            "Error: I/O port id: {}, inclusive range: [{:#x}, {:#x}] in protection domain: '{}' @ {}:{}:{} overlaps with I/O port id: {}, inclusive range: [{:#x}, {:#x}] in protection domain: '{}' @ {}:{}:{}",
+                            "Error: I/O port id: {}, half-open range: [{:#x}, {:#x}) in protection domain: '{}' @ {}:{}:{} overlaps with I/O port id: {}, half-open range: [{:#x}, {:#x}) in protection domain: '{}' @ {}:{}:{}",
                             this_ioport.id,
                             left_range.start,
                             left_range.end,

tool/microkit/src/util.rs

@@ -68,9 +68,9 @@ pub fn mask(n: u64) -> u64 {
     (1 << n) - 1
 }
 
-/// Returns true if two ranges overlap.
+/// Returns true if two [x..y) ranges overlap.
 pub fn ranges_overlap<T: PartialOrd>(left: &Range<T>, right: &Range<T>) -> bool {
-    left.start <= right.end && right.start <= left.end
+    !(left.end <= right.start || right.end <= left.start)
 }
 
 /// Product a 'human readable' string for the size.

tool/microkit/tests/test.rs

@@ -533,15 +533,15 @@ mod protection_domain {
     fn test_overlapping_x86_io_ports_1() {
         check_error(&DEFAULT_X86_64_KERNEL_CONFIG,
             "pd_overlapping_x86_io_ports_1.system",
-            "Error: I/O port id: 1, inclusive range: [0x3ff, 0x406] in protection domain: 'test1' @ pd_overlapping_x86_io_ports_1.system:8:5 overlaps with I/O port id: 0, inclusive range: [0x3f8, 0x3ff] in protection domain: 'test1' @ pd_overlapping_x86_io_ports_1.system:8:5"
+            "Error: I/O port id: 1, half-open range: [0x3ff, 0x407) in protection domain: 'test1' @ pd_overlapping_x86_io_ports_1.system:8:5 overlaps with I/O port id: 0, half-open range: [0x3f8, 0x400) in protection domain: 'test1' @ pd_overlapping_x86_io_ports_1.system:8:5"
         )
     }
 
     #[test]
     fn test_overlapping_x86_io_ports_2() {
         check_error(&DEFAULT_X86_64_KERNEL_CONFIG,
             "pd_overlapping_x86_io_ports_2.system",
-            "Error: I/O port id: 0, inclusive range: [0x3ff, 0x406] in protection domain: 'test2' @ pd_overlapping_x86_io_ports_2.system:13:5 overlaps with I/O port id: 0, inclusive range: [0x3f8, 0x3ff] in protection domain: 'test1' @ pd_overlapping_x86_io_ports_2.system:8:5"
+            "Error: I/O port id: 0, half-open range: [0x3ff, 0x407) in protection domain: 'test2' @ pd_overlapping_x86_io_ports_2.system:13:5 overlaps with I/O port id: 0, half-open range: [0x3f8, 0x400) in protection domain: 'test1' @ pd_overlapping_x86_io_ports_2.system:8:5"
         )
     }