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

Merge remote-tracking branch 'refs/remotes/project64/master'

This commit is contained in:
Samuel Yuan 2015-11-14 19:44:50 -05:00
parent 937625f0c6 87f13cbe4b
commit 7f0deb2ced
6 changed files with 142 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Project64/N64 System/Interpreter/Interpreter CPU.h
View File

@ -10,13 +10,15 @@
****************************************************************************/
#pragma once
#include <Project64\N64 System\Interpreter\Interpreter Ops.h>
class CInterpreterCPU :
private R4300iOp
{
public:
static void BuildCPU();
static void ExecuteCPU();
static void ExecuteOps(int Cycles);
static void ExecuteOps(int32_t Cycles);
static void InPermLoop();
private:

2
Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp
View File

@ -26,7 +26,7 @@ bool DelaySlotEffectsCompare(uint32_t PC, uint32_t Reg1, uint32_t Reg2);
m_NextInstruction = JUMP;\
m_JumpToLocation = (*_PROGRAM_COUNTER);\
return;\
}
}
#define TLB_READ_EXCEPTION(Address) \
g_Reg->DoTLBReadMiss(m_NextInstruction == JUMP,Address);\

2
Source/Project64/N64 System/Interpreter/Interpreter Ops 32.h
View File

@ -10,6 +10,8 @@
****************************************************************************/
#pragma once
#include "Interpreter Ops.h"
class R4300iOp32 :
public R4300iOp
{

4
Source/Project64/N64 System/Interpreter/Interpreter Ops.h
View File

@ -10,6 +10,10 @@
****************************************************************************/
#pragma once
#include <Project64\Settings\Debug Settings.h>
#include <Project64\N64 System\Mips\Register Class.h>
#include <Project64\N64 System\Mips\OpCode.h>
class R4300iOp :
public CLogging,
protected CDebugSettings,

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

@ -9,147 +9,150 @@
* *
****************************************************************************/
#include "stdafx.h"
#include "Audio.h"
#include <Project64\N64 System\System Globals.h>
#include <Project64\N64 System\N64 Class.h>
CAudio::CAudio()
{
Reset();
Reset();
}
CAudio::~CAudio()
{
}
void CAudio::Reset()
{
m_SecondBuff = 0;
m_Status = 0;
m_BytesPerSecond = 0;
m_CountsPerByte = g_System->AiCountPerBytes(); // should be calculated ... see below, instead allow from user settings
if (m_CountsPerByte == 0) m_CountsPerByte = 500; // If the user has no defined value, grant a default and we will calculate
m_FramesPerSecond = 60;
m_SecondBuff = 0;
m_Status = 0;
m_BytesPerSecond = 0;
m_CountsPerByte = g_System->AiCountPerBytes(); // should be calculated ... see below, instead allow from user settings
if (m_CountsPerByte == 0) m_CountsPerByte = 500; // If the user has no defined value, grant a default and we will calculate
m_FramesPerSecond = 60;
}
DWORD CAudio::GetLength()
uint32_t CAudio::GetLength()
{
WriteTraceF(TraceAudio,__FUNCTION__ ": Start (m_SecondBuff = %d)",m_SecondBuff);
DWORD TimeLeft = g_SystemTimer->GetTimer(CSystemTimer::AiTimerInterrupt), Res = 0;
if (TimeLeft > 0)
{
Res = (TimeLeft / m_CountsPerByte);
}
WriteTraceF(TraceAudio,__FUNCTION__ ": Done (res = %d, TimeLeft = %d)",Res, TimeLeft);
return (Res+3)&~3;
WriteTraceF(TraceAudio, __FUNCTION__ ": Start (m_SecondBuff = %d)", m_SecondBuff);
uint32_t TimeLeft = g_SystemTimer->GetTimer(CSystemTimer::AiTimerInterrupt), Res = 0;
if (TimeLeft > 0)
{
Res = (TimeLeft / m_CountsPerByte);
}
WriteTraceF(TraceAudio, __FUNCTION__ ": Done (res = %d, TimeLeft = %d)", Res, TimeLeft);
return (Res + 3)&~3;
}
DWORD CAudio::GetStatus()
uint32_t CAudio::GetStatus()
{
WriteTraceF(TraceAudio,__FUNCTION__ ": m_Status = %X",m_Status);
return m_Status;
WriteTraceF(TraceAudio, __FUNCTION__ ": m_Status = %X", m_Status);
return m_Status;
}
void CAudio::LenChanged()
{
WriteTraceF(TraceAudio,__FUNCTION__ ": Start (g_Reg->AI_LEN_REG = %d)",g_Reg->AI_LEN_REG);
if (g_Reg->AI_LEN_REG != 0)
{
if (g_Reg->AI_LEN_REG >= 0x40000)
{
WriteTraceF(TraceAudio,__FUNCTION__ ": *** Ignoring Write, To Large (%X)",g_Reg->AI_LEN_REG);
} else {
m_Status |= ai_busy;
DWORD AudioLeft = g_SystemTimer->GetTimer(CSystemTimer::AiTimerInterrupt);
if (m_SecondBuff == 0)
{
if (AudioLeft == 0)
{
WriteTraceF(TraceAudio, __FUNCTION__ ": Set Timer AI_LEN_REG: %d m_CountsPerByte: %d", g_Reg->AI_LEN_REG, m_CountsPerByte);
g_SystemTimer->SetTimer(CSystemTimer::AiTimerInterrupt, g_Reg->AI_LEN_REG * m_CountsPerByte, false);
}
else
{
WriteTraceF(TraceAudio, __FUNCTION__ ": Increasing Second Buffer (m_SecondBuff %d Increase: %d)", m_SecondBuff, g_Reg->AI_LEN_REG);
m_SecondBuff += g_Reg->AI_LEN_REG;
m_Status |= ai_full;
}
}
else
{
g_Notify->BreakPoint(__FILEW__, __LINE__);
}
}
}
else
{
WriteTraceF(TraceAudio,__FUNCTION__ ": *** Reset Timer to 0");
g_SystemTimer->StopTimer(CSystemTimer::AiTimerBusy);
g_SystemTimer->StopTimer(CSystemTimer::AiTimerInterrupt);
m_SecondBuff = 0;
m_Status = 0;
}
WriteTraceF(TraceAudio, __FUNCTION__ ": Start (g_Reg->AI_LEN_REG = %d)", g_Reg->AI_LEN_REG);
if (g_Reg->AI_LEN_REG != 0)
{
if (g_Reg->AI_LEN_REG >= 0x40000)
{
WriteTraceF(TraceAudio, __FUNCTION__ ": *** Ignoring Write, To Large (%X)", g_Reg->AI_LEN_REG);
}
else
{
m_Status |= ai_busy;
uint32_t AudioLeft = g_SystemTimer->GetTimer(CSystemTimer::AiTimerInterrupt);
if (m_SecondBuff == 0)
{
if (AudioLeft == 0)
{
WriteTraceF(TraceAudio, __FUNCTION__ ": Set Timer AI_LEN_REG: %d m_CountsPerByte: %d", g_Reg->AI_LEN_REG, m_CountsPerByte);
g_SystemTimer->SetTimer(CSystemTimer::AiTimerInterrupt, g_Reg->AI_LEN_REG * m_CountsPerByte, false);
}
else
{
WriteTraceF(TraceAudio, __FUNCTION__ ": Increasing Second Buffer (m_SecondBuff %d Increase: %d)", m_SecondBuff, g_Reg->AI_LEN_REG);
m_SecondBuff += g_Reg->AI_LEN_REG;
m_Status |= ai_full;
}
}
else
{
g_Notify->BreakPoint(__FILEW__, __LINE__);
}
}
}
else
{
WriteTraceF(TraceAudio, __FUNCTION__ ": *** Reset Timer to 0");
g_SystemTimer->StopTimer(CSystemTimer::AiTimerBusy);
g_SystemTimer->StopTimer(CSystemTimer::AiTimerInterrupt);
m_SecondBuff = 0;
m_Status = 0;
}
if (g_Plugins->Audio()->AiLenChanged != NULL)
{
g_Plugins->Audio()->AiLenChanged();
}
WriteTraceF(TraceAudio,__FUNCTION__ ": Done");
if (g_Plugins->Audio()->AiLenChanged != NULL)
{
g_Plugins->Audio()->AiLenChanged();
}
WriteTraceF(TraceAudio, __FUNCTION__ ": Done");
}
void CAudio::InterruptTimerDone()
{
WriteTraceF(TraceAudio,__FUNCTION__ ": Start (m_SecondBuff = %d)",m_SecondBuff);
m_Status &= ~ai_full;
g_Reg->MI_INTR_REG |= MI_INTR_AI;
g_Reg->CheckInterrupts();
if (m_SecondBuff != 0)
{
g_SystemTimer->SetTimer(CSystemTimer::AiTimerInterrupt,m_SecondBuff * m_CountsPerByte,false);
m_SecondBuff = 0;
}
else
{
m_Status &= ~ai_busy;
}
if (g_Reg->m_AudioIntrReg == 0)
{
g_System->SyncToAudio();
}
WriteTrace(TraceAudio,__FUNCTION__ ": Done");
WriteTraceF(TraceAudio, __FUNCTION__ ": Start (m_SecondBuff = %d)", m_SecondBuff);
m_Status &= ~ai_full;
g_Reg->MI_INTR_REG |= MI_INTR_AI;
g_Reg->CheckInterrupts();
if (m_SecondBuff != 0)
{
g_SystemTimer->SetTimer(CSystemTimer::AiTimerInterrupt, m_SecondBuff * m_CountsPerByte, false);
m_SecondBuff = 0;
}
else
{
m_Status &= ~ai_busy;
}
if (g_Reg->m_AudioIntrReg == 0)
{
g_System->SyncToAudio();
}
WriteTrace(TraceAudio, __FUNCTION__ ": Done");
}
void CAudio::BusyTimerDone()
{
WriteTraceF(TraceAudio,__FUNCTION__ ": Start (m_SecondBuff = %d)",m_SecondBuff);
g_Notify->BreakPoint(__FILEW__,__LINE__);
m_Status &= ~ai_busy;
WriteTraceF(TraceAudio, __FUNCTION__ ": Start (m_SecondBuff = %d)", m_SecondBuff);
g_Notify->BreakPoint(__FILEW__, __LINE__);
m_Status &= ~ai_busy;
}
void CAudio::SetViIntr ( DWORD VI_INTR_TIME )
void CAudio::SetViIntr(uint32_t VI_INTR_TIME)
{
double CountsPerSecond = (DWORD)((double)VI_INTR_TIME * m_FramesPerSecond);
if (m_BytesPerSecond != 0 && (g_System->AiCountPerBytes() == 0))
{
m_CountsPerByte = (int)((double)CountsPerSecond / (double)m_BytesPerSecond);
}
double CountsPerSecond = (uint32_t)((double)VI_INTR_TIME * m_FramesPerSecond);
if (m_BytesPerSecond != 0 && (g_System->AiCountPerBytes() == 0))
{
m_CountsPerByte = (int32_t)((double)CountsPerSecond / (double)m_BytesPerSecond);
}
}
void CAudio::SetFrequency (DWORD Dacrate, DWORD System)
void CAudio::SetFrequency(uint32_t Dacrate, uint32_t System)
{
WriteTraceF(TraceAudio,__FUNCTION__ "(Dacrate: %X System: %d): AI_BITRATE_REG = %X",Dacrate,System,g_Reg->AI_BITRATE_REG);
DWORD Frequency;
WriteTraceF(TraceAudio, __FUNCTION__ "(Dacrate: %X System: %d): AI_BITRATE_REG = %X", Dacrate, System, g_Reg->AI_BITRATE_REG);
uint32_t Frequency;
switch (System)
{
case SYSTEM_PAL: Frequency = 49656530 / (Dacrate + 1); break;
case SYSTEM_MPAL: Frequency = 48628316 / (Dacrate + 1); break;
default: Frequency = 48681812 / (Dacrate + 1); break;
}
switch (System)
{
case SYSTEM_PAL: Frequency = 49656530 / (Dacrate + 1); break;
case SYSTEM_MPAL: Frequency = 48628316 / (Dacrate + 1); break;
default: Frequency = 48681812 / (Dacrate + 1); break;
}
//nBlockAlign = 16 / 8 * 2;
m_BytesPerSecond = Frequency * 4;
//m_BytesPerSecond = 194532;
//m_BytesPerSecond = 128024;
//nBlockAlign = 16 / 8 * 2;
m_BytesPerSecond = Frequency * 4;
//m_BytesPerSecond = 194532;
//m_BytesPerSecond = 128024;
m_FramesPerSecond = System == SYSTEM_PAL ? 50 : 60;
}
m_FramesPerSecond = System == SYSTEM_PAL ? 50 : 60;
}

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

