RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Logging CheckBox, cellGame stuff and other fixes

Browse source 
* cellGameContentPermit and cellGameBootCheck updated.
* Checkbox in the Settings dialog, for enabling logging.
* Fixed GUI issue in the InterpreterDisAsmFrame.
* Fixed -dirty flag in wxWidgets submodule.
This commit is contained in:
Alexandro Sánchez Bach 2014-02-13 20:05:23 +01:00
parent 2b63888782
commit eb93e87b7f
11 changed files with 40 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/Cell/PPUInterpreter.h
View file

@ -69,7 +69,7 @@ private:
{
SysCalls::DoSyscall(CPU.GPR[11]);
if(enable_log)
if(Ini.HLELogging.GetValue())
{
ConLog.Warning("SysCall[%lld] done with code [0x%llx]! #pc: 0x%llx", CPU.GPR[11], CPU.GPR[3], CPU.PC);
if(CPU.GPR[11] > 1024)

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

@ -514,7 +514,7 @@ public:
case MFC_PUT_CMD:
case MFC_GET_CMD:
{
if (enable_log) ConLog.Write("DMA %s%s%s: lsa = 0x%x, ea = 0x%llx, tag = 0x%x, size = 0x%x, cmd = 0x%x",
if (Ini.HLELogging.GetValue()) ConLog.Write("DMA %s%s%s: lsa = 0x%x, ea = 0x%llx, tag = 0x%x, size = 0x%x, cmd = 0x%x",
wxString(op & MFC_PUT_CMD ? "PUT" : "GET").wx_str(),
wxString(op & MFC_BARRIER_MASK ? "B" : "").wx_str(),
wxString(op & MFC_FENCE_MASK ? "F" : "").wx_str(),
@ -541,7 +541,7 @@ public:
case MFC_PUTLLUC_CMD:
case MFC_PUTQLLUC_CMD:
{
if (enable_log) ConLog.Write("DMA %s: lsa=0x%x, ea = 0x%llx, (tag) = 0x%x, (size) = 0x%x, cmd = 0x%x",
if (Ini.HLELogging.GetValue()) ConLog.Write("DMA %s: lsa=0x%x, ea = 0x%llx, (tag) = 0x%x, (size) = 0x%x, cmd = 0x%x",
wxString(op == MFC_GETLLAR_CMD ? "GETLLAR" :
op == MFC_PUTLLC_CMD ? "PUTLLC" :
op == MFC_PUTLLUC_CMD ? "PUTLLUC" : "PUTQLLUC").wx_str(),

4
rpcs3/Emu/SysCalls/Modules.cpp
View file

@ -408,7 +408,7 @@ void Module::SetName(const std::string& name)
void Module::Log(const u32 id, wxString fmt, ...)
{
if(enable_log)
if(Ini.HLELogging.GetValue())
{
va_list list;
va_start(list, fmt);
@ -419,7 +419,7 @@ void Module::Log(const u32 id, wxString fmt, ...)
void Module::Log(wxString fmt, ...)
{
if(enable_log)
if(Ini.HLELogging.GetValue())
{
va_list list;
va_start(list, fmt);

6
rpcs3/Emu/SysCalls/Modules/cellGame.cpp
View file

@ -118,12 +118,12 @@ int cellGameBootCheck(mem32_t type, mem32_t attributes, mem_ptr_t<CellGameConten
if (!type.IsGood() || !attributes.IsGood() || !size.IsGood() || !dirName.IsGood())
return CELL_GAME_ERROR_PARAM;
wxString dir ("/dev_hdd0/game/" + Emu.m_title_id + "/USRDIR");
wxString dir = wxEmptyString;
type = CELL_GAME_GAMETYPE_DISC;
attributes = 0;
size->hddFreeSizeKB = 40000000; //40 GB, TODO: Use the free space of the computer's HDD where RPCS3 is being run.
size->sizeKB = CELL_GAME_SIZEKB_NOTCALC;
size->sizeKB = 0;
size->sysSizeKB = 0;
Memory.WriteString(dirName.GetAddr(), dir);
@ -150,6 +150,8 @@ int cellGameContentPermit(mem_list_ptr_t<u8> contentInfoPath, mem_list_ptr_t<u8
if (!contentInfoPath.IsGood() || !usrdirPath.IsGood())
return CELL_GAME_ERROR_PARAM;
Memory.WriteString(contentInfoPath.GetAddr(), "/dev_bdvd/PS3_GAME");
Memory.WriteString(usrdirPath.GetAddr(), "/dev_bdvd/PS3_GAME/USRDIR");
return CELL_OK;
}

6
rpcs3/Emu/SysCalls/SysCalls.cpp
View file

@ -297,8 +297,6 @@ static func_caller* sc_table[1024] =
null_func, null_func, null_func, bind_func(cellGcmCallback), //1024
};
bool enable_log = false;
void default_syscall()
{
declCPU();
@ -332,8 +330,8 @@ void default_syscall()
return;
case 1000:
enable_log = !enable_log;
ConLog.Warning("Log %s", wxString(enable_log ? "enabled" : "disabled").wx_str());
Ini.HLELogging.SetValue(!Ini.HLELogging.GetValue());
ConLog.Warning("Log %s", wxString(Ini.HLELogging.GetValue() ? "enabled" : "disabled").wx_str());
return;
}

6
rpcs3/Emu/SysCalls/SysCalls.h
View file

@ -14,8 +14,6 @@
#define declCPU PPUThread& CPU = GetCurrentPPUThread
extern bool enable_log;
class SysCallBase //Module
{
private:
@ -33,7 +31,7 @@ public:
void Log(const u32 id, wxString fmt, ...)
{
if(enable_log)
if(Ini.HLELogging.GetValue())
{
va_list list;
va_start(list, fmt);
@ -44,7 +42,7 @@ public:
void Log(wxString fmt, ...)
{
if(enable_log)
if(Ini.HLELogging.GetValue())
{
va_list list;
va_start(list, fmt);

2
rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.cpp
View file

@ -375,7 +375,7 @@ int sys_spu_initialize(u32 max_usable_spu, u32 max_raw_spu)
// return CELL_ENOMEM;
//}
//enable_log = true;
//Ini.HLELogging.SetValue(true);
//dump_enable = true;
return CELL_OK;