Merge remote-tracking branch 'origin/matthias/as_i32' into matthias/a…

…s_i32
scroll-tech · Dec 12, 2024 · 79ca1d1 · 79ca1d1
2 parents 887f906 + d841420
commit 79ca1d1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ceno_zkvm/src/instructions/riscv.rs b/ceno_zkvm/src/instructions/riscv.rs
@@ -11,7 +11,7 @@ pub mod arith_imm;
 pub mod branch;
 pub mod config;
 pub mod constants;
-pub mod divu;
+pub mod div;
 pub mod dummy;
 pub mod ecall;
 pub mod jump;

diff --git a/ceno_zkvm/src/instructions/riscv/divu.rs → ceno_zkvm/src/instructions/riscv/div.rs b/ceno_zkvm/src/instructions/riscv/divu.rs → ceno_zkvm/src/instructions/riscv/div.rs
@@ -181,7 +181,7 @@ mod test {
             circuit_builder::{CircuitBuilder, ConstraintSystem},
             instructions::{
                 Instruction,
-                riscv::{constants::UInt, divu::DivUInstruction},
+                riscv::{constants::UInt, div::DivUInstruction},
             },
             scheme::mock_prover::{MOCK_PC_START, MockProver},
         };

diff --git a/ceno_zkvm/src/instructions/riscv/rv32im.rs b/ceno_zkvm/src/instructions/riscv/rv32im.rs
@@ -7,7 +7,7 @@ use crate::{
             branch::{
                 BeqInstruction, BgeInstruction, BgeuInstruction, BltInstruction, BneInstruction,
             },
-            divu::DivUInstruction,
+            div::DivUInstruction,
             logic::{AndInstruction, OrInstruction, XorInstruction},
             logic_imm::{AndiInstruction, OriInstruction, XoriInstruction},
             mul::MulhuInstruction,
@@ -27,7 +27,7 @@ use ceno_emul::{
     InsnKind::{self, *},
     Platform, StepRecord,
 };
-use divu::{DivDummy, RemDummy, RemuDummy};
+use div::{DivDummy, RemDummy, RemuDummy};
 use ecall::EcallDummy;
 use ff_ext::ExtensionField;
 use itertools::Itertools;