Auto merge of #1342 - psumbera:master, r=emilio

Fix bitfields on big-endian machines. Fixes #1340
rust-lang · Jul 1, 2018 · c3955dd · c3955dd
2 parents 0176a76 + a642894
commit c3955dd
Show file tree

Hide file tree

Showing 29 changed files with 754 additions and 144 deletions.
diff --git a/src/codegen/bitfield_unit.rs b/src/codegen/bitfield_unit.rs
@@ -27,7 +27,12 @@ where
         let byte_index = index / 8;
         let byte = self.storage.as_ref()[byte_index];
 
-        let bit_index = index % 8;
+        let mut bit_index = index % 8;
+        #[cfg(target_endian = "big")]
+        {
+            // Adjust the index for endianness.
+            bit_index = 7 - bit_index;
+        }
         let mask = 1 << bit_index;
 
         byte & mask == mask
@@ -40,7 +45,12 @@ where
         let byte_index = index / 8;
         let byte = &mut self.storage.as_mut()[byte_index];
 
-        let bit_index = index % 8;
+        let mut bit_index = index % 8;
+        #[cfg(target_endian = "big")]
+        {
+            // Adjust the index for endianness.
+            bit_index = 7 - bit_index;
+        }
         let mask = 1 << bit_index;
 
         if val {
@@ -60,7 +70,13 @@ where
 
         for i in 0..(bit_width as usize) {
             if self.get_bit(i + bit_offset) {
-                val |= 1 << i;
+                let mut index  = i;
+                #[cfg(target_endian = "big")]
+                {
+                   // Adjust the index for endianness.
+                   index  = bit_width as usize - 1 - index;
+                }
+                val |= 1 << index;
             }
         }
 
@@ -76,7 +92,13 @@ where
         for i in 0..(bit_width as usize) {
             let mask = 1 << i;
             let val_bit_is_set = val & mask == mask;
-            self.set_bit(i + bit_offset, val_bit_is_set);
+            let mut index  = i;
+            #[cfg(target_endian = "big")]
+            {
+                // Adjust the index for endianness.
+                index  = bit_width as usize - 1 - index;
+            }
+            self.set_bit(index + bit_offset, val_bit_is_set);
         }
     }
 }
diff --git a/tests/expectations/tests/bitfield-32bit-overflow.rs b/tests/expectations/tests/bitfield-32bit-overflow.rs
@@ -28,7 +28,12 @@ where
         let byte_index = index / 8;
         let byte = self.storage.as_ref()[byte_index];
 
-        let bit_index = index % 8;
+        let mut bit_index = index % 8;
+        #[cfg(target_endian = "big")]
+        {
+            // Adjust the index for endianness.
+            bit_index = 7 - bit_index;
+        }
         let mask = 1 << bit_index;
 
         byte & mask == mask
@@ -41,7 +46,12 @@ where
         let byte_index = index / 8;
         let byte = &mut self.storage.as_mut()[byte_index];
 
-        let bit_index = index % 8;
+        let mut bit_index = index % 8;
+        #[cfg(target_endian = "big")]
+        {
+            // Adjust the index for endianness.
+            bit_index = 7 - bit_index;
+        }
         let mask = 1 << bit_index;
 
         if val {
@@ -61,7 +71,13 @@ where
 
         for i in 0..(bit_width as usize) {
             if self.get_bit(i + bit_offset) {
-                val |= 1 << i;
+                let mut index = i;
+                #[cfg(target_endian = "big")]
+                {
+                    // Adjust the index for endianness.
+                    index = bit_width as usize - 1 - index;
+                }
+                val |= 1 << index;
             }
         }
 
@@ -77,7 +93,13 @@ where
         for i in 0..(bit_width as usize) {
             let mask = 1 << i;
             let val_bit_is_set = val & mask == mask;
-            self.set_bit(i + bit_offset, val_bit_is_set);
+            let mut index = i;
+            #[cfg(target_endian = "big")]
+            {
+                // Adjust the index for endianness.
+                index = bit_width as usize - 1 - index;
+            }
+            self.set_bit(index + bit_offset, val_bit_is_set);
         }
     }
 }

