Misc Rust Fixes & Improvements

arch/msp430/src/architecture.rs

@@ -5,7 +5,7 @@ use crate::register::Register;
 use binaryninja::{
     architecture::{
         Architecture, CoreArchitecture, CustomArchitectureHandle, FlagCondition, InstructionInfo,
-        UnusedIntrinsic, UnusedRegisterStack, UnusedRegisterStackInfo,
+        UnusedIntrinsic, UnusedRegisterStack,
     },
     disassembly::{InstructionTextToken, InstructionTextTokenKind},
     Endianness,
@@ -42,7 +42,7 @@ impl Msp430 {
 
 impl Architecture for Msp430 {
     type Handle = CustomArchitectureHandle<Self>;
-    type RegisterStackInfo = UnusedRegisterStackInfo<Self::Register>;
+    type RegisterStackInfo = UnusedRegisterStack<Self::Register>;
     type RegisterStack = UnusedRegisterStack<Self::Register>;
     type Register = Register;
     type RegisterInfo = Register;

arch/riscv/src/lib.rs

@@ -9,17 +9,17 @@ use binaryninja::relocation::{Relocation, RelocationHandlerExt};
 use binaryninja::{
     add_optional_plugin_dependency, architecture,
     architecture::{
-        llvm_assemble, Architecture, ArchitectureExt, CoreArchitecture, CustomArchitectureHandle,
-        ImplicitRegisterExtend, InstructionInfo, LlvmServicesCodeModel, LlvmServicesDialect,
-        LlvmServicesRelocMode, Register as Reg, RegisterInfo, UnusedFlag, UnusedRegisterStack,
-        UnusedRegisterStackInfo,
+        Architecture, ArchitectureExt, CoreArchitecture, CustomArchitectureHandle,
+        ImplicitRegisterExtend, InstructionInfo, Register as Reg, RegisterInfo, UnusedFlag,
+        UnusedRegisterStack,
     },
     binary_view::{BinaryView, BinaryViewExt},
     calling_convention::{register_calling_convention, CallingConvention, ConventionBuilder},
     custom_binary_view::{BinaryViewType, BinaryViewTypeExt},
     disassembly::{InstructionTextToken, InstructionTextTokenKind},
     function::Function,
     function_recognizer::FunctionRecognizer,
+    llvm::{llvm_assemble, LlvmServicesCodeModel, LlvmServicesDialect, LlvmServicesRelocMode},
     rc::Ref,
     relocation::{
         CoreRelocationHandler, CustomRelocationHandlerHandle, RelocationHandler, RelocationInfo,
@@ -644,7 +644,7 @@ impl<D: RiscVDisassembler> Architecture for RiscVArch<D> {
 
     type RegisterInfo = Register<D>;
     type Register = Register<D>;
-    type RegisterStackInfo = UnusedRegisterStackInfo<Self::Register>;
+    type RegisterStackInfo = UnusedRegisterStack<Self::Register>;
     type RegisterStack = UnusedRegisterStack<Self::Register>;
 
     type Flag = UnusedFlag;

plugins/dwarf/dwarfdump/src/lib.rs

@@ -13,10 +13,11 @@
 // limitations under the License.
 
 use binaryninja::{
+    architecture::BranchType,
     binary_view::{BinaryView, BinaryViewExt},
     command::{register_command, Command},
     disassembly::{DisassemblyTextLine, InstructionTextToken, InstructionTextTokenKind},
-    flowgraph::{BranchType, EdgeStyle, FlowGraph, FlowGraphNode, FlowGraphOption},
+    flowgraph::{EdgeStyle, FlowGraph, FlowGraphNode, FlowGraphOption},
 };
 use dwarfreader::is_valid;
 

rust/README.md

@@ -29,12 +29,12 @@ fn main() {
         .load("/bin/cat")
         .expect("Couldn't open `/bin/cat`");
 
-    println!("Filename:  `{}`", bv.file().filename());
+    println!("File:  `{}`", bv.file());
     println!("File size: `{:#x}`", bv.len());
     println!("Function count: {}", bv.functions().len());
 
     for func in &bv.functions() {
-        println!("{}:", func.symbol().full_name());
+        println!("{}: {}", func.start(), func.symbol());
     }
 }
 ```

rust/examples/flowgraph.rs

@@ -7,9 +7,10 @@ use binaryninja::interaction::handler::{
 };
 use binaryninja::interaction::{MessageBoxButtonResult, MessageBoxButtonSet, MessageBoxIcon};
 use binaryninja::{
+    architecture::BranchType,
     binary_view::{BinaryView, BinaryViewExt},
     disassembly::{DisassemblyTextLine, InstructionTextToken, InstructionTextTokenKind},
-    flowgraph::{BranchType, EdgePenStyle, FlowGraph, ThemeColor},
+    flowgraph::{EdgePenStyle, FlowGraph, ThemeColor},
 };
 
 pub struct GraphPrinter;

rust/examples/simple.rs

@@ -12,12 +12,12 @@ fn main() {
         .load("/bin/cat")
         .expect("Couldn't open `/bin/cat`");
 
-    println!("Filename:  `{}`", bv.file().filename());
+    println!("File:  `{}`", bv.file());
     println!("File size: `{:#x}`", bv.len());
     println!("Function count: {}", bv.functions().len());
 
     for func in &bv.functions() {
-        println!("{:?}:", func.symbol().full_name());
+        println!("{}:", func.symbol());
         for basic_block in &func.basic_blocks() {
             // TODO : This is intended to be refactored to be more nice to work with soon(TM)
             for addr in basic_block.as_ref() {