diff --git a/rpcs3/Emu/Cell/Modules/cellSysutil.cpp b/rpcs3/Emu/Cell/Modules/cellSysutil.cpp
index e59a93bd32..6e846cedea 100644
--- a/rpcs3/Emu/Cell/Modules/cellSysutil.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSysutil.cpp
@@ -193,13 +193,13 @@ s32 sysutil_check_name_string(const char* src, s32 minlen, s32 maxlen)
 	}
 }
 
-s32 _cellSysutilGetSystemParamInt()
+error_code _cellSysutilGetSystemParamInt()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 cellSysutilGetSystemParamInt(CellSysutilParamId id, vm::ptr<s32> value)
+error_code cellSysutilGetSystemParamInt(CellSysutilParamId id, vm::ptr<s32> value)
 {
 	cellSysutil.warning("cellSysutilGetSystemParamInt(id=0x%x(%s), value=*0x%x)", id, id, value);
 
@@ -278,7 +278,7 @@ s32 cellSysutilGetSystemParamInt(CellSysutilParamId id, vm::ptr<s32> value)
 	return CELL_OK;
 }
 
-s32 cellSysutilGetSystemParamString(CellSysutilParamId id, vm::ptr<char> buf, u32 bufsize)
+error_code cellSysutilGetSystemParamString(CellSysutilParamId id, vm::ptr<char> buf, u32 bufsize)
 {
 	cellSysutil.trace("cellSysutilGetSystemParamString(id=0x%x(%s), buf=*0x%x, bufsize=%d)", id, id, buf, bufsize);
 
@@ -330,7 +330,7 @@ error_code cellSysutilCheckCallback(ppu_thread& ppu)
 	return CELL_OK;
 }
 
