From 429edb71087f6af043ada99f90d67ca1fb3c97ec Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Mon, 23 Mar 2020 00:53:52 -0700
Subject: update yaxpeax-dis decoders plus x86:32 decoding

---
 Cargo.lock  | 8 ++++----
 Cargo.toml  | 6 +++---
 src/main.rs | 5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6aea14d..b559e3e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -270,9 +270,9 @@ dependencies = [
 
 [[package]]
 name = "yaxpeax-arm"
-version = "0.0.2"
+version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b631720783f1ea2eeddf0de1643c5c90a2777921816294db8fd876ccd53dc"
+checksum = "2562e1dc153928886795f8f3794716ac0e96ed2ef040f8d29e3246f57d823dd3"
 dependencies = [
  "serde",
  "serde_derive",
@@ -350,9 +350,9 @@ dependencies = [
 
 [[package]]
 name = "yaxpeax-x86"
-version = "0.0.4"
+version = "0.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c99c7e696c0ef10d67492b728b588dc260d5fa2e33d1e37edcf7cd466c7946b4"
+checksum = "03c09fe81a0dd37ce551dfe63dd7ee8848abe3fb60a670344e9e5483ecfd5718"
 dependencies = [
  "num-traits",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 2a745f2..24fb857 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yaxpeax-dis"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["iximeow <me@iximeow.net>"]
 license = "0BSD"
 edition = "2018"
@@ -19,10 +19,10 @@ num-traits = "0.2.10"
 # common interfaces for all yaxpeax decoders
 yaxpeax-arch = { version = "0.0.3" }
 
-yaxpeax-arm = { version = "0.0.2" }
+yaxpeax-arm = { version = "0.0.3" }
 yaxpeax-mips = { version = "0.0.2" }
 yaxpeax-msp430 = { version = "0.0.3" }
 yaxpeax-pic17 = { version = "0.0.2" }
 yaxpeax-pic18 = { version = "0.0.2" }
-yaxpeax-x86 = { version = "0.0.4" }
+yaxpeax-x86 = { version = "0.0.10" }
 yaxpeax-m16c = { version = "0.0.2" }
diff --git a/src/main.rs b/src/main.rs
index b59ebb2..62fd390 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,7 +12,7 @@ fn main() {
              .short("a")
              .long("--architecture")
              .takes_value(true)
-             .possible_values(&["x86_64", "armv7", "armv8", "mips", "msp430", "pic17", "pic18", "m16c"])
+             .possible_values(&["x86_64", "x86:32", "armv7", "armv8", "mips", "msp430", "pic17", "pic18", "m16c"])
              .help("architecture to disassemble input as."))
         /*
         .arg(Arg::with_name("file")
@@ -36,7 +36,8 @@ fn main() {
     let verbose = matches.occurrences_of("verbose") > 0;
 
     match arch_str {
-        "x86_64" => decode_input::<yaxpeax_x86::x86_64>(buf, verbose),
+        "x86_64" => decode_input::<yaxpeax_x86::long_mode::Arch>(buf, verbose),
+        "x86:32" => decode_input::<yaxpeax_x86::protected_mode::Arch>(buf, verbose),
         "armv7" => decode_input::<yaxpeax_arm::armv7::ARMv7>(buf, verbose),
         "armv8" => decode_input::<yaxpeax_arm::armv8::a64::ARMv8>(buf, verbose),
         "mips" => decode_input::<yaxpeax_mips::MIPS>(buf, verbose),
-- 
cgit v1.1