Add assert about aligned addresses

near · Feb 1, 2024 · d7de340 · d7de340
1 parent f4fe1a2
commit d7de340
Show file tree

Hide file tree

Showing 6 changed files with 436 additions and 210 deletions.
diff --git a/cranelift/codegen/src/isa/zkasm/inst/emit.rs b/cranelift/codegen/src/isa/zkasm/inst/emit.rs
@@ -591,6 +591,11 @@ impl MachInstEmit for Inst {
                 match from {
                     AMode::RegOffset(r, ..) => {
                         debug_assert_eq!(r, e0());
+                        // For simplicity we assume that register address is word-aligned.
+                        // This was the case for Rust-generated code, but might be violated in the
+                        // future.
+                        put_string(&format!("${{ {} % 8 }} => A\n", reg_name(r)), sink);
+                        put_string(&format!("0: ASSERT\n"), sink);
                         // TODO(#43): Implement the conversion using verifiable computations.
                         put_string(
                             &format!(
@@ -689,6 +694,11 @@ impl MachInstEmit for Inst {
                 match to {
                     AMode::RegOffset(r, ..) => {
                         debug_assert_eq!(r, e0());
+                        // For simplicity we assume that register address is word-aligned.
+                        // This was the case for Rust-generated code, but might be violated in the
+                        // future.
+                        put_string(&format!("${{ {} % 8 }} => A\n", reg_name(r)), sink);
+                        put_string(&format!("0: ASSERT\n"), sink);
                         // TODO(#43): Implement the conversion using verifiable computations.
                         put_string(
                             &format!(

diff --git a/cranelift/codegen/src/isa/zkasm/inst/mod.rs b/cranelift/codegen/src/isa/zkasm/inst/mod.rs
@@ -337,6 +337,7 @@ fn zkasm_get_operands<F: Fn(VReg) -> VReg>(inst: &Inst, collector: &mut OperandC
                 collector.reg_fixed_use(r, e0());
             }
             let mut clobbered = PRegSet::empty();
+            clobbered.add(a0().to_real_reg().unwrap().into());
             clobbered.add(d0().to_real_reg().unwrap().into());
             collector.reg_clobbers(clobbered);
             collector.reg_def(rd);
@@ -346,6 +347,7 @@ fn zkasm_get_operands<F: Fn(VReg) -> VReg>(inst: &Inst, collector: &mut OperandC
                 collector.reg_fixed_use(r, e0());
             }
             let mut clobbered = PRegSet::empty();
+            clobbered.add(a0().to_real_reg().unwrap().into());
             clobbered.add(d0().to_real_reg().unwrap().into());
             collector.reg_clobbers(clobbered);
             collector.reg_late_use(src);