[update] rename Uncategorized to NoOperand

Alignof · Oct 2, 2024 · fef01ef · fef01ef
1 parent 982a9d8
commit fef01ef
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/src/instruction.rs b/src/instruction.rs
@@ -207,7 +207,7 @@ impl Display for Instruction {
             InstFormat::OnlyRs2 => {
                 write!(f, "{} {}", self.opc, reg2str(self.rs2.unwrap()),)
             }
-            InstFormat::Uncategorized => match self.opc {
+            InstFormat::NoOperand => match self.opc {
                 OpcodeKind::BaseI(BaseIOpcode::ECALL | BaseIOpcode::EBREAK)
                 | OpcodeKind::Zifencei(ZifenceiOpcode::FENCE)
                 | OpcodeKind::C(COpcode::NOP | COpcode::EBREAK)
@@ -395,14 +395,14 @@ pub enum InstFormat {
     /// ```
     ALrFormat,
 
-    /// Uncategorized format
+    /// NoOperand format
     /// ```ignore
     /// ecall
     /// wfi
     /// mret
     /// c.ebreak
     /// ```
-    Uncategorized,
+    NoOperand,
 
     /// Only rd name
     /// ```ignore

diff --git a/src/instruction/base_i.rs b/src/instruction/base_i.rs
@@ -170,7 +170,7 @@ impl Opcode for BaseIOpcode {
             }
             BaseIOpcode::JAL => InstFormat::JFormat,
             BaseIOpcode::LUI | BaseIOpcode::AUIPC => InstFormat::UFormat,
-            BaseIOpcode::ECALL | BaseIOpcode::EBREAK => InstFormat::Uncategorized,
+            BaseIOpcode::ECALL | BaseIOpcode::EBREAK => InstFormat::NoOperand,
         }
     }
 }
diff --git a/src/instruction/c_extension.rs b/src/instruction/c_extension.rs
@@ -103,7 +103,7 @@ impl Opcode for COpcode {
             COpcode::LI | COpcode::ADDI | COpcode::ADDIW | COpcode::ADDI16SP | COpcode::LUI => {
                 InstFormat::CiFormat
             }
-            COpcode::NOP => InstFormat::Uncategorized,
+            COpcode::NOP => InstFormat::NoOperand,
             COpcode::SUB
             | COpcode::XOR
             | COpcode::OR
@@ -115,7 +115,7 @@ impl Opcode for COpcode {
             COpcode::LDSP | COpcode::SLLI | COpcode::LWSP => InstFormat::CiFormat,
             COpcode::SDSP | COpcode::SWSP => InstFormat::CssFormat,
             COpcode::JR | COpcode::JALR | COpcode::MV | COpcode::ADD => InstFormat::CrFormat,
-            COpcode::EBREAK => InstFormat::Uncategorized,
+            COpcode::EBREAK => InstFormat::NoOperand,
         }
     }
 }
diff --git a/src/instruction/opcode.rs b/src/instruction/opcode.rs
@@ -53,14 +53,14 @@ impl OpcodeKind {
             }
             OpcodeKind::JAL => InstFormat::Jformat,
             OpcodeKind::LUI | OpcodeKind::AUIPC => InstFormat::Uformat,
-            OpcodeKind::ECALL | OpcodeKind::FENCE | OpcodeKind::EBREAK => InstFormat::Uncategorized,
+            OpcodeKind::ECALL | OpcodeKind::FENCE | OpcodeKind::EBREAK => InstFormat::NoOperand,
 
             // Zicsr
             OpcodeKind::CSRRW | OpcodeKind::CSRRS | OpcodeKind::CSRRC => InstFormat::CSRformat,
             OpcodeKind::CSRRWI | OpcodeKind::CSRRSI | OpcodeKind::CSRRCI => InstFormat::CSRuiformat,
 
             // Privileged
-            OpcodeKind::SRET | OpcodeKind::MRET | OpcodeKind::WFI => InstFormat::Uncategorized,
+            OpcodeKind::SRET | OpcodeKind::MRET | OpcodeKind::WFI => InstFormat::NoOperand,
             OpcodeKind::SFENCE_VMA => InstFormat::Rformat,
 
             // Multiplication and Division
@@ -119,7 +119,7 @@ impl OpcodeKind {
             | OpcodeKind::C_ADDIW
             | OpcodeKind::C_ADDI16SP
             | OpcodeKind::C_LUI => InstFormat::CIformat,
-            OpcodeKind::C_NOP => InstFormat::Uncategorized,
+            OpcodeKind::C_NOP => InstFormat::NoOperand,
             OpcodeKind::C_SUB
             | OpcodeKind::C_XOR
             | OpcodeKind::C_OR
@@ -132,7 +132,7 @@ impl OpcodeKind {
             OpcodeKind::C_JR | OpcodeKind::C_JALR | OpcodeKind::C_MV | OpcodeKind::C_ADD => {
                 InstFormat::CRformat
             }
-            OpcodeKind::C_EBREAK => InstFormat::Uncategorized,
+            OpcodeKind::C_EBREAK => InstFormat::NoOperand,
         }
     }
 

diff --git a/src/instruction/priv_extension.rs b/src/instruction/priv_extension.rs
@@ -27,7 +27,7 @@ impl Display for PrivOpcode {
 impl Opcode for PrivOpcode {
     fn get_format(&self) -> InstFormat {
         match self {
-            PrivOpcode::SRET | PrivOpcode::MRET | PrivOpcode::WFI => InstFormat::Uncategorized,
+            PrivOpcode::SRET | PrivOpcode::MRET | PrivOpcode::WFI => InstFormat::NoOperand,
             PrivOpcode::SFENCE_VMA => InstFormat::RFormat,
         }
     }

diff --git a/src/instruction/zicfiss_extension.rs b/src/instruction/zicfiss_extension.rs
@@ -44,7 +44,7 @@ impl Opcode for ZicfissOpcode {
             ZicfissOpcode::SSPOPCHK => InstFormat::OnlyRs2,
             ZicfissOpcode::SSRDP => InstFormat::OnlyRd,
             ZicfissOpcode::SSAMOSWAP_W | ZicfissOpcode::SSAMOSWAP_D => InstFormat::AFormat,
-            ZicfissOpcode::C_SSPUSH | ZicfissOpcode::C_SSPOPCHK => InstFormat::Uncategorized,
+            ZicfissOpcode::C_SSPUSH | ZicfissOpcode::C_SSPOPCHK => InstFormat::NoOperand,
         }
     }
 }
diff --git a/src/instruction/zifencei_extension.rs b/src/instruction/zifencei_extension.rs
@@ -21,7 +21,7 @@ impl Display for ZifenceiOpcode {
 impl Opcode for ZifenceiOpcode {
     fn get_format(&self) -> InstFormat {
         match self {
-            ZifenceiOpcode::FENCE => InstFormat::Uncategorized,
+            ZifenceiOpcode::FENCE => InstFormat::NoOperand,
         }
     }
 }