alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-24 00:31:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

when building docs, don't use instruction set

Browse source
This commit is contained in:
Corwin 2022-10-12 17:19:25 +01:00
parent a9faaffe46
commit ae419fb6c1
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
agb/src/sync/statics.rs
View file

@ -78,7 +78,7 @@ unsafe fn transfer_align4_thumb<T: Copy>(mut dst: *mut T, mut src: *const T) {
} }
} }
#[instruction_set(arm::a32)] #[cfg_attr(not(doc), instruction_set(arm::a32))]
#[allow(unused_assignments)] #[allow(unused_assignments)]
unsafe fn transfer_align4_arm<T: Copy>(mut dst: *mut T, mut src: *const T) { unsafe fn transfer_align4_arm<T: Copy>(mut dst: *mut T, mut src: *const T) {
let size = mem::size_of::<T>(); let size = mem::size_of::<T>();
@ -168,14 +168,14 @@ unsafe fn exchange<T>(dst: *mut T, src: *const T) -> T {
} }
} }
#[instruction_set(arm::a32)] #[cfg_attr(not(doc), instruction_set(arm::a32))]
unsafe fn exchange_align4_arm<T>(dst: *mut T, i: u32) -> u32 { unsafe fn exchange_align4_arm<T>(dst: *mut T, i: u32) -> u32 {
let out; let out;
asm!("swp {2}, {1}, [{0}]", in(reg) dst, in(reg) i, lateout(reg) out); asm!("swp {2}, {1}, [{0}]", in(reg) dst, in(reg) i, lateout(reg) out);
out out
} }
#[instruction_set(arm::a32)] #[cfg_attr(not(doc), instruction_set(arm::a32))]
unsafe fn exchange_align1_arm<T>(dst: *mut T, i: u8) -> u8 { unsafe fn exchange_align1_arm<T>(dst: *mut T, i: u8) -> u8 {
let out; let out;
asm!("swpb {2}, {1}, [{0}]", in(reg) dst, in(reg) i, lateout(reg) out); asm!("swpb {2}, {1}, [{0}]", in(reg) dst, in(reg) i, lateout(reg) out);
@ -220,7 +220,9 @@ pub struct Static<T> {
impl<T> Static<T> { impl<T> Static<T> {
/// Creates a new static variable. /// Creates a new static variable.
pub const fn new(val: T) -> Self { pub const fn new(val: T) -> Self {
Static { data: UnsafeCell::new(val) } Static {
data: UnsafeCell::new(val),
}
} }
/// Replaces the current value of the static variable with another, and /// Replaces the current value of the static variable with another, and
@ -260,10 +262,10 @@ unsafe impl<T> Sync for Static<T> {}
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use crate::Gba;
use crate::interrupt::Interrupt; use crate::interrupt::Interrupt;
use crate::sync::Static; use crate::sync::Static;
use crate::timer::Divider; use crate::timer::Divider;
use crate::Gba;
fn write_read_concurrency_test_impl<const COUNT: usize>(gba: &mut Gba) { fn write_read_concurrency_test_impl<const COUNT: usize>(gba: &mut Gba) {
let sentinel = [0x12345678; COUNT]; let sentinel = [0x12345678; COUNT];
@ -303,7 +305,7 @@ mod test {
// and interrupt // and interrupt
if interrupt_seen && no_interrupt_seen { if interrupt_seen && no_interrupt_seen {
timer.set_enabled(false); timer.set_enabled(false);
return return;
} }
if i % 8192 == 0 && i != 0 { if i % 8192 == 0 && i != 0 {