ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fast fix 

Previous commit was wrong
This commit is contained in:
Nekotekina 2013-12-22 22:16:57 +04:00
parent c9abf559be
commit 37b5b49f58
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.cpp
View File

@ -58,7 +58,6 @@ int sys_spu_image_open(mem_ptr_t<sys_spu_image> img, u32 path_addr)
img->entry_point = entry; img->entry_point = entry;
img->segs_addr = 0x0; img->segs_addr = 0x0;
img->nsegs = 0; img->nsegs = 0;
img->_img_offs = g_spu_offset;
return CELL_OK; return CELL_OK;
} }
@ -96,7 +95,7 @@ int sys_spu_thread_initialize(mem32_t thread, u32 group, u32 spu_num, mem_ptr_t<
return CELL_EBUSY; return CELL_EBUSY;
} }
u32 ls_entry = img->entry_point - img->_img_offs; u32 ls_entry = img->entry_point - g_spu_offset;
std::string name = Memory.ReadString(attr->name_addr, attr->name_len).mb_str(); std::string name = Memory.ReadString(attr->name_addr, attr->name_len).mb_str();
u64 a1 = arg->arg1; u64 a1 = arg->arg1;
u64 a2 = arg->arg2; u64 a2 = arg->arg2;
@ -105,11 +104,10 @@ int sys_spu_thread_initialize(mem32_t thread, u32 group, u32 spu_num, mem_ptr_t<
CPUThread& new_thread = Emu.GetCPU().AddThread(CPU_THREAD_SPU); CPUThread& new_thread = Emu.GetCPU().AddThread(CPU_THREAD_SPU);
//copy SPU image: //copy SPU image:
g_spu_alloc_size = 256 * 1024; u32 spu_offset = Memory.MainMem.Alloc(256 * 1024);
g_spu_offset = Memory.MainMem.Alloc(g_spu_alloc_size); memcpy(Memory + spu_offset, Memory + g_spu_offset, 256 * 1024);
memcpy(Memory + g_spu_offset, Memory + img->_img_offs, g_spu_alloc_size);
//initialize from new place: //initialize from new place:
new_thread.SetOffset(g_spu_offset); new_thread.SetOffset(spu_offset);
new_thread.SetEntry(ls_entry); new_thread.SetEntry(ls_entry);
new_thread.SetName(name); new_thread.SetName(name);
new_thread.SetArg(0, a1); new_thread.SetArg(0, a1);

1
rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.h
View File

@ -29,5 +29,4 @@ struct sys_spu_image
be_t<u32> entry_point; be_t<u32> entry_point;
be_t<u32> segs_addr; be_t<u32> segs_addr;
be_t<int> nsegs; be_t<int> nsegs;
u64 _img_offs;
}; };