Merge pull request #191 from bgamari/ioreg-fixes

A few ioreg! fixes

src/ioreg/builder/union.rs

@@ -61,7 +61,7 @@ impl<'a> Iterator<RegOrPadding<'a>> for PaddedRegsIterator<'a> {
       let ref reg = self.sorted_regs[self.index];
       if reg.offset > self.last_offset {
         let pad_length = reg.offset - self.last_offset;
-        self.last_offset = reg.offset + reg.size();
+        self.last_offset = reg.offset;
         Some(Pad(pad_length))
       } else {
         self.index += 1;

src/ioreg/test.rs

@@ -139,4 +139,38 @@ mod test {
       assert_eq!(get_value(&test, 0), 0x1 | 0x3<<8)
     }
   )
+
+  ioregs!(GAP_TEST = {
+    0x0 => reg32 reg1 {
+      0..31 => field,
+    }
+    0x10 => reg32 reg2 {
+      0..31 => field,
+    }
+    0x14 => reg32 reg3 {
+      0..31 => field,
+    }
+    0x20 => reg32 reg4 {
+      0..31 => field,
+    }
+  })
+
+  describe!(
+    before_each {
+      let test: GAP_TEST = zeroed_safe();
+      let base = &test as *const GAP_TEST;
+    }
+    it "has zero base offset" {
+      let addr = &test.reg1 as *const GAP_TEST_reg1;
+      assert_eq!(addr.to_uint() - base.to_uint(), 0x0)
+    }
+    it "computes the correct first gap" {
+      let addr = &test.reg2 as *const GAP_TEST_reg2;
+      assert_eq!(addr.to_uint() - base.to_uint(), 0x10)
+    }
+    it "computes the correct second gap" {
+      let addr = &test.reg4 as *const GAP_TEST_reg4;
+      assert_eq!(addr.to_uint() - base.to_uint(), 0x20)
+    }
+  )
 }