archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 23:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

RawSPU cleanup

Browse source
This commit is contained in:
Nekotekina 2014-07-16 20:10:18 +04:00
parent 694a2b774e
commit ecbc9d1b08
4 changed files with 54 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

183
rpcs3/Emu/Cell/RawSPUThread.cpp
View file

@ -22,75 +22,20 @@ RawSPUThread::~RawSPUThread()
bool RawSPUThread::Read32(const u64 addr, u32* value) bool RawSPUThread::Read32(const u64 addr, u32* value)
{ {
if(addr < GetStartAddr() + RAW_SPU_PROB_OFFSET) const u64 offset = addr - GetStartAddr() - RAW_SPU_PROB_OFFSET;
{
return MemoryBlock::Read32(addr, value);
}
const u32 offset = addr - GetStartAddr() - RAW_SPU_PROB_OFFSET; switch (offset)
switch(offset)
{ {
case MFC_LSA_offs:
{
LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Read32(MFC_LSA)", m_index);
*value = MFC2.LSA.GetValue();
break;
}
case MFC_EAH_offs:
{
LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Read32(MFC_EAH)", m_index);
*value = MFC2.EAH.GetValue();
break;
}
case MFC_EAL_offs:
{
LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Read32(MFC_EAL)", m_index);
*value = MFC2.EAL.GetValue();
break;
}
case MFC_Size_Tag_offs:
{
LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Read32(MFC_Size_Tag)", m_index);
*value = MFC2.Size_Tag.GetValue();
break;
}
case MFC_CMDStatus_offs: case MFC_CMDStatus_offs:
{ {
LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Read32(MFC_CMDStatus)", m_index);
*value = MFC2.CMDStatus.GetValue(); *value = MFC2.CMDStatus.GetValue();
break; break;
} }
case MFC_QStatus_offs: case MFC_QStatus_offs:
{ {
LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Read32(MFC_QStatus)", m_index); // TagStatus is not used: mask is written directly
*value = MFC2.QStatus.GetValue(); *value = MFC2.QueryMask.GetValue();
break;
}
case Prxy_QueryType_offs:
{
LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Read32(Prxy_QueryType)", m_index);
*value = Prxy.QueryType.GetValue();
break;
}
case Prxy_QueryMask_offs:
{
LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Read32(Prxy_QueryMask)", m_index);
*value = Prxy.QueryMask.GetValue();
break;
}
case Prxy_TagStatus_offs:
{
LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Read32(Prxy_TagStatus)", m_index);
*value = Prxy.TagStatus.GetValue();
break; break;
} }
@ -100,62 +45,23 @@ bool RawSPUThread::Read32(const u64 addr, u32* value)
SPU.Out_MBox.PopUncond(*value); SPU.Out_MBox.PopUncond(*value);
break; break;
} }
case SPU_In_MBox_offs:
{
LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Read32(SPU_In_MBox)", m_index);
while (!SPU.In_MBox.Pop(*value) && !Emu.IsStopped())
std::this_thread::sleep_for(std::chrono::milliseconds(1));
break;
}
case SPU_MBox_Status_offs: case SPU_MBox_Status_offs:
{ {
//LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Read32(SPU_MBox_Status)", m_index); *value = (SPU.Out_MBox.GetCount() & 0xff) | (SPU.In_MBox.GetFreeCount() << 8);
//SPU.MBox_Status.SetValue(SPU.Out_MBox.GetCount() ? SPU.MBox_Status.GetValue() | 1 : SPU.MBox_Status.GetValue() & ~1);
SPU.MBox_Status.SetValue((SPU.Out_MBox.GetCount() & 0xff) | (SPU.In_MBox.GetFreeCount() << 8));
*value = SPU.MBox_Status.GetValue();
break; break;
} }
case SPU_RunCntl_offs:
{
LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Read32(SPU_RunCntl)", m_index);
*value = (u32)IsRunning();
break;
}
case SPU_Status_offs: case SPU_Status_offs:
{ {
*value = SPU.Status.GetValue(); *value = SPU.Status.GetValue();
break; break;
} }
case SPU_NPC_offs:
{
LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Read32(SPU_NPC)", m_index);
*value = SPU.NPC.GetValue();
break;
}
case SPU_RdSigNotify1_offs:
{
LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Read32(SPU_RdSigNotify1)", m_index);
*value = SPU.SNR[0].GetValue();
break;
}
case SPU_RdSigNotify2_offs:
{
LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Read32(SPU_RdSigNotify2)", m_index);
*value = SPU.SNR[1].GetValue();
break;
}
default: default:
{ {
LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Read32(0x%x)", m_index, offset); // TODO: read value from LS if necessary (not important)
Emu.Pause(); LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Read32(0x%llx)", m_index, offset);
return false; return false;
} }
} }
@ -165,14 +71,9 @@ bool RawSPUThread::Read32(const u64 addr, u32* value)
bool RawSPUThread::Write32(const u64 addr, const u32 value) bool RawSPUThread::Write32(const u64 addr, const u32 value)
{ {
if(addr < GetStartAddr() + RAW_SPU_PROB_OFFSET) const u64 offset = addr - GetStartAddr() - RAW_SPU_PROB_OFFSET;
{
return MemoryBlock::Write32(addr, value);
}
const u32 offset = addr - GetStartAddr() - RAW_SPU_PROB_OFFSET; switch (offset)
switch(offset)
{ {
case MFC_LSA_offs: case MFC_LSA_offs:
{ {
@ -205,53 +106,26 @@ bool RawSPUThread::Write32(const u64 addr, const u32 value)
break; break;
} }
case MFC_QStatus_offs:
{
LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Write32(MFC_QStatus, 0x%x)", m_index, value);
//MFC2.QStatus.SetValue(value);
break;
}
case Prxy_QueryType_offs: case Prxy_QueryType_offs:
{ {
LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Write32(Prxy_QueryType, 0x%x)", m_index, value);
Prxy.QueryType.SetValue(value);
switch(value) switch(value)
{ {
case 2: case 2: break;
LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Prxy Query Immediate.", m_index);
break;
default: default:
{
LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Unknown Prxy Query Type. (prxy_query=0x%x)", m_index, value); LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Unknown Prxy Query Type. (prxy_query=0x%x)", m_index, value);
break; return false;
}
} }
Prxy.QueryType.SetValue(0); MFC2.QueryType.SetValue(value); // not used
MFC2.QStatus.SetValue(Prxy.QueryMask.GetValue());
break; break;
} }
case Prxy_QueryMask_offs: case Prxy_QueryMask_offs:
{ {
LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Write32(Prxy_QueryMask, 0x%x)", m_index, value); MFC2.QueryMask.SetValue(value); // TagStatus is not used
Prxy.QueryMask.SetValue(value);
break;
}
case Prxy_TagStatus_offs:
{
LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Write32(Prxy_TagStatus, 0x%x)", m_index, value);
Prxy.TagStatus.SetValue(value);
break;
}
case SPU_Out_MBox_offs:
{
LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Write32(SPU_Out_MBox, 0x%x)", m_index, value);
while (!SPU.Out_MBox.Push(value) && !Emu.IsStopped())
std::this_thread::sleep_for(std::chrono::milliseconds(1));
break; break;
} }
@ -261,13 +135,6 @@ bool RawSPUThread::Write32(const u64 addr, const u32 value)
SPU.In_MBox.PushUncond(value); SPU.In_MBox.PushUncond(value);
break; break;
} }
case SPU_MBox_Status_offs:
{
LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Write32(SPU_MBox_Status, 0x%x)", m_index, value);
SPU.MBox_Status.SetValue(value);
break;
}
case SPU_RunCntl_offs: case SPU_RunCntl_offs:
{ {
@ -289,39 +156,29 @@ bool RawSPUThread::Write32(const u64 addr, const u32 value)
break; break;
} }
case SPU_Status_offs:
{
LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Write32(SPU_Status, 0x%x)", m_index, value);
SPU.Status.SetValue(value);
break;
}
case SPU_NPC_offs: case SPU_NPC_offs:
{ {
LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Write32(SPU_NPC, 0x%x)", m_index, value);
SPU.NPC.SetValue(value); SPU.NPC.SetValue(value);
break; break;
} }
case SPU_RdSigNotify1_offs: case SPU_RdSigNotify1_offs:
{ {
LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Write32(SPU_RdSigNotify1, 0x%x)", m_index, value); WriteSNR(0, value);
SPU.SNR[0].SetValue(value);
break; break;
} }
case SPU_RdSigNotify2_offs: case SPU_RdSigNotify2_offs:
{ {
LOG_WARNING(Log::SPU, "RawSPUThread[%d]: Write32(SPU_RdSigNotify2, 0x%x)", m_index, value); WriteSNR(1, value);
SPU.SNR[1].SetValue(value);
break; break;
} }
default: default:
{ {
LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Write32(0x%x, 0x%x)", m_index, offset, value); // TODO: write value to LS if necessary (not important)
Emu.Pause(); LOG_ERROR(Log::SPU, "RawSPUThread[%d]: Write32(0x%llx, 0x%x)", m_index, offset, value);
break; return false;
} }
} }

