fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[XMA] Cleanup in XmaDecoder::WriteRegister

Browse Source 
- Replaced manual for loop with C++20 countr_zero standard call
This commit is contained in:
Gliniak
2025-12-23 23:28:13 +01:00
parent ac66db337b
commit 547226fc0b
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/xenia/apu/xma_decoder.cc
View File

@@ -339,16 +339,15 @@ void XmaDecoder::WriteRegister(uint32_t addr, uint32_t value) {
// XMAEnableContext
// The context ID is a bit in the range of the entire context array.
uint32_t base_context_id = (r - XmaRegister::Context0Kick) * 32;
for (int i = 0; value && i < 32; ++i, value >>= 1) {
if (value & 1) {
uint32_t context_id = base_context_id + i;
auto& context = *contexts_[context_id];
context.Enable();
if (!cvars::use_dedicated_xma_thread) {
context.Work();
}
const uint32_t base_context_id = (r - XmaRegister::Context0Kick) * 32;
while (value) {
const uint32_t context_id = base_context_id + std::countr_zero(value);
auto& context = *contexts_[context_id];
context.Enable();
if (!cvars::use_dedicated_xma_thread) {
context.Work();
}
value &= value - 1;
}
// Signal the decoder thread to start processing.
work_event_->SetBoostPriority();
@@ -356,27 +355,26 @@ void XmaDecoder::WriteRegister(uint32_t addr, uint32_t value) {
// Context lock command.
// This requests a lock by flagging the context.
// XMADisableContext
uint32_t base_context_id = (r - XmaRegister::Context0Lock) * 32;
for (int i = 0; value && i < 32; ++i, value >>= 1) {
if (value & 1) {
uint32_t context_id = base_context_id + i;
auto& context = *contexts_[context_id];
context.Disable();
}
const uint32_t base_context_id = (r - XmaRegister::Context0Lock) * 32;
while (value) {
const uint32_t context_id = base_context_id + std::countr_zero(value);
auto& context = *contexts_[context_id];
context.Disable();
value &= value - 1;
}
// Signal the decoder thread to start processing.
// work_event_->Set();
} else if (r >= XmaRegister::Context0Clear &&
r <= XmaRegister::Context9Clear) {
// Context clear command.
// This will reset the given hardware contexts.
uint32_t base_context_id = (r - XmaRegister::Context0Clear) * 32;
for (int i = 0; value && i < 32; ++i, value >>= 1) {
if (value & 1) {
uint32_t context_id = base_context_id + i;
XmaContext& context = *contexts_[context_id];
context.Clear();
}
const uint32_t base_context_id = (r - XmaRegister::Context0Clear) * 32;
while (value) {
const uint32_t context_id = base_context_id + std::countr_zero(value);
auto& context = *contexts_[context_id];
context.Clear();
value &= value - 1;
}
} else {
// 0601h (1804h) is written to with 0x02000000 and 0x03000000 around a lock