port long-mode ffi to protected-mode

3 files changed, 60 insertions, 1 deletions

diff --git a/ffi/multiarch/src/protected_mode.rs b/ffi/multiarch/src/protected_mode.rs
new file mode 100644
index 0000000..817462f
--- /dev/null
+++ b/ffi/multiarch/src/protected_mode.rs
@@ -0,0 +1,43 @@
+#![no_std]
+#![feature(lang_items)]
+
+#[panic_handler]
+#[cold]
+fn panic(_panic: &core::panic::PanicInfo) -> ! {
+    loop {}
+}
+
+#[lang = "eh_personality"] extern fn eh_personality() {}
+
+use yaxpeax_arch::{Arch, Decoder, LengthedInstruction, AddressBase};
+use yaxpeax_x86::protected_mode as x86;
+
+#[no_mangle]
+pub unsafe extern "C" fn yaxpeax_decode_x86_32_optimistic(data: *const u8, length: u64, inst: *mut x86::Instruction) -> bool {
+    let inst: &mut x86::Instruction = core::mem::transmute(inst);
+    <x86::Arch as Arch>::Decoder::default().decode_into(inst, core::slice::from_raw_parts(data as *const u8, length as usize).iter().cloned()).is_err()
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn yaxpeax_instr_length_x86_64(inst: *mut x86::Instruction) -> usize {
+    let inst: &mut x86::Instruction = core::mem::transmute(inst);
+    0.wrapping_offset(inst.len()).to_linear()
+}
+
+#[cfg(fmt)]
+mod write_sink;
+
+#[cfg(fmt)]
+mod fmt {
+    use write_sink::InstructionSink;
+
+    use core::fmt::Write;
+
+    #[no_mangle]
+    pub unsafe extern "C" fn yaxpeax_instr_fmt(inst: *mut x86::Instruction, text: *mut u8, len: usize) {
+        let inst: &mut x86::Instruction = core::mem::transmute(inst);
+        let res = core::slice::from_raw_parts_mut(text, len);
+
+        write!(InstructionSink { buf: res, offs: 0 }, "{}", inst).unwrap();
+    }
+}
diff --git a/ffi/protected_mode/Cargo.toml b/ffi/protected_mode/Cargo.toml
index 9c0e03a..95e8bf4 100644
--- a/ffi/protected_mode/Cargo.toml
+++ b/ffi/protected_mode/Cargo.toml
@@ -11,4 +11,9 @@ yaxpeax-arch = { version = "0.0.4", default-features = false }
 [lib]
 name = "yaxpeax_x86_ffi_protected_mode"
 path = "src/lib.rs"
-crate-type = ["staticlib"]
+crate-type = ["staticlib", "cdylib"]
+
+[features]
+default = ["fmt"]
+
+fmt = ["yaxpeax-x86/fmt"]
diff --git a/ffi/protected_mode/src/lib.rs b/ffi/protected_mode/src/lib.rs
index e69de29..368f8a9 100644
--- a/ffi/protected_mode/src/lib.rs
+++ b/ffi/protected_mode/src/lib.rs
@@ -0,0 +1,11 @@
+#![no_std]
+
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo) -> ! {
+    loop {}
+}
+
+#[path = "../../src/long_mode.rs"]
+mod long_mode;
+
+pub use long_mode::*;