From 5597f95abac378900691a0daf535597e04fb7289 Mon Sep 17 00:00:00 2001 From: raven02 Date: Mon, 2 Jun 2014 13:42:30 +0800 Subject: [PATCH] Log as error for null pointer --- rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp | 324 ++++++++++++++--------- 1 file changed, 202 insertions(+), 122 deletions(-) diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp index d52da1f121..e0b03fc5f0 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp @@ -6,14 +6,16 @@ void cellSpurs_init(); Module cellSpurs(0x000a, cellSpurs_init); -int cellSpursInitialize(mem_ptr_t spurs, int nSpus, int spuPriority, - int ppuPriority, bool exitIfNoWork) +int cellSpursInitialize(mem_ptr_t spurs, int nSpus, int spuPriority, + int ppuPriority, bool exitIfNoWork) { - cellSpurs.Warning("cellSpursInitialize(spurs_addr=0x%x, nSpus=%u, spuPriority=%u, ppuPriority=%u, exitIfNoWork=%u)", - spurs.GetAddr(), nSpus, spuPriority, ppuPriority, exitIfNoWork); + cellSpurs.Warning("cellSpursInitialize(spurs_addr=0x%x, nSpus=%u, spuPriority=%u, ppuPriority=%u, exitIfNoWork=%u)", spurs.GetAddr(), nSpus, spuPriority, ppuPriority, exitIfNoWork); - if(!spurs.IsGood()) + if (!spurs.IsGood()) + { + cellSpurs.Error("cellSpursInitialize : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } SPURSManagerAttribute *attr = new SPURSManagerAttribute(nSpus, spuPriority, ppuPriority, exitIfNoWork); spurs->spurs = new SPURSManager(attr); @@ -25,8 +27,11 @@ int cellSpursFinalize(mem_ptr_t spurs) { cellSpurs.Warning("cellSpursFinalize(spurs_addr=0x%x)", spurs.GetAddr()); - if(!spurs.IsGood()) + if (!spurs.IsGood()) + { + cellSpurs.Error("cellSpursFinalize : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } spurs->spurs->Finalize(); @@ -36,10 +41,13 @@ int cellSpursFinalize(mem_ptr_t spurs) int cellSpursInitializeWithAttribute(mem_ptr_t spurs, const mem_ptr_t attr) { cellSpurs.Warning("cellSpursInitializeWithAttribute(spurs_addr=0x%x, spurs_addr=0x%x)", - spurs.GetAddr(), attr.GetAddr()); - - if(!attr.IsGood() || !spurs.IsGood()) + spurs.GetAddr(), attr.GetAddr()); + + if (!attr.IsGood() || !spurs.IsGood()) + { + cellSpurs.Error("cellSpursInitializeWithAttribute : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } spurs->spurs = new SPURSManager(attr->attr); @@ -49,24 +57,28 @@ int cellSpursInitializeWithAttribute(mem_ptr_t spurs, const mem_ptr_t int cellSpursInitializeWithAttribute2(mem_ptr_t spurs, const mem_ptr_t attr) { cellSpurs.Warning("cellSpursInitializeWithAttribute2(spurs_addr=0x%x, spurs_addr=0x%x)", - spurs.GetAddr(), attr.GetAddr()); - - if(!attr.IsGood() || !spurs.IsGood()) + spurs.GetAddr(), attr.GetAddr()); + + if (!attr.IsGood() || !spurs.IsGood()) + { + cellSpurs.Error("cellSpursInitializeWithAttribute2 : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } spurs->spurs = new SPURSManager(attr->attr); return CELL_OK; } -int _cellSpursAttributeInitialize(mem_ptr_t attr, int nSpus, int spuPriority, - int ppuPriority, bool exitIfNoWork) +int _cellSpursAttributeInitialize(mem_ptr_t attr, int nSpus, int spuPriority, int ppuPriority, bool exitIfNoWork) { - cellSpurs.Warning("_cellSpursAttributeInitialize(attr_addr=0x%x, nSpus=%u, spuPriority=%u, ppuPriority=%u, exitIfNoWork=%u)", - attr.GetAddr(), nSpus, spuPriority, ppuPriority, exitIfNoWork); - - if(!attr.IsGood()) + cellSpurs.Warning("_cellSpursAttributeInitialize(attr_addr=0x%x, nSpus=%u, spuPriority=%u, ppuPriority=%u, exitIfNoWork=%u)", attr.GetAddr(), nSpus, spuPriority, ppuPriority, exitIfNoWork); + + if (!attr.IsGood()) + { + cellSpurs.Error("_cellSpursAttributeInitialize : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } attr->attr = new SPURSManagerAttribute(nSpus, spuPriority, ppuPriority, exitIfNoWork); @@ -75,11 +87,13 @@ int _cellSpursAttributeInitialize(mem_ptr_t attr, int nSpus, int cellSpursAttributeSetMemoryContainerForSpuThread(mem_ptr_t attr, u32 container) { - cellSpurs.Warning("cellSpursAttributeSetMemoryContainerForSpuThread(attr_addr=0x%x, container=0x%x)", - attr.GetAddr(), container); + cellSpurs.Warning("cellSpursAttributeSetMemoryContainerForSpuThread(attr_addr=0x%x, container=0x%x)", attr.GetAddr(), container); - if(!attr.IsGood()) + if (!attr.IsGood()) + { + cellSpurs.Error("cellSpursAttributeSetMemoryContainerForSpuThread : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } attr->attr->_setMemoryContainerForSpuThread(container); return CELL_OK; @@ -87,13 +101,15 @@ int cellSpursAttributeSetMemoryContainerForSpuThread(mem_ptr_t attr, const mem8_t prefix, u32 size) { - cellSpurs.Warning("cellSpursAttributeSetNamePrefix(attr_addr=0x%x, prefix_addr=0x%x, size=0x%x)", - attr.GetAddr(), prefix.GetAddr(), size); - - if(!attr.IsGood() || !prefix.IsGood()) + cellSpurs.Warning("cellSpursAttributeSetNamePrefix(attr_addr=0x%x, prefix_addr=0x%x, size=0x%x)", attr.GetAddr(), prefix.GetAddr(), size); + + if (!attr.IsGood() || !prefix.IsGood()) + { + cellSpurs.Error("cellSpursAttributeSetNamePrefix : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; - - if(size > 15) + } + + if (size > 15) return CELL_SPURS_CORE_ERROR_INVAL; attr->attr->_setNamePrefix(Memory.ReadString(prefix.GetAddr(), size).c_str(), size); @@ -104,9 +120,12 @@ int cellSpursAttributeSetNamePrefix(mem_ptr_t attr, const me int cellSpursAttributeEnableSpuPrintfIfAvailable(mem_ptr_t attr) { cellSpurs.Error("cellSpursAttributeEnableSpuPrintfIfAvailable(attr_addr=0x%x)", attr.GetAddr()); - - if(!attr.IsGood()) + + if (!attr.IsGood()) + { + cellSpurs.Error("cellSpursAttributeEnableSpuPrintfIfAvailable : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } @@ -120,9 +139,12 @@ int cellSpursTaskAttributeSetExitCodeContainer() int cellSpursAttributeSetSpuThreadGroupType(mem_ptr_t attr, int type) { cellSpurs.Warning("cellSpursAttributeSetSpuThreadGroupType(attr_addr=0x%x, type=%u)", attr.GetAddr(), type); - - if(!attr.IsGood()) + + if (!attr.IsGood()) + { + cellSpurs.Error("cellSpursAttributeSetSpuThreadGroupType : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } attr->attr->_setSpuThreadGroupType(type); @@ -132,103 +154,121 @@ int cellSpursAttributeSetSpuThreadGroupType(mem_ptr_t attr, int cellSpursAttributeEnableSystemWorkload(mem_ptr_t attr, const u8 priority[CELL_SPURS_MAX_SPU], u32 maxSpu, const bool isPreemptible[CELL_SPURS_MAX_SPU]) { - cellSpurs.Error("cellSpursAttributeEnableSystemWorkload(attr_addr=0x%x, priority[%u], maxSpu=%u, isPreemptible[%u])", - attr.GetAddr(), priority, maxSpu, isPreemptible); - - if(!attr.IsGood()) + cellSpurs.Error("cellSpursAttributeEnableSystemWorkload(attr_addr=0x%x, priority[%u], maxSpu=%u, isPreemptible[%u])", attr.GetAddr(), priority, maxSpu, isPreemptible); + + if (!attr.IsGood()) + { + cellSpurs.Error("cellSpursAttributeEnableSystemWorkload : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; - + } + for (int i = 0; i < CELL_SPURS_MAX_SPU; i++) - if(priority[i] != 1 || maxSpu == 0) - return CELL_SPURS_CORE_ERROR_INVAL; - + if (priority[i] != 1 || maxSpu == 0) + return CELL_SPURS_CORE_ERROR_INVAL; + return CELL_OK; } int cellSpursGetSpuThreadGroupId(mem_ptr_t spurs, mem32_t group) { - cellSpurs.Error("cellSpursGetSpuThreadGroupId(spurs_addr=0x%x, group_addr=0x%x)", - spurs.GetAddr(), group.GetAddr()); + cellSpurs.Error("cellSpursGetSpuThreadGroupId(spurs_addr=0x%x, group_addr=0x%x)", spurs.GetAddr(), group.GetAddr()); - if(!spurs.IsGood() || group.IsGood()) + if (!spurs.IsGood() || group.IsGood()) + { + cellSpurs.Error("cellSpursGetSpuThreadGroupId : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } int cellSpursGetNumSpuThread(mem_ptr_t spurs, mem32_t nThreads) { - cellSpurs.Error("cellSpursGetNumSpuThread(spurs_addr=0x%x, nThreads_addr=0x%x)", - spurs.GetAddr(), nThreads.GetAddr()); - - if(!spurs.IsGood() || nThreads.IsGood()) + cellSpurs.Error("cellSpursGetNumSpuThread(spurs_addr=0x%x, nThreads_addr=0x%x)", spurs.GetAddr(), nThreads.GetAddr()); + + if (!spurs.IsGood() || nThreads.IsGood()) + { + cellSpurs.Error("cellSpursGetNumSpuThread : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } int cellSpursGetSpuThreadId(mem_ptr_t spurs, mem32_t thread, mem32_t nThreads) { - cellSpurs.Error("cellSpursGetSpuThreadId(spurs_addr=0x%x, thread_addr=0x%x, nThreads_addr=0x%x)", - spurs.GetAddr(), thread.GetAddr(), nThreads.GetAddr()); - - if(!spurs.IsGood() || !thread.IsGood() || nThreads.IsGood()) + cellSpurs.Error("cellSpursGetSpuThreadId(spurs_addr=0x%x, thread_addr=0x%x, nThreads_addr=0x%x)", spurs.GetAddr(), thread.GetAddr(), nThreads.GetAddr()); + + if (!spurs.IsGood() || !thread.IsGood() || nThreads.IsGood()) + { + cellSpurs.Error("cellSpursGetSpuThreadId : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } int cellSpursSetMaxContention(mem_ptr_t spurs, u32 workloadId, u32 maxContention) { - cellSpurs.Error("cellSpursSetMaxContention(spurs_addr=0x%x, workloadId=%u, maxContention=%u)", - spurs.GetAddr(), workloadId, maxContention); - - if(!spurs.IsGood()) + cellSpurs.Error("cellSpursSetMaxContention(spurs_addr=0x%x, workloadId=%u, maxContention=%u)", spurs.GetAddr(), workloadId, maxContention); + + if (!spurs.IsGood()) + { + cellSpurs.Error("cellSpursSetMaxContention : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } int cellSpursSetPriorities(mem_ptr_t spurs, u32 workloadId, const u8 priorities[CELL_SPURS_MAX_SPU]) { - cellSpurs.Error("cellSpursSetPriorities(spurs_addr=0x%x, workloadId=%u, priorities[%u])", - spurs.GetAddr(), workloadId, priorities); - - if(!spurs.IsGood()) + cellSpurs.Error("cellSpursSetPriorities(spurs_addr=0x%x, workloadId=%u, priorities[%u])", spurs.GetAddr(), workloadId, priorities); + + if (!spurs.IsGood()) + { + cellSpurs.Error("cellSpursSetPriorities : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } int cellSpursSetPriority(mem_ptr_t spurs, u32 workloadId, u32 spuId, u32 priority) { - cellSpurs.Error("cellSpursSetPriority(spurs_addr=0x%x, workloadId=%u, spuId=%u, priority=%u)", - spurs.GetAddr(), workloadId, spuId, priority); - - if(!spurs.IsGood()) + cellSpurs.Error("cellSpursSetPriority(spurs_addr=0x%x, workloadId=%u, spuId=%u, priority=%u)", spurs.GetAddr(), workloadId, spuId, priority); + + if (!spurs.IsGood()) + { + cellSpurs.Error("cellSpursSetPriority : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } int cellSpursSetPreemptionVictimHints(mem_ptr_t spurs, const bool isPreemptible[CELL_SPURS_MAX_SPU]) { - cellSpurs.Error("cellSpursSetPreemptionVictimHints(spurs_addr=0x%x, isPreemptible[%u])", - spurs.GetAddr(), isPreemptible); - - if(!spurs.IsGood()) + cellSpurs.Error("cellSpursSetPreemptionVictimHints(spurs_addr=0x%x, isPreemptible[%u])", spurs.GetAddr(), isPreemptible); + + if (!spurs.IsGood()) + { + cellSpurs.Error("cellSpursSetPreemptionVictimHints : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } int cellSpursAttachLv2EventQueue(mem_ptr_t spurs, u32 queue, mem8_t port, int isDynamic) { - cellSpurs.Error("cellSpursAttachLv2EventQueue(spurs_addr=0x%x, queue=0x%x, port_addr=0x%x, isDynamic=%u)", - spurs.GetAddr(), queue, port.GetAddr(), isDynamic); - - if(!spurs.IsGood() || !port.IsGood()) + cellSpurs.Error("cellSpursAttachLv2EventQueue(spurs_addr=0x%x, queue=0x%x, port_addr=0x%x, isDynamic=%u)", spurs.GetAddr(), queue, port.GetAddr(), isDynamic); + + if (!spurs.IsGood() || !port.IsGood()) + { + cellSpurs.Error("cellSpursAttachLv2EventQueue : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } @@ -236,21 +276,27 @@ int cellSpursAttachLv2EventQueue(mem_ptr_t spurs, u32 queue, mem8_t p int cellSpursDetachLv2EventQueue(mem_ptr_t spurs, u8 port) { cellSpurs.Error("cellSpursDetachLv2EventQueue(spurs_addr=0x%x, port=0x%x)", spurs.GetAddr(), port); - - if(!spurs.IsGood()) + + if (!spurs.IsGood()) + { + cellSpurs.Error("cellSpursDetachLv2EventQueue : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } -int _cellSpursEventFlagInitialize(mem_ptr_t spurs, mem_ptr_t taskset, - mem_ptr_t eventFlag, u32 flagClearMode, u32 flagDirection) +int _cellSpursEventFlagInitialize(mem_ptr_t spurs, mem_ptr_t taskset, mem_ptr_t eventFlag, u32 flagClearMode, u32 flagDirection) { - cellSpurs.Error("_cellSpursEventFlagInitialize(spurs_addr=0x%x, taskset_addr=0x%x, eventFlag_addr=0x%x, flagClearMode=%u, flagDirection=%u)", - spurs.GetAddr(), taskset.GetAddr(), eventFlag.GetAddr(), flagClearMode, flagDirection); - - if(!spurs.IsGood() || !taskset.IsGood() || !eventFlag.IsGood()) + cellSpurs.Error("_cellSpursEventFlagInitialize(spurs_addr=0x%x, taskset_addr=0x%x, eventFlag_addr=0x%x, flagClearMode=%u, flagDirection=%u)", spurs.GetAddr(), taskset.GetAddr(), eventFlag.GetAddr(), flagClearMode, flagDirection); + + // Somehow Arkedo Series 01/02/03 always return spurs_addr as 0x0 but not other titles .Temporarily disable this memory checking. + /* if (!spurs.IsGood() || !taskset.IsGood() || !eventFlag.IsGood()) + { + cellSpurs.Error("_cellSpursEventFlagInitialize : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } + */ return CELL_OK; } @@ -258,9 +304,12 @@ int _cellSpursEventFlagInitialize(mem_ptr_t spurs, mem_ptr_t event_flag) { cellSpurs.Error("cellSpursEventFlagAttachLv2EventQueue(event_flag_addr=0x%x)", event_flag.GetAddr()); - - if(!event_flag.IsGood()) + + if (!event_flag.IsGood()) + { + cellSpurs.Error("cellSpursEventFlagAttachLv2EventQueue : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } @@ -268,20 +317,25 @@ int cellSpursEventFlagAttachLv2EventQueue(mem_ptr_t event_fl int cellSpursEventFlagDetachLv2EventQueue(mem_ptr_t event_flag) { cellSpurs.Error("cellSpursEventFlagDetachLv2EventQueue(event_flag_addr=0x%x)", event_flag.GetAddr()); - - if(!event_flag.IsGood()) + + if (!event_flag.IsGood()) + { + cellSpurs.Error("cellSpursEventFlagDetachLv2EventQueue : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } int cellSpursEventFlagWait(mem_ptr_t event_flag, mem16_t flag_bits, u32 wait_mode) { - cellSpurs.Error("cellSpursEventFlagWait(event_flag_addr=0x%x, flag_bits_addr=0x%x, wait_mode=%u)", - event_flag.GetAddr(), flag_bits.GetAddr(), wait_mode); - - if(!event_flag.IsGood() || !flag_bits.IsGood()) + cellSpurs.Error("cellSpursEventFlagWait(event_flag_addr=0x%x, flag_bits_addr=0x%x, wait_mode=%u)", event_flag.GetAddr(), flag_bits.GetAddr(), wait_mode); + + if (!event_flag.IsGood() || !flag_bits.IsGood()) + { + cellSpurs.Error("cellSpursEventFlagWait : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } @@ -367,21 +421,25 @@ int cellSpursQueueAttachLv2EventQueue() int cellSpursEnableExceptionEventHandler(mem_ptr_t spurs, bool flag) { cellSpurs.Error("cellSpursEnableExceptionEventHandler(spurs_addr=0x%x, flag=%u)", spurs.GetAddr(), flag); - - if(!spurs.IsGood()) + + if (!spurs.IsGood()) + { + cellSpurs.Error("cellSpursEnableExceptionEventHandler : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } -int cellSpursSetGlobalExceptionEventHandler(mem_ptr_t spurs, - mem_func_ptr_t eaHandler, mem_ptr_t arg) +int cellSpursSetGlobalExceptionEventHandler(mem_ptr_t spurs, mem_func_ptr_t eaHandler, mem_ptr_t arg) { - cellSpurs.Error("cellSpursEnableExceptionEventHandler(spurs_addr=0x%x, eaHandler_addr=0x%x, arg_addr=0x%x,)", - spurs.GetAddr(), eaHandler.GetAddr(), arg.GetAddr()); - - if(!spurs.IsGood() || eaHandler.IsGood()) + cellSpurs.Error("cellSpursEnableExceptionEventHandler(spurs_addr=0x%x, eaHandler_addr=0x%x, arg_addr=0x%x,)", spurs.GetAddr(), eaHandler.GetAddr(), arg.GetAddr()); + + if (!spurs.IsGood() || eaHandler.IsGood()) + { + cellSpurs.Error("cellSpursSetGlobalExceptionEventHandler : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } @@ -389,9 +447,12 @@ int cellSpursSetGlobalExceptionEventHandler(mem_ptr_t spurs, int cellSpursUnsetGlobalExceptionEventHandler(mem_ptr_t spurs) { cellSpurs.Error("cellSpursUnsetGlobalExceptionEventHandler(spurs_addr=0x%x)", spurs.GetAddr()); - - if(!spurs.IsGood()) + + if (!spurs.IsGood()) + { + cellSpurs.Error("cellSpursUnsetGlobalExceptionEventHandler : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } @@ -399,9 +460,12 @@ int cellSpursUnsetGlobalExceptionEventHandler(mem_ptr_t spurs) int cellSpursGetInfo(mem_ptr_t spurs, mem_ptr_t info) { cellSpurs.Error("cellSpursGetInfo(spurs_addr=0x%x, info_addr=0x%x)", spurs.GetAddr(), info.GetAddr()); - - if(!spurs.IsGood() || !info.IsGood()) + + if (!spurs.IsGood() || !info.IsGood()) + { + cellSpurs.Error("cellSpursGetInfo : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } @@ -409,9 +473,12 @@ int cellSpursGetInfo(mem_ptr_t spurs, mem_ptr_t info) int _cellSpursSendSignal(mem_ptr_t taskset, u32 taskID) { cellSpurs.Error("_cellSpursSendSignal(taskset_addr=0x%x, taskID=%u)", taskset.GetAddr(), taskID); - - if(!taskset.IsGood()) + + if (!taskset.IsGood()) + { + cellSpurs.Error("_cellSpursSendSignal : CELL_SPURS_CORE_ERROR_NULL_POINTER"); return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } @@ -452,14 +519,15 @@ int cellSpursCreateTasksetWithAttribute() return CELL_OK; } -int cellSpursCreateTaskset(mem_ptr_t spurs, mem_ptr_t taskset, - u64 args, mem8_t priority, u32 maxContention) +int cellSpursCreateTaskset(mem_ptr_t spurs, mem_ptr_t taskset, u64 args, mem8_t priority, u32 maxContention) { - cellSpurs.Error("cellSpursCreateTaskset(spurs_addr=0x%x, taskset_addr=0x%x, args=0x%x, priority_addr=0x%x, maxContention=%u)", - spurs.GetAddr(), taskset.GetAddr(), args, priority.GetAddr(), maxContention); - - if(!spurs.IsGood() || !taskset.IsGood()) - return CELL_SPURS_TASK_ERROR_NULL_POINTER; + cellSpurs.Error("cellSpursCreateTaskset(spurs_addr=0x%x, taskset_addr=0x%x, args=0x%x, priority_addr=0x%x, maxContention=%u)", spurs.GetAddr(), taskset.GetAddr(), args, priority.GetAddr(), maxContention); + + if (!spurs.IsGood() || !taskset.IsGood()) + { + cellSpurs.Error("cellSpursCreateTaskset : CELL_SPURS_CORE_ERROR_NULL_POINTER"); + return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } @@ -467,9 +535,12 @@ int cellSpursCreateTaskset(mem_ptr_t spurs, mem_ptr_t taskset) { cellSpurs.Error("cellSpursJoinTaskset(taskset_addr=0x%x)", taskset.GetAddr()); - - if(!taskset.IsGood()) - return CELL_SPURS_TASK_ERROR_NULL_POINTER; + + if (!taskset.IsGood()) + { + cellSpurs.Error("cellSpursJoinTaskset : CELL_SPURS_CORE_ERROR_NULL_POINTER"); + return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } @@ -477,9 +548,12 @@ int cellSpursJoinTaskset(mem_ptr_t taskset) int cellSpursGetTasksetId(mem_ptr_t taskset, mem32_t workloadId) { cellSpurs.Error("cellSpursGetTasksetId(taskset_addr=0x%x, workloadId_addr=0x%x)", taskset.GetAddr(), workloadId.GetAddr()); - - if(!taskset.IsGood() || !workloadId.IsGood()) - return CELL_SPURS_TASK_ERROR_NULL_POINTER; + + if (!taskset.IsGood() || !workloadId.IsGood()) + { + cellSpurs.Error("cellSpursGetTasksetId : CELL_SPURS_CORE_ERROR_NULL_POINTER"); + return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } @@ -487,22 +561,28 @@ int cellSpursGetTasksetId(mem_ptr_t taskset, mem32_t workloadI int cellSpursShutdownTaskset(mem_ptr_t taskset) { cellSpurs.Error("cellSpursShutdownTaskset(taskset_addr=0x%x)", taskset.GetAddr()); - - if(!taskset.IsGood()) - return CELL_SPURS_TASK_ERROR_NULL_POINTER; + + if (!taskset.IsGood()) + { + cellSpurs.Error("cellSpursShutdownTaskset : CELL_SPURS_CORE_ERROR_NULL_POINTER"); + return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } int cellSpursCreateTask(mem_ptr_t taskset, mem32_t taskID, mem_ptr_t elf_addr, - mem_ptr_t context_addr, u32 context_size, mem_ptr_t lsPattern, - mem_ptr_t argument) + mem_ptr_t context_addr, u32 context_size, mem_ptr_t lsPattern, + mem_ptr_t argument) { cellSpurs.Error("cellSpursCreateTask(taskset_addr=0x%x, taskID_addr=0x%x, elf_addr_addr=0x%x, context_addr_addr=0x%x, context_size=%u, lsPattern_addr=0x%x, argument_addr=0x%x)", taskset.GetAddr(), taskID.GetAddr(), elf_addr.GetAddr(), context_addr.GetAddr(), context_size, lsPattern.GetAddr(), argument.GetAddr()); - - if(!taskset.IsGood()) - return CELL_SPURS_TASK_ERROR_NULL_POINTER; + + if (!taskset.IsGood()) + { + cellSpurs.Error("cellSpursCreateTask : CELL_SPURS_CORE_ERROR_NULL_POINTER"); + return CELL_SPURS_CORE_ERROR_NULL_POINTER; + } return CELL_OK; } @@ -674,7 +754,7 @@ void cellSpurs_init() cellSpurs.AddFunc(0xb9bc6207, cellSpursAttachLv2EventQueue); cellSpurs.AddFunc(0x4e66d483, cellSpursDetachLv2EventQueue); cellSpurs.AddFunc(0xe0a6dbe4, _cellSpursSendSignal); - //cellSpurs.AddFunc(0x5ef96465, _cellSpursEventFlagInitialize); + cellSpurs.AddFunc(0x5ef96465, _cellSpursEventFlagInitialize); cellSpurs.AddFunc(0x87630976, cellSpursEventFlagAttachLv2EventQueue); cellSpurs.AddFunc(0x22aab31d, cellSpursEventFlagDetachLv2EventQueue); cellSpurs.AddFunc(0x373523d4, cellSpursEventFlagWait);