diff --git a/tests/expectations/tests/bitfield-large.rs b/tests/expectations/tests/bitfield-large.rs
@@ -1,9 +1,7 @@
 /* automatically generated by rust-bindgen */
 
-
 #![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
 
-
 #[repr(C)]
 #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct __BindgenBitfieldUnit<Storage, Align>
@@ -30,7 +28,12 @@ where
         let byte_index = index / 8;
         let byte = self.storage.as_ref()[byte_index];
 
-        let bit_index = index % 8;
+        let mut bit_index = index % 8;
+        #[cfg(target_endian = "big")]
+        {
+            // Adjust the index for endianness.
+            bit_index = 7 - bit_index;
+        }
         let mask = 1 << bit_index;
 
         byte & mask == mask
@@ -43,7 +46,12 @@ where
         let byte_index = index / 8;
         let byte = &mut self.storage.as_mut()[byte_index];
 
-        let bit_index = index % 8;
+        let mut bit_index = index % 8;
+        #[cfg(target_endian = "big")]
+        {
+            // Adjust the index for endianness.
+            bit_index = 7 - bit_index;
+        }
         let mask = 1 << bit_index;
 
         if val {
@@ -63,7 +71,13 @@ where
 
         for i in 0..(bit_width as usize) {
             if self.get_bit(i + bit_offset) {
-                val |= 1 << i;
+                let mut index = i;
+                #[cfg(target_endian = "big")]
+                {
+                    // Adjust the index for endianness.
+                    index = bit_width as usize - 1 - index;
+                }
+                val |= 1 << index;
             }
         }
 
@@ -79,7 +93,13 @@ where
         for i in 0..(bit_width as usize) {
             let mask = 1 << i;
             let val_bit_is_set = val & mask == mask;
-            self.set_bit(i + bit_offset, val_bit_is_set);
+            let mut index = i;
+            #[cfg(target_endian = "big")]
+            {
+                // Adjust the index for endianness.
+                index = bit_width as usize - 1 - index;
+            }
+            self.set_bit(index + bit_offset, val_bit_is_set);
         }
     }
 }

diff --git a/tests/expectations/tests/bitfield-method-same-name.rs b/tests/expectations/tests/bitfield-method-same-name.rs
@@ -1,9 +1,7 @@
 /* automatically generated by rust-bindgen */
 
-
 #![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
 
-
 #[repr(C)]
 #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct __BindgenBitfieldUnit<Storage, Align>
@@ -30,7 +28,12 @@ where
         let byte_index = index / 8;
         let byte = self.storage.as_ref()[byte_index];
 
-        let bit_index = index % 8;
+        let mut bit_index = index % 8;
+        #[cfg(target_endian = "big")]
+        {
+            // Adjust the index for endianness.
+            bit_index = 7 - bit_index;
+        }
         let mask = 1 << bit_index;
 
         byte & mask == mask
@@ -43,7 +46,12 @@ where
         let byte_index = index / 8;
         let byte = &mut self.storage.as_mut()[byte_index];
 
-        let bit_index = index % 8;
+        let mut bit_index = index % 8;
+        #[cfg(target_endian = "big")]
+        {
+            // Adjust the index for endianness.
+            bit_index = 7 - bit_index;
+        }
         let mask = 1 << bit_index;
 
         if val {
@@ -63,7 +71,13 @@ where
 
         for i in 0..(bit_width as usize) {
             if self.get_bit(i + bit_offset) {
-                val |= 1 << i;
+                let mut index = i;
+                #[cfg(target_endian = "big")]
+                {
+                    // Adjust the index for endianness.
+                    index = bit_width as usize - 1 - index;
+                }
+                val |= 1 << index;
             }
         }
 
@@ -79,7 +93,13 @@ where
         for i in 0..(bit_width as usize) {
             let mask = 1 << i;
             let val_bit_is_set = val & mask == mask;
-            self.set_bit(i + bit_offset, val_bit_is_set);
+            let mut index = i;
+            #[cfg(target_endian = "big")]
+            {
+                // Adjust the index for endianness.
+                index = bit_width as usize - 1 - index;
+            }
+            self.set_bit(index + bit_offset, val_bit_is_set);
         }
     }
 }

