Rust cleanup

arch/msp430/src/architecture.rs

@@ -20,11 +20,12 @@ use binaryninja::architecture::{
     BranchKind, FlagClassId, FlagGroupId, FlagId, FlagWriteId, RegisterId,
 };
 use binaryninja::low_level_il::expression::ValueExpr;
-use binaryninja::low_level_il::{MutableLiftedILExpr, MutableLiftedILFunction};
+use binaryninja::low_level_il::{LowLevelILMutableExpression, LowLevelILMutableFunction};
 use log::error;
 
 const MIN_MNEMONIC: usize = 9;
 
+#[derive(Debug)]
 pub struct Msp430 {
     handle: CoreArchitecture,
     custom_handle: CustomArchitectureHandle<Msp430>,
@@ -193,7 +194,7 @@ impl Architecture for Msp430 {
         &self,
         data: &[u8],
         addr: u64,
-        il: &mut MutableLiftedILFunction<Self>,
+        il: &LowLevelILMutableFunction,
     ) -> Option<(usize, bool)> {
         match msp430_asm::decode(data) {
             Ok(inst) => {
@@ -225,8 +226,8 @@ impl Architecture for Msp430 {
     fn flag_group_llil<'a>(
         &self,
         _group: Self::FlagGroup,
-        _il: &'a mut MutableLiftedILFunction<Self>,
-    ) -> Option<MutableLiftedILExpr<'a, Self, ValueExpr>> {
+        _il: &'a LowLevelILMutableFunction,
+    ) -> Option<LowLevelILMutableExpression<'a, ValueExpr>> {
         None
     }
 

arch/msp430/src/lift.rs

@@ -1,7 +1,6 @@
 use crate::architecture::offset_to_absolute;
 use crate::flag::{Flag, FlagWrite};
 use crate::register::Register;
-use crate::Msp430;
 
 use binaryninja::{architecture::FlagCondition, low_level_il::lifting::LowLevelILLabel};
 
@@ -13,7 +12,7 @@ use msp430_asm::single_operand::SingleOperand;
 use msp430_asm::two_operand::TwoOperand;
 
 use binaryninja::low_level_il::expression::ValueExpr;
-use binaryninja::low_level_il::{MutableLiftedILExpr, MutableLiftedILFunction};
+use binaryninja::low_level_il::{LowLevelILMutableExpression, LowLevelILMutableFunction};
 use log::info;
 
 macro_rules! auto_increment {
@@ -164,11 +163,7 @@ macro_rules! conditional_jump {
     };
 }
 
-pub(crate) fn lift_instruction(
-    inst: &Instruction,
-    addr: u64,
-    il: &MutableLiftedILFunction<Msp430>,
-) {
+pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMutableFunction) {
     match inst {
         Instruction::Rrc(inst) => {
             let size = match inst.operand_width() {
@@ -628,8 +623,8 @@ pub(crate) fn lift_instruction(
 fn lift_source_operand<'a>(
     operand: &Operand,
     size: usize,
-    il: &'a MutableLiftedILFunction<Msp430>,
-) -> MutableLiftedILExpr<'a, Msp430, ValueExpr> {
+    il: &'a LowLevelILMutableFunction,
+) -> LowLevelILMutableExpression<'a, ValueExpr> {
     match operand {
         Operand::RegisterDirect(r) => il.reg(size, Register::try_from(*r as u32).unwrap()),
         Operand::Indexed((r, offset)) => il

arch/msp430/src/register.rs

@@ -1,7 +1,7 @@
 use binaryninja::architecture;
 use binaryninja::architecture::{ImplicitRegisterExtend, RegisterId};
 
-use binaryninja::low_level_il::LowLevelILRegister;
+use binaryninja::low_level_il::LowLevelILRegisterKind;
 use std::borrow::Cow;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -134,8 +134,8 @@ impl architecture::RegisterInfo for Register {
     }
 }
 
-impl From<Register> for LowLevelILRegister<Register> {
+impl From<Register> for LowLevelILRegisterKind<Register> {
     fn from(register: Register) -> Self {
-        LowLevelILRegister::ArchReg(register)
+        LowLevelILRegisterKind::Arch(register)
     }
 }

arch/riscv/disasm/src/lib.rs

@@ -291,7 +291,7 @@ impl FloatRegType for () {}
 impl FloatRegType for f32 {}
 impl FloatRegType for f64 {}
 
-pub trait RegFile: Debug + Sized + Copy + Clone {
+pub trait RegFile: Debug + Sized + Copy + Clone + Send + Sync + 'static {
     type Int: IntRegType;
     type Float: FloatRegType;
 
@@ -2331,7 +2331,7 @@ impl StandardExtension for ExtensionSupported {
     }
 }
 
-pub trait RiscVDisassembler: Debug + Sized + Copy + Clone {
+pub trait RiscVDisassembler: 'static + Debug + Sized + Copy + Clone + Send + Sync {
     type RegFile: RegFile;
     type MulDivExtension: StandardExtension;
     type AtomicExtension: StandardExtension;
@@ -3175,6 +3175,7 @@ pub trait RiscVDisassembler: Debug + Sized + Copy + Clone {
 
 #[derive(Copy, Clone, Debug)]
 pub struct RiscVIMACDisassembler<RF: RegFile>(PhantomData<RF>);
+
 impl<RF: RegFile> RiscVDisassembler for RiscVIMACDisassembler<RF> {
     type RegFile = RF;
     type MulDivExtension = ExtensionSupported;