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

git-svn-id: https://localhost/svn/Project64/trunk@41 111125ac-702d-7242-af9c-5ba8ae61c1ef

This commit is contained in:
zilmar 2010-06-30 21:35:44 +00:00
parent 5b2b21cd08
commit edcaea006b
12 changed files with 40 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp
View File

@ -722,7 +722,7 @@ void TestInterpreterJump (DWORD PC, DWORD TargetPC, int Reg1, int Reg2)
R4300iOp::m_TestTimer = TRUE;
}
/************************* m_Opcode functions *************************/
/************************* Opcode functions *************************/
void R4300iOp::J (void) {
m_NextInstruction = DELAY_SLOT;
m_JumpToLocation = ((*_PROGRAM_COUNTER) & 0xF0000000) + (m_Opcode.target << 2);
@ -1052,24 +1052,6 @@ void R4300iOp::LW (void) {
#endif
if (m_Opcode.rt == 0) { return; }
#ifdef toremove
if (Address >= 0xA3F00000 && Address < 0xC0000000)
{
if (Address < 0xA4000000 || Address >= 0xA4002000)
{
Address &= 0x1FFFFFFF;
if (!r4300i_LW_NonMemory(Address,&_GPR[m_Opcode.rt].UW[0]))
{
if (ShowUnhandledMemory)
{
DisplayError("Failed to load word\n\nIn LW",Address);
}
}
_GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rt].W[0];
return;
}
}
#endif
if (!_MMU->LW_VAddr(Address,_GPR[m_Opcode.rt].UW[0])) {
if (g_ShowTLBMisses) {
@ -1189,24 +1171,6 @@ void R4300iOp::SW (void) {
#if (!defined(EXTERNAL_RELEASE))
Log_SW((*_PROGRAM_COUNTER),Address,_GPR[m_Opcode.rt].UW[0]);
#endif
#ifdef toremove
if (Address >= 0xA3F00000 && Address < 0xC0000000)
{
if (Address < 0xA4000000 || Address >= 0xA4002000)
{
Address &= 0x1FFFFFFF;
if (!r4300i_SW_NonMemory(Address,_GPR[m_Opcode.rt].UW[0]))
{
if (ShowUnhandledMemory)
{
DisplayError("Failed to load word\n\nIn SW",Address);
}
}
return;
}
}
#endif
if (!_MMU->SW_VAddr(Address,_GPR[m_Opcode.rt].UW[0]))
{
if (g_ShowTLBMisses)

24
Source/Project64/N64 System/Mips/Audio.cpp
View File

@ -14,6 +14,7 @@ void CAudio::Reset ( void )
m_CurrentLength = 0;
m_SecondBuff = 0;
m_Status = 0;
m_BytesPerSecond = 0;
m_CountsPerByte = 500; // should be calculated ... see below
m_FramesPerSecond = 60;
}
@ -21,6 +22,7 @@ void CAudio::Reset ( void )
DWORD CAudio::GetLength ( void )
{
DWORD TimeLeft = _SystemTimer->GetTimer(CSystemTimer::AiTimer);
WriteTraceF(TraceError,"CAudio::GetLength: TimeLeft = %d m_CountsPerByte = %d BytesLeft = %d",TimeLeft,(int)m_CountsPerByte, (int)(TimeLeft / m_CountsPerByte));
if (TimeLeft > 0)
{
return TimeLeft / m_CountsPerByte;
@ -40,6 +42,7 @@ void CAudio::LenChanged ( void )
return;
}
WriteTraceF(TraceError,"CAudio::LenChanged: m_CurrentLength = %d AI_LEN_REG = %d m_CountsPerByte = %d",m_CurrentLength,_Reg->AI_LEN_REG,(int)m_CountsPerByte);
if (m_CurrentLength == 0) {
m_CurrentLength = _Reg->AI_LEN_REG;
_SystemTimer->SetTimer(CSystemTimer::AiTimer,m_CurrentLength * m_CountsPerByte,false);
@ -55,8 +58,13 @@ void CAudio::LenChanged ( void )
void CAudio::TimerDone ( void )
{
WriteTraceF(TraceError,"CAudio::TimerDone: m_SecondBuff = %d",m_SecondBuff);
_Reg->MI_INTR_REG |= MI_INTR_AI;
_Reg->CheckInterrupts();
if (m_SecondBuff != 0) {
_SystemTimer->SetTimer(CSystemTimer::AiTimer,m_SecondBuff * m_CountsPerByte,true);
_SystemTimer->SetTimer(CSystemTimer::AiTimer,m_SecondBuff * m_CountsPerByte,false);
}
m_CurrentLength = m_SecondBuff;
m_SecondBuff = 0;
@ -65,18 +73,20 @@ void CAudio::TimerDone ( void )
void CAudio::SetViIntr ( DWORD VI_INTR_TIME )
{
WriteTraceF(TraceError,"CAudio::SetViIntr: VI_INTR_TIME = %d",VI_INTR_TIME);
double CountsPerSecond = (DWORD)((double)VI_INTR_TIME * m_FramesPerSecond);
m_CountsPerByte = (double)CountsPerSecond / (double)m_BytesPerSecond;
//m_CountsPerByte = 490; // donkey kong
//m_CountsPerByte = 100; // Paper mario
//m_CountsPerByte = 490; // Paper mario
if (m_BytesPerSecond != 0)
{
//m_CountsPerByte = (double)CountsPerSecond / (double)m_BytesPerSecond;
}
}
void CAudio::SetFrequency (DWORD Dacrate, DWORD System)
{
WriteTraceF(TraceError,"CAudio::SetFrequency: Dacrate = %d System = %d",Dacrate,System);
DWORD Frequency;
switch (System) {

2
Source/Project64/N64 System/Mips/Audio.h
View File

@ -20,7 +20,7 @@ private:
DWORD m_SecondBuff;
DWORD m_Status;
DWORD m_BytesPerSecond;
double m_CountsPerByte;
int m_CountsPerByte;
int m_FramesPerSecond;
/* float m_VSyncTiming;

8
Source/Project64/N64 System/Mips/Dma.cpp
View File

@ -55,10 +55,9 @@ void CDMA::PI_DMA_READ (void) {
return;
}
}
if (g_SaveUsing == SaveChip_FlashRam) {
#ifndef EXTERNAL_RELEASE
if (g_SaveUsing == SaveChip_FlashRam)
{
DisplayError("**** FLashRam DMA Read address %X *****",_Reg->PI_CART_ADDR_REG);
#endif
_Reg->PI_STATUS_REG &= ~PI_STATUS_DMA_BUSY;
_Reg->MI_INTR_REG |= MI_INTR_PI;
_Reg->CheckInterrupts();
@ -111,7 +110,8 @@ void CDMA::PI_DMA_WRITE (void) {
return;
}
if ( _Reg->PI_CART_ADDR_REG >= 0x10000000 && _Reg->PI_CART_ADDR_REG <= 0x1FBFFFFF) {
if ( _Reg->PI_CART_ADDR_REG >= 0x10000000 && _Reg->PI_CART_ADDR_REG <= 0x1FBFFFFF)
{
DWORD i;
#ifdef tofix
#ifdef ROM_IN_MAPSPACE

17
Source/Project64/N64 System/Mips/FlashRam.cpp
View File

@ -89,7 +89,8 @@ void CFlashram::DmaToFlashram(BYTE * Source, int StartOffset, int len) {
}
}
DWORD CFlashram::ReadFlashStatus (DWORD PAddr)
DWORD CFlashram::ReadFromFlashStatus (DWORD PAddr)
{
switch (PAddr) {
case 0x08000000: return (DWORD)(m_FlashStatus >> 32);
@ -205,17 +206,3 @@ void CFlashram::WriteToFlashCommand(DWORD FlashRAM_Command) {
#endif
}
}
DWORD CFlashram::ReadFromFlashStatus (DWORD PAddr)
{
switch (PAddr) {
case 0x08000000: return (DWORD)(m_FlashStatus >> 32);
default:
#ifndef EXTERNAL_RELEASE
DisplayError("Reading from flash ram status (%X)",PAddr);
#endif
break;
}
return (DWORD)(m_FlashStatus >> 32);
}

1
Source/Project64/N64 System/Mips/FlashRam.h
View File

@ -18,7 +18,6 @@ public:
void WriteToFlashCommand ( DWORD Value );
private:
DWORD ReadFlashStatus ( DWORD PAddr );
bool LoadFlashram ( void );
BYTE * m_FlashRamPointer;

6
Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp
View File

@ -764,6 +764,7 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
}
if ( ( Value & MI_CLR_DP_INTR ) != 0 ) {
AndConstToVariable(~MI_INTR_DP,&_Reg->MI_INTR_REG,"MI_INTR_REG");
AndConstToVariable(~MI_INTR_DP,&_Reg->m_GfxIntrReg,"m_GfxIntrReg");
}
}
break;
@ -1978,6 +1979,7 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
if ( ( Value & SP_CLR_BROKE ) != 0) { _Reg->SP_STATUS_REG &= ~SP_STATUS_BROKE; }
if ( ( Value & SP_CLR_INTR ) != 0) {
_Reg->MI_INTR_REG &= ~MI_INTR_SP;
_Reg->m_RspIntrReg &= ~MI_INTR_SP;
_Reg->CheckInterrupts();
}
#ifndef EXTERNAL_RELEASE
@ -2076,6 +2078,7 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
if ( ( Value & MI_SET_EBUS ) != 0 ) { _Reg->MI_MODE_REG |= MI_MODE_EBUS; }
if ( ( Value & MI_CLR_DP_INTR ) != 0 ) {
_Reg->MI_INTR_REG &= ~MI_INTR_DP;
_Reg->m_GfxIntrReg &= ~MI_INTR_DP;
_Reg->CheckInterrupts();
}
if ( ( Value & MI_CLR_RDRAM ) != 0 ) { _Reg->MI_MODE_REG &= ~MI_MODE_RDRAM; }
@ -2238,7 +2241,7 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
if (g_SaveUsing == SaveChip_Auto) { g_SaveUsing = SaveChip_FlashRam; }
if (g_SaveUsing != SaveChip_FlashRam) { return TRUE; }
WriteToFlashCommand(Value);
return FALSE;
return TRUE;
break;
case 0x1FC00000:
if (PAddr < 0x1FC007C0) {
@ -3776,6 +3779,7 @@ void CMipsMemoryVM::ChangeSpStatus (void)
if ( ( RegModValue & SP_CLR_BROKE ) != 0) { _Reg->SP_STATUS_REG &= ~SP_STATUS_BROKE; }
if ( ( RegModValue & SP_CLR_INTR ) != 0) {
_Reg->MI_INTR_REG &= ~MI_INTR_SP;
_Reg->m_RspIntrReg &= ~MI_INTR_SP;
_Reg->CheckInterrupts();
}
#ifndef EXTERNAL_RELEASE

6
Source/Project64/N64 System/Mips/Register Class.cpp
View File

@ -240,6 +240,10 @@ void CRegisters::Reset()
memset(m_Peripheral_Interface,0,sizeof(m_Peripheral_Interface));
memset(m_SerialInterface,0,sizeof(m_SerialInterface));
m_AudioIntrReg = 0;
m_GfxIntrReg = 0;
m_RspIntrReg = 0;
FixFpuLocations();
}
@ -264,6 +268,8 @@ void CRegisters::CheckInterrupts ( void )
MI_INTR_REG &= ~MI_INTR_AI;
MI_INTR_REG |= (m_AudioIntrReg & MI_INTR_AI);
}
MI_INTR_REG |= (m_RspIntrReg & MI_INTR_SP);
MI_INTR_REG |= (m_GfxIntrReg & MI_INTR_DP);
if ((MI_INTR_MASK_REG & MI_INTR_REG) != 0) {
FAKE_CAUSE_REGISTER |= CAUSE_IP2;
} else {

2
Source/Project64/N64 System/Mips/Register Class.h
View File

@ -502,6 +502,8 @@ public:
DWORD m_RDRAM_Interface[8];
DWORD m_SerialInterface[4];
DWORD m_AudioIntrReg;
DWORD m_GfxIntrReg;
DWORD m_RspIntrReg;
void CheckInterrupts ( void );

2
Source/Project64/N64 System/Mips/System Timing.cpp
View File

@ -184,8 +184,6 @@ void CSystemTimer::TimerDone (void)
break;
case CSystemTimer::AiTimer:
_SystemTimer->StopTimer(CSystemTimer::AiTimer);
_Reg->MI_INTR_REG |= MI_INTR_AI;
_Reg->CheckInterrupts();
_Audio->TimerDone();
break;
default:

2
Source/Project64/Plugins/GFX plugin.cpp
View File

@ -226,7 +226,7 @@ bool CGfxPlugin::Initiate ( CN64System * System, CMainGui * RenderWindow ) {
Info.RDRAM = _MMU->Rdram();
Info.DMEM = _MMU->Dmem();
Info.IMEM = _MMU->Imem();
Info.MI__INTR_REG = &_Reg->MI_INTR_REG;
Info.MI__INTR_REG = &_Reg->m_GfxIntrReg;
Info.DPC__START_REG = &_Reg->DPC_START_REG;
Info.DPC__END_REG = &_Reg->DPC_END_REG;
Info.DPC__CURRENT_REG = &_Reg->DPC_CURRENT_REG;

2
Source/Project64/Plugins/RSP Plugin.cpp
View File

@ -240,7 +240,7 @@ bool CRSP_Plugin::Initiate ( CPlugins * Plugins, CN64System * System )
Info.IMEM = _MMU->Imem();
Info.MemoryBswaped = FALSE;
Info.MI__INTR_REG = &_Reg->MI_INTR_REG;
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;