alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-10-18 08:01:39 +11:00
Code Issues Packages Projects Releases Wiki Activity

Remove the hack from the mixer

Browse source
This commit is contained in:
Gwilym Kuiper 2022-06-17 00:32:07 +01:00
parent 8a8e8c011b
commit 7e46cf6a1d
2 changed files with 3 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
agb/src/sound/mixer/mixer.s
View file

@ -141,34 +141,6 @@ agb_arm_func agb_rs__mixer_add_stereo
agb_arm_end agb_rs__mixer_add_stereo agb_arm_end agb_rs__mixer_add_stereo
.section .iwram
.balign 4
constant_zero:
.rept 4
.word 0
.endr
agb_arm_func agb_rs__init_buffer
@ arguments:
@ r0 = target buffer
@ r1 = size in bytes (must be a multiple of 16)
push {r4-r5}
@ zero registers r3-r5
ldr r2, =constant_zero
ldm r2, {r3-r5,r12}
1:
@ zero 4 words worth of the buffer
stmia r0!, {r3-r5,r12}
subs r1, r1, #(4 * 4)
@ loop if we haven't zeroed everything
bne 1b
pop {r4-r5}
bx lr
agb_arm_end agb_rs__init_buffer
agb_arm_func agb_rs__mixer_collapse agb_arm_func agb_rs__mixer_collapse
@ Arguments: @ Arguments:
@ r0 = target buffer (i8) @ r0 = target buffer (i8)

29
agb/src/sound/mixer/sw_mixer.rs
View file

@ -1,6 +1,5 @@
use core::cell::RefCell; use core::cell::RefCell;
use core::mem; use core::intrinsics::transmute;
use core::mem::MaybeUninit;
use bare_metal::{CriticalSection, Mutex}; use bare_metal::{CriticalSection, Mutex};
@ -29,8 +28,6 @@ extern "C" {
fn agb_rs__mixer_add_stereo(sound_data: *const u8, sound_buffer: *mut Num<i16, 4>); fn agb_rs__mixer_add_stereo(sound_data: *const u8, sound_buffer: *mut Num<i16, 4>);
fn agb_rs__mixer_collapse(sound_buffer: *mut i8, input_buffer: *const Num<i16, 4>); fn agb_rs__mixer_collapse(sound_buffer: *mut i8, input_buffer: *const Num<i16, 4>);
fn agb_rs__init_buffer(buffer: *mut MaybeUninit<Num<i16, 4>>, size_in_bytes: usize);
} }
pub struct Mixer { pub struct Mixer {
@ -235,28 +232,8 @@ impl MixerBuffer {
} }
fn write_channels<'a>(&mut self, channels: impl Iterator<Item = &'a mut SoundChannel>) { fn write_channels<'a>(&mut self, channels: impl Iterator<Item = &'a mut SoundChannel>) {
// This code is equivalent to: let mut buffer: [Num<i16, 4>; constants::SOUND_BUFFER_SIZE * 2] =
// let mut buffer: [Num<i16, 4>; constants::SOUND_BUFFER_SIZE * 2] = unsafe { transmute([0i16; constants::SOUND_BUFFER_SIZE * 2]) };
// [Num::new(0); constants::SOUND_BUFFER_SIZE * 2];
// but the above uses approximately 7% of the CPU time if running at 32kHz
let mut buffer: [Num<i16, 4>; constants::SOUND_BUFFER_SIZE * 2] = {
// Create an uninitialized array of `MaybeUninit`. The `assume_init` is
// safe because the type we are claiming to have initialized here is a
// bunch of `MaybeUninit`s, which do not require initialization.
let mut data: [MaybeUninit<Num<i16, 4>>; constants::SOUND_BUFFER_SIZE * 2] =
unsafe { MaybeUninit::uninit().assume_init() };
// Actually init the array (by filling it with zeros) and then transmute it (which is safe because
// we have now zeroed everything)
unsafe {
agb_rs__init_buffer(
data.as_mut_ptr(),
mem::size_of::<Num<i16, 4>>() * data.len(),
);
mem::transmute(data)
}
};
for channel in channels { for channel in channels {
if channel.is_done { if channel.is_done {