changing btype to sbtype to match the spec

o1-labs · Nov 4, 2024 · 66709e0 · 66709e0
1 parent 941d9ac
commit 66709e0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/o1vm/src/interpreters/riscv32i/column.rs b/o1vm/src/interpreters/riscv32i/column.rs
@@ -1,8 +1,8 @@
 use super::{
     interpreter::{
-        BInstruction, IInstruction, Instruction,
-        Instruction::{BType, IType, RType, SType, UJType, UType},
-        RInstruction, SInstruction, UInstruction,
+        IInstruction, Instruction,
+        Instruction::{IType, RType, SBType, SType, UJType, UType},
+        RInstruction, SBInstruction, SInstruction, UInstruction,
     },
     INSTRUCTION_SET_SIZE, SCRATCH_SIZE,
 };
@@ -46,21 +46,21 @@ impl From<Instruction> for usize {
             SType(stype) => {
                 SCRATCH_SIZE + 1 + RInstruction::COUNT + IInstruction::COUNT + stype as usize
             }
-            BType(btype) => {
+            SBType(sbtype) => {
                 SCRATCH_SIZE
                     + 1
                     + RInstruction::COUNT
                     + IInstruction::COUNT
                     + SInstruction::COUNT
-                    + btype as usize
+                    + sbtype as usize
             }
             UType(utype) => {
                 SCRATCH_SIZE
                     + 1
                     + RInstruction::COUNT
                     + IInstruction::COUNT
                     + SInstruction::COUNT
-                    + BInstruction::COUNT
+                    + SBInstruction::COUNT
                     + utype as usize
             }
             UJType(ujtype) => {
@@ -69,7 +69,7 @@ impl From<Instruction> for usize {
                     + RInstruction::COUNT
                     + IInstruction::COUNT
                     + SInstruction::COUNT
-                    + BInstruction::COUNT
+                    + SBInstruction::COUNT
                     + UInstruction::COUNT
                     + ujtype as usize
             }

diff --git a/o1vm/src/interpreters/riscv32i/interpreter.rs b/o1vm/src/interpreters/riscv32i/interpreter.rs
@@ -6,7 +6,7 @@ pub enum Instruction {
     RType(RInstruction),
     IType(IInstruction),
     SType(SInstruction),
-    BType(BInstruction),
+    SBType(SBInstruction),
     UType(UInstruction),
     UJType(UJInstruction),
 }
@@ -66,7 +66,7 @@ pub enum SInstruction {
 #[derive(
     Debug, Clone, Copy, Eq, PartialEq, EnumCount, EnumIter, Default, Hash, Ord, PartialOrd,
 )]
-pub enum BInstruction {
+pub enum SBInstruction {
     #[default]
     BranchEq, // beq
     BranchNeq,              // bne
@@ -121,10 +121,10 @@ impl IntoIterator for Instruction {
                 }
                 iter_contents.into_iter()
             }
-            Instruction::BType(_) => {
-                let mut iter_contents = Vec::with_capacity(BInstruction::COUNT);
-                for btype in BInstruction::iter() {
-                    iter_contents.push(Instruction::BType(btype));
+            Instruction::SBType(_) => {
+                let mut iter_contents = Vec::with_capacity(SBInstruction::COUNT);
+                for sbtype in SBInstruction::iter() {
+                    iter_contents.push(Instruction::SBType(sbtype));
                 }
                 iter_contents.into_iter()
             }