cmov: group impl blocks by trait in portable backend (#1344)

Orders the impls so the `Cmov` impls for `u16`, `u32`, and `u64` come
first, followed by the respective `CmovEq` impls.

Author: tarcieri

cmov/src/portable.rs

@@ -26,52 +26,52 @@ impl Cmov for u16 {
     }
 }
 
-// Uses `CmovEq` impl for `u32`
-impl CmovEq for u16 {
+impl Cmov for u32 {
     #[inline]
-    fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
-        u32::from(*self).cmovne(&(*rhs).into(), input, output);
+    fn cmovnz(&mut self, value: &Self, condition: Condition) {
+        *self = masksel(*self, *value, masknz32(condition.into()));
     }
 
     #[inline]
-    fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
-        u32::from(*self).cmoveq(&(*rhs).into(), input, output);
+    fn cmovz(&mut self, value: &Self, condition: Condition) {
+        *self = masksel(*self, *value, !masknz32(condition.into()));
     }
 }
 
-impl Cmov for u32 {
+impl Cmov for u64 {
     #[inline]
     fn cmovnz(&mut self, value: &Self, condition: Condition) {
-        *self = masksel(*self, *value, masknz32(condition.into()));
+        *self = masksel(*self, *value, masknz64(condition.into()));
     }
 
     #[inline]
     fn cmovz(&mut self, value: &Self, condition: Condition) {
-        *self = masksel(*self, *value, !masknz32(condition.into()));
+        *self = masksel(*self, *value, !masknz64(condition.into()));
     }
 }
 
-impl CmovEq for u32 {
+// Uses `CmovEq` impl for `u32`
+impl CmovEq for u16 {
     #[inline]
     fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
-        *output = masksel(*output, input, (maskne32(*self, *rhs) & 0xFF) as u8);
+        u32::from(*self).cmovne(&(*rhs).into(), input, output);
     }
 
     #[inline]
     fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
-        *output = masksel(*output, input, (maskeq32(*self, *rhs) & 0xFF) as u8);
+        u32::from(*self).cmoveq(&(*rhs).into(), input, output);
     }
 }
 
-impl Cmov for u64 {
+impl CmovEq for u32 {
     #[inline]
-    fn cmovnz(&mut self, value: &Self, condition: Condition) {
-        *self = masksel(*self, *value, masknz64(condition.into()));
+    fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
+        *output = masksel(*output, input, (maskne32(*self, *rhs) & 0xFF) as u8);
     }
 
     #[inline]
-    fn cmovz(&mut self, value: &Self, condition: Condition) {
-        *self = masksel(*self, *value, !masknz64(condition.into()));
+    fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
+        *output = masksel(*output, input, (maskeq32(*self, *rhs) & 0xFF) as u8);
     }
 }
 
@@ -88,21 +88,25 @@ impl CmovEq for u64 {
 }
 
 /// Returns `u32::MAX` if `x` is equal to `y`, otherwise returns `0` (32-bit version)
+#[inline]
 fn maskeq32(x: u32, y: u32) -> u32 {
     !maskne32(x, y)
 }
 
 /// Returns `u32::MAX` if `x` is equal to `y`, otherwise returns `0` (64-bit version)
+#[inline]
 fn maskeq64(x: u64, y: u64) -> u64 {
     !maskne64(x, y)
 }
 
 /// Returns `0` if `x` is equal to `y`, otherwise returns `1` (32-bit version)
+#[inline]
 fn maskne32(x: u32, y: u32) -> u32 {
     masknz32(x ^ y)
 }
 
 /// Returns `0` if `x` is equal to `y`, otherwise returns `1` (64-bit version)
+#[inline]
 fn maskne64(x: u64, y: u64) -> u64 {
     masknz64(x ^ y)
 }