CopyCircuit hi-lo changes

bus-mapping/src/circuit_input_builder/execution.rs

@@ -350,11 +350,35 @@ impl_expr!(CopyDataType, u64::from);
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct CopyStep {
     /// Byte value copied in this step.
-    pub value: u8,
+    pub half_word: [u8; 16],
     /// Byte value before this step.
-    pub prev_value: u8,
+    pub prev_half_word: [u8; 16],
     /// mask indicates this byte won't be copied.
-    pub mask: bool,
+    pub mask: [bool; 16],
+}
+
+impl From<&[(u8, bool, bool)]> for CopyStep {
+    fn from(steps: &[(u8, bool, bool)]) -> Self {
+        assert_eq!(steps.len(), 16, "steps length should be 16");
+        let bytes: [u8; 16] = steps
+            .iter()
+            .copied()
+            .map(|(v, _, _)| v)
+            .collect::<Vec<_>>()
+            .try_into()
+            .unwrap();
+        Self {
+            half_word: bytes,
+            prev_half_word: bytes,
+            mask: steps
+                .iter()
+                .copied()
+                .map(|(_, _, m)| m)
+                .collect::<Vec<_>>()
+                .try_into()
+                .unwrap(),
+        }
+    }
 }
 
 /// Defines an enum type that can hold either a number or a hash value.

gadgets/src/less_than.rs

@@ -55,6 +55,18 @@ impl<F: Field, const N_BYTES: usize> LtConfig<F, N_BYTES> {
         let rotation = rotation.unwrap_or_else(Rotation::cur);
         sum::expr(self.diff.iter().map(|c| meta.query_advice(*c, rotation)))
     }
+
+    /// Annotates the Lt chip's columns.
+    pub fn annotate<N, AR>(&self, region: &mut Region<'_, F>, name: N)
+    where
+        N: Fn() -> AR,
+        AR: Into<String>,
+    {
+        region.name_column(|| format!("{}.lt", name().into()), self.lt);
+        for (idx, diff_column) in self.diff.iter().enumerate() {
+            region.name_column(|| format!("{}.diff[{}]", name().into(), idx), *diff_column);
+        }
+    }
 }
 
 /// Chip that compares lhs < rhs.