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

- Improved sc function binder.

Browse source 
- Improved GLGSRender.
This commit is contained in:
DH 2013-06-30 11:46:29 +03:00
parent 3bb7a299ca
commit 5753edf6ef
133 changed files with 13624 additions and 3898 deletions
Download patch file Download diff file Expand all files Collapse all files

129
rpcs3/Emu/System.cpp
View file

@ -6,10 +6,11 @@
#include "Emu/Cell/PPCThreadManager.h"
#include "Emu/Cell/PPUThread.h"
#include "Emu/Cell/SPUThread.h"
#include "Gui/CompilerELF.h"
#include "Emu/SysCalls/SysCalls.h"
using namespace PPU_opcodes;
SysCalls SysCallsManager;
//SysCalls SysCallsManager;
Emulator::Emulator()
: m_status(Stopped)
@ -55,7 +56,7 @@ void Emulator::CheckStatus()
}
if(IsAllPaused)
{
ConLog.Warning("all paused!");
//ConLog.Warning("all paused!");
Pause();
return;
}
@ -69,41 +70,41 @@ void Emulator::CheckStatus()
}
if(IsAllStoped)
{
ConLog.Warning("all stoped!");
//ConLog.Warning("all stoped!");
Pause(); //Stop();
}
}
void Emulator::Run()
void Emulator::Load()
{
if(IsRunned()) Stop();
if(IsPaused())
{
Resume();
return;
}
//ConLog.Write("run...");
m_status = Runned;
if(!wxFileExists(m_path)) return;
ConLog.Write("loading '%s'...", m_path);
Memory.Init();
GetInfo().Reset();
//SetTLSData(0, 0, 0);
//SetMallocPageSize(0x100000);
Loader l(m_path);
if(!l.Load())
Memory.Write64(Memory.PRXMem.Alloc(8), 0xDEADBEEFABADCAFE);
bool is_error;
vfsLocalFile f(m_path);
Loader l(f);
try
{
Memory.Close();
Stop();
return;
is_error = !l.Load() || l.GetMachine() == MACHINE_Unknown;
}
if(l.GetMachine() == MACHINE_Unknown)
catch(const wxString& e)
{
ConLog.Error(e);
is_error = true;
}
catch(...)
{
ConLog.Error("Unhandled loader error.");
is_error = true;
}
if(is_error)
{
ConLog.Error("Unknown machine type");
Memory.Close();
Stop();
return;
@ -111,38 +112,76 @@ void Emulator::Run()
PPCThread& thread = GetCPU().AddThread(l.GetMachine() == MACHINE_PPC64);
Memory.MainMem.Alloc(0x10000000, 0x10010000);
Memory.PRXMem.Write64(Memory.PRXMem.GetStartAddr(), 0xDEADBEEFABADCAFE);
thread.SetPc(l.GetEntry());
thread.SetEntry(l.GetEntry());
thread.SetArg(thread.GetId());
Memory.StackMem.Alloc(0x1000);
thread.InitStack();
thread.AddArgv(m_path);
//thread.AddArgv("-emu");
m_rsx_callback = Memory.MainMem.Alloc(0x10) + 4;
m_rsx_callback = Memory.MainMem.Alloc(4 * 4) + 4;
Memory.Write32(m_rsx_callback - 4, m_rsx_callback);
mem32_t callback_data(m_rsx_callback);
callback_data += ToOpcode(ADDI) | ToRD(11) | ToRA(0) | ToIMM16(0x3ff);
callback_data += ToOpcode(SC) | ToSYS(2);
callback_data += ToOpcode(G_13) | SetField(BCLR, 21, 30) | ToBO(0x10 | 0x04) | ToBI(0) | ToLK(0);
m_ppu_thr_exit = Memory.MainMem.Alloc(4 * 3);
mem32_t ppu_thr_exit_data(m_ppu_thr_exit);
ppu_thr_exit_data += ToOpcode(ADDI) | ToRD(11) | ToRA(0) | ToIMM16(41);
ppu_thr_exit_data += ToOpcode(SC) | ToSYS(2);
ppu_thr_exit_data += ToOpcode(G_13) | SetField(BCLR, 21, 30) | ToBO(0x10 | 0x04) | ToBI(0) | ToLK(0);
thread.Run();
wxGetApp().m_MainFrame->UpdateUI();
wxCriticalSectionLocker lock(m_cs_status);
m_status = Ready;
}
void Emulator::Run()
{
if(!IsReady())
{
Load();
if(!IsReady()) return;
}
if(IsRunned()) Stop();
if(IsPaused())
{
Resume();
return;
}
wxCriticalSectionLocker lock(m_cs_status);
//ConLog.Write("run...");
m_status = Runned;
m_vfs.Mount("/", vfsDevice::GetRoot(m_path), new vfsLocalFile());
m_vfs.Mount("/dev_hdd0/", wxGetCwd() + "\\dev_hdd0\\", new vfsLocalFile());
m_vfs.Mount("/app_home/", vfsDevice::GetRoot(m_path), new vfsLocalFile());
m_vfs.Mount(vfsDevice::GetRootPs3(m_path), vfsDevice::GetRoot(m_path), new vfsLocalFile());
for(uint i=0; i<m_vfs.m_devices.GetCount(); ++i) ConLog.Write("%s -> %s", m_vfs.m_devices[i].GetPs3Path(), m_vfs.m_devices[i].GetLocalPath());
//if(m_memory_viewer && m_memory_viewer->exit) safe_delete(m_memory_viewer);
//m_memory_viewer->SetPC(loader.GetEntry());
//m_memory_viewer->Show();
//m_memory_viewer->ShowPC();
wxGetApp().SendDbgCommand(DID_START_EMU);
wxGetApp().m_MainFrame->UpdateUI();
if(!m_dbg_console) m_dbg_console = new DbgConsole();
GetGSManager().Init();
GetCallbackManager().Init();
if(Ini.CPUDecoderMode.GetValue() != 1)
{
GetCPU().Start();
GetCPU().Exec();
}
GetCPU().Exec();
}
void Emulator::Pause()
@ -150,7 +189,9 @@ void Emulator::Pause()
if(!IsRunned()) return;
//ConLog.Write("pause...");
wxCriticalSectionLocker lock(m_cs_status);
m_status = Paused;
wxGetApp().SendDbgCommand(DID_PAUSE_EMU);
wxGetApp().m_MainFrame->UpdateUI();
}
@ -159,7 +200,9 @@ void Emulator::Resume()
if(!IsPaused()) return;
//ConLog.Write("resume...");
wxCriticalSectionLocker lock(m_cs_status);
m_status = Runned;
wxGetApp().SendDbgCommand(DID_RESUME_EMU);
wxGetApp().m_MainFrame->UpdateUI();
CheckStatus();
@ -170,16 +213,22 @@ void Emulator::Stop()
{
if(IsStopped()) return;
//ConLog.Write("shutdown...");
{
wxCriticalSectionLocker lock(m_cs_status);
m_status = Stopped;
}
m_rsx_callback = 0;
m_status = Stopped;
wxGetApp().SendDbgCommand(DID_STOP_EMU);
wxGetApp().m_MainFrame->UpdateUI();
GetGSManager().Close();
GetCPU().Close();
SysCallsManager.Close();
//SysCallsManager.Close();
GetIdManager().Clear();
GetPadManager().Close();
GetCallbackManager().Clear();
UnloadModules();
CurGameInfo.Reset();
Memory.Close();
@ -187,7 +236,7 @@ void Emulator::Stop()
if(m_dbg_console)
{
GetDbgCon().Close();
m_dbg_console = NULL;
GetDbgCon().Clear();
}
//if(m_memory_viewer && m_memory_viewer->IsShown()) m_memory_viewer->Hide();
}