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

Fixed conflicts

Browse source
This commit is contained in:
Nekotekina 2014-01-08 00:49:40 +04:00
commit 775bf8b340
12 changed files with 314 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,23 @@ u32 LoadSpuImage(vfsStream& stream, u32& spu_ep)
spu_ep = l.GetEntry();
return spu_offset;
}
/*u64 g_last_spu_offset = 0;
static const u64 g_spu_alloc_size = 0x1000000;
u32 LoadSpuImage(vfsStream& stream, u64 address)
{
ELFLoader l(stream);
l.LoadInfo();
l.LoadData(address);
return address + l.GetEntry();
}
u32 LoadSpuImage(vfsStream& stream)
{
g_last_spu_offset = Memory.MainMem.Alloc(g_spu_alloc_size);
return LoadSpuImage(stream, g_last_spu_offset);
}*/
//156
int sys_spu_image_open(mem_ptr_t<sys_spu_image> img, u32 path_addr)