From 7329dade9490a247c532cce7dee6e91a03100070 Mon Sep 17 00:00:00 2001
From: Daniel Lubarov <daniel@lubarov.com>
Date: Wed, 2 Mar 2022 22:49:57 -0800
Subject: [PATCH] IS_MUL -> IS_MUL_ADD (#510)

---
 system_zero/src/alu/mod.rs       | 6 +++---
 system_zero/src/alu/mul_add.rs   | 4 ++--
 system_zero/src/registers/alu.rs | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/system_zero/src/alu/mod.rs b/system_zero/src/alu/mod.rs
index 730ca302..b1b05dc2 100644
--- a/system_zero/src/alu/mod.rs
+++ b/system_zero/src/alu/mod.rs
@@ -28,7 +28,7 @@ pub(crate) fn generate_alu<F: PrimeField64>(values: &mut [F; NUM_COLUMNS]) {
         generate_addition(values);
     } else if values[IS_SUB].is_one() {
         generate_subtraction(values);
-    } else if values[IS_MUL].is_one() {
+    } else if values[IS_MUL_ADD].is_one() {
         generate_mul_add(values);
     } else if values[IS_DIV].is_one() {
         generate_division(values);
@@ -42,7 +42,7 @@ pub(crate) fn eval_alu<F: Field, P: PackedField<Scalar = F>>(
     let local_values = &vars.local_values;
 
     // Check that the operation flag values are binary.
-    for col in [IS_ADD, IS_SUB, IS_MUL, IS_DIV] {
+    for col in [IS_ADD, IS_SUB, IS_MUL_ADD, IS_DIV] {
         let val = local_values[col];
         yield_constr.constraint(val * val - val);
     }
@@ -61,7 +61,7 @@ pub(crate) fn eval_alu_recursively<F: RichField + Extendable<D>, const D: usize>
     let local_values = &vars.local_values;
 
     // Check that the operation flag values are binary.
-    for col in [IS_ADD, IS_SUB, IS_MUL, IS_DIV] {
+    for col in [IS_ADD, IS_SUB, IS_MUL_ADD, IS_DIV] {
         let val = local_values[col];
         let constraint = builder.mul_sub_extension(val, val, val);
         yield_constr.constraint(builder, constraint);
diff --git a/system_zero/src/alu/mul_add.rs b/system_zero/src/alu/mul_add.rs
index 53ba34a2..b84cafbf 100644
--- a/system_zero/src/alu/mul_add.rs
+++ b/system_zero/src/alu/mul_add.rs
@@ -36,7 +36,7 @@ pub(crate) fn eval_mul_add<F: Field, P: PackedField<Scalar = F>>(
     local_values: &[P; NUM_COLUMNS],
     yield_constr: &mut ConstraintConsumer<P>,
 ) {
-    let is_mul = local_values[IS_MUL];
+    let is_mul = local_values[IS_MUL_ADD];
     let factor_0 = local_values[COL_MUL_ADD_FACTOR_0];
     let factor_1 = local_values[COL_MUL_ADD_FACTOR_1];
     let addend = local_values[COL_MUL_ADD_ADDEND];
@@ -63,7 +63,7 @@ pub(crate) fn eval_mul_add_recursively<F: RichField + Extendable<D>, const D: us
     local_values: &[ExtensionTarget<D>; NUM_COLUMNS],
     yield_constr: &mut RecursiveConstraintConsumer<F, D>,
 ) {
-    let is_mul = local_values[IS_MUL];
+    let is_mul = local_values[IS_MUL_ADD];
     let factor_0 = local_values[COL_MUL_ADD_FACTOR_0];
     let factor_1 = local_values[COL_MUL_ADD_FACTOR_1];
     let addend = local_values[COL_MUL_ADD_ADDEND];
diff --git a/system_zero/src/registers/alu.rs b/system_zero/src/registers/alu.rs
index 6a9412a1..585ecab1 100644
--- a/system_zero/src/registers/alu.rs
+++ b/system_zero/src/registers/alu.rs
@@ -2,8 +2,8 @@
 
 pub(crate) const IS_ADD: usize = super::START_ALU;
 pub(crate) const IS_SUB: usize = IS_ADD + 1;
-pub(crate) const IS_MUL: usize = IS_SUB + 1;
-pub(crate) const IS_DIV: usize = IS_MUL + 1;
+pub(crate) const IS_MUL_ADD: usize = IS_SUB + 1;
+pub(crate) const IS_DIV: usize = IS_MUL_ADD + 1;
 
 const START_SHARED_COLS: usize = IS_DIV + 1;