X86: support x86 (i386) and x86_64

Author: phip1611

README.md

@@ -24,7 +24,7 @@ let qemu_exit_handle = qemu_exit::RISCV64::new(addr);
 
 // io_base:             I/O-base of isa-debug-exit.
 // custom_exit_success: A custom success code; Must be an odd number.
-#[cfg(target_arch = "x86_64")]
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 let qemu_exit_handle = qemu_exit::X86::new(io_base, custom_exit_success);
 
 qemu_exit_handle.exit(1337);
@@ -48,7 +48,7 @@ You need to chose a machine with the `sifive_test` device, for exemple `-M virt`
 qemu-system-riscv64 -M virt -nographic -monitor none -serial stdio -kernel kernel.elf
 ```
 
-### x86_64
+### x86/x86_64
 
 Add the special ISA debug exit device by passing the flags:
 ```

src/lib.rs

@@ -21,7 +21,7 @@
 //!
 //! // io_base:             I/O-base of isa-debug-exit.
 //! // custom_exit_success: A custom success code; Must be an odd number.
-//! #[cfg(target_arch = "x86_64")]
+//! #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 //! let qemu_exit_handle = qemu_exit::X86::new(io_base, custom_exit_success);
 //!
 //! qemu_exit_handle.exit(1337);
@@ -84,10 +84,10 @@ pub mod riscv64;
 #[cfg(target_arch = "riscv64")]
 pub use riscv64::*;
 
-#[cfg(target_arch = "x86_64")]
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 pub mod x86;
 
-#[cfg(target_arch = "x86_64")]
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 pub use x86::*;
 
 /// Generic interface for exiting QEMU.

src/x86.rs

@@ -2,14 +2,14 @@
 //
 // Copyright (c) 2019-2022 Andre Richter <andre.o.richter@gmail.com>
 
-//! x86.
+//! x86 (i386) and x86_64.
 
 use crate::QEMUExit;
 use core::arch::asm;
 
 const EXIT_FAILURE: u32 = 0; // since ((0 << 1) | 1) = 1.
 
-/// x86 configuration.
+/// x86/x86_64 configuration.
 pub struct X86 {
     /// Port number of the isa-debug-exit device.
     io_base: u16,

tests/exit_13.rs

@@ -34,7 +34,7 @@ mod riscv64_virt;
 // x86
 //--------------------------------------------------------------------------------------------------
 
-#[cfg(target_arch = "x86_64")]
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 const QEMU_EXIT_HANDLE: qemu_exit::X86 = qemu_exit::X86::new(0xf4, 5);
 
 //--------------------------------------------------------------------------------------------------