From ba844a24033f9b655c395ccbc938f3a7cf45b644 Mon Sep 17 00:00:00 2001
From: 4l0n50 <alonso.gon@gmail.com>
Date: Wed, 12 Apr 2023 17:35:32 +0200
Subject: [PATCH] Change shl/shr behavior as well as BASIC_TERNARY_OP

---
 evm/src/cpu/cpu_stark.rs |  4 ++--
 evm/src/cpu/stack.rs     | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/evm/src/cpu/cpu_stark.rs b/evm/src/cpu/cpu_stark.rs
index 09c7d576..74e8fbd7 100644
--- a/evm/src/cpu/cpu_stark.rs
+++ b/evm/src/cpu/cpu_stark.rs
@@ -156,7 +156,7 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for CpuStark<F, D
         pc::eval_packed(local_values, yield_constr);
         shift::eval_packed(local_values, yield_constr);
         simple_logic::eval_packed(local_values, yield_constr);
-        stack::eval_packed(local_values, &mut dummy_yield_constr);
+        stack::eval_packed(local_values, yield_constr);
         stack_bounds::eval_packed(local_values, &mut dummy_yield_constr);
         syscalls::eval_packed(local_values, next_values, yield_constr);
     }
@@ -186,7 +186,7 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for CpuStark<F, D
         pc::eval_ext_circuit(builder, local_values, yield_constr);
         shift::eval_ext_circuit(builder, local_values, yield_constr);
         simple_logic::eval_ext_circuit(builder, local_values, yield_constr);
-        stack::eval_ext_circuit(builder, local_values, &mut dummy_yield_constr);
+        stack::eval_ext_circuit(builder, local_values, yield_constr);
         stack_bounds::eval_ext_circuit(builder, local_values, &mut dummy_yield_constr);
         syscalls::eval_ext_circuit(builder, local_values, next_values, yield_constr);
     }
diff --git a/evm/src/cpu/stack.rs b/evm/src/cpu/stack.rs
index e9258172..f5e9c78c 100644
--- a/evm/src/cpu/stack.rs
+++ b/evm/src/cpu/stack.rs
@@ -29,7 +29,7 @@ const BASIC_BINARY_OP: Option<StackBehavior> = Some(StackBehavior {
     disable_other_channels: true,
 });
 const BASIC_TERNARY_OP: Option<StackBehavior> = Some(StackBehavior {
-    num_pops: 2,
+    num_pops: 3,
     pushes: true,
     disable_other_channels: true,
 });
@@ -60,8 +60,16 @@ const STACK_BEHAVIORS: OpsColumnsView<Option<StackBehavior>> = OpsColumnsView {
     xor: BASIC_BINARY_OP,
     not: BASIC_UNARY_OP,
     byte: BASIC_BINARY_OP,
-    shl: BASIC_BINARY_OP,
-    shr: BASIC_BINARY_OP,
+    shl: Some(StackBehavior {
+        num_pops: 2,
+        pushes: true,
+        disable_other_channels: false,
+    }),
+    shr: Some(StackBehavior {
+        num_pops: 2,
+        pushes: true,
+        disable_other_channels: false,
+    }),
     keccak_general: None, // TODO
     prover_input: None,   // TODO
     pop: None,            // TODO