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

Revamp PFIFO command submission emulation (#2179)

Browse source
This commit is contained in:
Melissa Goad 2016-10-01 14:13:15 -05:00 • committed by Ivan
parent 44b8556dc6
commit 22b1400018
5 changed files with 65 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/Cell/Modules/cellGcmSys.cpp
View file

@ -1297,7 +1297,7 @@ s32 cellGcmCallback(vm::ptr<CellGcmContextData> context, u32 count)
std::pair<u32, u32> newCommandBuffer = getNextCommandBufferBeginEnd(context->current.addr()); std::pair<u32, u32> newCommandBuffer = getNextCommandBufferBeginEnd(context->current.addr());
u32 offset = getOffsetFromAddress(newCommandBuffer.first); u32 offset = getOffsetFromAddress(newCommandBuffer.first);
// Write jump instruction // Write jump instruction
*context->current = CELL_GCM_METHOD_FLAG_JUMP | offset; *context->current = RSX_METHOD_OLD_JUMP_CMD | offset;
// Update current command buffer // Update current command buffer
context->begin.set(newCommandBuffer.first); context->begin.set(newCommandBuffer.first);
context->current.set(newCommandBuffer.first); context->current.set(newCommandBuffer.first);

2
rpcs3/Emu/RSX/GCM.h
View file

@ -177,7 +177,7 @@ namespace rsx
template<typename AT> template<typename AT>
static inline u32 make_jump(vm::_ptr_base<be_t<u32>, AT>& dst, u32 offset) static inline u32 make_jump(vm::_ptr_base<be_t<u32>, AT>& dst, u32 offset)
{ {
*dst++ = CELL_GCM_METHOD_FLAG_JUMP | offset; *dst++ = RSX_METHOD_OLD_JUMP_CMD | offset;
return SIZE_32(u32); return SIZE_32(u32);
} }

20
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -403,14 +403,21 @@ namespace rsx
const u32 cmd = ReadIO32(get); const u32 cmd = ReadIO32(get);
const u32 count = (cmd >> 18) & 0x7ff; const u32 count = (cmd >> 18) & 0x7ff;
if (cmd & CELL_GCM_METHOD_FLAG_JUMP) if ((cmd & RSX_METHOD_OLD_JUMP_CMD_MASK) == RSX_METHOD_OLD_JUMP_CMD)
{ {
u32 offs = cmd & 0x1fffffff; u32 offs = cmd & 0x1ffffffc;
//LOG_WARNING(RSX, "rsx jump(0x%x) #addr=0x%x, cmd=0x%x, get=0x%x, put=0x%x", offs, m_ioAddress + get, cmd, get, put); //LOG_WARNING(RSX, "rsx jump(0x%x) #addr=0x%x, cmd=0x%x, get=0x%x, put=0x%x", offs, m_ioAddress + get, cmd, get, put);
ctrl->get = offs; ctrl->get = offs;
continue; continue;
} }
if (cmd & CELL_GCM_METHOD_FLAG_CALL) if ((cmd & RSX_METHOD_NEW_JUMP_CMD_MASK) == RSX_METHOD_NEW_JUMP_CMD)
{
u32 offs = cmd & 0xfffffffc;
//LOG_WARNING(RSX, "rsx jump(0x%x) #addr=0x%x, cmd=0x%x, get=0x%x, put=0x%x", offs, m_ioAddress + get, cmd, get, put);
ctrl->get = offs;
continue;
}
if ((cmd & RSX_METHOD_CALL_CMD_MASK) == RSX_METHOD_CALL_CMD)
{ {
m_call_stack.push(get + 4); m_call_stack.push(get + 4);
u32 offs = cmd & ~3; u32 offs = cmd & ~3;
@ -418,7 +425,7 @@ namespace rsx
ctrl->get = offs; ctrl->get = offs;
continue; continue;
} }
if (cmd == CELL_GCM_METHOD_FLAG_RETURN) if (cmd == RSX_METHOD_RETURN_CMD)
{ {
u32 get = m_call_stack.top(); u32 get = m_call_stack.top();
m_call_stack.pop(); m_call_stack.pop();
@ -426,7 +433,6 @@ namespace rsx
ctrl->get = get; ctrl->get = get;
continue; continue;
} }
if (cmd == 0) //nop if (cmd == 0) //nop
{ {
ctrl->get = get + 4; ctrl->get = get + 4;
@ -435,7 +441,7 @@ namespace rsx
auto args = vm::ptr<u32>::make((u32)RSXIOMem.RealAddr(get + 4)); auto args = vm::ptr<u32>::make((u32)RSXIOMem.RealAddr(get + 4));
u32 first_cmd = (cmd & 0xffff) >> 2; u32 first_cmd = (cmd & 0xfffc) >> 2;
if (cmd & 0x3) if (cmd & 0x3)
{ {
@ -444,7 +450,7 @@ namespace rsx
for (u32 i = 0; i < count; i++) for (u32 i = 0; i < count; i++)
{ {
u32 reg = cmd & CELL_GCM_METHOD_FLAG_NON_INCREMENT ? first_cmd : first_cmd + i; u32 reg = ((cmd & RSX_METHOD_NON_INCREMENT_CMD_MASK) == RSX_METHOD_NON_INCREMENT_CMD) ? first_cmd : first_cmd + i;
u32 value = args[i]; u32 value = args[i];
//LOG_NOTICE(RSX, "%s(0x%x) = 0x%x", get_method_name(reg).c_str(), reg, value); //LOG_NOTICE(RSX, "%s(0x%x) = 0x%x", get_method_name(reg).c_str(), reg, value);

27
rpcs3/Emu/RSX/gcm_enums.h
View file

@ -992,8 +992,35 @@ enum
enum Method enum Method
{ {
/*
CELL_GCM_METHOD_FLAG_NON_INCREMENT = 0x40000000, CELL_GCM_METHOD_FLAG_NON_INCREMENT = 0x40000000,
CELL_GCM_METHOD_FLAG_JUMP = 0x20000000, CELL_GCM_METHOD_FLAG_JUMP = 0x20000000,
CELL_GCM_METHOD_FLAG_CALL = 0x00000002, CELL_GCM_METHOD_FLAG_CALL = 0x00000002,
CELL_GCM_METHOD_FLAG_RETURN = 0x00020000, CELL_GCM_METHOD_FLAG_RETURN = 0x00020000,
*/
RSX_METHOD_OLD_JUMP_CMD_MASK = 0xe0000003,
RSX_METHOD_OLD_JUMP_CMD = 0x20000000,
RSX_METHOD_OLD_JUMP_OFFSET_MASK = 0x1ffffffc,
RSX_METHOD_INCREMENT_CMD_MASK = 0xe0030003,
RSX_METHOD_INCREMENT_CMD = 0,
RSX_METHOD_INCREMENT_COUNT_MASK = 0x0ffc0000,
RSX_METHOD_INCREMENT_COUNT_SHIFT = 18,
RSX_METHOD_INCREMENT_METHOD_MASK = 0x00001ffc,
RSX_METHOD_NON_INCREMENT_CMD_MASK = 0xe0030003,
RSX_METHOD_NON_INCREMENT_CMD = 0x40000000,
RSX_METHOD_NON_INCREMENT_COUNT_MASK = 0x0ffc0000,
RSX_METHOD_NON_INCREMENT_COUNT_SHIFT = 18,
RSX_METHOD_NON_INCREMENT_METHOD_MASK = 0x00001ffc,
RSX_METHOD_NEW_JUMP_CMD_MASK = 0x00000003,
RSX_METHOD_NEW_JUMP_CMD = 0x00000001,
RSX_METHOD_NEW_JUMP_OFFSET_MASK = 0xfffffffc,
RSX_METHOD_CALL_CMD_MASK = 0x00000003,
RSX_METHOD_CALL_CMD = 0x00000002,
RSX_METHOD_CALL_OFFSET_MASK = 0xfffffffc,
RSX_METHOD_RETURN_CMD = 0x00020000,
}; };

33
rpcs3/Gui/RSXDebugger.cpp
View file

@ -297,8 +297,10 @@ void RSXDebugger::OnScrollMemory(wxMouseEvent& event)
if(vm::check_addr(m_addr)) if(vm::check_addr(m_addr))
{ {
u32 cmd = vm::ps3::read32(m_addr); u32 cmd = vm::ps3::read32(m_addr);
u32 count = (cmd & (CELL_GCM_METHOD_FLAG_JUMP | CELL_GCM_METHOD_FLAG_CALL)) u32 count = ((cmd & RSX_METHOD_OLD_JUMP_CMD_MASK) == RSX_METHOD_OLD_JUMP_CMD)
|| cmd == CELL_GCM_METHOD_FLAG_RETURN ? 0 : (cmd >> 18) & 0x7ff; || ((cmd & RSX_METHOD_NEW_JUMP_CMD_MASK) == RSX_METHOD_NEW_JUMP_CMD)
|| ((cmd & RSX_METHOD_CALL_CMD_MASK) == RSX_METHOD_CALL_CMD)
|| cmd == RSX_METHOD_RETURN_CMD ? 0 : (cmd >> 18) & 0x7ff;
offset = 1 + count; offset = 1 + count;
} }
@ -642,7 +644,10 @@ void RSXDebugger::GetMemory()
m_list_commands->SetItem(i, 3, wxString::Format("%d", count)); m_list_commands->SetItem(i, 3, wxString::Format("%d", count));
m_list_commands->SetItem(i, 2, DisAsmCommand(cmd, count, addr, 0)); m_list_commands->SetItem(i, 2, DisAsmCommand(cmd, count, addr, 0));
if(!(cmd & (CELL_GCM_METHOD_FLAG_JUMP | CELL_GCM_METHOD_FLAG_CALL)) && cmd != CELL_GCM_METHOD_FLAG_RETURN) if((cmd & RSX_METHOD_OLD_JUMP_CMD_MASK) != RSX_METHOD_OLD_JUMP_CMD
&& (cmd & RSX_METHOD_NEW_JUMP_CMD_MASK) != RSX_METHOD_NEW_JUMP_CMD
&& (cmd & RSX_METHOD_CALL_CMD_MASK) != RSX_METHOD_CALL_CMD
&& cmd != RSX_METHOD_RETURN_CMD)
{ {
addr += 4 * count; addr += 4 * count;
} }
@ -1092,17 +1097,22 @@ wxString RSXDebugger::DisAsmCommand(u32 cmd, u32 count, u32 currentAddr, u32 ioA
wxString disasm = wxEmptyString; wxString disasm = wxEmptyString;
#define DISASM(string, ...) { if(disasm.IsEmpty()) disasm = wxString::Format((string), ##__VA_ARGS__); else disasm += (wxString(' ') + wxString::Format((string), ##__VA_ARGS__)); } #define DISASM(string, ...) { if(disasm.IsEmpty()) disasm = wxString::Format((string), ##__VA_ARGS__); else disasm += (wxString(' ') + wxString::Format((string), ##__VA_ARGS__)); }
if(cmd & CELL_GCM_METHOD_FLAG_JUMP) if((cmd & RSX_METHOD_OLD_JUMP_CMD_MASK) == RSX_METHOD_OLD_JUMP_CMD)
{ {
u32 jumpAddr = cmd & ~(CELL_GCM_METHOD_FLAG_JUMP | CELL_GCM_METHOD_FLAG_NON_INCREMENT); u32 jumpAddr = cmd & RSX_METHOD_OLD_JUMP_OFFSET_MASK;
DISASM("JUMP: %08x -> %08x", currentAddr, ioAddr+jumpAddr); DISASM("JUMP: %08x -> %08x", currentAddr, ioAddr+jumpAddr);
} }
else if(cmd & CELL_GCM_METHOD_FLAG_CALL) else if((cmd & RSX_METHOD_NEW_JUMP_CMD_MASK) == RSX_METHOD_NEW_JUMP_CMD)
{ {
u32 callAddr = cmd & ~CELL_GCM_METHOD_FLAG_CALL; u32 jumpAddr = cmd & RSX_METHOD_NEW_JUMP_OFFSET_MASK;
DISASM("JUMP: %08x -> %08x", currentAddr, ioAddr + jumpAddr);
}
else if((cmd & RSX_METHOD_CALL_CMD_MASK) == RSX_METHOD_CALL_CMD)
{
u32 callAddr = cmd & RSX_METHOD_CALL_OFFSET_MASK;
DISASM("CALL: %08x -> %08x", currentAddr, ioAddr+callAddr); DISASM("CALL: %08x -> %08x", currentAddr, ioAddr+callAddr);
} }
if(cmd == CELL_GCM_METHOD_FLAG_RETURN) if(cmd == RSX_METHOD_RETURN_CMD)
{ {
DISASM("RETURN"); DISASM("RETURN");
} }
@ -1111,7 +1121,10 @@ wxString RSXDebugger::DisAsmCommand(u32 cmd, u32 count, u32 currentAddr, u32 ioA
{ {
DISASM("Null cmd"); DISASM("Null cmd");
} }
else if(!(cmd & (CELL_GCM_METHOD_FLAG_JUMP | CELL_GCM_METHOD_FLAG_CALL)) && cmd != CELL_GCM_METHOD_FLAG_RETURN) else if ((cmd & RSX_METHOD_OLD_JUMP_CMD_MASK) != RSX_METHOD_OLD_JUMP_CMD
&& (cmd & RSX_METHOD_NEW_JUMP_CMD_MASK) != RSX_METHOD_NEW_JUMP_CMD
&& (cmd & RSX_METHOD_CALL_CMD_MASK) != RSX_METHOD_CALL_CMD
&& cmd != RSX_METHOD_RETURN_CMD)
{ {
auto args = vm::ps3::ptr<u32>::make(currentAddr + 4); auto args = vm::ps3::ptr<u32>::make(currentAddr + 4);
@ -1147,7 +1160,7 @@ wxString RSXDebugger::DisAsmCommand(u32 cmd, u32 count, u32 currentAddr, u32 ioA
} }
} }
if(cmd & CELL_GCM_METHOD_FLAG_NON_INCREMENT) if((cmd & RSX_METHOD_NON_INCREMENT_CMD_MASK) == RSX_METHOD_NON_INCREMENT_CMD)
{ {
DISASM("Non Increment cmd"); DISASM("Non Increment cmd");
} }