ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project64] Add header to rsp plugin

This commit is contained in:
zilmar 2016-10-03 10:57:07 +11:00
parent 7d4ba9b278
commit b19277223b
4 changed files with 264 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Project64-core/Plugins/PluginBase.cpp
View File

@ -285,6 +285,7 @@ bool CPlugin::ValidPluginVersion(PLUGIN_INFO & PluginInfo)
if (PluginInfo.Version == 0x0100) { return true; } if (PluginInfo.Version == 0x0100) { return true; }
if (PluginInfo.Version == 0x0101) { return true; } if (PluginInfo.Version == 0x0101) { return true; }
if (PluginInfo.Version == 0x0102) { return true; } if (PluginInfo.Version == 0x0102) { return true; }
if (PluginInfo.Version == 0x0103) { return true; }
break; break;
case PLUGIN_TYPE_GFX: case PLUGIN_TYPE_GFX:
if (!PluginInfo.MemoryBswaped) { return false; } if (!PluginInfo.MemoryBswaped) { return false; }

379
Source/Project64-core/Plugins/RSPPlugin.cpp
View File

@ -75,138 +75,281 @@ bool CRSP_Plugin::Initiate(CPlugins * Plugins, CN64System * System)
return false; return false;
} }
typedef struct if (m_PluginInfo.Version >= 0x103)
{ {
void * hInst; typedef struct
int MemoryBswaped; /* If this is set to TRUE, then the memory has been pre {
bswap on a dword (32 bits) boundry */ void * hInst;
uint8_t * RDRAM; int MemoryBswaped; /* If this is set to TRUE, then the memory has been pre
uint8_t * DMEM; bswap on a dword (32 bits) boundry */
uint8_t * IMEM; uint8_t * HEADER; // This is the rom header (first 40h bytes of the rom
// This will be in the same memory format as the rest of the memory.
uint8_t * RDRAM;
uint8_t * DMEM;
uint8_t * IMEM;
uint32_t * MI__INTR_REG; uint32_t * MI__INTR_REG;
uint32_t * SP__MEM_ADDR_REG; uint32_t * SP__MEM_ADDR_REG;
uint32_t * SP__DRAM_ADDR_REG; uint32_t * SP__DRAM_ADDR_REG;
uint32_t * SP__RD_LEN_REG; uint32_t * SP__RD_LEN_REG;
uint32_t * SP__WR_LEN_REG; uint32_t * SP__WR_LEN_REG;
uint32_t * SP__STATUS_REG; uint32_t * SP__STATUS_REG;
uint32_t * SP__DMA_FULL_REG; uint32_t * SP__DMA_FULL_REG;
uint32_t * SP__DMA_BUSY_REG; uint32_t * SP__DMA_BUSY_REG;
uint32_t * SP__PC_REG; uint32_t * SP__PC_REG;
uint32_t * SP__SEMAPHORE_REG; uint32_t * SP__SEMAPHORE_REG;
uint32_t * DPC__START_REG; uint32_t * DPC__START_REG;
uint32_t * DPC__END_REG; uint32_t * DPC__END_REG;
uint32_t * DPC__CURRENT_REG; uint32_t * DPC__CURRENT_REG;
uint32_t * DPC__STATUS_REG; uint32_t * DPC__STATUS_REG;
uint32_t * DPC__CLOCK_REG; uint32_t * DPC__CLOCK_REG;
uint32_t * DPC__BUFBUSY_REG; uint32_t * DPC__BUFBUSY_REG;
uint32_t * DPC__PIPEBUSY_REG; uint32_t * DPC__PIPEBUSY_REG;
uint32_t * DPC__TMEM_REG; uint32_t * DPC__TMEM_REG;
void(CALL *CheckInterrupts)(void); void(CALL *CheckInterrupts)(void);
void(CALL *ProcessDlist)(void); void(CALL *ProcessDlist)(void);
void(CALL *ProcessAlist)(void); void(CALL *ProcessAlist)(void);
void(CALL *ProcessRdpList)(void); void(CALL *ProcessRdpList)(void);
void(CALL *ShowCFB)(void); void(CALL *ShowCFB)(void);
} RSP_INFO_1_1; } RSP_INFO_1_3;
RSP_INFO_1_1 Info = { 0 }; RSP_INFO_1_3 Info = { 0 };
#ifdef _WIN32 #ifdef _WIN32
Info.hInst = (Plugins != NULL && Plugins->MainWindow() != NULL) ? Plugins->MainWindow()->GetModuleInstance() : NULL; Info.hInst = (Plugins != NULL && Plugins->MainWindow() != NULL) ? Plugins->MainWindow()->GetModuleInstance() : NULL;
#else #else
Info.hInst = NULL; Info.hInst = NULL;
#endif #endif
Info.CheckInterrupts = DummyCheckInterrupts; Info.CheckInterrupts = DummyCheckInterrupts;
Info.MemoryBswaped = (System == NULL); // only true when the system's not yet loaded Info.MemoryBswaped = (System == NULL); // only true when the system's not yet loaded
//Get Function from DLL //Get Function from DLL
void(CALL *InitiateRSP) (RSP_INFO_1_1 Audio_Info, uint32_t * Cycles); void(CALL *InitiateRSP) (RSP_INFO_1_3 RSP_Info, uint32_t * Cycles);
LoadFunction(InitiateRSP); LoadFunction(InitiateRSP);
if (InitiateRSP == NULL) if (InitiateRSP == NULL)
{
WriteTrace(TraceRSPPlugin, TraceDebug, "Failed to find InitiateRSP");
WriteTrace(TraceRSPPlugin, TraceDebug, "Done (res: false)");
return false;
}
// We are initializing the plugin before any rom is loaded so we do not have any correct
// parameters here.. just needed to we can config the DLL.
if (System == NULL)
{
static uint8_t Buffer[100];
static uint32_t Value = 0;
Info.ProcessDlist = DummyCheckInterrupts;
Info.ProcessRdpList = DummyCheckInterrupts;
Info.ShowCFB = DummyCheckInterrupts;
Info.ProcessAlist = DummyCheckInterrupts;
Info.HEADER = Buffer;
Info.RDRAM = Buffer;
Info.DMEM = Buffer;
Info.IMEM = Buffer;
Info.MI__INTR_REG = &Value;
Info.SP__MEM_ADDR_REG = &Value;
Info.SP__DRAM_ADDR_REG = &Value;
Info.SP__RD_LEN_REG = &Value;
Info.SP__WR_LEN_REG = &Value;
Info.SP__STATUS_REG = &Value;
Info.SP__DMA_FULL_REG = &Value;
Info.SP__DMA_BUSY_REG = &Value;
Info.SP__PC_REG = &Value;
Info.SP__SEMAPHORE_REG = &Value;
Info.DPC__START_REG = &Value;
Info.DPC__END_REG = &Value;
Info.DPC__CURRENT_REG = &Value;
Info.DPC__STATUS_REG = &Value;
Info.DPC__CLOCK_REG = &Value;
Info.DPC__BUFBUSY_REG = &Value;
Info.DPC__PIPEBUSY_REG = &Value;
Info.DPC__TMEM_REG = &Value;
}
// Send initialization information to the DLL
else
{
Info.ProcessDlist = Plugins->Gfx()->ProcessDList;
Info.ProcessRdpList = Plugins->Gfx()->ProcessRDPList;
Info.ShowCFB = Plugins->Gfx()->ShowCFB;
Info.ProcessAlist = Plugins->Audio()->ProcessAList;
CMipsMemoryVM & MMU = System->m_MMU_VM;
CRegisters & Reg = System->m_Reg;
Info.HEADER = g_Rom->GetRomAddress();
Info.RDRAM = MMU.Rdram();
Info.DMEM = MMU.Dmem();
Info.IMEM = MMU.Imem();
Info.MI__INTR_REG = &Reg.m_RspIntrReg;
Info.SP__MEM_ADDR_REG = &Reg.SP_MEM_ADDR_REG;
Info.SP__DRAM_ADDR_REG = &Reg.SP_DRAM_ADDR_REG;
Info.SP__RD_LEN_REG = &Reg.SP_RD_LEN_REG;
Info.SP__WR_LEN_REG = &Reg.SP_WR_LEN_REG;
Info.SP__STATUS_REG = &Reg.SP_STATUS_REG;
Info.SP__DMA_FULL_REG = &Reg.SP_DMA_FULL_REG;
Info.SP__DMA_BUSY_REG = &Reg.SP_DMA_BUSY_REG;
Info.SP__PC_REG = &Reg.SP_PC_REG;
Info.SP__SEMAPHORE_REG = &Reg.SP_SEMAPHORE_REG;
Info.DPC__START_REG = &Reg.DPC_START_REG;
Info.DPC__END_REG = &Reg.DPC_END_REG;
Info.DPC__CURRENT_REG = &Reg.DPC_CURRENT_REG;
Info.DPC__STATUS_REG = &Reg.DPC_STATUS_REG;
Info.DPC__CLOCK_REG = &Reg.DPC_CLOCK_REG;
Info.DPC__BUFBUSY_REG = &Reg.DPC_BUFBUSY_REG;
Info.DPC__PIPEBUSY_REG = &Reg.DPC_PIPEBUSY_REG;
Info.DPC__TMEM_REG = &Reg.DPC_TMEM_REG;
}
InitiateRSP(Info, &m_CycleCount);
}
else
{ {
WriteTrace(TraceRSPPlugin, TraceDebug, "Failed to find InitiateRSP"); typedef struct
WriteTrace(TraceRSPPlugin, TraceDebug, "Done (res: false)"); {
return false; void * hInst;
int MemoryBswaped; /* If this is set to TRUE, then the memory has been pre
bswap on a dword (32 bits) boundry */
uint8_t * RDRAM;
uint8_t * DMEM;
uint8_t * IMEM;
uint32_t * MI__INTR_REG;
uint32_t * SP__MEM_ADDR_REG;
uint32_t * SP__DRAM_ADDR_REG;
uint32_t * SP__RD_LEN_REG;
uint32_t * SP__WR_LEN_REG;
uint32_t * SP__STATUS_REG;
uint32_t * SP__DMA_FULL_REG;
uint32_t * SP__DMA_BUSY_REG;
uint32_t * SP__PC_REG;
uint32_t * SP__SEMAPHORE_REG;
uint32_t * DPC__START_REG;
uint32_t * DPC__END_REG;
uint32_t * DPC__CURRENT_REG;
uint32_t * DPC__STATUS_REG;
uint32_t * DPC__CLOCK_REG;
uint32_t * DPC__BUFBUSY_REG;
uint32_t * DPC__PIPEBUSY_REG;
uint32_t * DPC__TMEM_REG;
void(CALL *CheckInterrupts)(void);
void(CALL *ProcessDlist)(void);
void(CALL *ProcessAlist)(void);
void(CALL *ProcessRdpList)(void);
void(CALL *ShowCFB)(void);
} RSP_INFO_1_1;
RSP_INFO_1_1 Info = { 0 };
#ifdef _WIN32
Info.hInst = (Plugins != NULL && Plugins->MainWindow() != NULL) ? Plugins->MainWindow()->GetModuleInstance() : NULL;
#else
Info.hInst = NULL;
#endif
Info.CheckInterrupts = DummyCheckInterrupts;
Info.MemoryBswaped = (System == NULL); // only true when the system's not yet loaded
//Get Function from DLL
void(CALL *InitiateRSP) (RSP_INFO_1_1 RSP_Info, uint32_t * Cycles);
LoadFunction(InitiateRSP);
if (InitiateRSP == NULL)
{
WriteTrace(TraceRSPPlugin, TraceDebug, "Failed to find InitiateRSP");
WriteTrace(TraceRSPPlugin, TraceDebug, "Done (res: false)");
return false;
}
// We are initializing the plugin before any rom is loaded so we do not have any correct
// parameters here.. just needed to we can config the DLL.
if (System == NULL)
{
static uint8_t Buffer[100];
static uint32_t Value = 0;
Info.ProcessDlist = DummyCheckInterrupts;
Info.ProcessRdpList = DummyCheckInterrupts;
Info.ShowCFB = DummyCheckInterrupts;
Info.ProcessAlist = DummyCheckInterrupts;
Info.RDRAM = Buffer;
Info.DMEM = Buffer;
Info.IMEM = Buffer;
Info.MI__INTR_REG = &Value;
Info.SP__MEM_ADDR_REG = &Value;
Info.SP__DRAM_ADDR_REG = &Value;
Info.SP__RD_LEN_REG = &Value;
Info.SP__WR_LEN_REG = &Value;
Info.SP__STATUS_REG = &Value;
Info.SP__DMA_FULL_REG = &Value;
Info.SP__DMA_BUSY_REG = &Value;
Info.SP__PC_REG = &Value;
Info.SP__SEMAPHORE_REG = &Value;
Info.DPC__START_REG = &Value;
Info.DPC__END_REG = &Value;
Info.DPC__CURRENT_REG = &Value;
Info.DPC__STATUS_REG = &Value;
Info.DPC__CLOCK_REG = &Value;
Info.DPC__BUFBUSY_REG = &Value;
Info.DPC__PIPEBUSY_REG = &Value;
Info.DPC__TMEM_REG = &Value;
}
// Send initialization information to the DLL
else
{
Info.ProcessDlist = Plugins->Gfx()->ProcessDList;
Info.ProcessRdpList = Plugins->Gfx()->ProcessRDPList;
Info.ShowCFB = Plugins->Gfx()->ShowCFB;
Info.ProcessAlist = Plugins->Audio()->ProcessAList;
CMipsMemoryVM & MMU = System->m_MMU_VM;
CRegisters & Reg = System->m_Reg;
Info.RDRAM = MMU.Rdram();
Info.DMEM = MMU.Dmem();
Info.IMEM = MMU.Imem();
Info.MI__INTR_REG = &Reg.m_RspIntrReg;
Info.SP__MEM_ADDR_REG = &Reg.SP_MEM_ADDR_REG;
Info.SP__DRAM_ADDR_REG = &Reg.SP_DRAM_ADDR_REG;
Info.SP__RD_LEN_REG = &Reg.SP_RD_LEN_REG;
Info.SP__WR_LEN_REG = &Reg.SP_WR_LEN_REG;
Info.SP__STATUS_REG = &Reg.SP_STATUS_REG;
Info.SP__DMA_FULL_REG = &Reg.SP_DMA_FULL_REG;
Info.SP__DMA_BUSY_REG = &Reg.SP_DMA_BUSY_REG;
Info.SP__PC_REG = &Reg.SP_PC_REG;
Info.SP__SEMAPHORE_REG = &Reg.SP_SEMAPHORE_REG;
Info.DPC__START_REG = &Reg.DPC_START_REG;
Info.DPC__END_REG = &Reg.DPC_END_REG;
Info.DPC__CURRENT_REG = &Reg.DPC_CURRENT_REG;
Info.DPC__STATUS_REG = &Reg.DPC_STATUS_REG;
Info.DPC__CLOCK_REG = &Reg.DPC_CLOCK_REG;
Info.DPC__BUFBUSY_REG = &Reg.DPC_BUFBUSY_REG;
Info.DPC__PIPEBUSY_REG = &Reg.DPC_PIPEBUSY_REG;
Info.DPC__TMEM_REG = &Reg.DPC_TMEM_REG;
}
InitiateRSP(Info, &m_CycleCount);
} }
// We are initializing the plugin before any rom is loaded so we do not have any correct
// parameters here.. just needed to we can config the DLL.
if (System == NULL)
{
static uint8_t Buffer[100];
static uint32_t Value = 0;
Info.ProcessDlist = DummyCheckInterrupts;
Info.ProcessRdpList = DummyCheckInterrupts;
Info.ShowCFB = DummyCheckInterrupts;
Info.ProcessAlist = DummyCheckInterrupts;
Info.RDRAM = Buffer;
Info.DMEM = Buffer;
Info.IMEM = Buffer;
Info.MI__INTR_REG = &Value;
Info.SP__MEM_ADDR_REG = &Value;
Info.SP__DRAM_ADDR_REG = &Value;
Info.SP__RD_LEN_REG = &Value;
Info.SP__WR_LEN_REG = &Value;
Info.SP__STATUS_REG = &Value;
Info.SP__DMA_FULL_REG = &Value;
Info.SP__DMA_BUSY_REG = &Value;
Info.SP__PC_REG = &Value;
Info.SP__SEMAPHORE_REG = &Value;
Info.DPC__START_REG = &Value;
Info.DPC__END_REG = &Value;
Info.DPC__CURRENT_REG = &Value;
Info.DPC__STATUS_REG = &Value;
Info.DPC__CLOCK_REG = &Value;
Info.DPC__BUFBUSY_REG = &Value;
Info.DPC__PIPEBUSY_REG = &Value;
Info.DPC__TMEM_REG = &Value;
}
// Send initialization information to the DLL
else
{
Info.ProcessDlist = Plugins->Gfx()->ProcessDList;
Info.ProcessRdpList = Plugins->Gfx()->ProcessRDPList;
Info.ShowCFB = Plugins->Gfx()->ShowCFB;
Info.ProcessAlist = Plugins->Audio()->ProcessAList;
CMipsMemoryVM & MMU = System->m_MMU_VM;
CRegisters & Reg = System->m_Reg;
Info.RDRAM = MMU.Rdram();
Info.DMEM = MMU.Dmem();
Info.IMEM = MMU.Imem();
Info.MI__INTR_REG = &Reg.m_RspIntrReg;
Info.SP__MEM_ADDR_REG = &Reg.SP_MEM_ADDR_REG;
Info.SP__DRAM_ADDR_REG = &Reg.SP_DRAM_ADDR_REG;
Info.SP__RD_LEN_REG = &Reg.SP_RD_LEN_REG;
Info.SP__WR_LEN_REG = &Reg.SP_WR_LEN_REG;
Info.SP__STATUS_REG = &Reg.SP_STATUS_REG;
Info.SP__DMA_FULL_REG = &Reg.SP_DMA_FULL_REG;
Info.SP__DMA_BUSY_REG = &Reg.SP_DMA_BUSY_REG;
Info.SP__PC_REG = &Reg.SP_PC_REG;
Info.SP__SEMAPHORE_REG = &Reg.SP_SEMAPHORE_REG;
Info.DPC__START_REG = &Reg.DPC_START_REG;
Info.DPC__END_REG = &Reg.DPC_END_REG;
Info.DPC__CURRENT_REG = &Reg.DPC_CURRENT_REG;
Info.DPC__STATUS_REG = &Reg.DPC_STATUS_REG;
Info.DPC__CLOCK_REG = &Reg.DPC_CLOCK_REG;
Info.DPC__BUFBUSY_REG = &Reg.DPC_BUFBUSY_REG;
Info.DPC__PIPEBUSY_REG = &Reg.DPC_PIPEBUSY_REG;
Info.DPC__TMEM_REG = &Reg.DPC_TMEM_REG;
}
InitiateRSP(Info, &m_CycleCount);
m_Initialized = true; m_Initialized = true;
#ifdef _WIN32 #ifdef _WIN32

