Merge both packages
This commit is contained in:
parent
094cbb5f29
commit
addea1efa0
12
Cargo.toml
12
Cargo.toml
|
@ -4,9 +4,13 @@ version = "0.1.0"
|
|||
authors = ["Michel Heily <michelheily@gmail.com>"]
|
||||
edition = "2018"
|
||||
|
||||
[workspace]
|
||||
members = [".", "arm7tdmi"]
|
||||
|
||||
[dependencies]
|
||||
byteorder = "*"
|
||||
arm7tdmi = {path = "arm7tdmi"}
|
||||
enum-primitive-derive = "^0.1"
|
||||
num-traits = "^0.1"
|
||||
bit = "^0.1"
|
||||
clap = {version = "2.33", features = ["color", "yaml"]}
|
||||
|
||||
[[bin]]
|
||||
name = "disass"
|
||||
path = "src/disass.rs"
|
|
@ -1,15 +0,0 @@
|
|||
[package]
|
||||
name = "arm7tdmi"
|
||||
version = "0.1.0"
|
||||
authors = ["Michel Heily <michelheily@gmail.com>"]
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
byteorder = "*"
|
||||
enum-primitive-derive = "^0.1"
|
||||
num-traits = "^0.1"
|
||||
bit = "^0.1"
|
||||
|
||||
[[bin]]
|
||||
name = "disass"
|
||||
path = "src/disass.rs"
|
|
@ -1,10 +1,5 @@
|
|||
#[macro_use]
|
||||
extern crate enum_primitive_derive;
|
||||
extern crate num_traits;
|
||||
|
||||
extern crate bit;
|
||||
|
||||
pub mod arm;
|
||||
pub use arm::arm_isa::ArmInstruction;
|
||||
|
||||
pub const REG_PC: usize = 15;
|
||||
|
|
@ -5,12 +5,17 @@ use std::io::prelude::*;
|
|||
use std::fs::File;
|
||||
use std::convert::TryFrom;
|
||||
|
||||
#[macro_use]
|
||||
extern crate enum_primitive_derive;
|
||||
extern crate num_traits;
|
||||
|
||||
extern crate bit;
|
||||
|
||||
extern crate byteorder;
|
||||
use byteorder::{LittleEndian, ReadBytesExt};
|
||||
|
||||
extern crate arm7tdmi;
|
||||
|
||||
use arm7tdmi::arm::arm_isa::ArmInstruction;
|
||||
mod arm7tdmi;
|
||||
use arm7tdmi::ArmInstruction;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum DisassemblerError {
|
Reference in a new issue