summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-10-01 10:26:16 -0400
committerLioncash <mathew1800@gmail.com>2015-10-01 10:26:16 -0400
commitccc3cd884efcf76314c66848c341fa63bd3f9a5d (patch)
treee0cff6422872221939e9e8e4fda409096520de38 /Source
parent696d6eae099feba23c280017c5184785fc1e3076 (diff)
DSPCore: Use std::array to represent ifx_regs
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/DSP/DSPCore.h2
-rw-r--r--Source/Core/Core/DSP/DSPHWInterface.cpp5
-rw-r--r--Source/Core/Core/HW/DSPLLE/DSPLLE.cpp2
3 files changed, 3 insertions, 6 deletions
diff --git a/Source/Core/Core/DSP/DSPCore.h b/Source/Core/Core/DSP/DSPCore.h
index 6fa8498268..6819a4dcdf 100644
--- a/Source/Core/Core/DSP/DSPCore.h
+++ b/Source/Core/Core/DSP/DSPCore.h
@@ -242,7 +242,7 @@ struct SDSP
std::atomic<u32> mbox[2];
// Accelerator / DMA / other hardware registers. Not GPRs.
- u16 ifx_regs[256];
+ std::array<u16, 256> ifx_regs;
// When state saving, all of the above can just be memcpy'd into the save state.
// The below needs special handling.
diff --git a/Source/Core/Core/DSP/DSPHWInterface.cpp b/Source/Core/Core/DSP/DSPHWInterface.cpp
index 08ba2fa40f..b8c1f70bd4 100644
--- a/Source/Core/Core/DSP/DSPHWInterface.cpp
+++ b/Source/Core/Core/DSP/DSPHWInterface.cpp
@@ -21,10 +21,7 @@ static void gdsp_do_dma();
void gdsp_ifx_init()
{
- for (int i = 0; i < 256; i++)
- {
- g_dsp.ifx_regs[i] = 0;
- }
+ g_dsp.ifx_regs.fill(0);
g_dsp.mbox[0].store(0);
g_dsp.mbox[1].store(0);
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
index bbaf19f7cc..d01540773f 100644
--- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
+++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
@@ -74,7 +74,7 @@ void DSPLLE::DoState(PointerWrap &p)
}
p.Do(g_dsp.step_counter);
- p.Do(g_dsp.ifx_regs);
+ p.DoArray(g_dsp.ifx_regs);
p.Do(g_dsp.mbox[0]);
p.Do(g_dsp.mbox[1]);
UnWriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);