Consistently format ASM blocks

This mostly makes the code shorter and easier to read

Signed-off-by: Joe Richey <[email protected]>

Author: josephlr

src/instructions/interrupts.rs

@@ -13,12 +13,11 @@ pub fn are_enabled() -> bool {
 /// This is a wrapper around the `sti` instruction.
 #[inline]
 pub fn enable() {
-    #[cfg(feature = "inline_asm")]
     unsafe {
+        #[cfg(feature = "inline_asm")]
         asm!("sti", options(nomem, nostack));
-    }
-    #[cfg(not(feature = "inline_asm"))]
-    unsafe {
+
+        #[cfg(not(feature = "inline_asm"))]
         crate::asm::x86_64_asm_interrupt_enable();
     }
 }
@@ -28,13 +27,11 @@ pub fn enable() {
 /// This is a wrapper around the `cli` instruction.
 #[inline]
 pub fn disable() {
-    #[cfg(feature = "inline_asm")]
     unsafe {
+        #[cfg(feature = "inline_asm")]
         asm!("cli", options(nomem, nostack));
-    }
 
-    #[cfg(not(feature = "inline_asm"))]
-    unsafe {
+        #[cfg(not(feature = "inline_asm"))]
         crate::asm::x86_64_asm_interrupt_disable();
     }
 }
@@ -129,26 +126,23 @@ where
 /// information.
 #[inline]
 pub fn enable_and_hlt() {
-    #[cfg(feature = "inline_asm")]
     unsafe {
+        #[cfg(feature = "inline_asm")]
         asm!("sti; hlt", options(nomem, nostack));
-    }
-    #[cfg(not(feature = "inline_asm"))]
-    unsafe {
+
+        #[cfg(not(feature = "inline_asm"))]
         crate::asm::x86_64_asm_interrupt_enable_and_hlt();
     }
 }
 
 /// Cause a breakpoint exception by invoking the `int3` instruction.
 #[inline]
 pub fn int3() {
-    #[cfg(feature = "inline_asm")]
     unsafe {
+        #[cfg(feature = "inline_asm")]
         asm!("int3", options(nomem, nostack));
-    }
 
-    #[cfg(not(feature = "inline_asm"))]
-    unsafe {
+        #[cfg(not(feature = "inline_asm"))]
         crate::asm::x86_64_asm_int3();
     }
 }

src/instructions/mod.rs

@@ -12,13 +12,11 @@ pub mod tlb;
 /// Halts the CPU until the next interrupt arrives.
 #[inline]
 pub fn hlt() {
-    #[cfg(feature = "inline_asm")]
     unsafe {
+        #[cfg(feature = "inline_asm")]
         asm!("hlt", options(nomem, nostack));
-    }
 
-    #[cfg(not(feature = "inline_asm"))]
-    unsafe {
+        #[cfg(not(feature = "inline_asm"))]
         crate::asm::x86_64_asm_hlt();
     }
 }
@@ -31,13 +29,11 @@ pub fn hlt() {
 /// endless loop away.
 #[inline]
 pub fn nop() {
-    #[cfg(feature = "inline_asm")]
     unsafe {
+        #[cfg(feature = "inline_asm")]
         asm!("nop", options(nomem, nostack, preserves_flags));
-    }
 
-    #[cfg(not(feature = "inline_asm"))]
-    unsafe {
+        #[cfg(not(feature = "inline_asm"))]
         crate::asm::x86_64_asm_nop();
     }
 }

src/instructions/port.rs

@@ -6,92 +6,77 @@ use core::marker::PhantomData;
 pub use crate::structures::port::{PortRead, PortWrite};
 
 impl PortRead for u8 {
-    #[cfg(feature = "inline_asm")]
-    #[inline]
-    unsafe fn read_from_port(port: u16) -> u8 {
-        let value: u8;
-        asm!("in al, dx", out("al") value, in("dx") port, options(nomem, nostack));
-        value
-    }
-
-    #[cfg(not(feature = "inline_asm"))]
     #[inline]
     unsafe fn read_from_port(port: u16) -> u8 {
+        #[cfg(feature = "inline_asm")]
+        {
+            let value: u8;
+            asm!("in al, dx", out("al") value, in("dx") port, options(nomem, nostack));
+            value
+        }
+        #[cfg(not(feature = "inline_asm"))]
         crate::asm::x86_64_asm_read_from_port_u8(port)
     }
 }
 
 impl PortRead for u16 {
-    #[cfg(feature = "inline_asm")]
-    #[inline]
-    unsafe fn read_from_port(port: u16) -> u16 {
-        let value: u16;
-        asm!("in ax, dx", out("ax") value, in("dx") port, options(nomem, nostack));
-        value
-    }
-
-    #[cfg(not(feature = "inline_asm"))]
     #[inline]
     unsafe fn read_from_port(port: u16) -> u16 {
+        #[cfg(feature = "inline_asm")]
+        {
+            let value: u16;
+            asm!("in ax, dx", out("ax") value, in("dx") port, options(nomem, nostack));
+            value
+        }
+        #[cfg(not(feature = "inline_asm"))]
         crate::asm::x86_64_asm_read_from_port_u16(port)
     }
 }
 
 impl PortRead for u32 {
-    #[cfg(feature = "inline_asm")]
-    #[inline]
-    unsafe fn read_from_port(port: u16) -> u32 {
-        let value: u32;
-        asm!("in eax, dx", out("eax") value, in("dx") port, options(nomem, nostack));
-        value
-    }
-
-    #[cfg(not(feature = "inline_asm"))]
     #[inline]
     unsafe fn read_from_port(port: u16) -> u32 {
+        #[cfg(feature = "inline_asm")]
+        {
+            let value: u32;
+            asm!("in eax, dx", out("eax") value, in("dx") port, options(nomem, nostack));
+            value
+        }
+        #[cfg(not(feature = "inline_asm"))]
         crate::asm::x86_64_asm_read_from_port_u32(port)
     }
 }
 
 impl PortWrite for u8 {
-    #[cfg(feature = "inline_asm")]
     #[inline]
     unsafe fn write_to_port(port: u16, value: u8) {
+        #[cfg(feature = "inline_asm")]
         asm!("out dx, al", in("dx") port, in("al") value, options(nomem, nostack));
-    }
 
-    #[cfg(not(feature = "inline_asm"))]
-    #[inline]
-    unsafe fn write_to_port(port: u16, value: u8) {
-        crate::asm::x86_64_asm_write_to_port_u8(port, value)
+        #[cfg(not(feature = "inline_asm"))]
+        crate::asm::x86_64_asm_write_to_port_u8(port, value);
     }
 }
 
 impl PortWrite for u16 {
-    #[cfg(feature = "inline_asm")]
     #[inline]
     unsafe fn write_to_port(port: u16, value: u16) {
+        #[cfg(feature = "inline_asm")]
         asm!("out dx, ax", in("dx") port, in("ax") value, options(nomem, nostack));
-    }
 
-    #[cfg(not(feature = "inline_asm"))]
-    #[inline]
-    unsafe fn write_to_port(port: u16, value: u16) {
-        crate::asm::x86_64_asm_write_to_port_u16(port, value)
+        #[cfg(not(feature = "inline_asm"))]
+        crate::asm::x86_64_asm_write_to_port_u16(port, value);
     }
 }
 
 impl PortWrite for u32 {
-    #[cfg(feature = "inline_asm")]
     #[inline]
     unsafe fn write_to_port(port: u16, value: u32) {
+        #[cfg(feature = "inline_asm")]
         asm!("out dx, eax", in("dx") port, in("eax") value, options(nomem, nostack));
-    }
 
-    #[cfg(not(feature = "inline_asm"))]
-    #[inline]
-    unsafe fn write_to_port(port: u16, value: u32) {
-        crate::asm::x86_64_asm_write_to_port_u32(port, value)
+        #[cfg(not(feature = "inline_asm"))]
+        crate::asm::x86_64_asm_write_to_port_u32(port, value);
     }
 }
 

src/instructions/segmentation.rs

@@ -16,26 +16,18 @@ use crate::structures::gdt::SegmentSelector;
 #[inline]
 pub unsafe fn set_cs(sel: SegmentSelector) {
     #[cfg(feature = "inline_asm")]
-    #[inline(always)]
-    unsafe fn inner(sel: SegmentSelector) {
-        asm!(
-            "push {sel}",
-            "lea {tmp}, [1f + rip]",
-            "push {tmp}",
-            "retfq",
-            "1:",
-            sel = in(reg) u64::from(sel.0),
-            tmp = lateout(reg) _,
-        );
-    }
+    asm!(
+        "push {sel}",
+        "lea {tmp}, [1f + rip]",
+        "push {tmp}",
+        "retfq",
+        "1:",
+        sel = in(reg) u64::from(sel.0),
+        tmp = lateout(reg) _,
+    );
 
     #[cfg(not(feature = "inline_asm"))]
-    #[inline(always)]
-    unsafe fn inner(sel: SegmentSelector) {
-        crate::asm::x86_64_asm_set_cs(u64::from(sel.0))
-    }
-
-    inner(sel)
+    crate::asm::x86_64_asm_set_cs(u64::from(sel.0));
 }
 
 /// Reload stack segment register.
@@ -131,18 +123,18 @@ pub unsafe fn swap_gs() {
 /// Returns the current value of the code segment register.
 #[inline]
 pub fn cs() -> SegmentSelector {
+    let segment: u16;
+
     #[cfg(feature = "inline_asm")]
-    {
-        let segment: u16;
-        unsafe { asm!("mov {0:x}, cs", out(reg) segment, options(nostack, nomem)) };
-        SegmentSelector(segment)
+    unsafe {
+        asm!("mov {0:x}, cs", out(reg) segment, options(nostack, nomem));
     }
-
     #[cfg(not(feature = "inline_asm"))]
-    {
-        let segment: u16 = unsafe { crate::asm::x86_64_asm_get_cs() };
-        SegmentSelector(segment)
+    unsafe {
+        segment = crate::asm::x86_64_asm_get_cs();
     }
+
+    SegmentSelector(segment)
 }
 
 /// Writes the FS segment base address
@@ -157,18 +149,10 @@ pub fn cs() -> SegmentSelector {
 #[inline]
 pub unsafe fn wrfsbase(val: u64) {
     #[cfg(feature = "inline_asm")]
-    #[inline(always)]
-    unsafe fn inner(val: u64) {
-        asm!("wrfsbase {}", in(reg) val, options(nomem, nostack));
-    }
+    asm!("wrfsbase {}", in(reg) val, options(nomem, nostack));
 
     #[cfg(not(feature = "inline_asm"))]
-    #[inline(always)]
-    unsafe fn inner(val: u64) {
-        crate::asm::x86_64_asm_wrfsbase(val)
-    }
-
-    inner(val)
+    crate::asm::x86_64_asm_wrfsbase(val);
 }
 
 /// Reads the FS segment base address
@@ -179,20 +163,14 @@ pub unsafe fn wrfsbase(val: u64) {
 #[inline]
 pub unsafe fn rdfsbase() -> u64 {
     #[cfg(feature = "inline_asm")]
-    #[inline(always)]
-    unsafe fn inner() -> u64 {
+    {
         let val: u64;
         asm!("rdfsbase {}", out(reg) val, options(nomem, nostack));
         val
     }
 
     #[cfg(not(feature = "inline_asm"))]
-    #[inline(always)]
-    unsafe fn inner() -> u64 {
-        crate::asm::x86_64_asm_rdfsbase()
-    }
-
-    inner()
+    crate::asm::x86_64_asm_rdfsbase()
 }
 
 /// Writes the GS segment base address
@@ -206,18 +184,10 @@ pub unsafe fn rdfsbase() -> u64 {
 #[inline]
 pub unsafe fn wrgsbase(val: u64) {
     #[cfg(feature = "inline_asm")]
-    #[inline(always)]
-    unsafe fn inner(val: u64) {
-        asm!("wrgsbase {}", in(reg) val, options(nomem, nostack))
-    }
+    asm!("wrgsbase {}", in(reg) val, options(nomem, nostack));
 
     #[cfg(not(feature = "inline_asm"))]
-    #[inline(always)]
-    unsafe fn inner(val: u64) {
-        crate::asm::x86_64_asm_wrgsbase(val)
-    }
-
-    inner(val)
+    crate::asm::x86_64_asm_wrgsbase(val);
 }
 
 /// Reads the GS segment base address
@@ -228,18 +198,12 @@ pub unsafe fn wrgsbase(val: u64) {
 #[inline]
 pub unsafe fn rdgsbase() -> u64 {
     #[cfg(feature = "inline_asm")]
-    #[inline(always)]
-    unsafe fn inner() -> u64 {
+    {
         let val: u64;
         asm!("rdgsbase {}", out(reg) val, options(nomem, nostack));
         val
     }
 
     #[cfg(not(feature = "inline_asm"))]
-    #[inline(always)]
-    unsafe fn inner() -> u64 {
-        crate::asm::x86_64_asm_rdgsbase()
-    }
-
-    inner()
+    crate::asm::x86_64_asm_rdgsbase()
 }

src/instructions/tables.rs

@@ -52,15 +52,13 @@ pub fn sidt() -> DescriptorTablePointer {
         limit: 0,
         base: VirtAddr::new(0),
     };
-    #[cfg(feature = "inline_asm")]
     unsafe {
+        #[cfg(feature = "inline_asm")]
         asm!("sidt [{}]", in(reg) &mut idt, options(nostack));
-    }
-    #[cfg(not(feature = "inline_asm"))]
-    unsafe {
+
+        #[cfg(not(feature = "inline_asm"))]
         crate::asm::x86_64_asm_sidt(&mut idt as *mut _);
     }
-
     idt
 }
 
@@ -77,5 +75,5 @@ pub unsafe fn load_tss(sel: SegmentSelector) {
     asm!("ltr {0:x}", in(reg) sel.0, options(nostack, nomem));
 
     #[cfg(not(feature = "inline_asm"))]
-    crate::asm::x86_64_asm_ltr(sel.0)
+    crate::asm::x86_64_asm_ltr(sel.0);
 }