2
Source/RSP/Main.cpp
View File

@ -228,7 +228,7 @@ void FixMenuState(void)
*******************************************************************/ *******************************************************************/
EXPORT void GetDllInfo(PLUGIN_INFO * PluginInfo) EXPORT void GetDllInfo(PLUGIN_INFO * PluginInfo)
{ {
PluginInfo->Version = 0x0102; PluginInfo->Version = 0x0103;
PluginInfo->Type = PLUGIN_TYPE_RSP; PluginInfo->Type = PLUGIN_TYPE_RSP;
#ifdef _DEBUG #ifdef _DEBUG
sprintf(PluginInfo->Name, "RSP Debug Plugin %s", VER_FILE_VERSION_STR); sprintf(PluginInfo->Name, "RSP Debug Plugin %s", VER_FILE_VERSION_STR);

1
Source/RSP/Rsp.h
View File

@ -67,6 +67,7 @@ typedef struct {
void * hInst; void * hInst;
int MemoryBswaped; /* If this is set to TRUE, then the memory has been pre int MemoryBswaped; /* If this is set to TRUE, then the memory has been pre
bswap on a dword (32 bits) boundry */ bswap on a dword (32 bits) boundry */
uint8_t * HEADER;
uint8_t * RDRAM; uint8_t * RDRAM;
uint8_t * DMEM; uint8_t * DMEM;
uint8_t * IMEM; uint8_t * IMEM;