@ -11,29 +11,32 @@
#pragma once
class CAudio
{
enum
{
ai_full = 0x80000000,
ai_busy = 0x40000000,
};
{
enum
{
ai_full = 0x80000000,
ai_busy = 0x40000000,
};
public:
CAudio();
~CAudio();
CAudio();
~CAudio();
DWORD GetLength ();
DWORD GetStatus ();
void LenChanged ();
void InterruptTimerDone();
void BusyTimerDone ();
void Reset ();
void SetViIntr ( DWORD VI_INTR_TIME );
void SetFrequency ( DWORD Dacrate, DWORD System );
uint32_t GetLength ();
uint32_t GetStatus ();
void LenChanged ();
void InterruptTimerDone();
void BusyTimerDone ();
void Reset ();
void SetViIntr ( uint32_t VI_INTR_TIME );
void SetFrequency ( uint32_t Dacrate, uint32_t System );
private:
DWORD m_SecondBuff;
DWORD m_Status;
DWORD m_BytesPerSecond;
int m_CountsPerByte;
int m_FramesPerSecond;
CAudio(const CAudio&); // Disable copy constructor
CAudio& operator=(const CAudio&); // Disable assignment
uint32_t m_SecondBuff;
uint32_t m_Status;
uint32_t m_BytesPerSecond;
int32_t m_CountsPerByte;
int32_t m_FramesPerSecond;
};