6
rpcs3/Emu/Cell/SPUThread.cpp
View file

@ -75,9 +75,13 @@ void SPUThread::InitRegs()
dmac.queue_lock = 0;*/ dmac.queue_lock = 0;*/
SPU.Status.SetValue(SPU_STATUS_STOPPED); SPU.Status.SetValue(SPU_STATUS_STOPPED);
Prxy.QueryType.SetValue(0);
// TODO: check initialization if necessary
MFC2.QueryType.SetValue(0); // prxy
MFC1.CMDStatus.SetValue(0); MFC1.CMDStatus.SetValue(0);
MFC2.CMDStatus.SetValue(0); MFC2.CMDStatus.SetValue(0);
MFC1.TagStatus.SetValue(0);
MFC2.TagStatus.SetValue(0);
//PC = SPU.NPC.GetValue(); //PC = SPU.NPC.GetValue();
} }

49
rpcs3/Emu/Cell/SPUThread.h
View file

@ -523,16 +523,11 @@ public:
Channel<1> EAL; Channel<1> EAL;
Channel<1> Size_Tag; Channel<1> Size_Tag;
Channel<1> CMDStatus; Channel<1> CMDStatus;
Channel<1> QStatus; Channel<1> QueryType; // only for prxy
} MFC1, MFC2;
struct
{
Channel<1> QueryType;
Channel<1> QueryMask; Channel<1> QueryMask;
Channel<1> TagStatus; Channel<1> TagStatus;
Channel<1> AtomicStat; Channel<1> AtomicStat;
} Prxy; } MFC1, MFC2;
struct StalledList struct StalledList
{ {
@ -555,7 +550,6 @@ public:
Channel<1> Out_MBox; Channel<1> Out_MBox;
Channel<1> Out_IntrMBox; Channel<1> Out_IntrMBox;
Channel<4> In_MBox; Channel<4> In_MBox;
Channel<1> MBox_Status;
Channel<1> Status; Channel<1> Status;
Channel<1> NPC; Channel<1> NPC;
Channel<1> SNR[2]; Channel<1> SNR[2];
@ -831,7 +825,7 @@ public:
reservation.data[i] = *(u128*)&Memory[(u32)ea + i * 16]; reservation.data[i] = *(u128*)&Memory[(u32)ea + i * 16];
*(u128*)&Memory[dmac.ls_offset + lsa + i * 16] = reservation.data[i]; *(u128*)&Memory[dmac.ls_offset + lsa + i * 16] = reservation.data[i];
} }
Prxy.AtomicStat.PushUncond(MFC_GETLLAR_SUCCESS); MFCArgs.AtomicStat.PushUncond(MFC_GETLLAR_SUCCESS);
} }
else if (op == MFC_PUTLLC_CMD) // store conditional else if (op == MFC_PUTLLC_CMD) // store conditional
{ {
@ -854,7 +848,7 @@ public:
} }
if (changed == 0) // nothing changed? if (changed == 0) // nothing changed?
{ {
Prxy.AtomicStat.PushUncond(MFC_PUTLLC_SUCCESS); MFCArgs.AtomicStat.PushUncond(MFC_PUTLLC_SUCCESS);
} }
else if (changed == 1) else if (changed == 1)
{ {
@ -862,7 +856,7 @@ public:
{ {
LOG_ERROR(Log::SPU, "MFC_PUTLLC_CMD: TODO: 128bit compare and swap"); LOG_ERROR(Log::SPU, "MFC_PUTLLC_CMD: TODO: 128bit compare and swap");
Emu.Pause(); Emu.Pause();
Prxy.AtomicStat.PushUncond(MFC_PUTLLC_SUCCESS); MFCArgs.AtomicStat.PushUncond(MFC_PUTLLC_SUCCESS);
} }
else else
{ {
@ -871,11 +865,11 @@ public:
if (InterlockedCompareExchange64((volatile long long*)(Memory + (u32)ea + last * 16 + last_q * 8), if (InterlockedCompareExchange64((volatile long long*)(Memory + (u32)ea + last * 16 + last_q * 8),
buf[last]._u64[last_q], reservation.data[last]._u64[last_q]) == reservation.data[last]._u64[last_q]) buf[last]._u64[last_q], reservation.data[last]._u64[last_q]) == reservation.data[last]._u64[last_q])
{ {
Prxy.AtomicStat.PushUncond(MFC_PUTLLC_SUCCESS); MFCArgs.AtomicStat.PushUncond(MFC_PUTLLC_SUCCESS);
} }
else else
{ {
Prxy.AtomicStat.PushUncond(MFC_PUTLLC_FAILURE); MFCArgs.AtomicStat.PushUncond(MFC_PUTLLC_FAILURE);
} }
/*u32 last_d = last_q * 2; /*u32 last_d = last_q * 2;
if (buf[last]._u32[last_d] == reservation.data[last]._u32[last_d] && buf[last]._u32[last_d+1] != reservation.data[last]._u32[last_d+1]) if (buf[last]._u32[last_d] == reservation.data[last]._u32[last_d] && buf[last]._u32[last_d+1] != reservation.data[last]._u32[last_d+1])
@ -890,7 +884,7 @@ public:
{ {
LOG_ERROR(Log::SPU, "MFC_PUTLLC_CMD: TODO: 64bit compare and swap"); LOG_ERROR(Log::SPU, "MFC_PUTLLC_CMD: TODO: 64bit compare and swap");
Emu.Pause(); Emu.Pause();
Prxy.AtomicStat.PushUncond(MFC_PUTLLC_SUCCESS); MFCArgs.AtomicStat.PushUncond(MFC_PUTLLC_SUCCESS);
}*/ }*/
} }
} }
@ -900,18 +894,18 @@ public:
LOG_ERROR(Log::SPU, "MFC_PUTLLC_CMD: Reservation Error: impossibru (~ 16x%d (mask=0x%x)) (opcode=0x%x, cmd=0x%x, lsa = 0x%x, ea = 0x%llx, tag = 0x%x, size = 0x%x)", LOG_ERROR(Log::SPU, "MFC_PUTLLC_CMD: Reservation Error: impossibru (~ 16x%d (mask=0x%x)) (opcode=0x%x, cmd=0x%x, lsa = 0x%x, ea = 0x%llx, tag = 0x%x, size = 0x%x)",
changed, mask, op, cmd, lsa, ea, tag, size); changed, mask, op, cmd, lsa, ea, tag, size);
Emu.Pause(); Emu.Pause();
Prxy.AtomicStat.PushUncond(MFC_PUTLLC_SUCCESS); MFCArgs.AtomicStat.PushUncond(MFC_PUTLLC_SUCCESS);
} }
} }
else else
{ {
Prxy.AtomicStat.PushUncond(MFC_PUTLLC_FAILURE); MFCArgs.AtomicStat.PushUncond(MFC_PUTLLC_FAILURE);
} }
reservation.clear(); reservation.clear();
} }
else // failed else // failed
{ {
Prxy.AtomicStat.PushUncond(MFC_PUTLLC_FAILURE); MFCArgs.AtomicStat.PushUncond(MFC_PUTLLC_FAILURE);
} }
} }
else // store unconditional else // store unconditional
@ -920,7 +914,7 @@ public:
ProcessCmd(MFC_PUT_CMD, tag, lsa, ea, 128); ProcessCmd(MFC_PUT_CMD, tag, lsa, ea, 128);
if (op == MFC_PUTLLUC_CMD) if (op == MFC_PUTLLUC_CMD)
{ {
Prxy.AtomicStat.PushUncond(MFC_PUTLLUC_SUCCESS); MFCArgs.AtomicStat.PushUncond(MFC_PUTLLUC_SUCCESS);
} }
if ((reservation.addr + reservation.size > ea && reservation.addr <= ea + size) || if ((reservation.addr + reservation.size > ea && reservation.addr <= ea + size) ||
(ea + size > reservation.addr && ea <= reservation.addr + reservation.size)) (ea + size > reservation.addr && ea <= reservation.addr + reservation.size))
@ -944,12 +938,12 @@ public:
{ {
case SPU_WrOutMbox: return SPU.Out_MBox.GetFreeCount(); case SPU_WrOutMbox: return SPU.Out_MBox.GetFreeCount();
case SPU_RdInMbox: return SPU.In_MBox.GetCount(); case SPU_RdInMbox: return SPU.In_MBox.GetCount();
case MFC_RdTagStat: return Prxy.TagStatus.GetCount(); case MFC_RdTagStat: return MFC1.TagStatus.GetCount();
case MFC_RdListStallStat: return StallStat.GetCount(); case MFC_RdListStallStat: return StallStat.GetCount();
case MFC_WrTagUpdate: return Prxy.TagStatus.GetCount(); // hack case MFC_WrTagUpdate: return MFC1.TagStatus.GetCount(); // hack
case SPU_RdSigNotify1: return SPU.SNR[0].GetCount(); case SPU_RdSigNotify1: return SPU.SNR[0].GetCount();
case SPU_RdSigNotify2: return SPU.SNR[1].GetCount(); case SPU_RdSigNotify2: return SPU.SNR[1].GetCount();
case MFC_RdAtomicStat: return Prxy.AtomicStat.GetCount(); case MFC_RdAtomicStat: return MFC1.AtomicStat.GetCount();
default: default:
{ {
@ -1115,14 +1109,14 @@ public:
case MFC_WrTagMask: case MFC_WrTagMask:
{ {
//ConLog.Warning("%s: %s = 0x%x", __FUNCTION__, spu_ch_name[ch], v); //ConLog.Warning("%s: %s = 0x%x", __FUNCTION__, spu_ch_name[ch], v);
Prxy.QueryMask.SetValue(v); MFC1.QueryMask.SetValue(v);
break; break;
} }
case MFC_WrTagUpdate: case MFC_WrTagUpdate:
{ {
//ConLog.Warning("%s: %s = 0x%x", __FUNCTION__, spu_ch_name[ch], v); //ConLog.Warning("%s: %s = 0x%x", __FUNCTION__, spu_ch_name[ch], v);
Prxy.TagStatus.PushUncond(Prxy.QueryMask.GetValue()); MFC1.TagStatus.PushUncond(MFC1.QueryMask.GetValue());
break; break;
} }
@ -1184,7 +1178,7 @@ public:
case SPU_WrDec: case SPU_WrDec:
{ {
m_dec_start = get_system_time(); m_dec_start = get_time();
m_dec_value = v; m_dec_value = v;
break; break;
} }
@ -1215,7 +1209,7 @@ public:
case MFC_RdTagStat: case MFC_RdTagStat:
{ {
while (!Prxy.TagStatus.Pop(v) && !Emu.IsStopped()) std::this_thread::sleep_for(std::chrono::milliseconds(1)); while (!MFC1.TagStatus.Pop(v) && !Emu.IsStopped()) std::this_thread::sleep_for(std::chrono::milliseconds(1));
//ConLog.Warning("%s: 0x%x = %s", __FUNCTION__, v, spu_ch_name[ch]); //ConLog.Warning("%s: 0x%x = %s", __FUNCTION__, v, spu_ch_name[ch]);
break; break;
} }
@ -1236,7 +1230,7 @@ public:
case MFC_RdAtomicStat: case MFC_RdAtomicStat:
{ {
while (!Prxy.AtomicStat.Pop(v) && !Emu.IsStopped()) std::this_thread::sleep_for(std::chrono::milliseconds(1)); while (!MFC1.AtomicStat.Pop(v) && !Emu.IsStopped()) std::this_thread::sleep_for(std::chrono::milliseconds(1));
break; break;
} }
@ -1248,8 +1242,7 @@ public:
case SPU_RdDec: case SPU_RdDec:
{ {
// decrementer freq is probably 80 MHz v = m_dec_value - (u32)(get_time() - m_dec_start);
v = m_dec_value - (u32)(get_system_time() - m_dec_start) * 80;
break; break;
} }

10
rpcs3/Emu/Memory/Memory.h
View file

@ -401,7 +401,10 @@ public:
} }
else else
{ {
RawSPUMem[(addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET]->Write32(addr, data); if (!RawSPUMem[(addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET]->Write32(addr, data))
{
*(u32*)((u8*)GetBaseAddr() + addr) = re32(data);
}
} }
} }
else else
@ -474,7 +477,10 @@ public:
else else
{ {
u32 res; u32 res;
RawSPUMem[(addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET]->Read32(addr, &res); if (!RawSPUMem[(addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET]->Read32(addr, &res))
{
res = re32(*(u32*)((u8*)GetBaseAddr() + addr));
}
return res; return res;
} }
} }