Opcode SHL

zkevm-circuits/src/evm_circuit/execution.rs

@@ -55,14 +55,13 @@ mod logs;
 mod memory;
 mod memory_copy;
 mod msize;
-mod mul_div_mod;
+mod mul_div_mod_shl_shr;
 mod mulmod;
 mod origin;
 mod pc;
 mod pop;
 mod push;
 mod selfbalance;
-mod shr;
 mod signed_comparator;
 mod signextend;
 mod sload;
@@ -103,14 +102,13 @@ use logs::LogGadget;
 use memory::MemoryGadget;
 use memory_copy::CopyToMemoryGadget;
 use msize::MsizeGadget;
-use mul_div_mod::MulDivModGadget;
+use mul_div_mod_shl_shr::MulDivModShlShrGadget;
 use mulmod::MulModGadget;
 use origin::OriginGadget;
 use pc::PcGadget;
 use pop::PopGadget;
 use push::PushGadget;
 use selfbalance::SelfbalanceGadget;
-use shr::ShrGadget;
 use signed_comparator::SignedComparatorGadget;
 use signextend::SignextendGadget;
 use sload::SloadGadget;
@@ -180,14 +178,13 @@ pub(crate) struct ExecutionConfig<F> {
     log_gadget: LogGadget<F>,
     memory_gadget: MemoryGadget<F>,
     msize_gadget: MsizeGadget<F>,
-    mul_div_mod_gadget: MulDivModGadget<F>,
+    mul_div_mod_shl_shr_gadget: MulDivModShlShrGadget<F>,
     mulmod_gadget: MulModGadget<F>,
     origin_gadget: OriginGadget<F>,
     pc_gadget: PcGadget<F>,
     pop_gadget: PopGadget<F>,
     push_gadget: PushGadget<F>,
     selfbalance_gadget: SelfbalanceGadget<F>,
-    shr_gadget: ShrGadget<F>,
     sha3_gadget: DummyGadget<F, 2, 1, { ExecutionState::SHA3 }>,
     signed_comparator_gadget: SignedComparatorGadget<F>,
     signextend_gadget: SignextendGadget<F>,
@@ -373,15 +370,14 @@ impl<F: Field> ExecutionConfig<F> {
             log_gadget: configure_gadget!(),
             memory_gadget: configure_gadget!(),
             msize_gadget: configure_gadget!(),
-            mul_div_mod_gadget: configure_gadget!(),
+            mul_div_mod_shl_shr_gadget: configure_gadget!(),
             mulmod_gadget: configure_gadget!(),
             origin_gadget: configure_gadget!(),
             pc_gadget: configure_gadget!(),
             pop_gadget: configure_gadget!(),
             push_gadget: configure_gadget!(),
             selfbalance_gadget: configure_gadget!(),
             sha3_gadget: configure_gadget!(),
-            shr_gadget: configure_gadget!(),
             signed_comparator_gadget: configure_gadget!(),
             signextend_gadget: configure_gadget!(),
             sload_gadget: configure_gadget!(),
@@ -811,7 +807,9 @@ impl<F: Field> ExecutionConfig<F> {
             ExecutionState::LOG => assign_exec_step!(self.log_gadget),
             ExecutionState::MEMORY => assign_exec_step!(self.memory_gadget),
             ExecutionState::MSIZE => assign_exec_step!(self.msize_gadget),
-            ExecutionState::MUL_DIV_MOD => assign_exec_step!(self.mul_div_mod_gadget),
+            ExecutionState::MUL_DIV_MOD_SHL_SHR => {
+                assign_exec_step!(self.mul_div_mod_shl_shr_gadget)
+            }
             ExecutionState::MULMOD => assign_exec_step!(self.mulmod_gadget),
             ExecutionState::ORIGIN => assign_exec_step!(self.origin_gadget),
             ExecutionState::PC => assign_exec_step!(self.pc_gadget),
@@ -823,7 +821,6 @@ impl<F: Field> ExecutionConfig<F> {
             ExecutionState::BLOCKCTXU256 => assign_exec_step!(self.block_ctx_u256_gadget),
             ExecutionState::SELFBALANCE => assign_exec_step!(self.selfbalance_gadget),
             ExecutionState::SHA3 => assign_exec_step!(self.sha3_gadget),
-            ExecutionState::SHR => assign_exec_step!(self.shr_gadget),
             ExecutionState::SIGNEXTEND => assign_exec_step!(self.signextend_gadget),
             ExecutionState::SLOAD => assign_exec_step!(self.sload_gadget),
             ExecutionState::SSTORE => assign_exec_step!(self.sstore_gadget),