enable enc2

Author: flier

Cargo.toml

@@ -8,20 +8,26 @@ edition = "2018"
 repository = "https://github.com/rust-xed/xed-sys"
 readme = "README.md"
 keywords = ["xed", "intel", "x86", "x86_64"]
-categories = ["encoding", "external-ffi-bindings", "hardware-support", "parsing"]
+categories = [
+  "encoding",
+  "external-ffi-bindings",
+  "hardware-support",
+  "parsing",
+]
 
 [badges]
-appveyor  = { repository = "rust-xed/xed-sys" }
+appveyor = { repository = "rust-xed/xed-sys" }
 travis-ci = { repository = "rust-xed/xed-sys" }
 
+[features]
+default = []
+enc2 = []
+
 [dependencies]
 
 [build-dependencies]
 bindgen = "0.69"
 target-lexicon = "0.12"
 
 [workspace]
-members = [
-  ".",
-  "build-tools"
-]
+members = [".", "build-tools"]

build-tools/Cargo.toml

@@ -4,12 +4,16 @@ version = "0.1.0"
 authors = ["Phantomical", "Agustin Godnic"]
 edition = "2018"
 
+[features]
+default = []
+enc2 = []
+
 [dependencies]
 bindgen = "0.69"
 fs_extra = "1.2"
 num_cpus = "1.13"
 target-lexicon = "0.12"
 
-syn = { version = "2.0", features = [ "full" ] }
+syn = { version = "2.0", features = ["full"] }
 quote = "1.0"
 proc-macro2 = "1.0"

build-tools/src/bin/build-xed.rs

@@ -85,6 +85,10 @@ fn main() {
         cmd.arg("--opt=0");
     }
 
+    if cfg!(feature = "enc2") {
+        cmd.arg("--enc2");
+    }
+    
     cmd.arg("install").current_dir(&build_dir);
 
     eprintln!("XED build command: {:?}", cmd);

build.rs

@@ -24,7 +24,7 @@ fn build_bindings(cwd: &Path) {
 
     eprintln!("{}", cwd.display());
 
-    let builder = bindgen::Builder::default()
+    let mut builder = bindgen::Builder::default()
         .clang_arg(format!("--include-directory={}", include_dir.display()))
         .clang_arg("-DXED_ENCODER")
         .clang_arg("-DXED_DECODER")
@@ -38,6 +38,10 @@ fn build_bindings(cwd: &Path) {
         .derive_debug(true)
         .prepend_enum_name(false);
 
+    if cfg!(feature = "enc2") {
+        builder = builder.clang_arg("-DXED_ENC2");
+    }
+
     builder.dump_preprocessed_input().unwrap();
 
     let bindings = match builder.generate() {
@@ -147,6 +151,10 @@ fn main() {
         cmd.arg("--opt=0");
     }
 
+    if cfg!(feature = "enc2") {
+        cmd.arg("--enc2");
+    }
+
     cmd.arg("install").current_dir(&build_dir);
 
     eprintln!("XED build command: {:?}", cmd);
@@ -162,6 +170,13 @@ fn main() {
     println!("cargo:rustc-link-search=native={}", lib_dir.display());
     println!("cargo:rustc-link-lib=static=xed");
 
+    if cfg!(feature = "enc2") {
+        println!("cargo:rustc-link-lib=static=xed-enc2-m32-a32");
+        println!("cargo:rustc-link-lib=static=xed-enc2-m64-a64");
+        println!("cargo:rustc-link-lib=static=xed-chk-enc2-m32-a32");
+        println!("cargo:rustc-link-lib=static=xed-chk-enc2-m64-a64");
+    }
+
     // Generate bindings
     build_bindings(&cwd);
 }

xed.h

@@ -1,2 +1,9 @@
 #include "xed/xed-interface.h"
 #include "xed/xed-isa-set.h"
+
+#ifdef XED_ENC2
+#include "xed/xed-enc2-m32-a32.h"
+#include "xed/xed-chk-enc2-m32-a32.h"
+#include "xed/xed-enc2-m64-a64.h"
+#include "xed/xed-chk-enc2-m64-a64.h"
+#endif