From be2f993155098052ffbf42db10c5749899b6a213 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sun, 26 Jul 2015 15:10:06 +0300 Subject: [PATCH] func_def eliminated --- rpcs3/Emu/ARMv7/Modules/sceDeci4p.h | 2 +- rpcs3/Emu/ARMv7/Modules/sceFiber.h | 2 +- rpcs3/Emu/ARMv7/Modules/sceFios.h | 8 ++++---- rpcs3/Emu/ARMv7/Modules/sceGxm.h | 14 +++++++------- rpcs3/Emu/ARMv7/Modules/sceHttp.h | 10 +++++----- rpcs3/Emu/ARMv7/Modules/sceIme.h | 4 ++-- rpcs3/Emu/ARMv7/Modules/sceLibKernel.h | 6 +++--- rpcs3/Emu/ARMv7/Modules/sceLibc.h | 2 +- rpcs3/Emu/ARMv7/Modules/sceLocation.h | 4 ++-- rpcs3/Emu/ARMv7/Modules/sceNet.h | 4 ++-- rpcs3/Emu/ARMv7/Modules/sceNetCtl.h | 2 +- rpcs3/Emu/ARMv7/Modules/sceNgs.h | 2 +- rpcs3/Emu/ARMv7/Modules/sceNpBasic.h | 10 +++++----- rpcs3/Emu/ARMv7/Modules/sceNpCommon.h | 2 +- rpcs3/Emu/ARMv7/Modules/sceNpManager.h | 2 +- rpcs3/Emu/ARMv7/Modules/sceNpMatching.h | 14 +++++++------- rpcs3/Emu/ARMv7/Modules/scePhotoExport.h | 2 +- rpcs3/Emu/ARMv7/Modules/sceSulpha.h | 2 +- rpcs3/Emu/ARMv7/Modules/sceUlt.h | 2 +- rpcs3/Emu/ARMv7/Modules/sceVoice.h | 2 +- rpcs3/Emu/Memory/vm_ptr.h | 2 +- rpcs3/Emu/SysCalls/Modules/cellAdec.h | 2 +- rpcs3/Emu/SysCalls/Modules/cellDmux.h | 4 ++-- rpcs3/Emu/SysCalls/Modules/cellGifDec.h | 4 ++-- rpcs3/Emu/SysCalls/Modules/cellPngDec.h | 8 ++++---- rpcs3/Emu/SysCalls/Modules/cellRudp.h | 4 ++-- rpcs3/Emu/SysCalls/Modules/cellSearch.h | 2 +- rpcs3/Emu/SysCalls/Modules/cellSpurs.h | 8 ++++---- rpcs3/Emu/SysCalls/Modules/cellSubdisplay.h | 2 +- rpcs3/Emu/SysCalls/Modules/cellSysutil.h | 18 +++++++++--------- rpcs3/Emu/SysCalls/Modules/cellVdec.h | 2 +- rpcs3/Emu/SysCalls/Modules/sceNp.h | 2 +- rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h | 2 +- rpcs3/Emu/SysCalls/Modules/sys_lv2dbg.h | 2 +- rpcs3/stdafx.h | 20 ++------------------ 35 files changed, 81 insertions(+), 97 deletions(-) diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeci4p.h b/rpcs3/Emu/ARMv7/Modules/sceDeci4p.h index 8f5e20acfe..98f9e59faa 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceDeci4p.h +++ b/rpcs3/Emu/ARMv7/Modules/sceDeci4p.h @@ -1,5 +1,5 @@ #pragma once -using SceKernelDeci4pCallback = func_def pCommon)>; +using SceKernelDeci4pCallback = s32(s32 notifyId, s32 notifyCount, s32 notifyArg, vm::ptr pCommon); extern psv_log_base sceDeci4p; diff --git a/rpcs3/Emu/ARMv7/Modules/sceFiber.h b/rpcs3/Emu/ARMv7/Modules/sceFiber.h index 521d0eeb13..5ad7a5251c 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceFiber.h +++ b/rpcs3/Emu/ARMv7/Modules/sceFiber.h @@ -1,6 +1,6 @@ #pragma once -using SceFiberEntry = func_def; +using SceFiberEntry = void(u32 argOnInitialize, u32 argOnRun); struct set_alignment(8) SceFiber { diff --git a/rpcs3/Emu/ARMv7/Modules/sceFios.h b/rpcs3/Emu/ARMv7/Modules/sceFios.h index 68c14608fa..195d69b74e 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceFios.h +++ b/rpcs3/Emu/ARMv7/Modules/sceFios.h @@ -1,8 +1,8 @@ #pragma once -using SceFiosOpCallback = func_def pContext, s32 op, u8 event, s32 err)>; -using SceFiosVprintfCallback = func_def fmt, va_list ap)>; -using SceFiosMemcpyCallback = func_def(vm::ptr dst, vm::cptr src, u32 len)>; +using SceFiosOpCallback = s32(vm::ptr pContext, s32 op, u8 event, s32 err); +using SceFiosVprintfCallback = s32(vm::cptr fmt, va_list ap); +using SceFiosMemcpyCallback = vm::ptr(vm::ptr dst, vm::cptr src, u32 len); enum SceFiosWhence : s32 { @@ -100,7 +100,7 @@ struct SceFiosOverlay char src[292]; }; -using SceFiosIOFilterCallback = func_def; +using SceFiosIOFilterCallback = void(); struct SceFiosPsarcDearchiverContext { diff --git a/rpcs3/Emu/ARMv7/Modules/sceGxm.h b/rpcs3/Emu/ARMv7/Modules/sceGxm.h index c6a37730d8..bd6d5c7fe5 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceGxm.h +++ b/rpcs3/Emu/ARMv7/Modules/sceGxm.h @@ -29,7 +29,7 @@ enum SCE_GXM_ERROR_DRIVER = 0x805B0017, }; -using SceGxmDisplayQueueCallback = func_def callbackData)>; +using SceGxmDisplayQueueCallback = void(vm::cptr callbackData); struct SceGxmInitializeParams { @@ -1193,12 +1193,12 @@ struct SceGxmShaderPatcher; struct SceGxmRegisteredProgram; -using SceGxmShaderPatcherHostAllocCallback = func_def(vm::ptr userData, u32 size)>; -using SceGxmShaderPatcherHostFreeCallback = func_def userData, vm::ptr mem)>; -using SceGxmShaderPatcherBufferAllocCallback = func_def(vm::ptr userData, u32 size)>; -using SceGxmShaderPatcherBufferFreeCallback = func_def userData, vm::ptr mem)>; -using SceGxmShaderPatcherUsseAllocCallback = func_def(vm::ptr userData, u32 size, vm::ptr usseOffset)>; -using SceGxmShaderPatcherUsseFreeCallback = func_def userData, vm::ptr mem)>; +using SceGxmShaderPatcherHostAllocCallback = vm::ptr(vm::ptr userData, u32 size); +using SceGxmShaderPatcherHostFreeCallback = void(vm::ptr userData, vm::ptr mem); +using SceGxmShaderPatcherBufferAllocCallback = vm::ptr(vm::ptr userData, u32 size); +using SceGxmShaderPatcherBufferFreeCallback = void(vm::ptr userData, vm::ptr mem); +using SceGxmShaderPatcherUsseAllocCallback = vm::ptr(vm::ptr userData, u32 size, vm::ptr usseOffset); +using SceGxmShaderPatcherUsseFreeCallback = void(vm::ptr userData, vm::ptr mem); struct SceGxmShaderPatcherParams { diff --git a/rpcs3/Emu/ARMv7/Modules/sceHttp.h b/rpcs3/Emu/ARMv7/Modules/sceHttp.h index 6b957307ef..69e027bb06 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceHttp.h +++ b/rpcs3/Emu/ARMv7/Modules/sceHttp.h @@ -29,8 +29,8 @@ enum SceHttpAuthType : s32 SCE_HTTP_AUTH_RESERVED2 }; -using SceHttpAuthInfoCallback = func_def realm, vm::ptr username, vm::ptr password, s32 needEntity, vm::pptr entityBody, vm::ptr entitySize, vm::ptr save, vm::ptr userArg)>; -using SceHttpRedirectCallback = func_def method, vm::cptr location, vm::ptr userArg)>; +using SceHttpAuthInfoCallback = s32(s32 request, SceHttpAuthType authType, vm::cptr realm, vm::ptr username, vm::ptr password, s32 needEntity, vm::pptr entityBody, vm::ptr entitySize, vm::ptr save, vm::ptr userArg); +using SceHttpRedirectCallback = s32(s32 request, s32 statusCode, vm::ptr method, vm::cptr location, vm::ptr userArg); struct SceHttpMemoryPoolStats { @@ -54,8 +54,8 @@ struct SceHttpUriElement u8 reserved[10]; }; -using SceHttpCookieRecvCallback = func_def url, vm::cptr cookieHeader, u32 headerLen, vm::ptr userArg)>; -using SceHttpCookieSendCallback = func_def url, vm::cptr cookieHeader, vm::ptr userArg)>; +using SceHttpCookieRecvCallback = s32(s32 request, vm::cptr url, vm::cptr cookieHeader, u32 headerLen, vm::ptr userArg); +using SceHttpCookieSendCallback = s32(s32 request, vm::cptr url, vm::cptr cookieHeader, vm::ptr userArg); struct SceHttpsData { @@ -69,6 +69,6 @@ struct SceHttpsCaList le_t caNum; }; -using SceHttpsCallback = func_def> sslCert, s32 certNum, vm::ptr userArg)>; +using SceHttpsCallback = s32(u32 verifyEsrr, vm::cptr> sslCert, s32 certNum, vm::ptr userArg); extern psv_log_base sceHttp; diff --git a/rpcs3/Emu/ARMv7/Modules/sceIme.h b/rpcs3/Emu/ARMv7/Modules/sceIme.h index 4e1fda1849..27aaf63987 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceIme.h +++ b/rpcs3/Emu/ARMv7/Modules/sceIme.h @@ -1,6 +1,6 @@ #pragma once -using SceImeCharFilter = func_def; +using SceImeCharFilter = s32(u16 ch); struct SceImeRect { @@ -46,7 +46,7 @@ struct SceImePreeditGeometry le_t height; }; -using SceImeEventHandler = func_def arg, vm::cptr e)>; +using SceImeEventHandler = void(vm::ptr arg, vm::cptr e); struct SceImeParam { diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h index 3fd02fa5e5..5b77b2c239 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h +++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h @@ -305,7 +305,7 @@ struct SceKernelAllocMemBlockOpt // Thread Manager definitions (threads) -using SceKernelThreadEntry = func_def pArgBlock)>; +using SceKernelThreadEntry = s32(u32 argSize, vm::ptr pArgBlock); struct SceKernelThreadOptParam { @@ -370,7 +370,7 @@ struct SceKernelSystemInfo // Thread Manager definitions (callbacks) -using SceKernelCallbackFunction = func_def pCommon)>; +using SceKernelCallbackFunction = s32(s32 notifyId, s32 notifyCount, s32 notifyArg, vm::ptr pCommon); struct SceKernelCallbackInfo { @@ -388,7 +388,7 @@ struct SceKernelCallbackInfo // Thread Manager definitions (events) -using SceKernelThreadEventHandler = func_def pCommon)>; +using SceKernelThreadEventHandler = s32(s32 type, s32 threadId, s32 arg, vm::ptr pCommon); struct SceKernelEventInfo { diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.h b/rpcs3/Emu/ARMv7/Modules/sceLibc.h index b09d575cf7..2766711aea 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLibc.h +++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.h @@ -1,5 +1,5 @@ #pragma once -using atexit_func_t = func_def)>; +using atexit_func_t = void(vm::ptr); extern psv_log_base sceLibc; diff --git a/rpcs3/Emu/ARMv7/Modules/sceLocation.h b/rpcs3/Emu/ARMv7/Modules/sceLocation.h index 08253563bd..95d809797c 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLocation.h +++ b/rpcs3/Emu/ARMv7/Modules/sceLocation.h @@ -70,8 +70,8 @@ struct SceLocationHeadingInfo le_t timestamp; }; -using SceLocationLocationInfoCallback = func_def location, vm::ptr userdata)>; -using SceLocationHeadingInfoCallback = func_def heading, vm::ptr userdata)>; +using SceLocationLocationInfoCallback = void(s32 result, u8 handle, vm::cptr location, vm::ptr userdata); +using SceLocationHeadingInfoCallback = void(s32 result, u8 handle, vm::cptr heading, vm::ptr userdata); struct SceLocationPermissionInfo { diff --git a/rpcs3/Emu/ARMv7/Modules/sceNet.h b/rpcs3/Emu/ARMv7/Modules/sceNet.h index 37548dc287..816f31541a 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNet.h +++ b/rpcs3/Emu/ARMv7/Modules/sceNet.h @@ -115,8 +115,8 @@ struct SceNetEmulationParam u8 reserved[44]; }; -using SceNetResolverFunctionAllocate = func_def(u32 size, s32 rid, vm::cptr name, vm::ptr user)>; -using SceNetResolverFunctionFree = func_def ptr, s32 rid, vm::cptr name, vm::ptr user)>; +using SceNetResolverFunctionAllocate = vm::ptr(u32 size, s32 rid, vm::cptr name, vm::ptr user); +using SceNetResolverFunctionFree = void(vm::ptr ptr, s32 rid, vm::cptr name, vm::ptr user); struct SceNetResolverParam { diff --git a/rpcs3/Emu/ARMv7/Modules/sceNetCtl.h b/rpcs3/Emu/ARMv7/Modules/sceNetCtl.h index 864194c30b..212ed9bd4b 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNetCtl.h +++ b/rpcs3/Emu/ARMv7/Modules/sceNetCtl.h @@ -42,6 +42,6 @@ struct SceNetCtlAdhocPeerInfo SceNetInAddr inet_addr; }; -using SceNetCtlCallback = func_def arg)>; +using SceNetCtlCallback = void(s32 event_type, vm::ptr arg); extern psv_log_base sceNetCtl; diff --git a/rpcs3/Emu/ARMv7/Modules/sceNgs.h b/rpcs3/Emu/ARMv7/Modules/sceNgs.h index c9955aa814..ce2d70751a 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNgs.h +++ b/rpcs3/Emu/ARMv7/Modules/sceNgs.h @@ -95,7 +95,7 @@ struct SceNgsCallbackInfo vm::lptr pUserData; }; -using SceNgsCallbackFunc = func_def pCallbackInfo)>; +using SceNgsCallbackFunc = void(vm::cptr pCallbackInfo); struct SceSulphaNgsConfig { diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpBasic.h b/rpcs3/Emu/ARMv7/Modules/sceNpBasic.h index acf4b67438..02c6f4b19e 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpBasic.h +++ b/rpcs3/Emu/ARMv7/Modules/sceNpBasic.h @@ -10,7 +10,7 @@ enum SceNpBasicFriendListEventType : s32 SCE_NP_BASIC_FRIEND_LIST_EVENT_TYPE_DELETED = 4 }; -using SceNpBasicFriendListEventHandler = func_def friendId, vm::ptr userdata)>; +using SceNpBasicFriendListEventHandler = void(SceNpBasicFriendListEventType eventType, vm::cptr friendId, vm::ptr userdata); enum SceNpBasicFriendOnlineStatusEventType : s32 { @@ -28,7 +28,7 @@ enum SceNpBasicFriendOnlineStatus : s32 SCE_NP_BASIC_FRIEND_ONLINE_STATUS_ONLINE_IN_CONTEXT = 4 }; -using SceNpBasicFriendOnlineStatusEventHandler = func_def friendId, SceNpBasicFriendOnlineStatus status, vm::ptr userdata)>; +using SceNpBasicFriendOnlineStatusEventHandler = void(SceNpBasicFriendOnlineStatusEventType eventType, vm::cptr friendId, SceNpBasicFriendOnlineStatus status, vm::ptr userdata); enum SceNpBasicBlockListEventType : s32 { @@ -38,7 +38,7 @@ enum SceNpBasicBlockListEventType : s32 SCE_NP_BASIC_BLOCK_LIST_EVENT_TYPE_DELETED = 4 }; -using SceNpBasicBlockListEventHandler = func_def playerId, vm::ptr userdata)>; +using SceNpBasicBlockListEventHandler = void(SceNpBasicBlockListEventType eventType, vm::cptr playerId, vm::ptr userdata); enum SceNpBasicFriendGamePresenceEventType : s32 { @@ -72,7 +72,7 @@ struct SceNpBasicGamePresence SceNpBasicInGamePresence inGamePresence; }; -using SceNpBasicFriendGamePresenceEventHandler = func_def friendId, vm::cptr presence, vm::ptr userdata)>; +using SceNpBasicFriendGamePresenceEventHandler = void(SceNpBasicFriendGamePresenceEventType eventtype, vm::cptr friendId, vm::cptr presence, vm::ptr userdata); struct SceNpBasicInGameDataMessage { @@ -80,7 +80,7 @@ struct SceNpBasicInGameDataMessage le_t dataSize; }; -using SceNpBasicInGameDataMessageEventHandler = func_def from, vm::cptr message, vm::ptr userdata)>; +using SceNpBasicInGameDataMessageEventHandler = void(vm::cptr from, vm::cptr message, vm::ptr userdata); struct SceNpBasicEventHandlers { diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h index 56e2a65252..31c2ff9937 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h +++ b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h @@ -117,7 +117,7 @@ struct SceNpTicketVersion le_t minor; }; -using SceNpAuthCallback = func_def arg)>; +using SceNpAuthCallback = s32(s32 id, s32 result, vm::ptr arg); struct SceNpAuthRequestParameter { diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpManager.h b/rpcs3/Emu/ARMv7/Modules/sceNpManager.h index 3b07700d44..5753bf421d 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpManager.h +++ b/rpcs3/Emu/ARMv7/Modules/sceNpManager.h @@ -7,6 +7,6 @@ struct SceNpOptParam le_t optParamSize; }; -using SceNpServiceStateCallback = func_def userdata)>; +using SceNpServiceStateCallback = void(SceNpServiceState state, vm::ptr userdata); extern psv_log_base sceNpManager; diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.h b/rpcs3/Emu/ARMv7/Modules/sceNpMatching.h index 2aa5048250..e438c38655 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.h +++ b/rpcs3/Emu/ARMv7/Modules/sceNpMatching.h @@ -382,13 +382,13 @@ struct SceNpMatching2InvitationData le_t optDataLen; }; -using SceNpMatching2RequestCallback = func_def data, vm::ptr arg)>; -using SceNpMatching2LobbyEventCallback = func_def data, vm::ptr arg)>; -using SceNpMatching2RoomEventCallback = func_def data, vm::ptr arg)>; -using SceNpMatching2LobbyMessageCallback = func_def data, vm::ptr arg)>; -using SceNpMatching2RoomMessageCallback = func_def data, vm::ptr arg)>; -using SceNpMatching2SignalingCallback = func_def arg)>; -using SceNpMatching2ContextCallback = func_def arg)>; +using SceNpMatching2RequestCallback = void(u16 ctxId, u32 reqId, u16 event, s32 errorCode, vm::cptr data, vm::ptr arg); +using SceNpMatching2LobbyEventCallback = void(u16 ctxId, u64 lobbyId, u16 event, s32 errorCode, vm::cptr data, vm::ptr arg); +using SceNpMatching2RoomEventCallback = void(u16 ctxId, u64 roomId, u16 event, s32 errorCode, vm::cptr data, vm::ptr arg); +using SceNpMatching2LobbyMessageCallback = void(u16 ctxId, u64 lobbyId, u16 srcMemberId, u16 event, s32 errorCode, vm::cptr data, vm::ptr arg); +using SceNpMatching2RoomMessageCallback = void(u16 ctxId, u64 roomId, u16 srcMemberId, u16 event, s32 errorCode, vm::cptr data, vm::ptr arg); +using SceNpMatching2SignalingCallback = void(u16 ctxId, u64 roomId, u16 peerMemberId, u16 event, s32 errorCode, vm::ptr arg); +using SceNpMatching2ContextCallback = void(u16 ctxId, u16 event, u8 eventCause, s32 errorCode, vm::ptr arg); struct SceNpMatching2RequestOptParam { diff --git a/rpcs3/Emu/ARMv7/Modules/scePhotoExport.h b/rpcs3/Emu/ARMv7/Modules/scePhotoExport.h index ca7bb6931b..23b25755b8 100644 --- a/rpcs3/Emu/ARMv7/Modules/scePhotoExport.h +++ b/rpcs3/Emu/ARMv7/Modules/scePhotoExport.h @@ -9,6 +9,6 @@ struct ScePhotoExportParam char reserved[32]; }; -using ScePhotoExportCancelFunc = func_def)>; +using ScePhotoExportCancelFunc = s32(vm::ptr); extern psv_log_base scePhotoExport; diff --git a/rpcs3/Emu/ARMv7/Modules/sceSulpha.h b/rpcs3/Emu/ARMv7/Modules/sceSulpha.h index 646d73e2f1..e373c37e8e 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceSulpha.h +++ b/rpcs3/Emu/ARMv7/Modules/sceSulpha.h @@ -1,6 +1,6 @@ #pragma once -using SceSulphaCallback = func_def arg)>; +using SceSulphaCallback = void(vm::ptr arg); struct SceSulphaConfig { diff --git a/rpcs3/Emu/ARMv7/Modules/sceUlt.h b/rpcs3/Emu/ARMv7/Modules/sceUlt.h index f26f4d303f..42e741f2a7 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceUlt.h +++ b/rpcs3/Emu/ARMv7/Modules/sceUlt.h @@ -153,6 +153,6 @@ struct SceUltUlthread CHECK_SIZE(SceUltUlthread, 256); -using SceUltUlthreadEntry = func_def; +using SceUltUlthreadEntry = s32(u32 arg); extern psv_log_base sceUlt; diff --git a/rpcs3/Emu/ARMv7/Modules/sceVoice.h b/rpcs3/Emu/ARMv7/Modules/sceVoice.h index 267ca6e335..a7986df9a6 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceVoice.h +++ b/rpcs3/Emu/ARMv7/Modules/sceVoice.h @@ -114,7 +114,7 @@ struct SceVoicePortParam }; }; -using SceVoiceEventCallback = func_def event)>; +using SceVoiceEventCallback = void(vm::ptr event); struct SceVoiceInitParam { diff --git a/rpcs3/Emu/Memory/vm_ptr.h b/rpcs3/Emu/Memory/vm_ptr.h index 66a68f9976..9dd93c5051 100644 --- a/rpcs3/Emu/Memory/vm_ptr.h +++ b/rpcs3/Emu/Memory/vm_ptr.h @@ -116,7 +116,7 @@ namespace vm { AT m_addr; - using type = func_def; + using type = RT(T...); AT addr() const { diff --git a/rpcs3/Emu/SysCalls/Modules/cellAdec.h b/rpcs3/Emu/SysCalls/Modules/cellAdec.h index 5ef4594a5d..f6e72ed086 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAdec.h +++ b/rpcs3/Emu/SysCalls/Modules/cellAdec.h @@ -368,7 +368,7 @@ enum CellAdecMsgType : s32 CELL_ADEC_MSG_TYPE_SEQDONE, }; -using CellAdecCbMsg = func_def; +using CellAdecCbMsg = s32(u32 handle, CellAdecMsgType msgType, s32 msgData, u32 cbArg); struct CellAdecCb { diff --git a/rpcs3/Emu/SysCalls/Modules/cellDmux.h b/rpcs3/Emu/SysCalls/Modules/cellDmux.h index 60b43778ee..efebcdd4c1 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellDmux.h +++ b/rpcs3/Emu/SysCalls/Modules/cellDmux.h @@ -219,7 +219,7 @@ struct CellDmuxResource2 be_t shit[4]; }; -using CellDmuxCbMsg = func_def demuxerMsg, u32 cbArg)>; +using CellDmuxCbMsg = u32(u32 demuxerHandle, vm::ptr demuxerMsg, u32 cbArg); struct CellDmuxCb { @@ -227,7 +227,7 @@ struct CellDmuxCb be_t cbArg; }; -using CellDmuxCbEsMsg = func_def esMsg, u32 cbArg)>; +using CellDmuxCbEsMsg = u32(u32 demuxerHandle, u32 esHandle, vm::ptr esMsg, u32 cbArg); struct CellDmuxEsCb { diff --git a/rpcs3/Emu/SysCalls/Modules/cellGifDec.h b/rpcs3/Emu/SysCalls/Modules/cellGifDec.h index 5e17576136..8bc28cf434 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGifDec.h +++ b/rpcs3/Emu/SysCalls/Modules/cellGifDec.h @@ -57,8 +57,8 @@ using CellGifDecMainHandle = vm::ptr; using CellGifDecSubHandle = u32; // vm::ptr; // Callbacks for memory management -using CellGifDecCbControlMalloc = func_def(u32 size, vm::ptr cbCtrlMallocArg)>; -using CellGifDecCbControlFree = func_def ptr, vm::ptr cbCtrlFreeArg)>; +using CellGifDecCbControlMalloc = vm::ptr(u32 size, vm::ptr cbCtrlMallocArg); +using CellGifDecCbControlFree = s32(vm::ptr ptr, vm::ptr cbCtrlFreeArg); // Structs struct CellGifDecThreadInParam diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.h b/rpcs3/Emu/SysCalls/Modules/cellPngDec.h index 9606576d2f..4996622d72 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.h +++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.h @@ -88,8 +88,8 @@ using CellPngDecMainHandle = vm::ptr; using CellPngDecSubHandle = vm::ptr; // Callbacks for memory management -using CellPngDecCbControlMalloc = func_def(u32 size, vm::ptr cbCtrlMallocArg)>; -using CellPngDecCbControlFree = func_def ptr, vm::ptr cbCtrlFreeArg)>; +using CellPngDecCbControlMalloc = vm::ptr(u32 size, vm::ptr cbCtrlMallocArg); +using CellPngDecCbControlFree = s32(vm::ptr ptr, vm::ptr cbCtrlFreeArg); // Structs struct CellPngDecThreadInParam @@ -251,8 +251,8 @@ struct CellPngDecExtOutParam }; // Callbacks for decoding partial streams -using CellPngDecCbControlStream = func_def strmInfo, vm::ptr strmParam, vm::ptr cbCtrlStrmArg)>; -using CellPngDecCbControlDisp = func_def dispInfo, vm::ptr dispParam, vm::ptr cbCtrlDispArg)>; +using CellPngDecCbControlStream = s32(vm::ptr strmInfo, vm::ptr strmParam, vm::ptr cbCtrlStrmArg); +using CellPngDecCbControlDisp = s32(vm::ptr dispInfo, vm::ptr dispParam, vm::ptr cbCtrlDispArg); struct CellPngDecCbCtrlStrm { diff --git a/rpcs3/Emu/SysCalls/Modules/cellRudp.h b/rpcs3/Emu/SysCalls/Modules/cellRudp.h index 9ae50fa65e..6b59f74e8f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellRudp.h +++ b/rpcs3/Emu/SysCalls/Modules/cellRudp.h @@ -79,8 +79,8 @@ enum typedef s32(CellRudpEventHandler)(s32 event_id, s32 soc, vm::cptr data, u32 datalen, vm::cptr addr, u32 addrlen, vm::ptr arg); -using CellRudpAllocatorFuncAlloc = func_def(u32 size)>; -using CellRudpAllocatorFuncFree = func_def ptr)>; +using CellRudpAllocatorFuncAlloc = vm::ptr(u32 size); +using CellRudpAllocatorFuncFree = u32(vm::ptr ptr); struct CellRudpAllocator { diff --git a/rpcs3/Emu/SysCalls/Modules/cellSearch.h b/rpcs3/Emu/SysCalls/Modules/cellSearch.h index be910c9be4..2b63c6527a 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSearch.h +++ b/rpcs3/Emu/SysCalls/Modules/cellSearch.h @@ -165,7 +165,7 @@ enum CellSearchEvent : s32 CELL_SEARCH_EVENT_SCENESEARCH_RESULT, }; -using CellSearchSystemCallback = func_def param, vm::ptr userData)>; +using CellSearchSystemCallback = void(CellSearchEvent event, s32 result, vm::cptr param, vm::ptr userData); struct CellSearchContentId { diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.h b/rpcs3/Emu/SysCalls/Modules/cellSpurs.h index 952c848f27..f4cc4174d6 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.h +++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.h @@ -317,7 +317,7 @@ struct set_alignment(8) CellSpursAttribute CHECK_SIZE_ALIGN(CellSpursAttribute, 512, 8); -using CellSpursShutdownCompletionEventHook = func_def spurs, u32 wid, vm::ptr arg)>; +using CellSpursShutdownCompletionEventHook = void(vm::ptr spurs, u32 wid, vm::ptr arg); struct set_alignment(16) CellSpursTraceInfo { @@ -428,7 +428,7 @@ struct set_alignment(128) CellSpurs struct EventPortMux; - using EventHandlerCallback = func_def, u64 data)>; + using EventHandlerCallback = void(vm::ptr, u64 data); struct EventHandlerListNode { @@ -588,7 +588,7 @@ struct CellSpursExceptionInfo }; // Exception handler -using CellSpursGlobalExceptionEventHandler = func_def spurs, vm::cptr info, u32 id, vm::ptr arg)>; +using CellSpursGlobalExceptionEventHandler = void(vm::ptr spurs, vm::cptr info, u32 id, vm::ptr arg); struct CellSpursWorkloadAttribute { @@ -678,7 +678,7 @@ struct set_alignment(16) CellSpursTaskAttribute2 CHECK_SIZE_ALIGN(CellSpursTaskAttribute2, 256, 16); // Exception handler -using CellSpursTasksetExceptionEventHandler = func_def spurs, vm::ptr taskset, u32 idTask, vm::cptr info, vm::ptr arg)>; +using CellSpursTasksetExceptionEventHandler = void(vm::ptr spurs, vm::ptr taskset, u32 idTask, vm::cptr info, vm::ptr arg); struct set_alignment(128) CellSpursTaskExitCode { diff --git a/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.h b/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.h index 590a6aa41b..ca217f71eb 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.h +++ b/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.h @@ -82,4 +82,4 @@ struct CellSubDisplayPeerInfo CellSubDisplayNickname pspNickname; }; -using CellSubDisplayHandler = func_def userdata)>; +using CellSubDisplayHandler = void(s32 cbMsg, u64 cbParam, vm::ptr userdata); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil.h b/rpcs3/Emu/SysCalls/Modules/cellSysutil.h index 8cfdbfeef6..54f506f46d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutil.h +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil.h @@ -80,7 +80,7 @@ enum CELL_SYSUTIL_SYSCHAT_VOICE_STREAMING_PAUSED = 0x0164, }; -using CellSysutilCallback = func_def userdata)>; +using CellSysutilCallback = void(u64 status, u64 param, vm::ptr userdata); void sysutilSendSystemCommand(u64 status, u64 param); @@ -154,15 +154,15 @@ enum CELL_SYSCACHE_ERROR_NOTMOUNTED = 0x8002bc04, // We don't really need to simulate the mounting, so this is probably useless }; -using CellWebBrowserCallback = func_def client_session, vm::ptr usrdata)>; -using CellWebComponentCallback = func_def client_session, vm::ptr usrdata)>; -using CellWebBrowserSystemCallback = func_def usrdata)>; +using CellWebBrowserCallback = void(s32 cb_type, vm::ptr client_session, vm::ptr usrdata); +using CellWebComponentCallback = void(s32 web_browser_id, s32 cb_type, vm::ptr client_session, vm::ptr usrdata); +using CellWebBrowserSystemCallback = void(s32 cb_type, vm::ptr usrdata); -using CellWebBrowserMIMETypeCallback = func_def mimetype, vm::cptr url, vm::ptr usrdata)>; -using CellWebBrowserErrorCallback = func_def usrdata)>; -using CellWebBrowserStatusCallback = func_def usrdata)>; -using CellWebBrowserNotify = func_def message, vm::ptr usrdata)>; -using CellWebBrowserUsrdata = func_def usrdata)>; +using CellWebBrowserMIMETypeCallback = void(vm::cptr mimetype, vm::cptr url, vm::ptr usrdata); +using CellWebBrowserErrorCallback = void(s32 err_type, vm::ptr usrdata); +using CellWebBrowserStatusCallback = void(s32 err_type, vm::ptr usrdata); +using CellWebBrowserNotify = void(vm::cptr message, vm::ptr usrdata); +using CellWebBrowserUsrdata = void(vm::ptr usrdata); struct CellWebBrowserMimeSet { diff --git a/rpcs3/Emu/SysCalls/Modules/cellVdec.h b/rpcs3/Emu/SysCalls/Modules/cellVdec.h index f4d180979c..b578f8f190 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVdec.h +++ b/rpcs3/Emu/SysCalls/Modules/cellVdec.h @@ -171,7 +171,7 @@ struct CellVdecPicFormat2 be_t unk1; }; -using CellVdecCbMsg = func_def; +using CellVdecCbMsg = u32(u32 handle, CellVdecMsgType msgType, s32 msgData, u32 cbArg); // Callback Function Information struct CellVdecCb diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.h b/rpcs3/Emu/SysCalls/Modules/sceNp.h index b9fc091488..85db17dfa2 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNp.h +++ b/rpcs3/Emu/SysCalls/Modules/sceNp.h @@ -217,7 +217,7 @@ enum // SCE_NP_MATCHING2_NET_H_ERRNO_BASE = 0x800225XX, }; -using SceNpBasicEventHandler = func_def arg)>; +using SceNpBasicEventHandler = s32(s32 event, s32 retCode, u32 reqId, vm::ptr arg); // NP Manager Utility statuses enum diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h index d9efc9236f..ecb7c1ffc8 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h +++ b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h @@ -148,4 +148,4 @@ enum SCE_NP_TROPHY_STATUS_CHANGES_DETECTED = 9, }; -using SceNpTrophyStatusCallback = func_def arg)>; +using SceNpTrophyStatusCallback = s32(u32 context, u32 status, s32 completed, s32 total, vm::ptr arg); diff --git a/rpcs3/Emu/SysCalls/Modules/sys_lv2dbg.h b/rpcs3/Emu/SysCalls/Modules/sys_lv2dbg.h index 04a786d0dd..5661690945 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_lv2dbg.h +++ b/rpcs3/Emu/SysCalls/Modules/sys_lv2dbg.h @@ -252,7 +252,7 @@ struct sys_dbg_event_flag_information_t be_t wait_all_threads_num; }; -using dbg_exception_handler_t = func_def; +using dbg_exception_handler_t = void(u64 exception_type, u64 thread_id, u64 dar); enum : u64 { diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index 83d40adfec..0e6635f399 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -119,26 +119,10 @@ struct explicit_bool_t }; // return 32 bit sizeof() to avoid widening/narrowing conversions with size_t -#define sizeof32(type) static_cast(sizeof32_t::value) +#define sizeof32(type) static_cast(sizeof(type)) // return 32 bit alignof() to avoid widening/narrowing conversions with size_t -#define alignof32(type) static_cast(alignof32_t<__alignof(type)>::value) - -template struct sizeof32_t -{ - static_assert(Size <= UINT32_MAX, "sizeof32() error: size is too big"); - - enum : u32 { value = static_cast(Size) }; -}; - -template struct alignof32_t -{ - static_assert(Align <= UINT32_MAX, "alignof32() error: alignment is too big"); - - enum : u32 { value = static_cast(Align) }; -}; - -template using func_def = T; // workaround for MSVC bug: `using X = func_def;` instead of `using X = void();` +#define alignof32(type) static_cast(__alignof(type)) template struct ID_type;