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

- Implemented ARM9Thread.

Browse source 
- Improved OpenGL Renderer.
- Improved RAW SPU mfc.
This commit is contained in:
DH 2013-11-03 21:23:16 +02:00
parent 6622dc42b5
commit 0b35be32a4
65 changed files with 3255 additions and 2207 deletions
Download patch file Download diff file Expand all files Collapse all files

50
rpcs3/Emu/System.cpp
View file

@ -3,7 +3,6 @@
#include "Emu/Memory/Memory.h"
#include "Ini.h"
#include "Emu/Cell/PPCThreadManager.h"
#include "Emu/Cell/PPUThread.h"
#include "Emu/Cell/SPUThread.h"
#include "Emu/Cell/PPUInstrTable.h"
@ -44,7 +43,7 @@ void Emulator::SetPath(const wxString& path, const wxString& elf_path)
void Emulator::CheckStatus()
{
ArrayF<PPCThread>& threads = GetCPU().GetThreads();
ArrayF<CPUThread>& threads = GetCPU().GetThreads();
if(!threads.GetCount())
{
Stop();
@ -83,7 +82,6 @@ void Emulator::Load()
{
if(!wxFileExists(m_path)) return;
ConLog.Write("Loading '%s'...", m_path);
Memory.Init();
GetInfo().Reset();
m_vfs.Init(m_path);
//m_vfs.Mount("/", vfsDevice::GetRoot(m_path), new vfsLocalFile());
@ -117,7 +115,19 @@ void Emulator::Load()
try
{
is_error = !l.Load() || l.GetMachine() == MACHINE_Unknown;
if(!(is_error = !l.Analyze() || l.GetMachine() == MACHINE_Unknown))
{
switch(l.GetMachine())
{
case MACHINE_SPU:
case MACHINE_PPC64:
Memory.Init(Memory_PS3);
break;
}
is_error = !l.Load();
}
}
catch(const wxString& e)
{
@ -130,6 +140,21 @@ void Emulator::Load()
is_error = true;
}
CPUThreadType thread_type;
if(!is_error)
{
switch(l.GetMachine())
{
case MACHINE_PPC64: thread_type = CPU_THREAD_PPU; break;
case MACHINE_SPU: thread_type = CPU_THREAD_SPU; break;
default:
is_error = true;
break;
}
}
if(is_error)
{
Memory.Close();
@ -138,17 +163,20 @@ void Emulator::Load()
}
LoadPoints(BreakPointsDBName);
PPCThread& thread = GetCPU().AddThread(l.GetMachine() == MACHINE_PPC64 ? PPC_THREAD_PPU : PPC_THREAD_SPU);
if(l.GetMachine() == MACHINE_SPU)
CPUThread& thread = GetCPU().AddThread(thread_type);
switch(l.GetMachine())
{
case MACHINE_SPU:
ConLog.Write("offset = 0x%llx", Memory.MainMem.GetStartAddr());
ConLog.Write("max addr = 0x%x", l.GetMaxAddr());
thread.SetOffset(Memory.MainMem.GetStartAddr());
Memory.MainMem.Alloc(Memory.MainMem.GetStartAddr() + l.GetMaxAddr(), 0xFFFFED - l.GetMaxAddr());
thread.SetEntry(l.GetEntry() - Memory.MainMem.GetStartAddr());
}
else
break;
case MACHINE_PPC64:
{
thread.SetEntry(l.GetEntry());
Memory.StackMem.Alloc(0x1000);
@ -172,6 +200,12 @@ void Emulator::Load()
ppu_thr_exit_data += SC(2);
ppu_thr_exit_data += BCLR(0x10 | 0x04, 0, 0, 0);
}
break;
default:
thread.SetEntry(l.GetEntry());
break;
}
if(!m_dbg_console)
{