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

[Project64] Add Load32AudioInterface

This commit is contained in:
zilmar 2015-12-21 21:06:51 +11:00
parent 6d4ea6d693
commit 9778846ae8
2 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
View File

@ -2531,39 +2531,8 @@ bool CMipsMemoryVM::LW_NonMemory(uint32_t PAddr, uint32_t* Value)
*Value = m_MemLookupValue.UW[0]; *Value = m_MemLookupValue.UW[0];
break; break;
case 0x04500000: case 0x04500000:
switch (PAddr) Load32AudioInterface();
{ *Value = m_MemLookupValue.UW[0];
case 0x04500004:
if (g_System->bFixedAudio())
{
*Value = g_Audio->GetLength();
}
else
{
if (g_Plugins->Audio()->AiReadLength != NULL)
{
*Value = g_Plugins->Audio()->AiReadLength();
}
else
{
*Value = 0;
}
}
break;
case 0x0450000C:
if (g_System->bFixedAudio())
{
*Value = g_Audio->GetStatus();
}
else
{
*Value = g_Reg->AI_STATUS_REG;
}
break;
default:
*Value = 0;
return false;
}
break; break;
case 0x04600000: case 0x04600000:
switch (PAddr) switch (PAddr)
@ -2725,7 +2694,7 @@ bool CMipsMemoryVM::SH_NonMemory(uint32_t PAddr, uint16_t Value)
//VirtualProtect(m_RDRAM+(PAddr & ~0xFFF),0xFFC,PAGE_NOACCESS, &OldProtect); //VirtualProtect(m_RDRAM+(PAddr & ~0xFFF),0xFFC,PAGE_NOACCESS, &OldProtect);
g_Notify->DisplayError(L"PAddr = %x", PAddr); g_Notify->DisplayError(L"PAddr = %x", PAddr);
break; break;
} }
#endif #endif
if (PAddr < RdramSize()) if (PAddr < RdramSize())
{ {
@ -2737,7 +2706,7 @@ bool CMipsMemoryVM::SH_NonMemory(uint32_t PAddr, uint16_t Value)
break; break;
default: default:
return false; return false;
} }
return true; return true;
} }
@ -2757,7 +2726,7 @@ bool CMipsMemoryVM::SW_NonMemory(uint32_t PAddr, uint32_t Value)
} }
#endif #endif
//LogMessage("%X: Wrote To Rom %08X from %08X",PROGRAM_COUNTER,Value,PAddr); //LogMessage("%X: Wrote To Rom %08X from %08X",PROGRAM_COUNTER,Value,PAddr);
} }
else else
{ {
return false; return false;
@ -3078,7 +3047,7 @@ bool CMipsMemoryVM::SW_NonMemory(uint32_t PAddr, uint32_t Value)
g_Reg->MI_INTR_REG &= ~MI_INTR_DP; g_Reg->MI_INTR_REG &= ~MI_INTR_DP;
g_Reg->m_GfxIntrReg &= ~MI_INTR_DP; g_Reg->m_GfxIntrReg &= ~MI_INTR_DP;
g_Reg->CheckInterrupts(); g_Reg->CheckInterrupts();
} }
if ((Value & MI_CLR_RDRAM) != 0) if ((Value & MI_CLR_RDRAM) != 0)
{ {
g_Reg->MI_MODE_REG &= ~MI_MODE_RDRAM; g_Reg->MI_MODE_REG &= ~MI_MODE_RDRAM;
@ -3354,10 +3323,10 @@ bool CMipsMemoryVM::SW_NonMemory(uint32_t PAddr, uint32_t Value)
default: default:
return false; return false;
break; break;
} }
return true; return true;
} }
void CMipsMemoryVM::UpdateHalfLine() void CMipsMemoryVM::UpdateHalfLine()
{ {
@ -5671,4 +5640,44 @@ void CMipsMemoryVM::Load32VideoInterface(void)
g_Notify->BreakPoint(__FILE__, __LINE__); g_Notify->BreakPoint(__FILE__, __LINE__);
} }
} }
}
void CMipsMemoryVM::Load32AudioInterface(void)
{
switch (m_MemLookupAddress & 0x1FFFFFFF)
{
case 0x04500004:
if (g_System->bFixedAudio())
{
m_MemLookupValue.UW[0] = g_Audio->GetLength();
}
else
{
if (g_Plugins->Audio()->AiReadLength != NULL)
{
m_MemLookupValue.UW[0] = g_Plugins->Audio()->AiReadLength();
}
else
{
m_MemLookupValue.UW[0] = 0;
}
}
break;
case 0x0450000C:
if (g_System->bFixedAudio())
{
m_MemLookupValue.UW[0] = g_Audio->GetStatus();
}
else
{
m_MemLookupValue.UW[0] = g_Reg->AI_STATUS_REG;
}
break;
default:
m_MemLookupValue.UW[0] = 0;
if (bHaveDebugger())
{
g_Notify->BreakPoint(__FILE__, __LINE__);
}
}
} }

1
Source/Project64-core/N64System/Mips/MemoryVirtualMem.h
View File

@ -187,6 +187,7 @@ private:
static void Load32DPCommand(void); static void Load32DPCommand(void);
static void Load32MIPSInterface(void); static void Load32MIPSInterface(void);
static void Load32VideoInterface(void); static void Load32VideoInterface(void);
static void Load32AudioInterface(void);
CMipsMemory_CallBack * const m_CBClass; CMipsMemory_CallBack * const m_CBClass;