diff --git a/tests/expectations/tests/bitfield_align.rs b/tests/expectations/tests/bitfield_align.rs
@@ -28,7 +28,12 @@ where
         let byte_index = index / 8;
         let byte = self.storage.as_ref()[byte_index];
 
-        let bit_index = index % 8;
+        let mut bit_index = index % 8;
+        #[cfg(target_endian = "big")]
+        {
+            // Adjust the index for endianness.
+            bit_index = 7 - bit_index;
+        }
         let mask = 1 << bit_index;
 
         byte & mask == mask
@@ -41,7 +46,12 @@ where
         let byte_index = index / 8;
         let byte = &mut self.storage.as_mut()[byte_index];
 
-        let bit_index = index % 8;
+        let mut bit_index = index % 8;
+        #[cfg(target_endian = "big")]
+        {
+            // Adjust the index for endianness.
+            bit_index = 7 - bit_index;
+        }
         let mask = 1 << bit_index;
 
         if val {
@@ -61,7 +71,13 @@ where
 
         for i in 0..(bit_width as usize) {
             if self.get_bit(i + bit_offset) {
-                val |= 1 << i;
+                let mut index = i;
+                #[cfg(target_endian = "big")]
+                {
+                    // Adjust the index for endianness.
+                    index = bit_width as usize - 1 - index;
+                }
+                val |= 1 << index;
             }
         }
 
@@ -77,7 +93,13 @@ where
         for i in 0..(bit_width as usize) {
             let mask = 1 << i;
             let val_bit_is_set = val & mask == mask;
-            self.set_bit(i + bit_offset, val_bit_is_set);
+            let mut index = i;
+            #[cfg(target_endian = "big")]
+            {
+                // Adjust the index for endianness.
+                index = bit_width as usize - 1 - index;
+            }
+            self.set_bit(index + bit_offset, val_bit_is_set);
         }
     }
 }

diff --git a/tests/expectations/tests/bitfield_align_2.rs b/tests/expectations/tests/bitfield_align_2.rs
@@ -28,7 +28,12 @@ where
         let byte_index = index / 8;
         let byte = self.storage.as_ref()[byte_index];
 
-        let bit_index = index % 8;
+        let mut bit_index = index % 8;
+        #[cfg(target_endian = "big")]
+        {
+            // Adjust the index for endianness.
+            bit_index = 7 - bit_index;
+        }
         let mask = 1 << bit_index;
 
         byte & mask == mask
@@ -41,7 +46,12 @@ where
         let byte_index = index / 8;
         let byte = &mut self.storage.as_mut()[byte_index];
 
-        let bit_index = index % 8;
+        let mut bit_index = index % 8;
+        #[cfg(target_endian = "big")]
+        {
+            // Adjust the index for endianness.
+            bit_index = 7 - bit_index;
+        }
         let mask = 1 << bit_index;
 
         if val {
@@ -61,7 +71,13 @@ where
 
         for i in 0..(bit_width as usize) {
             if self.get_bit(i + bit_offset) {
-                val |= 1 << i;
+                let mut index = i;
+                #[cfg(target_endian = "big")]
+                {
+                    // Adjust the index for endianness.
+                    index = bit_width as usize - 1 - index;
+                }
+                val |= 1 << index;
             }
         }
 
@@ -77,7 +93,13 @@ where
         for i in 0..(bit_width as usize) {
             let mask = 1 << i;
             let val_bit_is_set = val & mask == mask;
-            self.set_bit(i + bit_offset, val_bit_is_set);
+            let mut index = i;
+            #[cfg(target_endian = "big")]
+            {
+                // Adjust the index for endianness.
+                index = bit_width as usize - 1 - index;
+            }
+            self.set_bit(index + bit_offset, val_bit_is_set);
         }
     }
 }