Fix build.

jpd002 · Mar 11, 2024 · 5d9a955 · 5d9a955
1 parent 0e7df23
commit 5d9a955
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/tools/PsfPlayer/Source/psp/Psp_PsfSubSystem.cpp b/tools/PsfPlayer/Source/psp/Psp_PsfSubSystem.cpp
@@ -14,8 +14,8 @@ CPsfSubSystem::CPsfSubSystem(uint32 ramSize)
     , m_cpu(MEMORYMAP_ENDIAN_LSBF)
     , m_copScu(MIPS_REGSIZE_32)
     , m_copFpu(MIPS_REGSIZE_32)
-    , m_spuCore0(m_spuRam, SPURAMSIZE, &m_spuSampleCache, 0)
-    , m_spuCore1(m_spuRam, SPURAMSIZE, &m_spuSampleCache, 1)
+    , m_spuCore0(m_spuRam, SPURAMSIZE, &m_spuSampleCache, &m_irqChecker, 0)
+    , m_spuCore1(m_spuRam, SPURAMSIZE, &m_spuSampleCache, &m_irqChecker, 1)
     , m_bios(m_cpu, m_ram, ramSize)
 {
 	m_cpu.m_executor = std::make_unique<CGenericMipsExecutor<BlockLookupTwoWay>>(m_cpu, ramSize, BLOCK_CATEGORY_PSP);
@@ -49,6 +49,7 @@ void CPsfSubSystem::Reset()
 	memset(m_spuRam, 0, SPURAMSIZE);
 	m_cpu.m_executor->Reset();
 	m_spuSampleCache.Clear();
+	m_irqChecker.Reset();
 	m_spuCore0.Reset();
 	m_spuCore1.Reset();
 	m_spuCore0.SetDestinationSamplingRate(SAMPLING_RATE);

diff --git a/tools/PsfPlayer/Source/psp/Psp_PsfSubSystem.h b/tools/PsfPlayer/Source/psp/Psp_PsfSubSystem.h
@@ -55,6 +55,7 @@ namespace Psp
 		uint32 m_ramSize;
 		uint8* m_spuRam;
 		Iop::CSpuSampleCache m_spuSampleCache;
+		Iop::CSampleAccessIrqChecker m_irqChecker;
 		Iop::CSpuBase m_spuCore0;
 		Iop::CSpuBase m_spuCore1;
 		Framework::CMemStream m_audioStream;

diff --git a/tools/SpuTest/Test.cpp b/tools/SpuTest/Test.cpp
@@ -8,8 +8,8 @@
 
 CTest::CTest()
     : m_ram(new uint8[PS2::SPU_RAM_SIZE])
-    , m_spuCore0(m_ram, PS2::SPU_RAM_SIZE, &m_spuSampleCache, 0)
-    , m_spuCore1(m_ram, PS2::SPU_RAM_SIZE, &m_spuSampleCache, 1)
+    , m_spuCore0(m_ram, PS2::SPU_RAM_SIZE, &m_spuSampleCache, &m_irqChecker, 0)
+    , m_spuCore1(m_ram, PS2::SPU_RAM_SIZE, &m_spuSampleCache, &m_irqChecker, 1)
     , m_spu(m_spuCore0, m_spuCore1)
 {
 	memset(m_ram, 0, PS2::SPU_RAM_SIZE);

diff --git a/tools/SpuTest/Test.h b/tools/SpuTest/Test.h
@@ -42,6 +42,7 @@ class CTest
 
 	uint8* m_ram = nullptr;
 	Iop::CSpuSampleCache m_spuSampleCache;
+	Iop::CSampleAccessIrqChecker m_irqChecker;
 	Iop::CSpuBase m_spuCore0;
 	Iop::CSpuBase m_spuCore1;
 	Iop::CSpu2 m_spu;