vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Share the functions in interrupt/mod.rs between x86 and x86_64

Browse Source
This commit is contained in:
bjorn3
2024-02-25 14:45:10 +01:00
parent fbe2980b3d
commit eecfbb19d2
3 changed files with 43 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/x86/interrupt/mod.rs
-43
View File
@@ -15,46 +15,3 @@ pub use super::{
device::local_apic::bsp_apic_id,
idt::{available_irqs_iter, is_reserved, set_reserved},
};
/// Clear interrupts
#[inline(always)]
pub unsafe fn disable() {
core::arch::asm!("cli", options(nomem, nostack));
}
/// Set interrupts
#[inline(always)]
pub unsafe fn enable() {
core::arch::asm!("sti", options(nomem, nostack));
}
/// Set interrupts and halt
/// This will atomically wait for the next interrupt
/// Performing enable followed by halt is not guaranteed to be atomic, use this instead!
#[inline(always)]
pub unsafe fn enable_and_halt() {
core::arch::asm!("sti; hlt", options(nomem, nostack));
}
/// Set interrupts and nop
/// This will enable interrupts and allow the IF flag to be processed
/// Simply enabling interrupts does not gurantee that they will trigger, use this instead!
#[inline(always)]
pub unsafe fn enable_and_nop() {
core::arch::asm!("sti; nop", options(nomem, nostack));
}
/// Halt instruction
#[inline(always)]
pub unsafe fn halt() {
core::arch::asm!("hlt", options(nomem, nostack));
}
/// Pause instruction
/// Safe because it is similar to a NOP, and has no memory effects
#[inline(always)]
pub fn pause() {
unsafe {
core::arch::asm!("pause", options(nomem, nostack));
}
}
src/arch/x86_64/interrupt/mod.rs
-43
View File
@@ -15,46 +15,3 @@ pub use super::{
device::local_apic::bsp_apic_id,
idt::{available_irqs_iter, is_reserved, set_reserved},
};
/// Clear interrupts
#[inline(always)]
pub unsafe fn disable() {
core::arch::asm!("cli", options(nomem, nostack));
}
/// Set interrupts
#[inline(always)]
pub unsafe fn enable() {
core::arch::asm!("sti", options(nomem, nostack));
}
/// Set interrupts and halt
/// This will atomically wait for the next interrupt
/// Performing enable followed by halt is not guaranteed to be atomic, use this instead!
#[inline(always)]
pub unsafe fn enable_and_halt() {
core::arch::asm!("sti; hlt", options(nomem, nostack));
}
/// Set interrupts and nop
/// This will enable interrupts and allow the IF flag to be processed
/// Simply enabling interrupts does not gurantee that they will trigger, use this instead!
#[inline(always)]
pub unsafe fn enable_and_nop() {
core::arch::asm!("sti; nop", options(nomem, nostack));
}
/// Halt instruction
#[inline(always)]
pub unsafe fn halt() {
core::arch::asm!("hlt", options(nomem, nostack));
}
/// Pause instruction
/// Safe because it is similar to a NOP, and has no memory effects
#[inline(always)]
pub fn pause() {
unsafe {
core::arch::asm!("pause", options(nomem, nostack));
}
}
src/arch/x86_shared/interrupt/mod.rs
+43
View File
@@ -4,3 +4,46 @@ pub mod ipi;
pub mod trace;
pub use self::trace::stack_trace;
/// Clear interrupts
#[inline(always)]
pub unsafe fn disable() {
core::arch::asm!("cli", options(nomem, nostack));
}
/// Set interrupts
#[inline(always)]
pub unsafe fn enable() {
core::arch::asm!("sti", options(nomem, nostack));
}
/// Set interrupts and halt
/// This will atomically wait for the next interrupt
/// Performing enable followed by halt is not guaranteed to be atomic, use this instead!
#[inline(always)]
pub unsafe fn enable_and_halt() {
core::arch::asm!("sti; hlt", options(nomem, nostack));
}
/// Set interrupts and nop
/// This will enable interrupts and allow the IF flag to be processed
/// Simply enabling interrupts does not gurantee that they will trigger, use this instead!
#[inline(always)]
pub unsafe fn enable_and_nop() {
core::arch::asm!("sti; nop", options(nomem, nostack));
}
/// Halt instruction
#[inline(always)]
pub unsafe fn halt() {
core::arch::asm!("hlt", options(nomem, nostack));
}
/// Pause instruction
/// Safe because it is similar to a NOP, and has no memory effects
#[inline(always)]
pub fn pause() {
unsafe {
core::arch::asm!("pause", options(nomem, nostack));
}
}