-s32 cellSysutilRegisterCallback(s32 slot, vm::ptr<CellSysutilCallback> func, vm::ptr<void> userdata)
+error_code cellSysutilRegisterCallback(s32 slot, vm::ptr<CellSysutilCallback> func, vm::ptr<void> userdata)
 {
 	cellSysutil.warning("cellSysutilRegisterCallback(slot=%d, func=*0x%x, userdata=*0x%x)", slot, func, userdata);
 
@@ -346,7 +346,7 @@ s32 cellSysutilRegisterCallback(s32 slot, vm::ptr<CellSysutilCallback> func, vm:
 	return CELL_OK;
 }
 
-s32 cellSysutilUnregisterCallback(u32 slot)
+error_code cellSysutilUnregisterCallback(u32 slot)
 {
 	cellSysutil.warning("cellSysutilUnregisterCallback(slot=%d)", slot);
 
@@ -364,7 +364,7 @@ s32 cellSysutilUnregisterCallback(u32 slot)
 
 bool g_bgm_playback_enabled = true;
 
-s32 cellSysutilEnableBgmPlayback()
+error_code cellSysutilEnableBgmPlayback()
 {
 	cellSysutil.warning("cellSysutilEnableBgmPlayback()");
 
@@ -374,7 +374,7 @@ s32 cellSysutilEnableBgmPlayback()
 	return CELL_OK;
 }
 
-s32 cellSysutilEnableBgmPlaybackEx(vm::ptr<CellSysutilBgmPlaybackExtraParam> param)
+error_code cellSysutilEnableBgmPlaybackEx(vm::ptr<CellSysutilBgmPlaybackExtraParam> param)
 {
 	cellSysutil.warning("cellSysutilEnableBgmPlaybackEx(param=*0x%x)", param);
 
@@ -384,7 +384,7 @@ s32 cellSysutilEnableBgmPlaybackEx(vm::ptr<CellSysutilBgmPlaybackExtraParam> par
 	return CELL_OK;
 }
 
-s32 cellSysutilDisableBgmPlayback()
+error_code cellSysutilDisableBgmPlayback()
 {
 	cellSysutil.warning("cellSysutilDisableBgmPlayback()");
 
@@ -394,7 +394,7 @@ s32 cellSysutilDisableBgmPlayback()
 	return CELL_OK;
 }
 
-s32 cellSysutilDisableBgmPlaybackEx(vm::ptr<CellSysutilBgmPlaybackExtraParam> param)
+error_code cellSysutilDisableBgmPlaybackEx(vm::ptr<CellSysutilBgmPlaybackExtraParam> param)
 {
 	cellSysutil.warning("cellSysutilDisableBgmPlaybackEx(param=*0x%x)", param);
 
@@ -404,7 +404,7 @@ s32 cellSysutilDisableBgmPlaybackEx(vm::ptr<CellSysutilBgmPlaybackExtraParam> pa
 	return CELL_OK;
 }
 
-s32 cellSysutilGetBgmPlaybackStatus(vm::ptr<CellSysutilBgmPlaybackStatus> status)
+error_code cellSysutilGetBgmPlaybackStatus(vm::ptr<CellSysutilBgmPlaybackStatus> status)
 {
 	cellSysutil.warning("cellSysutilGetBgmPlaybackStatus(status=*0x%x)", status);
 
@@ -418,7 +418,7 @@ s32 cellSysutilGetBgmPlaybackStatus(vm::ptr<CellSysutilBgmPlaybackStatus> status
 	return CELL_OK;
 }
 
-s32 cellSysutilGetBgmPlaybackStatus2(vm::ptr<CellSysutilBgmPlaybackStatus2> status2)
+error_code cellSysutilGetBgmPlaybackStatus2(vm::ptr<CellSysutilBgmPlaybackStatus2> status2)
 {
 	cellSysutil.warning("cellSysutilGetBgmPlaybackStatus2(status2=*0x%x)", status2);
 
@@ -429,283 +429,283 @@ s32 cellSysutilGetBgmPlaybackStatus2(vm::ptr<CellSysutilBgmPlaybackStatus2> stat
 	return CELL_OK;
 }
 
-s32 cellSysutilSetBgmPlaybackExtraParam()
+error_code cellSysutilSetBgmPlaybackExtraParam()
 {
 	cellSysutil.todo("cellSysutilSetBgmPlaybackExtraParam()");
 	return CELL_OK;
 }
 
-s32 cellSysutilRegisterCallbackDispatcher()
+error_code cellSysutilRegisterCallbackDispatcher()
 {
 	cellSysutil.todo("cellSysutilRegisterCallbackDispatcher()");
 	return CELL_OK;
 }
 
-s32 cellSysutilUnregisterCallbackDispatcher()
+error_code cellSysutilUnregisterCallbackDispatcher()
 {
 	cellSysutil.todo("cellSysutilUnregisterCallbackDispatcher()");
 	return CELL_OK;
 }
 
-s32 cellSysutilPacketRead()
+error_code cellSysutilPacketRead()
 {
 	cellSysutil.todo("cellSysutilPacketRead()");
 	return CELL_OK;
 }
 
-s32 cellSysutilPacketWrite()
+error_code cellSysutilPacketWrite()
 {
 	cellSysutil.todo("cellSysutilPacketWrite()");
 	return CELL_OK;
 }
 
-s32 cellSysutilPacketBegin()
+error_code cellSysutilPacketBegin()
 {
 	cellSysutil.todo("cellSysutilPacketBegin()");
 	return CELL_OK;
 }
 
-s32 cellSysutilPacketEnd()
+error_code cellSysutilPacketEnd()
 {
 	cellSysutil.todo("cellSysutilPacketEnd()");
 	return CELL_OK;
 }
 
-s32 cellSysutilGameDataAssignVmc()
+error_code cellSysutilGameDataAssignVmc()
 {
 	cellSysutil.todo("cellSysutilGameDataAssignVmc()");
 	return CELL_OK;
 }
 
-s32 cellSysutilGameDataExit()
+error_code cellSysutilGameDataExit()
 {
 	cellSysutil.todo("cellSysutilGameDataExit()");
 	return CELL_OK;
 }
 
-s32 cellSysutilGameExit_I()
+error_code cellSysutilGameExit_I()
 {
 	cellSysutil.todo("cellSysutilGameExit_I()");
 	return CELL_OK;
 }
 
-s32 cellSysutilGamePowerOff_I()
+error_code cellSysutilGamePowerOff_I()
 {
 	cellSysutil.todo("cellSysutilGamePowerOff_I()");
 	return CELL_OK;
 }
 
-s32 cellSysutilGameReboot_I()
+error_code cellSysutilGameReboot_I()
 {
 	cellSysutil.todo("cellSysutilGameReboot_I()");
 	return CELL_OK;
 }
 
-s32 cellSysutilSharedMemoryAlloc()
+error_code cellSysutilSharedMemoryAlloc()
 {
 	cellSysutil.todo("cellSysutilSharedMemoryAlloc()");
 	return CELL_OK;
 }
 
-s32 cellSysutilSharedMemoryFree()
+error_code cellSysutilSharedMemoryFree()
 {
 	cellSysutil.todo("cellSysutilSharedMemoryFree()");
 	return CELL_OK;
 }
 
-s32 cellSysutilNotification()
+error_code cellSysutilNotification()
 {
 	cellSysutil.todo("cellSysutilNotification()");
 	return CELL_OK;
 }
 
-s32 _ZN4cxml7Element11AppendChildERS0_()
+error_code _ZN4cxml7Element11AppendChildERS0_()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN4cxml8DocumentC1Ev()
+error_code _ZN4cxml8DocumentC1Ev()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN4cxml8DocumentD1Ev()
+error_code _ZN4cxml8DocumentD1Ev()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN4cxml8Document5ClearEv()
+error_code _ZN4cxml8Document5ClearEv()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN4cxml8Document5WriteEPFiPKvjPvES3_()
+error_code _ZN4cxml8Document5WriteEPFiPKvjPvES3_()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN4cxml8Document12RegisterFileEPKvjPNS_4FileE()
+error_code _ZN4cxml8Document12RegisterFileEPKvjPNS_4FileE()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN4cxml8Document13CreateElementEPKciPNS_7ElementE()
+error_code _ZN4cxml8Document13CreateElementEPKciPNS_7ElementE()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN4cxml8Document14SetHeaderMagicEPKc()
+error_code _ZN4cxml8Document14SetHeaderMagicEPKc()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN4cxml8Document16CreateFromBufferEPKvjb()
+error_code _ZN4cxml8Document16CreateFromBufferEPKvjb()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN4cxml8Document18GetDocumentElementEv()
+error_code _ZN4cxml8Document18GetDocumentElementEv()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZNK4cxml4File7GetAddrEv()
+error_code _ZNK4cxml4File7GetAddrEv()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZNK4cxml7Element12GetAttributeEPKcPNS_9AttributeE()
+error_code _ZNK4cxml7Element12GetAttributeEPKcPNS_9AttributeE()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZNK4cxml7Element13GetFirstChildEv()
+error_code _ZNK4cxml7Element13GetFirstChildEv()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZNK4cxml7Element14GetNextSiblingEv()
+error_code _ZNK4cxml7Element14GetNextSiblingEv()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZNK4cxml9Attribute6GetIntEPi()
+error_code _ZNK4cxml9Attribute6GetIntEPi()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZNK4cxml9Attribute7GetFileEPNS_4FileE()
+error_code _ZNK4cxml9Attribute7GetFileEPNS_4FileE()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN8cxmlutil6SetIntERKN4cxml7ElementEPKci()
+error_code _ZN8cxmlutil6SetIntERKN4cxml7ElementEPKci()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN8cxmlutil6GetIntERKN4cxml7ElementEPKcPi()
+error_code _ZN8cxmlutil6GetIntERKN4cxml7ElementEPKcPi()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN8cxmlutil7SetFileERKN4cxml7ElementEPKcRKNS0_4FileE()
+error_code _ZN8cxmlutil7SetFileERKN4cxml7ElementEPKcRKNS0_4FileE()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN8cxmlutil8GetFloatERKN4cxml7ElementEPKcPf()
+error_code _ZN8cxmlutil8GetFloatERKN4cxml7ElementEPKcPf()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN8cxmlutil8SetFloatERKN4cxml7ElementEPKcf()
+error_code _ZN8cxmlutil8SetFloatERKN4cxml7ElementEPKcf()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN8cxmlutil9GetStringERKN4cxml7ElementEPKcPS5_Pj()
+error_code _ZN8cxmlutil9GetStringERKN4cxml7ElementEPKcPS5_Pj()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN8cxmlutil9SetStringERKN4cxml7ElementEPKcS5_()
+error_code _ZN8cxmlutil9SetStringERKN4cxml7ElementEPKcS5_()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN8cxmlutil16CheckElementNameERKN4cxml7ElementEPKc()
+error_code _ZN8cxmlutil16CheckElementNameERKN4cxml7ElementEPKc()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN8cxmlutil16FindChildElementERKN4cxml7ElementEPKcS5_S5_()
+error_code _ZN8cxmlutil16FindChildElementERKN4cxml7ElementEPKcS5_S5_()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN8cxmlutil7GetFileERKN4cxml7ElementEPKcPNS0_4FileE()
+error_code _ZN8cxmlutil7GetFileERKN4cxml7ElementEPKcPNS0_4FileE()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN16sysutil_cxmlutil11FixedMemory3EndEi()
+error_code _ZN16sysutil_cxmlutil11FixedMemory3EndEi()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN16sysutil_cxmlutil11FixedMemory5BeginEi()
+error_code _ZN16sysutil_cxmlutil11FixedMemory5BeginEi()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN16sysutil_cxmlutil11FixedMemory8AllocateEN4cxml14AllocationTypeEPvS3_jPS3_Pj()
+error_code _ZN16sysutil_cxmlutil11FixedMemory8AllocateEN4cxml14AllocationTypeEPvS3_jPS3_Pj()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN16sysutil_cxmlutil12PacketWriter5WriteEPKvjPv()
+error_code _ZN16sysutil_cxmlutil12PacketWriter5WriteEPKvjPv()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 _ZN16sysutil_cxmlutil12PacketWriterC1EiiRN4cxml8DocumentE()
+error_code _ZN16sysutil_cxmlutil12PacketWriterC1EiiRN4cxml8DocumentE()
 {
 	UNIMPLEMENTED_FUNC(cellSysutil);
 	return CELL_OK;
 }
 
-s32 cellSysutil_E1EC7B6A(vm::ptr<u32> unk)
+error_code cellSysutil_E1EC7B6A(vm::ptr<u32> unk)
 {
 	cellSysutil.todo("cellSysutil_E1EC7B6A(unk=*0x%x)", unk);
 	*unk = 0;