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

Merge pull request #736 from tambry/cellSpursTasksetAttribute2

Browse source 
Added TasksetAttribute2 initilization and fixed wrong TODO message
This commit is contained in:
B1ackDaemon 2014-08-10 22:16:02 +03:00
commit 2fbd9453dd
2 changed files with 152 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

41
rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp
View file

@ -471,7 +471,7 @@ int cellSpursEventFlagGetClearMode(mem_ptr_t<CellSpursEventFlag> eventFlag, mem3
int cellSpursEventFlagGetTasksetAddress(mem_ptr_t<CellSpursEventFlag> eventFlag, mem_ptr_t<CellSpursTaskset> taskset) int cellSpursEventFlagGetTasksetAddress(mem_ptr_t<CellSpursEventFlag> eventFlag, mem_ptr_t<CellSpursTaskset> taskset)
{ {
cellSpurs->Todo("cellSpursEventFlagTryWait(eventFlag_addr=0x%x, taskset_addr=0x%x)", eventFlag.GetAddr(), taskset.GetAddr()); cellSpurs->Todo("cellSpursEventFlagGetTasksetAddress(eventFlag_addr=0x%x, taskset_addr=0x%x)", eventFlag.GetAddr(), taskset.GetAddr());
if (eventFlag.GetAddr() % 128 != 0) if (eventFlag.GetAddr() % 128 != 0)
{ {
@ -716,9 +716,23 @@ int cellSpursTasksetAttributeSetName()
return CELL_OK; return CELL_OK;
} }
int _cellSpursTasksetAttribute2Initialize() int _cellSpursTasksetAttribute2Initialize(mem_ptr_t<CellSpursTasksetAttribute2> attribute, u32 revision)
{ {
UNIMPLEMENTED_FUNC(cellSpurs); cellSpurs->Warning("_cellSpursTasksetAttribute2Initialize(attribute_addr=0x%x, revision=%d)", attribute.GetAddr(), revision);
attribute->revision = revision;
attribute->name_addr = NULL;
attribute->argTaskset = 0;
for (int i = 0; i < 8; i++)
{
attribute->priority[i] = 1;
}
attribute->maxContention = 8;
attribute->enableClearLs = 0;
attribute->CellSpursTaskNameBuffer_addr = 0;
return CELL_OK; return CELL_OK;
} }
@ -770,9 +784,26 @@ int cellSpursTaskAttributeSetExitCodeContainer()
return CELL_OK; return CELL_OK;
} }
int _cellSpursTaskAttribute2Initialize() int _cellSpursTaskAttribute2Initialize(mem_ptr_t<CellSpursTaskAttribute2> attribute, u32 revision)
{ {
UNIMPLEMENTED_FUNC(cellSpurs); cellSpurs->Warning("_cellSpursTaskAttribute2Initialize(attribute_addr=0x%x, revision=%d)", attribute.GetAddr(), revision);
attribute->revision = revision;
attribute->sizeContext = 0;
attribute->eaContext = NULL;
for (int c = 0; c < 4; c++)
{
attribute->lsPattern.u32[c] = 0;
}
for (int i = 0; i < 2; i++)
{
attribute->lsPattern.u64[i] = 0;
}
attribute->name_addr = 0;
return CELL_OK; return CELL_OK;
} }

4
rpcs3/Emu/SysCalls/Modules/cellSpurs.h
View file

@ -26,8 +26,8 @@ enum
CELL_SPURS_TASK_ERROR_PERM = 0x80410909, CELL_SPURS_TASK_ERROR_PERM = 0x80410909,
CELL_SPURS_TASK_ERROR_BUSY = 0x8041090A, CELL_SPURS_TASK_ERROR_BUSY = 0x8041090A,
CELL_SPURS_TASK_ERROR_FAULT = 0x8041090D, CELL_SPURS_TASK_ERROR_FAULT = 0x8041090D,
CELL_SPURS_TASK_ERROR_STAT = 0x8041090F,
CELL_SPURS_TASK_ERROR_ALIGN = 0x80410910, CELL_SPURS_TASK_ERROR_ALIGN = 0x80410910,
CELL_SPURS_TASK_ERROR_STAT = 0x8041090F,
CELL_SPURS_TASK_ERROR_NULL_POINTER = 0x80410911, CELL_SPURS_TASK_ERROR_NULL_POINTER = 0x80410911,
CELL_SPURS_TASK_ERROR_FATAL = 0x80410914, CELL_SPURS_TASK_ERROR_FATAL = 0x80410914,
CELL_SPURS_TASK_ERROR_SHUTDOWN = 0x80410920, CELL_SPURS_TASK_ERROR_SHUTDOWN = 0x80410920,
@ -214,7 +214,7 @@ struct CellSpursTaskAttribute2
be_t<u32> revision; be_t<u32> revision;
be_t<u32> sizeContext; be_t<u32> sizeContext;
be_t<u64> eaContext; be_t<u64> eaContext;
CellSpursTaskLsPattern lsPattern; //??? CellSpursTaskLsPattern lsPattern;
be_t<u32> name_addr; be_t<u32> name_addr;
//be_t<u32> __reserved__[]; //be_t<u32> __reserved__[];
}; };