@@ -39,7 +39,7 @@ use openvm_stark_backend::{
39
39
40
40
use crate :: { bus:: MemcpyBus , MemcpyIterChip } ;
41
41
use openvm_circuit:: arch:: {
42
- execution_mode:: { E1ExecutionCtx , E2ExecutionCtx } ,
42
+ execution_mode:: { ExecutionCtxTrait , MeteredExecutionCtxTrait } ,
43
43
get_record_from_slice, ExecuteFunc , ExecutionError , Executor ,
44
44
MeteredExecutor , RecordArena , StaticProgramError , TraceFiller , VmExecState ,
45
45
} ;
@@ -324,7 +324,7 @@ where
324
324
}
325
325
326
326
fn execute (
327
- & mut self ,
327
+ & self ,
328
328
state : VmStateMut < F , TracingMemory , RA > ,
329
329
instruction : & Instruction < F > ,
330
330
) -> Result < ( ) , ExecutionError > {
@@ -565,7 +565,7 @@ impl<F: PrimeField32> Executor<F> for MemcpyLoopExecutor {
565
565
data : & mut [ u8 ] ,
566
566
) -> Result < ExecuteFunc < F , Ctx > , StaticProgramError >
567
567
where
568
- Ctx : E1ExecutionCtx ,
568
+ Ctx : ExecutionCtxTrait ,
569
569
{
570
570
let data: & mut MemcpyLoopPreCompute = data. borrow_mut ( ) ;
571
571
self . pre_compute_impl ( pc, inst, data) ?;
@@ -586,7 +586,7 @@ impl<F: PrimeField32> MeteredExecutor<F> for MemcpyLoopExecutor {
586
586
data : & mut [ u8 ] ,
587
587
) -> Result < ExecuteFunc < F , Ctx > , StaticProgramError >
588
588
where
589
- Ctx : E2ExecutionCtx ,
589
+ Ctx : MeteredExecutionCtxTrait ,
590
590
{
591
591
let data: & mut E2PreCompute < MemcpyLoopPreCompute > = data. borrow_mut ( ) ;
592
592
data. chip_idx = chip_idx as u32 ;
@@ -596,7 +596,7 @@ impl<F: PrimeField32> MeteredExecutor<F> for MemcpyLoopExecutor {
596
596
}
597
597
598
598
#[ inline( always) ]
599
- unsafe fn execute_e12_impl < F : PrimeField32 , CTX : E1ExecutionCtx > (
599
+ unsafe fn execute_e12_impl < F : PrimeField32 , CTX : ExecutionCtxTrait > (
600
600
pre_compute : & MemcpyLoopPreCompute ,
601
601
vm_state : & mut VmExecState < F , GuestMemory , CTX > ,
602
602
) {
@@ -674,15 +674,15 @@ unsafe fn execute_e12_impl<F: PrimeField32, CTX: E1ExecutionCtx>(
674
674
vm_state. instret += 1 ;
675
675
}
676
676
677
- unsafe fn execute_e1_impl < F : PrimeField32 , CTX : E1ExecutionCtx > (
677
+ unsafe fn execute_e1_impl < F : PrimeField32 , CTX : ExecutionCtxTrait > (
678
678
pre_compute : & [ u8 ] ,
679
679
vm_state : & mut VmExecState < F , GuestMemory , CTX > ,
680
680
) {
681
681
let pre_compute: & MemcpyLoopPreCompute = pre_compute. borrow ( ) ;
682
682
execute_e12_impl :: < F , CTX > ( pre_compute, vm_state) ;
683
683
}
684
684
685
- unsafe fn execute_e2_impl < F : PrimeField32 , CTX : E2ExecutionCtx > (
685
+ unsafe fn execute_e2_impl < F : PrimeField32 , CTX : MeteredExecutionCtxTrait > (
686
686
pre_compute : & [ u8 ] ,
687
687
vm_state : & mut VmExecState < F , GuestMemory , CTX > ,
688
688
) {
0 commit comments