OOPIFY: Convert SoundCPU to an A0H

Author: skmp

libswirl/hw/aica/aica_mmio.cpp

@@ -10,6 +10,7 @@
 #include <math.h>
 #include "hw/holly/holly_intc.h"
 #include "hw/holly/sb.h"
+#include "hw/arm7/SoundCPU.h"
 
 #define SH4_IRQ_BIT (1<<(holly_SPU_IRQ&255))
 
@@ -381,7 +382,7 @@ void WriteMem_aica_rtc(u32 addr,u32 data,u32 sz)
 void ArmSetRST()
 {
 	ARMRST&=1;
-	g_SoundCPU->SetResetState(ARMRST);
+	sh4_cpu->GetA0H<SoundCPU>(A0H_SCPU)->SetResetState(ARMRST);
 }
 
 //Init/res/term

libswirl/hw/arm7/SoundCPU.cpp

@@ -1,18 +1,18 @@
 // nullAICA.cpp : Defines the entry point for the DLL application.
 //
 
-#include "types.h"
+#include "SoundCPU.h"
 #include "arm7.h"
 #include "arm_mem.h"
 
 struct SoundCPU_impl : SoundCPU {
 
 	//called when plugin is used by emu (you should do first time init here)
-	s32 Init()
+	bool Init()
 	{
 		arm_Init();
 
-		return rv_ok;
+		return true;
 	}
 
 	//called when plugin is unloaded by emu, only if dcInit is called (eg, not called to enumerate plugins)

libswirl/hw/arm7/SoundCPU.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "hw/sh4/sh4_mmio.h"
+struct SoundCPU : MMIODevice {
+	
+	virtual void SetResetState(u32 State) = 0;
+	virtual void Update(u32 cycles) = 0;
+	
+	virtual ~SoundCPU() { }
+
+	static SoundCPU* Create();
+};

libswirl/hw/sh4/interpr/sh4_interpreter.cpp

@@ -21,6 +21,7 @@
 #include "profiler/profiler.h"
 #include "../dyna/blockmanager.h"
 #include "../sh4_sched.h"
+#include "hw/arm7/SoundCPU.h"
 
 #include "libswirl.h"
 
@@ -106,7 +107,7 @@ int AicaUpdate(void* psh4, int tag, int c, int j)
 
     //if (aica_sample_cycles>=AICA_SAMPLE_CYCLES)
     {
-        g_SoundCPU->Update(512 * 32);
+        sh4_cpu->GetA0H<SoundCPU>(A0H_SCPU)->Update(512 * 32);
         sh4_cpu->GetA0H<AICA>(A0H_AICA)->Update(1 * 32);
         //aica_sample_cycles-=AICA_SAMPLE_CYCLES;
     }

libswirl/hw/sh4/sh4_if.h

@@ -250,6 +250,7 @@ enum Area0Hanlders {
 	A0H_MAPLE,
 	A0H_ASIC,
 	A0H_SPG,
+	A0H_SCPU,
 
 	A0H_MAX
 };

libswirl/libswirl.cpp

@@ -32,6 +32,7 @@
 #include "hw/modem/modem.h"
 #include "hw/holly/holly_intc.h"
 #include "hw/aica/aica_mmio.h"
+#include "hw/arm7/SoundCPU.h"
 
 #define fault_printf(...)
 
@@ -41,7 +42,7 @@
 
 unique_ptr<VirtualDreamcast> virtualDreamcast;
 unique_ptr<GDRomDisc> g_GDRDisc;
-unique_ptr<SoundCPU> g_SoundCPU;
+
 MMIODevice* g_GDRomDrive;
 
 
@@ -125,21 +126,11 @@ s32 plugins_Init()
         return rv;
 #endif
 
-
-    g_SoundCPU.reset(SoundCPU::Create());
-
-    if (s32 rv = g_SoundCPU->Init())
-        return rv;
-
     return rv_ok;
 }
 
 void plugins_Term()
 {
-    //term all plugins
-    g_SoundCPU->Term();
-    g_SoundCPU.reset(nullptr);
-
     g_GDRDisc->Term();
     g_GDRDisc.reset(nullptr);
 }
@@ -148,7 +139,6 @@ void plugins_Reset(bool Manual)
 {
     reios_reset();
     g_GDRDisc->Reset(Manual);
-    g_SoundCPU->Reset(Manual);
     //libExtDevice_Reset(Manual);
 }
 
@@ -823,6 +813,8 @@ struct Dreamcast_impl : VirtualDreamcast {
         SPG* spg = SPG::Create(asic);
         MMIODevice* pvrDevice = Create_PVRDevice(systemBus, asic, spg);
         MMIODevice* aicaDevice = Create_AicaDevice(systemBus, asic);
+        SoundCPU* soundCPU = SoundCPU::Create();
+
         MMIODevice* mapleDevice = Create_MapleDevice(systemBus, asic);
 
         MMIODevice* extDevice = Create_ExtDevice(); // or Create_Modem();
@@ -848,7 +840,8 @@ struct Dreamcast_impl : VirtualDreamcast {
         sh4_cpu->SetA0Handler(A0H_MAPLE, mapleDevice);
         sh4_cpu->SetA0Handler(A0H_ASIC, asic);
         sh4_cpu->SetA0Handler(A0H_SPG, spg);
-
+        sh4_cpu->SetA0Handler(A0H_SCPU, soundCPU);
+        
         return sh4_cpu->Init();
     }
 

libswirl/libswirl.h

@@ -23,7 +23,7 @@ struct VirtualDreamcast {
 
 extern unique_ptr<VirtualDreamcast> virtualDreamcast;
 extern unique_ptr<GDRomDisc> g_GDRDisc;
-extern unique_ptr<SoundCPU> g_SoundCPU;
+
 extern MMIODevice* g_GDRomDrive;
 
 

libswirl/types.h

@@ -773,17 +773,7 @@ static u32 libExtDevice_ReadMem_A5(u32 addr,u32 size){ return 0; }
 static void libExtDevice_WriteMem_A5(u32 addr,u32 data,u32 size) { }
 
 //ARM
-struct SoundCPU {
-	virtual s32 Init() = 0;
-	virtual void Reset(bool M) = 0;
-	virtual void Term() = 0;
 
-	virtual void SetResetState(u32 State) = 0;
-	virtual void Update(u32 cycles) = 0;
-	virtual ~SoundCPU() { }
-
-	static SoundCPU* Create();
-};
 
 #define 	ReadMemArrRet(arr,addr,sz)				\
 			{if (sz==1)								\