diff --git a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp b/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp index 20f8e22e53..83559262c3 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp @@ -4,7 +4,7 @@ #include "sceAppUtil.h" -s32 sceAppUtilInit(vm::ptr initParam, vm::ptr bootParam) +s32 sceAppUtilInit(vm::cptr initParam, vm::ptr bootParam) { throw __FUNCTION__; } @@ -14,27 +14,27 @@ s32 sceAppUtilShutdown() throw __FUNCTION__; } -s32 sceAppUtilSaveDataSlotCreate(u32 slotId, vm::ptr param, vm::ptr mountPoint) +s32 sceAppUtilSaveDataSlotCreate(u32 slotId, vm::cptr param, vm::cptr mountPoint) { throw __FUNCTION__; } -s32 sceAppUtilSaveDataSlotDelete(u32 slotId, vm::ptr mountPoint) +s32 sceAppUtilSaveDataSlotDelete(u32 slotId, vm::cptr mountPoint) { throw __FUNCTION__; } -s32 sceAppUtilSaveDataSlotSetParam(u32 slotId, vm::ptr param, vm::ptr mountPoint) +s32 sceAppUtilSaveDataSlotSetParam(u32 slotId, vm::cptr param, vm::cptr mountPoint) { throw __FUNCTION__; } -s32 sceAppUtilSaveDataSlotGetParam(u32 slotId, vm::ptr param, vm::ptr mountPoint) +s32 sceAppUtilSaveDataSlotGetParam(u32 slotId, vm::ptr param, vm::cptr mountPoint) { throw __FUNCTION__; } -s32 sceAppUtilSaveDataFileSave(vm::ptr slot, vm::ptr files, u32 fileNum, vm::ptr mountPoint, vm::ptr requiredSizeKB) +s32 sceAppUtilSaveDataFileSave(vm::cptr slot, vm::cptr files, u32 fileNum, vm::cptr mountPoint, vm::ptr requiredSizeKB) { throw __FUNCTION__; } @@ -59,7 +59,7 @@ s32 sceAppUtilSystemParamGetString(u32 paramId, vm::ptr buf, u32 bufSize) throw __FUNCTION__; } -s32 sceAppUtilSaveSafeMemory(vm::ptr buf, u32 bufSize, s64 offset) +s32 sceAppUtilSaveSafeMemory(vm::cptr buf, u32 bufSize, s64 offset) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.h b/rpcs3/Emu/ARMv7/Modules/sceAppUtil.h index 254684a166..b3e9fc4448 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.h +++ b/rpcs3/Emu/ARMv7/Modules/sceAppUtil.h @@ -50,7 +50,7 @@ struct SceAppUtilSaveDataSlot struct SceAppUtilSaveDataFile { - vm::lptr filePath; + vm::lcptr filePath; vm::lptr buf; le_t bufSize; le_t offset; diff --git a/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp b/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp index 81ddcfc3d2..24c7a841d3 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp @@ -4,12 +4,12 @@ #include "sceCommonDialog.h" -s32 sceCommonDialogUpdate(vm::ptr updateParam) +s32 sceCommonDialogUpdate(vm::cptr updateParam) { throw __FUNCTION__; } -s32 sceMsgDialogInit(vm::ptr param) +s32 sceMsgDialogInit(vm::cptr param) { throw __FUNCTION__; } @@ -74,7 +74,7 @@ s32 sceNetCheckDialogTerm() throw __FUNCTION__; } -s32 sceSaveDataDialogInit(vm::ptr param) +s32 sceSaveDataDialogInit(vm::cptr param) { throw __FUNCTION__; } @@ -109,12 +109,12 @@ s32 sceSaveDataDialogSubClose() throw __FUNCTION__; } -s32 sceSaveDataDialogContinue(vm::ptr param) +s32 sceSaveDataDialogContinue(vm::cptr param) { throw __FUNCTION__; } -s32 sceSaveDataDialogFinish(vm::ptr param) +s32 sceSaveDataDialogFinish(vm::cptr param) { throw __FUNCTION__; } @@ -129,7 +129,7 @@ s32 sceSaveDataDialogProgressBarSetValue(s32 target, u32 rate) throw __FUNCTION__; } -s32 sceImeDialogInit(vm::ptr param) +s32 sceImeDialogInit(vm::cptr param) { throw __FUNCTION__; } @@ -154,7 +154,7 @@ s32 sceImeDialogTerm() throw __FUNCTION__; } -s32 scePhotoImportDialogInit(vm::ptr param) +s32 scePhotoImportDialogInit(vm::cptr param) { throw __FUNCTION__; } @@ -179,7 +179,7 @@ s32 scePhotoImportDialogAbort() throw __FUNCTION__; } -s32 scePhotoReviewDialogInit(vm::ptr param) +s32 scePhotoReviewDialogInit(vm::cptr param) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.h b/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.h index ff75ebf615..564c9eabea 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.h +++ b/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.h @@ -40,7 +40,7 @@ struct SceCommonDialogUpdateParam struct SceMsgDialogUserMessageParam { le_t buttonType; - vm::lptr msg; + vm::lcptr msg; char reserved[32]; }; @@ -61,7 +61,7 @@ struct SceMsgDialogProgressBarParam { le_t barType; SceMsgDialogSystemMessageParam sysMsgParam; - vm::lptr msg; + vm::lcptr msg; char reserved[32]; }; @@ -107,18 +107,18 @@ struct SceSaveDataDialogFixedParam struct SceSaveDataDialogListParam { - vm::lptr slotList; + vm::lcptr slotList; le_t slotListSize; le_t focusPos; le_t focusId; - vm::lptr listTitle; + vm::lcptr listTitle; char reserved[32]; }; struct SceSaveDataDialogUserMessageParam { le_t buttonType; - vm::lptr msg; + vm::lcptr msg; le_t targetSlot; char reserved[32]; }; @@ -142,15 +142,15 @@ struct SceSaveDataDialogProgressBarParam { le_t barType; SceSaveDataDialogSystemMessageParam sysMsgParam; - vm::lptr msg; + vm::lcptr msg; le_t targetSlot; char reserved[32]; }; struct SceSaveDataDialogSlotConfigParam { - vm::lptr mountPoint; - vm::lptr appSubDir; + vm::lcptr mountPoint; + vm::lcptr appSubDir; char reserved[32]; }; @@ -207,7 +207,7 @@ struct SceImeDialogParam vm::lptr filter; le_t dialogMode; le_t textBoxMode; - vm::lptr title; + vm::lcptr title; le_t maxTextLength; vm::lptr initialText; vm::lptr inputTextBuffer; diff --git a/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp b/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp index 64fdb24a1a..979f94d531 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp @@ -34,7 +34,7 @@ s32 sceCtrlReadBufferNegative(s32 port, vm::ptr pData, s32 nBufs) throw __FUNCTION__; } -s32 sceCtrlSetRapidFire(s32 port, s32 idx, vm::ptr pRule) +s32 sceCtrlSetRapidFire(s32 port, s32 idx, vm::cptr pRule) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp b/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp index 1de7d91282..0211c1f342 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp @@ -14,12 +14,12 @@ s32 sceDbgSetBreakOnErrorState(SceDbgBreakOnErrorState state) throw __FUNCTION__; } -s32 sceDbgAssertionHandler(vm::ptr pFile, s32 line, bool stop, vm::ptr pComponent, vm::ptr pMessage) // va_args... +s32 sceDbgAssertionHandler(vm::cptr pFile, s32 line, bool stop, vm::cptr pComponent, vm::cptr pMessage) // va_args... { throw __FUNCTION__; } -s32 sceDbgLoggingHandler(vm::ptr pFile, s32 line, s32 severity, vm::ptr pComponent, vm::ptr pMessage) // va_args... +s32 sceDbgLoggingHandler(vm::cptr pFile, s32 line, s32 severity, vm::cptr pComponent, vm::cptr pMessage) // va_args... { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp b/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp index a9d66bac53..6b1e6a5087 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp @@ -4,7 +4,7 @@ #include "sceDeci4p.h" -s32 sceKernelDeci4pOpen(vm::ptr protoname, u32 protonum, u32 bufsize) +s32 sceKernelDeci4pOpen(vm::cptr protoname, u32 protonum, u32 bufsize) { throw __FUNCTION__; } @@ -19,7 +19,7 @@ s32 sceKernelDeci4pRead(s32 socketid, vm::ptr buffer, u32 size, u32 reserv throw __FUNCTION__; } -s32 sceKernelDeci4pWrite(s32 socketid, vm::ptr buffer, u32 size, u32 reserved) +s32 sceKernelDeci4pWrite(s32 socketid, vm::cptr buffer, u32 size, u32 reserved) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp b/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp index 7982dff124..cce3335a3d 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp @@ -4,67 +4,67 @@ #include "sceDeflt.h" -s32 sceGzipIsValid(vm::ptr pSrcGzip) +s32 sceGzipIsValid(vm::cptr pSrcGzip) { throw __FUNCTION__; } -s32 sceGzipGetInfo(vm::ptr pSrcGzip, vm::pptr ppvExtra, vm::pptr ppszName, vm::pptr ppszComment, vm::ptr pusCrc, vm::pptr ppvData) +s32 sceGzipGetInfo(vm::cptr pSrcGzip, vm::cpptr ppvExtra, vm::cpptr ppszName, vm::cpptr ppszComment, vm::ptr pusCrc, vm::cpptr ppvData) { throw __FUNCTION__; } -vm::ptr sceGzipGetName(vm::ptr pSrcGzip) +vm::cptr sceGzipGetName(vm::cptr pSrcGzip) { throw __FUNCTION__; } -vm::ptr sceGzipGetComment(vm::ptr pSrcGzip) +vm::cptr sceGzipGetComment(vm::cptr pSrcGzip) { throw __FUNCTION__; } -vm::ptr sceGzipGetCompressedData(vm::ptr pSrcGzip) +vm::cptr sceGzipGetCompressedData(vm::cptr pSrcGzip) { throw __FUNCTION__; } -s32 sceGzipDecompress(vm::ptr pDst, u32 uiBufSize, vm::ptr pSrcGzip, vm::ptr puiCrc32) +s32 sceGzipDecompress(vm::ptr pDst, u32 uiBufSize, vm::cptr pSrcGzip, vm::ptr puiCrc32) { throw __FUNCTION__; } -s32 sceZlibIsValid(vm::ptr pSrcZlib) +s32 sceZlibIsValid(vm::cptr pSrcZlib) { throw __FUNCTION__; } -s32 sceZlibGetInfo(vm::ptr pSrcZlib, vm::ptr pbCmf, vm::ptr pbFlg, vm::ptr puiDictId, vm::pptr ppvData) +s32 sceZlibGetInfo(vm::cptr pSrcZlib, vm::ptr pbCmf, vm::ptr pbFlg, vm::ptr puiDictId, vm::cpptr ppvData) { throw __FUNCTION__; } -vm::ptr sceZlibGetCompressedData(vm::ptr pSrcZlib) +vm::cptr sceZlibGetCompressedData(vm::cptr pSrcZlib) { throw __FUNCTION__; } -s32 sceZlibDecompress(vm::ptr pDst, u32 uiBufSize, vm::ptr pSrcZlib, vm::ptr puiAdler32) +s32 sceZlibDecompress(vm::ptr pDst, u32 uiBufSize, vm::cptr pSrcZlib, vm::ptr puiAdler32) { throw __FUNCTION__; } -u32 sceZlibAdler32(u32 uiAdler, vm::ptr pSrc, u32 uiSize) +u32 sceZlibAdler32(u32 uiAdler, vm::cptr pSrc, u32 uiSize) { throw __FUNCTION__; } -s32 sceDeflateDecompress(vm::ptr pDst, u32 uiBufSize, vm::ptr pSrcDeflate, vm::pptr ppNext) +s32 sceDeflateDecompress(vm::ptr pDst, u32 uiBufSize, vm::cptr pSrcDeflate, vm::cpptr ppNext) { throw __FUNCTION__; } -s32 sceZipGetInfo(vm::ptr pSrc, vm::pptr ppvExtra, vm::ptr puiCrc, vm::pptr ppvData) +s32 sceZipGetInfo(vm::cptr pSrc, vm::cpptr ppvExtra, vm::ptr puiCrc, vm::cpptr ppvData) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp b/rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp index e06d0976c9..3e920cde38 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp @@ -9,7 +9,7 @@ s32 sceDisplayGetRefreshRate(vm::ptr pFps) throw __FUNCTION__; } -s32 sceDisplaySetFrameBuf(vm::ptr pFrameBuf, s32 iUpdateTimingMode) +s32 sceDisplaySetFrameBuf(vm::cptr pFrameBuf, s32 iUpdateTimingMode) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp b/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp index 4324f85557..a8984af8ab 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp @@ -4,7 +4,7 @@ #include "sceFiber.h" -s32 _sceFiberInitializeImpl(vm::ptr fiber, vm::ptr name, vm::ptr entry, u32 argOnInitialize, vm::ptr addrContext, u32 sizeContext, vm::ptr optParam, u32 buildVersion) +s32 _sceFiberInitializeImpl(vm::ptr fiber, vm::cptr name, vm::ptr entry, u32 argOnInitialize, vm::ptr addrContext, u32 sizeContext, vm::cptr optParam, u32 buildVersion) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceFios.cpp b/rpcs3/Emu/ARMv7/Modules/sceFios.cpp index 7994f1a8fe..2ed780a21f 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceFios.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceFios.cpp @@ -4,7 +4,7 @@ #include "sceFios.h" -s32 sceFiosInitialize(vm::ptr pParameters) +s32 sceFiosInitialize(vm::cptr pParameters) { throw __FUNCTION__; } @@ -19,12 +19,12 @@ bool sceFiosIsInitialized(vm::ptr pOutParameters) throw __FUNCTION__; } -void sceFiosUpdateParameters(vm::ptr pParameters) +void sceFiosUpdateParameters(vm::cptr pParameters) { throw __FUNCTION__; } -void sceFiosSetGlobalDefaultOpAttr(vm::ptr pAttr) +void sceFiosSetGlobalDefaultOpAttr(vm::cptr pAttr) { throw __FUNCTION__; } @@ -34,7 +34,7 @@ bool sceFiosGetGlobalDefaultOpAttr(vm::ptr pOutAttr) throw __FUNCTION__; } -void sceFiosSetThreadDefaultOpAttr(vm::ptr pAttr) +void sceFiosSetThreadDefaultOpAttr(vm::cptr pAttr) { throw __FUNCTION__; } @@ -109,292 +109,292 @@ bool sceFiosIsValidHandle(s32 h) throw __FUNCTION__; } -s32 sceFiosPathcmp(vm::ptr pA, vm::ptr pB) +s32 sceFiosPathcmp(vm::cptr pA, vm::cptr pB) { throw __FUNCTION__; } -s32 sceFiosPathncmp(vm::ptr pA, vm::ptr pB, u32 n) +s32 sceFiosPathncmp(vm::cptr pA, vm::cptr pB, u32 n) { throw __FUNCTION__; } -s32 sceFiosPrintf(vm::ptr pFormat) // va_args... +s32 sceFiosPrintf(vm::cptr pFormat) // va_args... { throw __FUNCTION__; } -s32 sceFiosVprintf(vm::ptr pFormat) // va_list +s32 sceFiosVprintf(vm::cptr pFormat) // va_list { throw __FUNCTION__; } -s32 sceFiosFileExists(vm::ptr pAttr, vm::ptr pPath, vm::ptr pOutExists) +s32 sceFiosFileExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) { throw __FUNCTION__; } -bool sceFiosFileExistsSync(vm::ptr pAttr, vm::ptr pPath) +bool sceFiosFileExistsSync(vm::cptr pAttr, vm::cptr pPath) { throw __FUNCTION__; } -s32 sceFiosFileGetSize(vm::ptr pAttr, vm::ptr pPath, vm::ptr pOutSize) +s32 sceFiosFileGetSize(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutSize) { throw __FUNCTION__; } -s64 sceFiosFileGetSizeSync(vm::ptr pAttr, vm::ptr pPath) +s64 sceFiosFileGetSizeSync(vm::cptr pAttr, vm::cptr pPath) { throw __FUNCTION__; } -s32 sceFiosFileDelete(vm::ptr pAttr, vm::ptr pPath) +s32 sceFiosFileDelete(vm::cptr pAttr, vm::cptr pPath) { throw __FUNCTION__; } -s32 sceFiosFileDeleteSync(vm::ptr pAttr, vm::ptr pPath) +s32 sceFiosFileDeleteSync(vm::cptr pAttr, vm::cptr pPath) { throw __FUNCTION__; } -s32 sceFiosDirectoryExists(vm::ptr pAttr, vm::ptr pPath, vm::ptr pOutExists) +s32 sceFiosDirectoryExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) { throw __FUNCTION__; } -bool sceFiosDirectoryExistsSync(vm::ptr pAttr, vm::ptr pPath) +bool sceFiosDirectoryExistsSync(vm::cptr pAttr, vm::cptr pPath) { throw __FUNCTION__; } -s32 sceFiosDirectoryCreate(vm::ptr pAttr, vm::ptr pPath) +s32 sceFiosDirectoryCreate(vm::cptr pAttr, vm::cptr pPath) { throw __FUNCTION__; } -s32 sceFiosDirectoryCreateSync(vm::ptr pAttr, vm::ptr pPath) +s32 sceFiosDirectoryCreateSync(vm::cptr pAttr, vm::cptr pPath) { throw __FUNCTION__; } -s32 sceFiosDirectoryDelete(vm::ptr pAttr, vm::ptr pPath) +s32 sceFiosDirectoryDelete(vm::cptr pAttr, vm::cptr pPath) { throw __FUNCTION__; } -s32 sceFiosDirectoryDeleteSync(vm::ptr pAttr, vm::ptr pPath) +s32 sceFiosDirectoryDeleteSync(vm::cptr pAttr, vm::cptr pPath) { throw __FUNCTION__; } -s32 sceFiosExists(vm::ptr pAttr, vm::ptr pPath, vm::ptr pOutExists) +s32 sceFiosExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) { throw __FUNCTION__; } -bool sceFiosExistsSync(vm::ptr pAttr, vm::ptr pPath) +bool sceFiosExistsSync(vm::cptr pAttr, vm::cptr pPath) { throw __FUNCTION__; } -s32 sceFiosStat(vm::ptr pAttr, vm::ptr pPath, vm::ptr pOutStatus) +s32 sceFiosStat(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutStatus) { throw __FUNCTION__; } -s32 sceFiosStatSync(vm::ptr pAttr, vm::ptr pPath, vm::ptr pOutStatus) +s32 sceFiosStatSync(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutStatus) { throw __FUNCTION__; } -s32 sceFiosDelete(vm::ptr pAttr, vm::ptr pPath) +s32 sceFiosDelete(vm::cptr pAttr, vm::cptr pPath) { throw __FUNCTION__; } -s32 sceFiosDeleteSync(vm::ptr pAttr, vm::ptr pPath) +s32 sceFiosDeleteSync(vm::cptr pAttr, vm::cptr pPath) { throw __FUNCTION__; } -s32 sceFiosResolve(vm::ptr pAttr, vm::ptr pInTuple, vm::ptr pOutTuple) +s32 sceFiosResolve(vm::cptr pAttr, vm::cptr pInTuple, vm::ptr pOutTuple) { throw __FUNCTION__; } -s32 sceFiosResolveSync(vm::ptr pAttr, vm::ptr pInTuple, vm::ptr pOutTuple) +s32 sceFiosResolveSync(vm::cptr pAttr, vm::cptr pInTuple, vm::ptr pOutTuple) { throw __FUNCTION__; } -s32 sceFiosRename(vm::ptr pAttr, vm::ptr pOldPath, vm::ptr pNewPath) +s32 sceFiosRename(vm::cptr pAttr, vm::cptr pOldPath, vm::cptr pNewPath) { throw __FUNCTION__; } -s32 sceFiosRenameSync(vm::ptr pAttr, vm::ptr pOldPath, vm::ptr pNewPath) +s32 sceFiosRenameSync(vm::cptr pAttr, vm::cptr pOldPath, vm::cptr pNewPath) { throw __FUNCTION__; } -s32 sceFiosFileRead(vm::ptr pAttr, vm::ptr pPath, vm::ptr pBuf, s64 length, s64 offset) +s32 sceFiosFileRead(vm::cptr pAttr, vm::cptr pPath, vm::ptr pBuf, s64 length, s64 offset) { throw __FUNCTION__; } -s64 sceFiosFileReadSync(vm::ptr pAttr, vm::ptr pPath, vm::ptr pBuf, s64 length, s64 offset) +s64 sceFiosFileReadSync(vm::cptr pAttr, vm::cptr pPath, vm::ptr pBuf, s64 length, s64 offset) { throw __FUNCTION__; } -s32 sceFiosFileWrite(vm::ptr pAttr, vm::ptr pPath, vm::ptr pBuf, s64 length, s64 offset) +s32 sceFiosFileWrite(vm::cptr pAttr, vm::cptr pPath, vm::cptr pBuf, s64 length, s64 offset) { throw __FUNCTION__; } -s64 sceFiosFileWriteSync(vm::ptr pAttr, vm::ptr pPath, vm::ptr pBuf, s64 length, s64 offset) +s64 sceFiosFileWriteSync(vm::cptr pAttr, vm::cptr pPath, vm::cptr pBuf, s64 length, s64 offset) { throw __FUNCTION__; } -s32 sceFiosFileTruncate(vm::ptr pAttr, vm::ptr pPath, s64 length) +s32 sceFiosFileTruncate(vm::cptr pAttr, vm::cptr pPath, s64 length) { throw __FUNCTION__; } -s32 sceFiosFileTruncateSync(vm::ptr pAttr, vm::ptr pPath, s64 length) +s32 sceFiosFileTruncateSync(vm::cptr pAttr, vm::cptr pPath, s64 length) { throw __FUNCTION__; } -s32 sceFiosFHOpen(vm::ptr pAttr, vm::ptr pOutFH, vm::ptr pPath, vm::ptr pOpenParams) +s32 sceFiosFHOpen(vm::cptr pAttr, vm::ptr pOutFH, vm::cptr pPath, vm::cptr pOpenParams) { throw __FUNCTION__; } -s32 sceFiosFHOpenSync(vm::ptr pAttr, vm::ptr pOutFH, vm::ptr pPath, vm::ptr pOpenParams) +s32 sceFiosFHOpenSync(vm::cptr pAttr, vm::ptr pOutFH, vm::cptr pPath, vm::cptr pOpenParams) { throw __FUNCTION__; } -s32 sceFiosFHStat(vm::ptr pAttr, s32 fh, vm::ptr pOutStatus) +s32 sceFiosFHStat(vm::cptr pAttr, s32 fh, vm::ptr pOutStatus) { throw __FUNCTION__; } -s32 sceFiosFHStatSync(vm::ptr pAttr, s32 fh, vm::ptr pOutStatus) +s32 sceFiosFHStatSync(vm::cptr pAttr, s32 fh, vm::ptr pOutStatus) { throw __FUNCTION__; } -s32 sceFiosFHTruncate(vm::ptr pAttr, s32 fh, s64 length) +s32 sceFiosFHTruncate(vm::cptr pAttr, s32 fh, s64 length) { throw __FUNCTION__; } -s32 sceFiosFHTruncateSync(vm::ptr pAttr, s32 fh, s64 length) +s32 sceFiosFHTruncateSync(vm::cptr pAttr, s32 fh, s64 length) { throw __FUNCTION__; } -s32 sceFiosFHSync(vm::ptr pAttr, s32 fh) +s32 sceFiosFHSync(vm::cptr pAttr, s32 fh) { throw __FUNCTION__; } -s32 sceFiosFHSyncSync(vm::ptr pAttr, s32 fh) +s32 sceFiosFHSyncSync(vm::cptr pAttr, s32 fh) { throw __FUNCTION__; } -s32 sceFiosFHRead(vm::ptr pAttr, s32 fh, vm::ptr pBuf, s64 length) +s32 sceFiosFHRead(vm::cptr pAttr, s32 fh, vm::ptr pBuf, s64 length) { throw __FUNCTION__; } -s64 sceFiosFHReadSync(vm::ptr pAttr, s32 fh, vm::ptr pBuf, s64 length) +s64 sceFiosFHReadSync(vm::cptr pAttr, s32 fh, vm::ptr pBuf, s64 length) { throw __FUNCTION__; } -s32 sceFiosFHWrite(vm::ptr pAttr, s32 fh, vm::ptr pBuf, s64 length) +s32 sceFiosFHWrite(vm::cptr pAttr, s32 fh, vm::cptr pBuf, s64 length) { throw __FUNCTION__; } -s64 sceFiosFHWriteSync(vm::ptr pAttr, s32 fh, vm::ptr pBuf, s64 length) +s64 sceFiosFHWriteSync(vm::cptr pAttr, s32 fh, vm::cptr pBuf, s64 length) { throw __FUNCTION__; } -s32 sceFiosFHReadv(vm::ptr pAttr, s32 fh, vm::ptr iov, s32 iovcnt) +s32 sceFiosFHReadv(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt) { throw __FUNCTION__; } -s64 sceFiosFHReadvSync(vm::ptr pAttr, s32 fh, vm::ptr iov, s32 iovcnt) +s64 sceFiosFHReadvSync(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt) { throw __FUNCTION__; } -s32 sceFiosFHWritev(vm::ptr pAttr, s32 fh, vm::ptr iov, s32 iovcnt) +s32 sceFiosFHWritev(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt) { throw __FUNCTION__; } -s64 sceFiosFHWritevSync(vm::ptr pAttr, s32 fh, vm::ptr iov, s32 iovcnt) +s64 sceFiosFHWritevSync(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt) { throw __FUNCTION__; } -s32 sceFiosFHPread(vm::ptr pAttr, s32 fh, vm::ptr pBuf, s64 length, s64 offset) +s32 sceFiosFHPread(vm::cptr pAttr, s32 fh, vm::ptr pBuf, s64 length, s64 offset) { throw __FUNCTION__; } -s64 sceFiosFHPreadSync(vm::ptr pAttr, s32 fh, vm::ptr pBuf, s64 length, s64 offset) +s64 sceFiosFHPreadSync(vm::cptr pAttr, s32 fh, vm::ptr pBuf, s64 length, s64 offset) { throw __FUNCTION__; } -s32 sceFiosFHPwrite(vm::ptr pAttr, s32 fh, vm::ptr pBuf, s64 length, s64 offset) +s32 sceFiosFHPwrite(vm::cptr pAttr, s32 fh, vm::cptr pBuf, s64 length, s64 offset) { throw __FUNCTION__; } -s64 sceFiosFHPwriteSync(vm::ptr pAttr, s32 fh, vm::ptr pBuf, s64 length, s64 offset) +s64 sceFiosFHPwriteSync(vm::cptr pAttr, s32 fh, vm::cptr pBuf, s64 length, s64 offset) { throw __FUNCTION__; } -s32 sceFiosFHPreadv(vm::ptr pAttr, s32 fh, vm::ptr iov, s32 iovcnt, s64 offset) +s32 sceFiosFHPreadv(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt, s64 offset) { throw __FUNCTION__; } -s64 sceFiosFHPreadvSync(vm::ptr pAttr, s32 fh, vm::ptr iov, s32 iovcnt, s64 offset) +s64 sceFiosFHPreadvSync(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt, s64 offset) { throw __FUNCTION__; } -s32 sceFiosFHPwritev(vm::ptr pAttr, s32 fh, vm::ptr iov, s32 iovcnt, s64 offset) +s32 sceFiosFHPwritev(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt, s64 offset) { throw __FUNCTION__; } -s64 sceFiosFHPwritevSync(vm::ptr pAttr, s32 fh, vm::ptr iov, s32 iovcnt, s64 offset) +s64 sceFiosFHPwritevSync(vm::cptr pAttr, s32 fh, vm::cptr iov, s32 iovcnt, s64 offset) { throw __FUNCTION__; } -s32 sceFiosFHClose(vm::ptr pAttr, s32 fh) +s32 sceFiosFHClose(vm::cptr pAttr, s32 fh) { throw __FUNCTION__; } -s32 sceFiosFHCloseSync(vm::ptr pAttr, s32 fh) +s32 sceFiosFHCloseSync(vm::cptr pAttr, s32 fh) { throw __FUNCTION__; } @@ -409,7 +409,7 @@ s64 sceFiosFHTell(s32 fh) throw __FUNCTION__; } -vm::ptr sceFiosFHGetPath(s32 fh) +vm::cptr sceFiosFHGetPath(s32 fh) { throw __FUNCTION__; } @@ -424,37 +424,37 @@ vm::ptr sceFiosFHGetOpenParams(s32 fh) throw __FUNCTION__; } -s32 sceFiosDHOpen(vm::ptr pAttr, vm::ptr pOutDH, vm::ptr pPath, SceFiosBuffer buf) +s32 sceFiosDHOpen(vm::cptr pAttr, vm::ptr pOutDH, vm::cptr pPath, SceFiosBuffer buf) { throw __FUNCTION__; } -s32 sceFiosDHOpenSync(vm::ptr pAttr, vm::ptr pOutDH, vm::ptr pPath, SceFiosBuffer buf) +s32 sceFiosDHOpenSync(vm::cptr pAttr, vm::ptr pOutDH, vm::cptr pPath, SceFiosBuffer buf) { throw __FUNCTION__; } -s32 sceFiosDHRead(vm::ptr pAttr, s32 dh, vm::ptr pOutEntry) +s32 sceFiosDHRead(vm::cptr pAttr, s32 dh, vm::ptr pOutEntry) { throw __FUNCTION__; } -s32 sceFiosDHReadSync(vm::ptr pAttr, s32 dh, vm::ptr pOutEntry) +s32 sceFiosDHReadSync(vm::cptr pAttr, s32 dh, vm::ptr pOutEntry) { throw __FUNCTION__; } -s32 sceFiosDHClose(vm::ptr pAttr, s32 dh) +s32 sceFiosDHClose(vm::cptr pAttr, s32 dh) { throw __FUNCTION__; } -s32 sceFiosDHCloseSync(vm::ptr pAttr, s32 dh) +s32 sceFiosDHCloseSync(vm::cptr pAttr, s32 dh) { throw __FUNCTION__; } -vm::ptr sceFiosDHGetPath(s32 dh) +vm::cptr sceFiosDHGetPath(s32 dh) { throw __FUNCTION__; } @@ -504,12 +504,12 @@ bool sceFiosOpIsCancelled(s32 op) throw __FUNCTION__; } -vm::ptr sceFiosOpGetAttr(s32 op) +vm::cptr sceFiosOpGetAttr(s32 op) { throw __FUNCTION__; } -vm::ptr sceFiosOpGetPath(s32 op) +vm::cptr sceFiosOpGetPath(s32 op) { throw __FUNCTION__; } @@ -559,7 +559,7 @@ u64 sceFiosDateGetCurrent() throw __FUNCTION__; } -u64 sceFiosDateFromComponents(vm::ptr pComponents) +u64 sceFiosDateFromComponents(vm::cptr pComponents) { throw __FUNCTION__; } @@ -569,7 +569,7 @@ vm::ptr sceFiosDateToComponents(u64 date, vm::ptr pOutComponents) throw __FUNCTION__; } -u64 sceFiosDateFromSceDateTime(vm::ptr pSceDateTime) +u64 sceFiosDateFromSceDateTime(vm::cptr pSceDateTime) { throw __FUNCTION__; } @@ -579,7 +579,7 @@ vm::ptr sceFiosDateToSceDateTime(u64 date, vm::ptr pSc throw __FUNCTION__; } -s32 sceFiosOverlayAdd(vm::ptr pOverlay, vm::ptr pOutID) +s32 sceFiosOverlayAdd(vm::cptr pOverlay, vm::ptr pOutID) { throw __FUNCTION__; } @@ -594,7 +594,7 @@ s32 sceFiosOverlayGetInfo(s32 id, vm::ptr pOutOverlay) throw __FUNCTION__; } -s32 sceFiosOverlayModify(s32 id, vm::ptr pNewValue) +s32 sceFiosOverlayModify(s32 id, vm::cptr pNewValue) { throw __FUNCTION__; } @@ -604,37 +604,37 @@ s32 sceFiosOverlayGetList(vm::ptr pOutIDs, u32 maxIDs, vm::ptr pActual throw __FUNCTION__; } -s32 sceFiosOverlayResolveSync(s32 resolveFlag, vm::ptr pInPath, vm::ptr pOutPath, u32 maxPath) +s32 sceFiosOverlayResolveSync(s32 resolveFlag, vm::cptr pInPath, vm::ptr pOutPath, u32 maxPath) { throw __FUNCTION__; } -s32 sceFiosArchiveGetMountBufferSize(vm::ptr pAttr, vm::ptr pArchivePath, vm::ptr pOpenParams) +s32 sceFiosArchiveGetMountBufferSize(vm::cptr pAttr, vm::cptr pArchivePath, vm::cptr pOpenParams) { throw __FUNCTION__; } -s64 sceFiosArchiveGetMountBufferSizeSync(vm::ptr pAttr, vm::ptr pArchivePath, vm::ptr pOpenParams) +s64 sceFiosArchiveGetMountBufferSizeSync(vm::cptr pAttr, vm::cptr pArchivePath, vm::cptr pOpenParams) { throw __FUNCTION__; } -s32 sceFiosArchiveMount(vm::ptr pAttr, vm::ptr pOutFH, vm::ptr pArchivePath, vm::ptr pMountPoint, SceFiosBuffer mountBuffer, vm::ptr pOpenParams) +s32 sceFiosArchiveMount(vm::cptr pAttr, vm::ptr pOutFH, vm::cptr pArchivePath, vm::cptr pMountPoint, SceFiosBuffer mountBuffer, vm::cptr pOpenParams) { throw __FUNCTION__; } -s32 sceFiosArchiveMountSync(vm::ptr pAttr, vm::ptr pOutFH, vm::ptr pArchivePath, vm::ptr pMountPoint, SceFiosBuffer mountBuffer, vm::ptr pOpenParams) +s32 sceFiosArchiveMountSync(vm::cptr pAttr, vm::ptr pOutFH, vm::cptr pArchivePath, vm::cptr pMountPoint, SceFiosBuffer mountBuffer, vm::cptr pOpenParams) { throw __FUNCTION__; } -s32 sceFiosArchiveUnmount(vm::ptr pAttr, s32 fh) +s32 sceFiosArchiveUnmount(vm::cptr pAttr, s32 fh) { throw __FUNCTION__; } -s32 sceFiosArchiveUnmountSync(vm::ptr pAttr, s32 fh) +s32 sceFiosArchiveUnmountSync(vm::cptr pAttr, s32 fh) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp b/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp index d8f3730e6c..77233f3082 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp @@ -4,7 +4,7 @@ #include "sceGxm.h" -s32 sceGxmInitialize(vm::ptr params) +s32 sceGxmInitialize(vm::cptr params) { throw __FUNCTION__; } @@ -19,7 +19,7 @@ vm::ptr sceGxmGetNotificationRegion() throw __FUNCTION__; } -s32 sceGxmNotificationWait(vm::ptr notification) +s32 sceGxmNotificationWait(vm::cptr notification) { throw __FUNCTION__; } @@ -54,7 +54,7 @@ s32 sceGxmUnmapFragmentUsseMemory(vm::ptr base) throw __FUNCTION__; } -s32 sceGxmDisplayQueueAddEntry(vm::ptr oldBuffer, vm::ptr newBuffer, vm::ptr callbackData) +s32 sceGxmDisplayQueueAddEntry(vm::ptr oldBuffer, vm::ptr newBuffer, vm::cptr callbackData) { throw __FUNCTION__; } @@ -75,7 +75,7 @@ s32 sceGxmSyncObjectDestroy(vm::ptr syncObject) } -s32 sceGxmCreateContext(vm::ptr params, vm::pptr context) +s32 sceGxmCreateContext(vm::cptr params, vm::pptr context) { throw __FUNCTION__; } @@ -91,12 +91,12 @@ void sceGxmSetValidationEnable(vm::ptr context, bool enable) } -void sceGxmSetVertexProgram(vm::ptr context, vm::ptr vertexProgram) +void sceGxmSetVertexProgram(vm::ptr context, vm::cptr vertexProgram) { throw __FUNCTION__; } -void sceGxmSetFragmentProgram(vm::ptr context, vm::ptr fragmentProgram) +void sceGxmSetFragmentProgram(vm::ptr context, vm::cptr fragmentProgram) { throw __FUNCTION__; } @@ -111,58 +111,58 @@ s32 sceGxmReserveFragmentDefaultUniformBuffer(vm::ptr context, vm throw __FUNCTION__; } -s32 sceGxmSetVertexStream(vm::ptr context, u32 streamIndex, vm::ptr streamData) +s32 sceGxmSetVertexStream(vm::ptr context, u32 streamIndex, vm::cptr streamData) { throw __FUNCTION__; } -s32 sceGxmSetVertexTexture(vm::ptr context, u32 textureIndex, vm::ptr texture) +s32 sceGxmSetVertexTexture(vm::ptr context, u32 textureIndex, vm::cptr texture) { throw __FUNCTION__; } -s32 sceGxmSetFragmentTexture(vm::ptr context, u32 textureIndex, vm::ptr texture) +s32 sceGxmSetFragmentTexture(vm::ptr context, u32 textureIndex, vm::cptr texture) { throw __FUNCTION__; } -s32 sceGxmSetVertexUniformBuffer(vm::ptr context, u32 bufferIndex, vm::ptr bufferData) +s32 sceGxmSetVertexUniformBuffer(vm::ptr context, u32 bufferIndex, vm::cptr bufferData) { throw __FUNCTION__; } -s32 sceGxmSetFragmentUniformBuffer(vm::ptr context, u32 bufferIndex, vm::ptr bufferData) +s32 sceGxmSetFragmentUniformBuffer(vm::ptr context, u32 bufferIndex, vm::cptr bufferData) { throw __FUNCTION__; } -s32 sceGxmSetAuxiliarySurface(vm::ptr context, u32 surfaceIndex, vm::ptr surface) +s32 sceGxmSetAuxiliarySurface(vm::ptr context, u32 surfaceIndex, vm::cptr surface) { throw __FUNCTION__; } -void sceGxmSetPrecomputedFragmentState(vm::ptr context, vm::ptr precomputedState) +void sceGxmSetPrecomputedFragmentState(vm::ptr context, vm::cptr precomputedState) { throw __FUNCTION__; } -void sceGxmSetPrecomputedVertexState(vm::ptr context, vm::ptr precomputedState) +void sceGxmSetPrecomputedVertexState(vm::ptr context, vm::cptr precomputedState) { throw __FUNCTION__; } -s32 sceGxmDrawPrecomputed(vm::ptr context, vm::ptr precomputedDraw) +s32 sceGxmDrawPrecomputed(vm::ptr context, vm::cptr precomputedDraw) { throw __FUNCTION__; } -s32 sceGxmDraw(vm::ptr context, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::ptr indexData, u32 indexCount) +s32 sceGxmDraw(vm::ptr context, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::cptr indexData, u32 indexCount) { throw __FUNCTION__; } -s32 sceGxmDrawInstanced(vm::ptr context, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::ptr indexData, u32 indexCount, u32 indexWrap) +s32 sceGxmDrawInstanced(vm::ptr context, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::cptr indexData, u32 indexCount, u32 indexWrap) { throw __FUNCTION__; } @@ -172,17 +172,17 @@ s32 sceGxmSetVisibilityBuffer(vm::ptr context, vm::ptr buff throw __FUNCTION__; } -s32 sceGxmBeginScene(vm::ptr context, u32 flags, vm::ptr renderTarget, vm::ptr validRegion, vm::ptr vertexSyncObject, vm::ptr fragmentSyncObject, vm::ptr colorSurface, vm::ptr depthStencil) +s32 sceGxmBeginScene(vm::ptr context, u32 flags, vm::cptr renderTarget, vm::cptr validRegion, vm::ptr vertexSyncObject, vm::ptr fragmentSyncObject, vm::cptr colorSurface, vm::cptr depthStencil) { throw __FUNCTION__; } -s32 sceGxmMidSceneFlush(vm::ptr context, u32 flags, vm::ptr vertexSyncObject, vm::ptr vertexNotification) +s32 sceGxmMidSceneFlush(vm::ptr context, u32 flags, vm::ptr vertexSyncObject, vm::cptr vertexNotification) { throw __FUNCTION__; } -s32 sceGxmEndScene(vm::ptr context, vm::ptr vertexNotification, vm::ptr fragmentNotification) +s32 sceGxmEndScene(vm::ptr context, vm::cptr vertexNotification, vm::cptr fragmentNotification) { throw __FUNCTION__; } @@ -353,7 +353,7 @@ void sceGxmFinish(vm::ptr context) throw __FUNCTION__; } -s32 sceGxmPushUserMarker(vm::ptr context, vm::ptr tag) +s32 sceGxmPushUserMarker(vm::ptr context, vm::cptr tag) { throw __FUNCTION__; } @@ -363,12 +363,12 @@ s32 sceGxmPopUserMarker(vm::ptr context) throw __FUNCTION__; } -s32 sceGxmSetUserMarker(vm::ptr context, vm::ptr tag) +s32 sceGxmSetUserMarker(vm::ptr context, vm::cptr tag) { throw __FUNCTION__; } -s32 sceGxmPadHeartbeat(vm::ptr displaySurface, vm::ptr displaySyncObject) +s32 sceGxmPadHeartbeat(vm::cptr displaySurface, vm::ptr displaySyncObject) { throw __FUNCTION__; } @@ -388,12 +388,12 @@ s32 sceGxmColorSurfaceInitDisabled(vm::ptr surface) throw __FUNCTION__; } -bool sceGxmColorSurfaceIsEnabled(vm::ptr surface) +bool sceGxmColorSurfaceIsEnabled(vm::cptr surface) { throw __FUNCTION__; } -void sceGxmColorSurfaceGetClip(vm::ptr surface, vm::ptr xMin, vm::ptr yMin, vm::ptr xMax, vm::ptr yMax) +void sceGxmColorSurfaceGetClip(vm::cptr surface, vm::ptr xMin, vm::ptr yMin, vm::ptr xMax, vm::ptr yMax) { throw __FUNCTION__; } @@ -403,7 +403,7 @@ void sceGxmColorSurfaceSetClip(vm::ptr surface, u32 xMin, u3 throw __FUNCTION__; } -SceGxmColorSurfaceScaleMode sceGxmColorSurfaceGetScaleMode(vm::ptr surface) +SceGxmColorSurfaceScaleMode sceGxmColorSurfaceGetScaleMode(vm::cptr surface) { throw __FUNCTION__; } @@ -413,7 +413,7 @@ void sceGxmColorSurfaceSetScaleMode(vm::ptr surface, SceGxmC throw __FUNCTION__; } -vm::ptr sceGxmColorSurfaceGetData(vm::ptr surface) +vm::ptr sceGxmColorSurfaceGetData(vm::cptr surface) { throw __FUNCTION__; } @@ -423,7 +423,7 @@ s32 sceGxmColorSurfaceSetData(vm::ptr surface, vm::ptr throw __FUNCTION__; } -SceGxmColorFormat sceGxmColorSurfaceGetFormat(vm::ptr surface) +SceGxmColorFormat sceGxmColorSurfaceGetFormat(vm::cptr surface) { throw __FUNCTION__; } @@ -433,12 +433,12 @@ s32 sceGxmColorSurfaceSetFormat(vm::ptr surface, SceGxmColor throw __FUNCTION__; } -SceGxmColorSurfaceType sceGxmColorSurfaceGetType(vm::ptr surface) +SceGxmColorSurfaceType sceGxmColorSurfaceGetType(vm::cptr surface) { throw __FUNCTION__; } -u32 sceGxmColorSurfaceGetStrideInPixels(vm::ptr surface) +u32 sceGxmColorSurfaceGetStrideInPixels(vm::cptr surface) { throw __FUNCTION__; } @@ -453,7 +453,7 @@ s32 sceGxmDepthStencilSurfaceInitDisabled(vm::ptr sur throw __FUNCTION__; } -float sceGxmDepthStencilSurfaceGetBackgroundDepth(vm::ptr surface) +float sceGxmDepthStencilSurfaceGetBackgroundDepth(vm::cptr surface) { throw __FUNCTION__; } @@ -463,7 +463,7 @@ void sceGxmDepthStencilSurfaceSetBackgroundDepth(vm::ptr surface) +u8 sceGxmDepthStencilSurfaceGetBackgroundStencil(vm::cptr surface) { throw __FUNCTION__; } @@ -473,7 +473,7 @@ void sceGxmDepthStencilSurfaceSetBackgroundStencil(vm::ptr surface) +bool sceGxmDepthStencilSurfaceIsEnabled(vm::cptr surface) { throw __FUNCTION__; } @@ -483,7 +483,7 @@ void sceGxmDepthStencilSurfaceSetForceLoadMode(vm::ptr surface) +SceGxmDepthStencilForceLoadMode sceGxmDepthStencilSurfaceGetForceLoadMode(vm::cptr surface) { throw __FUNCTION__; } @@ -493,12 +493,12 @@ void sceGxmDepthStencilSurfaceSetForceStoreMode(vm::ptr surface) +SceGxmDepthStencilForceStoreMode sceGxmDepthStencilSurfaceGetForceStoreMode(vm::cptr surface) { throw __FUNCTION__; } -SceGxmColorSurfaceGammaMode sceGxmColorSurfaceGetGammaMode(vm::ptr surface) +SceGxmColorSurfaceGammaMode sceGxmColorSurfaceGetGammaMode(vm::cptr surface) { throw __FUNCTION__; } @@ -508,7 +508,7 @@ s32 sceGxmColorSurfaceSetGammaMode(vm::ptr surface, SceGxmCo throw __FUNCTION__; } -SceGxmColorSurfaceDitherMode sceGxmColorSurfaceGetDitherMode(vm::ptr surface) +SceGxmColorSurfaceDitherMode sceGxmColorSurfaceGetDitherMode(vm::cptr surface) { throw __FUNCTION__; } @@ -518,139 +518,139 @@ s32 sceGxmColorSurfaceSetDitherMode(vm::ptr surface, SceGxmC throw __FUNCTION__; } -SceGxmDepthStencilFormat sceGxmDepthStencilSurfaceGetFormat(vm::ptr surface) +SceGxmDepthStencilFormat sceGxmDepthStencilSurfaceGetFormat(vm::cptr surface) { throw __FUNCTION__; } -u32 sceGxmDepthStencilSurfaceGetStrideInSamples(vm::ptr surface) +u32 sceGxmDepthStencilSurfaceGetStrideInSamples(vm::cptr surface) { throw __FUNCTION__; } -s32 sceGxmProgramCheck(vm::ptr program) +s32 sceGxmProgramCheck(vm::cptr program) { throw __FUNCTION__; } -u32 sceGxmProgramGetSize(vm::ptr program) +u32 sceGxmProgramGetSize(vm::cptr program) { throw __FUNCTION__; } -SceGxmProgramType sceGxmProgramGetType(vm::ptr program) +SceGxmProgramType sceGxmProgramGetType(vm::cptr program) { throw __FUNCTION__; } -bool sceGxmProgramIsDiscardUsed(vm::ptr program) +bool sceGxmProgramIsDiscardUsed(vm::cptr program) { throw __FUNCTION__; } -bool sceGxmProgramIsDepthReplaceUsed(vm::ptr program) +bool sceGxmProgramIsDepthReplaceUsed(vm::cptr program) { throw __FUNCTION__; } -bool sceGxmProgramIsSpriteCoordUsed(vm::ptr program) +bool sceGxmProgramIsSpriteCoordUsed(vm::cptr program) { throw __FUNCTION__; } -u32 sceGxmProgramGetDefaultUniformBufferSize(vm::ptr program) +u32 sceGxmProgramGetDefaultUniformBufferSize(vm::cptr program) { throw __FUNCTION__; } -u32 sceGxmProgramGetParameterCount(vm::ptr program) +u32 sceGxmProgramGetParameterCount(vm::cptr program) { throw __FUNCTION__; } -vm::ptr sceGxmProgramGetParameter(vm::ptr program, u32 index) +vm::cptr sceGxmProgramGetParameter(vm::cptr program, u32 index) { throw __FUNCTION__; } -vm::ptr sceGxmProgramFindParameterByName(vm::ptr program, vm::ptr name) +vm::cptr sceGxmProgramFindParameterByName(vm::cptr program, vm::cptr name) { throw __FUNCTION__; } -vm::ptr sceGxmProgramFindParameterBySemantic(vm::ptr program, SceGxmParameterSemantic semantic, u32 index) +vm::cptr sceGxmProgramFindParameterBySemantic(vm::cptr program, SceGxmParameterSemantic semantic, u32 index) { throw __FUNCTION__; } -u32 sceGxmProgramParameterGetIndex(vm::ptr program, vm::ptr parameter) +u32 sceGxmProgramParameterGetIndex(vm::cptr program, vm::cptr parameter) { throw __FUNCTION__; } -SceGxmParameterCategory sceGxmProgramParameterGetCategory(vm::ptr parameter) +SceGxmParameterCategory sceGxmProgramParameterGetCategory(vm::cptr parameter) { throw __FUNCTION__; } -vm::ptr sceGxmProgramParameterGetName(vm::ptr parameter) +vm::cptr sceGxmProgramParameterGetName(vm::cptr parameter) { throw __FUNCTION__; } -SceGxmParameterSemantic sceGxmProgramParameterGetSemantic(vm::ptr parameter) +SceGxmParameterSemantic sceGxmProgramParameterGetSemantic(vm::cptr parameter) { throw __FUNCTION__; } -u32 sceGxmProgramParameterGetSemanticIndex(vm::ptr parameter) +u32 sceGxmProgramParameterGetSemanticIndex(vm::cptr parameter) { throw __FUNCTION__; } -SceGxmParameterType sceGxmProgramParameterGetType(vm::ptr parameter) +SceGxmParameterType sceGxmProgramParameterGetType(vm::cptr parameter) { throw __FUNCTION__; } -u32 sceGxmProgramParameterGetComponentCount(vm::ptr parameter) +u32 sceGxmProgramParameterGetComponentCount(vm::cptr parameter) { throw __FUNCTION__; } -u32 sceGxmProgramParameterGetArraySize(vm::ptr parameter) +u32 sceGxmProgramParameterGetArraySize(vm::cptr parameter) { throw __FUNCTION__; } -u32 sceGxmProgramParameterGetResourceIndex(vm::ptr parameter) +u32 sceGxmProgramParameterGetResourceIndex(vm::cptr parameter) { throw __FUNCTION__; } -u32 sceGxmProgramParameterGetContainerIndex(vm::ptr parameter) +u32 sceGxmProgramParameterGetContainerIndex(vm::cptr parameter) { throw __FUNCTION__; } -bool sceGxmProgramParameterIsSamplerCube(vm::ptr parameter) +bool sceGxmProgramParameterIsSamplerCube(vm::cptr parameter) { throw __FUNCTION__; } -vm::ptr sceGxmFragmentProgramGetProgram(vm::ptr fragmentProgram) +vm::cptr sceGxmFragmentProgramGetProgram(vm::cptr fragmentProgram) { throw __FUNCTION__; } -vm::ptr sceGxmVertexProgramGetProgram(vm::ptr vertexProgram) +vm::cptr sceGxmVertexProgramGetProgram(vm::cptr vertexProgram) { throw __FUNCTION__; } -s32 sceGxmShaderPatcherCreate(vm::ptr params, vm::pptr shaderPatcher) +s32 sceGxmShaderPatcherCreate(vm::cptr params, vm::pptr shaderPatcher) { throw __FUNCTION__; } @@ -670,7 +670,7 @@ s32 sceGxmShaderPatcherDestroy(vm::ptr shaderPatcher) throw __FUNCTION__; } -s32 sceGxmShaderPatcherRegisterProgram(vm::ptr shaderPatcher, vm::ptr programHeader, vm::pptr programId) +s32 sceGxmShaderPatcherRegisterProgram(vm::ptr shaderPatcher, vm::cptr programHeader, vm::pptr programId) { throw __FUNCTION__; } @@ -680,22 +680,22 @@ s32 sceGxmShaderPatcherUnregisterProgram(vm::ptr shaderPatc throw __FUNCTION__; } -vm::ptr sceGxmShaderPatcherGetProgramFromId(vm::ptr programId) +vm::cptr sceGxmShaderPatcherGetProgramFromId(vm::ptr programId) { throw __FUNCTION__; } -s32 sceGxmShaderPatcherSetAuxiliarySurface(vm::ptr shaderPatcher, u32 auxSurfaceIndex, vm::ptr auxSurface) +s32 sceGxmShaderPatcherSetAuxiliarySurface(vm::ptr shaderPatcher, u32 auxSurfaceIndex, vm::cptr auxSurface) { throw __FUNCTION__; } -s32 sceGxmShaderPatcherCreateVertexProgram(vm::ptr shaderPatcher, vm::ptr programId, vm::ptr attributes, u32 attributeCount, vm::ptr streams, u32 streamCount, vm::pptr vertexProgram) +s32 sceGxmShaderPatcherCreateVertexProgram(vm::ptr shaderPatcher, vm::ptr programId, vm::cptr attributes, u32 attributeCount, vm::cptr streams, u32 streamCount, vm::pptr vertexProgram) { throw __FUNCTION__; } -s32 sceGxmShaderPatcherCreateFragmentProgram(vm::ptr shaderPatcher, vm::ptr programId, SceGxmOutputRegisterFormat outputFormat, SceGxmMultisampleMode multisampleMode, vm::ptr blendInfo, vm::ptr vertexProgram, vm::pptr fragmentProgram) +s32 sceGxmShaderPatcherCreateFragmentProgram(vm::ptr shaderPatcher, vm::ptr programId, SceGxmOutputRegisterFormat outputFormat, SceGxmMultisampleMode multisampleMode, vm::cptr blendInfo, vm::cptr vertexProgram, vm::pptr fragmentProgram) { throw __FUNCTION__; } @@ -720,52 +720,52 @@ s32 sceGxmShaderPatcherReleaseFragmentProgram(vm::ptr shade throw __FUNCTION__; } -u32 sceGxmShaderPatcherGetHostMemAllocated(vm::ptr shaderPatcher) +u32 sceGxmShaderPatcherGetHostMemAllocated(vm::cptr shaderPatcher) { throw __FUNCTION__; } -u32 sceGxmShaderPatcherGetBufferMemAllocated(vm::ptr shaderPatcher) +u32 sceGxmShaderPatcherGetBufferMemAllocated(vm::cptr shaderPatcher) { throw __FUNCTION__; } -u32 sceGxmShaderPatcherGetVertexUsseMemAllocated(vm::ptr shaderPatcher) +u32 sceGxmShaderPatcherGetVertexUsseMemAllocated(vm::cptr shaderPatcher) { throw __FUNCTION__; } -u32 sceGxmShaderPatcherGetFragmentUsseMemAllocated(vm::ptr shaderPatcher) +u32 sceGxmShaderPatcherGetFragmentUsseMemAllocated(vm::cptr shaderPatcher) { throw __FUNCTION__; } -s32 sceGxmTextureInitSwizzled(vm::ptr texture, vm::ptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) +s32 sceGxmTextureInitSwizzled(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) { throw __FUNCTION__; } -s32 sceGxmTextureInitLinear(vm::ptr texture, vm::ptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) +s32 sceGxmTextureInitLinear(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) { throw __FUNCTION__; } -s32 sceGxmTextureInitLinearStrided(vm::ptr texture, vm::ptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 byteStride) +s32 sceGxmTextureInitLinearStrided(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 byteStride) { throw __FUNCTION__; } -s32 sceGxmTextureInitTiled(vm::ptr texture, vm::ptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) +s32 sceGxmTextureInitTiled(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) { throw __FUNCTION__; } -s32 sceGxmTextureInitCube(vm::ptr texture, vm::ptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) +s32 sceGxmTextureInitCube(vm::ptr texture, vm::cptr data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount) { throw __FUNCTION__; } -SceGxmTextureType sceGxmTextureGetType(vm::ptr texture) +SceGxmTextureType sceGxmTextureGetType(vm::cptr texture) { throw __FUNCTION__; } @@ -775,7 +775,7 @@ s32 sceGxmTextureSetMinFilter(vm::ptr texture, SceGxmTextureFilte throw __FUNCTION__; } -SceGxmTextureFilter sceGxmTextureGetMinFilter(vm::ptr texture) +SceGxmTextureFilter sceGxmTextureGetMinFilter(vm::cptr texture) { throw __FUNCTION__; } @@ -785,7 +785,7 @@ s32 sceGxmTextureSetMagFilter(vm::ptr texture, SceGxmTextureFilte throw __FUNCTION__; } -SceGxmTextureFilter sceGxmTextureGetMagFilter(vm::ptr texture) +SceGxmTextureFilter sceGxmTextureGetMagFilter(vm::cptr texture) { throw __FUNCTION__; } @@ -795,7 +795,7 @@ s32 sceGxmTextureSetMipFilter(vm::ptr texture, SceGxmTextureMipFi throw __FUNCTION__; } -SceGxmTextureMipFilter sceGxmTextureGetMipFilter(vm::ptr texture) +SceGxmTextureMipFilter sceGxmTextureGetMipFilter(vm::cptr texture) { throw __FUNCTION__; } @@ -805,7 +805,7 @@ s32 sceGxmTextureSetAnisoMode(vm::ptr texture, SceGxmTextureAniso throw __FUNCTION__; } -SceGxmTextureAnisoMode sceGxmTextureGetAnisoMode(vm::ptr texture) +SceGxmTextureAnisoMode sceGxmTextureGetAnisoMode(vm::cptr texture) { throw __FUNCTION__; } @@ -815,7 +815,7 @@ s32 sceGxmTextureSetUAddrMode(vm::ptr texture, SceGxmTextureAddrM throw __FUNCTION__; } -SceGxmTextureAddrMode sceGxmTextureGetUAddrMode(vm::ptr texture) +SceGxmTextureAddrMode sceGxmTextureGetUAddrMode(vm::cptr texture) { throw __FUNCTION__; } @@ -825,7 +825,7 @@ s32 sceGxmTextureSetVAddrMode(vm::ptr texture, SceGxmTextureAddrM throw __FUNCTION__; } -SceGxmTextureAddrMode sceGxmTextureGetVAddrMode(vm::ptr texture) +SceGxmTextureAddrMode sceGxmTextureGetVAddrMode(vm::cptr texture) { throw __FUNCTION__; } @@ -835,7 +835,7 @@ s32 sceGxmTextureSetFormat(vm::ptr texture, SceGxmTextureFormat t throw __FUNCTION__; } -SceGxmTextureFormat sceGxmTextureGetFormat(vm::ptr texture) +SceGxmTextureFormat sceGxmTextureGetFormat(vm::cptr texture) { throw __FUNCTION__; } @@ -845,7 +845,7 @@ s32 sceGxmTextureSetLodBias(vm::ptr texture, u32 bias) throw __FUNCTION__; } -u32 sceGxmTextureGetLodBias(vm::ptr texture) +u32 sceGxmTextureGetLodBias(vm::cptr texture) { throw __FUNCTION__; } @@ -855,7 +855,7 @@ s32 sceGxmTextureSetStride(vm::ptr texture, u32 byteStride) throw __FUNCTION__; } -u32 sceGxmTextureGetStride(vm::ptr texture) +u32 sceGxmTextureGetStride(vm::cptr texture) { throw __FUNCTION__; } @@ -865,7 +865,7 @@ s32 sceGxmTextureSetWidth(vm::ptr texture, u32 width) throw __FUNCTION__; } -u32 sceGxmTextureGetWidth(vm::ptr texture) +u32 sceGxmTextureGetWidth(vm::cptr texture) { throw __FUNCTION__; } @@ -875,17 +875,17 @@ s32 sceGxmTextureSetHeight(vm::ptr texture, u32 height) throw __FUNCTION__; } -u32 sceGxmTextureGetHeight(vm::ptr texture) +u32 sceGxmTextureGetHeight(vm::cptr texture) { throw __FUNCTION__; } -s32 sceGxmTextureSetData(vm::ptr texture, vm::ptr data) +s32 sceGxmTextureSetData(vm::ptr texture, vm::cptr data) { throw __FUNCTION__; } -vm::ptr sceGxmTextureGetData(vm::ptr texture) +vm::ptr sceGxmTextureGetData(vm::cptr texture) { throw __FUNCTION__; } @@ -895,22 +895,22 @@ s32 sceGxmTextureSetMipmapCount(vm::ptr texture, u32 mipCount) throw __FUNCTION__; } -u32 sceGxmTextureGetMipmapCount(vm::ptr texture) +u32 sceGxmTextureGetMipmapCount(vm::cptr texture) { throw __FUNCTION__; } -s32 sceGxmTextureSetPalette(vm::ptr texture, vm::ptr paletteData) +s32 sceGxmTextureSetPalette(vm::ptr texture, vm::cptr paletteData) { throw __FUNCTION__; } -vm::ptr sceGxmTextureGetPalette(vm::ptr texture) +vm::ptr sceGxmTextureGetPalette(vm::cptr texture) { throw __FUNCTION__; } -SceGxmTextureGammaMode sceGxmTextureGetGammaMode(vm::ptr texture) +SceGxmTextureGammaMode sceGxmTextureGetGammaMode(vm::cptr texture) { throw __FUNCTION__; } @@ -920,12 +920,12 @@ s32 sceGxmTextureSetGammaMode(vm::ptr texture, SceGxmTextureGamma throw __FUNCTION__; } -u32 sceGxmGetPrecomputedVertexStateSize(vm::ptr vertexProgram) +u32 sceGxmGetPrecomputedVertexStateSize(vm::cptr vertexProgram) { throw __FUNCTION__; } -s32 sceGxmPrecomputedVertexStateInit(vm::ptr precomputedState, vm::ptr vertexProgram, vm::ptr memBlock) +s32 sceGxmPrecomputedVertexStateInit(vm::ptr precomputedState, vm::cptr vertexProgram, vm::ptr memBlock) { throw __FUNCTION__; } @@ -935,37 +935,37 @@ void sceGxmPrecomputedVertexStateSetDefaultUniformBuffer(vm::ptr sceGxmPrecomputedVertexStateGetDefaultUniformBuffer(vm::ptr precomputedState) +vm::ptr sceGxmPrecomputedVertexStateGetDefaultUniformBuffer(vm::cptr precomputedState) { throw __FUNCTION__; } -s32 sceGxmPrecomputedVertexStateSetAllTextures(vm::ptr precomputedState, vm::ptr textures) +s32 sceGxmPrecomputedVertexStateSetAllTextures(vm::ptr precomputedState, vm::cptr textures) { throw __FUNCTION__; } -s32 sceGxmPrecomputedVertexStateSetTexture(vm::ptr precomputedState, u32 textureIndex, vm::ptr texture) +s32 sceGxmPrecomputedVertexStateSetTexture(vm::ptr precomputedState, u32 textureIndex, vm::cptr texture) { throw __FUNCTION__; } -s32 sceGxmPrecomputedVertexStateSetAllUniformBuffers(vm::ptr precomputedState, vm::ptr> bufferDataArray) +s32 sceGxmPrecomputedVertexStateSetAllUniformBuffers(vm::ptr precomputedState, vm::cptr> bufferDataArray) { throw __FUNCTION__; } -s32 sceGxmPrecomputedVertexStateSetUniformBuffer(vm::ptr precomputedState, u32 bufferIndex, vm::ptr bufferData) +s32 sceGxmPrecomputedVertexStateSetUniformBuffer(vm::ptr precomputedState, u32 bufferIndex, vm::cptr bufferData) { throw __FUNCTION__; } -u32 sceGxmGetPrecomputedFragmentStateSize(vm::ptr fragmentProgram) +u32 sceGxmGetPrecomputedFragmentStateSize(vm::cptr fragmentProgram) { throw __FUNCTION__; } -s32 sceGxmPrecomputedFragmentStateInit(vm::ptr precomputedState, vm::ptr fragmentProgram, vm::ptr memBlock) +s32 sceGxmPrecomputedFragmentStateInit(vm::ptr precomputedState, vm::cptr fragmentProgram, vm::ptr memBlock) { throw __FUNCTION__; } @@ -975,83 +975,83 @@ void sceGxmPrecomputedFragmentStateSetDefaultUniformBuffer(vm::ptr sceGxmPrecomputedFragmentStateGetDefaultUniformBuffer(vm::ptr precomputedState) +vm::ptr sceGxmPrecomputedFragmentStateGetDefaultUniformBuffer(vm::cptr precomputedState) { throw __FUNCTION__; } -s32 sceGxmPrecomputedFragmentStateSetAllTextures(vm::ptr precomputedState, vm::ptr textureArray) +s32 sceGxmPrecomputedFragmentStateSetAllTextures(vm::ptr precomputedState, vm::cptr textureArray) { throw __FUNCTION__; } -s32 sceGxmPrecomputedFragmentStateSetTexture(vm::ptr precomputedState, u32 textureIndex, vm::ptr texture) +s32 sceGxmPrecomputedFragmentStateSetTexture(vm::ptr precomputedState, u32 textureIndex, vm::cptr texture) { throw __FUNCTION__; } -s32 sceGxmPrecomputedFragmentStateSetAllUniformBuffers(vm::ptr precomputedState, vm::ptr> bufferDataArray) +s32 sceGxmPrecomputedFragmentStateSetAllUniformBuffers(vm::ptr precomputedState, vm::cptr> bufferDataArray) { throw __FUNCTION__; } -s32 sceGxmPrecomputedFragmentStateSetUniformBuffer(vm::ptr precomputedState, u32 bufferIndex, vm::ptr bufferData) +s32 sceGxmPrecomputedFragmentStateSetUniformBuffer(vm::ptr precomputedState, u32 bufferIndex, vm::cptr bufferData) { throw __FUNCTION__; } -s32 sceGxmPrecomputedFragmentStateSetAllAuxiliarySurfaces(vm::ptr precomputedState, vm::ptr auxSurfaceArray) +s32 sceGxmPrecomputedFragmentStateSetAllAuxiliarySurfaces(vm::ptr precomputedState, vm::cptr auxSurfaceArray) { throw __FUNCTION__; } -u32 sceGxmGetPrecomputedDrawSize(vm::ptr vertexProgram) +u32 sceGxmGetPrecomputedDrawSize(vm::cptr vertexProgram) { throw __FUNCTION__; } -s32 sceGxmPrecomputedDrawInit(vm::ptr precomputedDraw, vm::ptr vertexProgram, vm::ptr memBlock) +s32 sceGxmPrecomputedDrawInit(vm::ptr precomputedDraw, vm::cptr vertexProgram, vm::ptr memBlock) { throw __FUNCTION__; } -s32 sceGxmPrecomputedDrawSetAllVertexStreams(vm::ptr precomputedDraw, vm::ptr> streamDataArray) +s32 sceGxmPrecomputedDrawSetAllVertexStreams(vm::ptr precomputedDraw, vm::cptr> streamDataArray) { throw __FUNCTION__; } -s32 sceGxmPrecomputedDrawSetVertexStream(vm::ptr precomputedDraw, u32 streamIndex, vm::ptr streamData) +s32 sceGxmPrecomputedDrawSetVertexStream(vm::ptr precomputedDraw, u32 streamIndex, vm::cptr streamData) { throw __FUNCTION__; } -void sceGxmPrecomputedDrawSetParams(vm::ptr precomputedDraw, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::ptr indexData, u32 indexCount) +void sceGxmPrecomputedDrawSetParams(vm::ptr precomputedDraw, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::cptr indexData, u32 indexCount) { throw __FUNCTION__; } -void sceGxmPrecomputedDrawSetParamsInstanced(vm::ptr precomputedDraw, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::ptr indexData, u32 indexCount, u32 indexWrap) +void sceGxmPrecomputedDrawSetParamsInstanced(vm::ptr precomputedDraw, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::cptr indexData, u32 indexCount, u32 indexWrap) { throw __FUNCTION__; } -s32 sceGxmGetRenderTargetMemSizes(vm::ptr params, vm::ptr hostMemSize, vm::ptr driverMemSize) +s32 sceGxmGetRenderTargetMemSizes(vm::cptr params, vm::ptr hostMemSize, vm::ptr driverMemSize) { throw __FUNCTION__; } -s32 sceGxmCreateRenderTarget(vm::ptr params, vm::pptr renderTarget) +s32 sceGxmCreateRenderTarget(vm::cptr params, vm::pptr renderTarget) { throw __FUNCTION__; } -s32 sceGxmRenderTargetGetHostMem(vm::ptr renderTarget, vm::pptr hostMem) +s32 sceGxmRenderTargetGetHostMem(vm::cptr renderTarget, vm::pptr hostMem) { throw __FUNCTION__; } -s32 sceGxmRenderTargetGetDriverMemBlock(vm::ptr renderTarget, vm::ptr driverMemBlock) +s32 sceGxmRenderTargetGetDriverMemBlock(vm::cptr renderTarget, vm::ptr driverMemBlock) { throw __FUNCTION__; } @@ -1061,7 +1061,7 @@ s32 sceGxmDestroyRenderTarget(vm::ptr renderTarget) throw __FUNCTION__; } -s32 sceGxmSetUniformDataF(vm::ptr uniformBuffer, vm::ptr parameter, u32 componentOffset, u32 componentCount, vm::ptr sourceData) +s32 sceGxmSetUniformDataF(vm::ptr uniformBuffer, vm::cptr parameter, u32 componentOffset, u32 componentCount, vm::cptr sourceData) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp b/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp index bd349ea970..ff731ed7c6 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp @@ -19,7 +19,7 @@ s32 sceHttpGetMemoryPoolStats(vm::ptr currentStat) throw __FUNCTION__; } -s32 sceHttpCreateTemplate(vm::ptr userAgent, s32 httpVer, s32 autoProxyConf) +s32 sceHttpCreateTemplate(vm::cptr userAgent, s32 httpVer, s32 autoProxyConf) { throw __FUNCTION__; } @@ -29,12 +29,12 @@ s32 sceHttpDeleteTemplate(s32 tmplId) throw __FUNCTION__; } -s32 sceHttpCreateConnection(s32 tmplId, vm::ptr serverName, vm::ptr scheme, u16 port, s32 enableKeepalive) +s32 sceHttpCreateConnection(s32 tmplId, vm::cptr serverName, vm::cptr scheme, u16 port, s32 enableKeepalive) { throw __FUNCTION__; } -s32 sceHttpCreateConnectionWithURL(s32 tmplId, vm::ptr url, s32 enableKeepalive) +s32 sceHttpCreateConnectionWithURL(s32 tmplId, vm::cptr url, s32 enableKeepalive) { throw __FUNCTION__; } @@ -44,12 +44,12 @@ s32 sceHttpDeleteConnection(s32 connId) throw __FUNCTION__; } -s32 sceHttpCreateRequest(s32 connId, s32 method, vm::ptr path, u64 contentLength) +s32 sceHttpCreateRequest(s32 connId, s32 method, vm::cptr path, u64 contentLength) { throw __FUNCTION__; } -s32 sceHttpCreateRequestWithURL(s32 connId, s32 method, vm::ptr url, u64 contentLength) +s32 sceHttpCreateRequestWithURL(s32 connId, s32 method, vm::cptr url, u64 contentLength) { throw __FUNCTION__; } @@ -74,7 +74,7 @@ s32 sceHttpSetRequestContentLength(s32 id, u64 contentLength) throw __FUNCTION__; } -s32 sceHttpSendRequest(s32 reqId, vm::ptr postData, u32 size) +s32 sceHttpSendRequest(s32 reqId, vm::cptr postData, u32 size) { throw __FUNCTION__; } @@ -104,22 +104,22 @@ s32 sceHttpReadData(s32 reqId, vm::ptr data, u32 size) throw __FUNCTION__; } -s32 sceHttpAddRequestHeader(s32 id, vm::ptr name, vm::ptr value, u32 mode) +s32 sceHttpAddRequestHeader(s32 id, vm::cptr name, vm::cptr value, u32 mode) { throw __FUNCTION__; } -s32 sceHttpRemoveRequestHeader(s32 id, vm::ptr name) +s32 sceHttpRemoveRequestHeader(s32 id, vm::cptr name) { throw __FUNCTION__; } -s32 sceHttpParseResponseHeader(vm::ptr header, u32 headerLen, vm::ptr fieldStr, vm::pptr fieldValue, vm::ptr valueLen) +s32 sceHttpParseResponseHeader(vm::cptr header, u32 headerLen, vm::cptr fieldStr, vm::cpptr fieldValue, vm::ptr valueLen) { throw __FUNCTION__; } -s32 sceHttpParseStatusLine(vm::ptr statusLine, u32 lineLen, vm::ptr httpMajorVer, vm::ptr httpMinorVer, vm::ptr responseCode, vm::pptr reasonPhrase, vm::ptr phraseLen) +s32 sceHttpParseStatusLine(vm::cptr statusLine, u32 lineLen, vm::ptr httpMajorVer, vm::ptr httpMinorVer, vm::ptr responseCode, vm::cpptr reasonPhrase, vm::ptr phraseLen) { throw __FUNCTION__; } @@ -179,32 +179,32 @@ s32 sceHttpSetRecvTimeOut(s32 id, u32 usec) throw __FUNCTION__; } -s32 sceHttpUriEscape(vm::ptr out, vm::ptr require, u32 prepare, vm::ptr in) +s32 sceHttpUriEscape(vm::ptr out, vm::ptr require, u32 prepare, vm::cptr in) { throw __FUNCTION__; } -s32 sceHttpUriUnescape(vm::ptr out, vm::ptr require, u32 prepare, vm::ptr in) +s32 sceHttpUriUnescape(vm::ptr out, vm::ptr require, u32 prepare, vm::cptr in) { throw __FUNCTION__; } -s32 sceHttpUriParse(vm::ptr out, vm::ptr srcUrl, vm::ptr pool, vm::ptr require, u32 prepare) +s32 sceHttpUriParse(vm::ptr out, vm::cptr srcUrl, vm::ptr pool, vm::ptr require, u32 prepare) { throw __FUNCTION__; } -s32 sceHttpUriBuild(vm::ptr out, vm::ptr require, u32 prepare, vm::ptr srcElement, u32 option) +s32 sceHttpUriBuild(vm::ptr out, vm::ptr require, u32 prepare, vm::cptr srcElement, u32 option) { throw __FUNCTION__; } -s32 sceHttpUriMerge(vm::ptr mergedUrl, vm::ptr url, vm::ptr relativeUrl, vm::ptr require, u32 prepare, u32 option) +s32 sceHttpUriMerge(vm::ptr mergedUrl, vm::cptr url, vm::cptr relativeUrl, vm::ptr require, u32 prepare, u32 option) { throw __FUNCTION__; } -s32 sceHttpUriSweepPath(vm::ptr dst, vm::ptr src, u32 srcSize) +s32 sceHttpUriSweepPath(vm::ptr dst, vm::cptr src, u32 srcSize) { throw __FUNCTION__; } @@ -219,12 +219,12 @@ s32 sceHttpGetCookieEnabled(s32 id, vm::ptr enable) throw __FUNCTION__; } -s32 sceHttpGetCookie(vm::ptr url, vm::ptr cookie, vm::ptr cookieLength, u32 prepare, s32 secure) +s32 sceHttpGetCookie(vm::cptr url, vm::ptr cookie, vm::ptr cookieLength, u32 prepare, s32 secure) { throw __FUNCTION__; } -s32 sceHttpAddCookie(vm::ptr url, vm::ptr cookie, u32 cookieLength) +s32 sceHttpAddCookie(vm::cptr url, vm::cptr cookie, u32 cookieLength) { throw __FUNCTION__; } @@ -239,7 +239,7 @@ s32 sceHttpSetCookieSendCallback(s32 id, vm::ptr cbfu throw __FUNCTION__; } -s32 sceHttpsLoadCert(s32 caCertNum, vm::pptr caList, vm::ptr cert, vm::ptr privKey) +s32 sceHttpsLoadCert(s32 caCertNum, vm::cpptr caList, vm::cptr cert, vm::cptr privKey) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceIme.cpp b/rpcs3/Emu/ARMv7/Modules/sceIme.cpp index ad8628a510..93ac93ef48 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceIme.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceIme.cpp @@ -14,12 +14,12 @@ s32 sceImeUpdate() throw __FUNCTION__; } -s32 sceImeSetCaret(vm::ptr caret) +s32 sceImeSetCaret(vm::cptr caret) { throw __FUNCTION__; } -s32 sceImeSetPreeditGeometry(vm::ptr preedit) +s32 sceImeSetPreeditGeometry(vm::cptr preedit) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp b/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp index 4d960dde0f..2817a5ff71 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp @@ -15,7 +15,7 @@ s32 sceJpegFinishMJpeg() } s32 sceJpegDecodeMJpeg( - vm::ptr pJpeg, + vm::cptr pJpeg, u32 isize, vm::ptr pRGBA, u32 osize, @@ -29,7 +29,7 @@ s32 sceJpegDecodeMJpeg( } s32 sceJpegDecodeMJpegYCbCr( - vm::ptr pJpeg, + vm::cptr pJpeg, u32 isize, vm::ptr pYCbCr, u32 osize, @@ -42,7 +42,7 @@ s32 sceJpegDecodeMJpegYCbCr( s32 sceJpegMJpegCsc( vm::ptr pRGBA, - vm::ptr pYCbCr, + vm::cptr pYCbCr, s32 xysize, s32 iFrameWidth, s32 colorOption, @@ -52,7 +52,7 @@ s32 sceJpegMJpegCsc( } s32 sceJpegGetOutputInfo( - vm::ptr pJpeg, + vm::cptr pJpeg, u32 isize, s32 outputFormat, s32 decodeMode, diff --git a/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp b/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp index a66672fe69..abed16dc2e 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp @@ -22,7 +22,7 @@ s32 sceJpegEncoderInit( s32 sceJpegEncoderEncode( SceJpegEncoderContext context, - vm::ptr pYCbCr) + vm::cptr pYCbCr) { throw __FUNCTION__; } @@ -65,7 +65,7 @@ s32 sceJpegEncoderSetOutputAddr( s32 sceJpegEncoderCsc( SceJpegEncoderContext context, vm::ptr pYCbCr, - vm::ptr pRGBA, + vm::cptr pRGBA, s32 iFrameWidth, s32 inputPixelFormat) { diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp index 602b60ca0b..213b98ceb4 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp @@ -13,7 +13,7 @@ #include "psv_mutex.h" #include "psv_cond.h" -s32 sceKernelAllocMemBlock(vm::ptr name, s32 type, u32 vsize, vm::ptr pOpt) +s32 sceKernelAllocMemBlock(vm::cptr name, s32 type, u32 vsize, vm::ptr pOpt) { throw __FUNCTION__; } @@ -34,13 +34,13 @@ s32 sceKernelGetMemBlockInfoByAddr(vm::ptr vbase, vm::ptr pName, + vm::cptr pName, vm::ptr entry, s32 initPriority, u32 stackSize, u32 attr, s32 cpuAffinityMask, - vm::ptr pOptParam) + vm::cptr pOptParam) { sceLibKernel.Warning("sceKernelCreateThread(pName=*0x%x, entry=*0x%x, initPriority=%d, stackSize=0x%x, attr=0x%x, cpuAffinityMask=0x%x, pOptParam=*0x%x)", pName, entry, initPriority, stackSize, attr, cpuAffinityMask, pOptParam); @@ -58,7 +58,7 @@ s32 sceKernelCreateThread( return armv7.GetId(); } -s32 sceKernelStartThread(s32 threadId, u32 argSize, vm::ptr pArgBlock) +s32 sceKernelStartThread(s32 threadId, u32 argSize, vm::cptr pArgBlock) { sceLibKernel.Warning("sceKernelStartThread(threadId=0x%x, argSize=0x%x, pArgBlock=*0x%x)", threadId, argSize, pArgBlock); @@ -302,7 +302,7 @@ s32 sceKernelWaitThreadEndCB(s32 threadId, vm::ptr pExitStatus, vm::ptr pName, u32 attr, vm::ptr callbackFunc, vm::ptr pCommon) +s32 sceKernelCreateCallback(vm::cptr pName, u32 attr, vm::ptr callbackFunc, vm::ptr pCommon) { throw __FUNCTION__; } @@ -391,7 +391,7 @@ s32 sceKernelWaitMultipleEventsCB(vm::ptr pWaitEventList, s3 // Event flag functions -s32 sceKernelCreateEventFlag(vm::ptr pName, u32 attr, u32 initPattern, vm::ptr pOptParam) +s32 sceKernelCreateEventFlag(vm::cptr pName, u32 attr, u32 initPattern, vm::cptr pOptParam) { sceLibKernel.Error("sceKernelCreateEventFlag(pName=*0x%x, attr=0x%x, initPattern=0x%x, pOptParam=*0x%x)", pName, attr, initPattern, pOptParam); @@ -408,7 +408,7 @@ s32 sceKernelDeleteEventFlag(s32 evfId) throw __FUNCTION__; } -s32 sceKernelOpenEventFlag(vm::ptr pName) +s32 sceKernelOpenEventFlag(vm::cptr pName) { throw __FUNCTION__; } @@ -455,7 +455,7 @@ s32 sceKernelGetEventFlagInfo(s32 evfId, vm::ptr pInfo) // Semaphore functions -s32 sceKernelCreateSema(vm::ptr pName, u32 attr, s32 initCount, s32 maxCount, vm::ptr pOptParam) +s32 sceKernelCreateSema(vm::cptr pName, u32 attr, s32 initCount, s32 maxCount, vm::cptr pOptParam) { sceLibKernel.Error("sceKernelCreateSema(pName=*0x%x, attr=0x%x, initCount=%d, maxCount=%d, pOptParam=*0x%x)", pName, attr, initCount, maxCount, pOptParam); @@ -486,7 +486,7 @@ s32 sceKernelDeleteSema(s32 semaId) return SCE_OK; } -s32 sceKernelOpenSema(vm::ptr pName) +s32 sceKernelOpenSema(vm::cptr pName) { throw __FUNCTION__; } @@ -539,7 +539,7 @@ s32 sceKernelGetSemaInfo(s32 semaId, vm::ptr pInfo) // Mutex functions -s32 sceKernelCreateMutex(vm::ptr pName, u32 attr, s32 initCount, vm::ptr pOptParam) +s32 sceKernelCreateMutex(vm::cptr pName, u32 attr, s32 initCount, vm::cptr pOptParam) { sceLibKernel.Error("sceKernelCreateMutex(pName=*0x%x, attr=0x%x, initCount=%d, pOptParam=*0x%x)", pName, attr, initCount, pOptParam); @@ -556,7 +556,7 @@ s32 sceKernelDeleteMutex(s32 mutexId) throw __FUNCTION__; } -s32 sceKernelOpenMutex(vm::ptr pName) +s32 sceKernelOpenMutex(vm::cptr pName) { throw __FUNCTION__; } @@ -598,7 +598,7 @@ s32 sceKernelGetMutexInfo(s32 mutexId, vm::ptr pInfo) // Lightweight mutex functions -s32 sceKernelCreateLwMutex(vm::ptr pWork, vm::ptr pName, u32 attr, s32 initCount, vm::ptr pOptParam) +s32 sceKernelCreateLwMutex(vm::ptr pWork, vm::cptr pName, u32 attr, s32 initCount, vm::cptr pOptParam) { throw __FUNCTION__; } @@ -640,7 +640,7 @@ s32 sceKernelGetLwMutexInfoById(s32 lwMutexId, vm::ptr pIn // Condition variable functions -s32 sceKernelCreateCond(vm::ptr pName, u32 attr, s32 mutexId, vm::ptr pOptParam) +s32 sceKernelCreateCond(vm::cptr pName, u32 attr, s32 mutexId, vm::cptr pOptParam) { sceLibKernel.Error("sceKernelCreateCond(pName=*0x%x, attr=0x%x, mutexId=0x%x, pOptParam=*0x%x)", pName, attr, mutexId, pOptParam); @@ -657,7 +657,7 @@ s32 sceKernelDeleteCond(s32 condId) throw __FUNCTION__; } -s32 sceKernelOpenCond(vm::ptr pName) +s32 sceKernelOpenCond(vm::cptr pName) { throw __FUNCTION__; } @@ -699,7 +699,7 @@ s32 sceKernelGetCondInfo(s32 condId, vm::ptr pInfo) // Lightweight condition variable functions -s32 sceKernelCreateLwCond(vm::ptr pWork, vm::ptr pName, u32 attr, vm::ptr pLwMutex, vm::ptr pOptParam) +s32 sceKernelCreateLwCond(vm::ptr pWork, vm::cptr pName, u32 attr, vm::ptr pLwMutex, vm::cptr pOptParam) { throw __FUNCTION__; } @@ -763,7 +763,7 @@ u32 sceKernelGetSystemTimeLow() // Timer functions -s32 sceKernelCreateTimer(vm::ptr pName, u32 attr, vm::ptr pOptParam) +s32 sceKernelCreateTimer(vm::cptr pName, u32 attr, vm::cptr pOptParam) { throw __FUNCTION__; } @@ -773,7 +773,7 @@ s32 sceKernelDeleteTimer(s32 timerId) throw __FUNCTION__; } -s32 sceKernelOpenTimer(vm::ptr pName) +s32 sceKernelOpenTimer(vm::cptr pName) { throw __FUNCTION__; } @@ -840,7 +840,7 @@ s32 sceKernelGetTimerInfo(s32 timerId, vm::ptr pInfo) // Reader/writer lock functions -s32 sceKernelCreateRWLock(vm::ptr pName, u32 attr, vm::ptr pOptParam) +s32 sceKernelCreateRWLock(vm::cptr pName, u32 attr, vm::cptr pOptParam) { throw __FUNCTION__; } @@ -850,7 +850,7 @@ s32 sceKernelDeleteRWLock(s32 rwLockId) throw __FUNCTION__; } -s32 sceKernelOpenRWLock(vm::ptr pName) +s32 sceKernelOpenRWLock(vm::cptr pName) { throw __FUNCTION__; } @@ -912,37 +912,37 @@ s32 sceKernelGetRWLockInfo(s32 rwLockId, vm::ptr pInfo) // IO/File functions -s32 sceIoRemove(vm::ptr filename) +s32 sceIoRemove(vm::cptr filename) { throw __FUNCTION__; } -s32 sceIoMkdir(vm::ptr dirname, s32 mode) +s32 sceIoMkdir(vm::cptr dirname, s32 mode) { throw __FUNCTION__; } -s32 sceIoRmdir(vm::ptr dirname) +s32 sceIoRmdir(vm::cptr dirname) { throw __FUNCTION__; } -s32 sceIoRename(vm::ptr oldname, vm::ptr newname) +s32 sceIoRename(vm::cptr oldname, vm::cptr newname) { throw __FUNCTION__; } -s32 sceIoDevctl(vm::ptr devname, s32 cmd, vm::ptr arg, u32 arglen, vm::ptr bufp, u32 buflen) +s32 sceIoDevctl(vm::cptr devname, s32 cmd, vm::cptr arg, u32 arglen, vm::ptr bufp, u32 buflen) { throw __FUNCTION__; } -s32 sceIoSync(vm::ptr devname, s32 flag) +s32 sceIoSync(vm::cptr devname, s32 flag) { throw __FUNCTION__; } -s32 sceIoOpen(vm::ptr filename, s32 flag, s32 mode) +s32 sceIoOpen(vm::cptr filename, s32 flag, s32 mode) { throw __FUNCTION__; } @@ -952,7 +952,7 @@ s32 sceIoClose(s32 fd) throw __FUNCTION__; } -s32 sceIoIoctl(s32 fd, s32 cmd, vm::ptr argp, u32 arglen, vm::ptr bufp, u32 buflen) +s32 sceIoIoctl(s32 fd, s32 cmd, vm::cptr argp, u32 arglen, vm::ptr bufp, u32 buflen) { throw __FUNCTION__; } @@ -972,7 +972,7 @@ s32 sceIoRead(s32 fd, vm::ptr buf, u32 nbyte) throw __FUNCTION__; } -s32 sceIoWrite(s32 fd, vm::ptr buf, u32 nbyte) +s32 sceIoWrite(s32 fd, vm::cptr buf, u32 nbyte) { throw __FUNCTION__; } @@ -982,12 +982,12 @@ s32 sceIoPread(s32 fd, vm::ptr buf, u32 nbyte, s64 offset) throw __FUNCTION__; } -s32 sceIoPwrite(s32 fd, vm::ptr buf, u32 nbyte, s64 offset) +s32 sceIoPwrite(s32 fd, vm::cptr buf, u32 nbyte, s64 offset) { throw __FUNCTION__; } -s32 sceIoDopen(vm::ptr dirname) +s32 sceIoDopen(vm::cptr dirname) { throw __FUNCTION__; } @@ -1002,12 +1002,12 @@ s32 sceIoDread(s32 fd, vm::ptr buf) throw __FUNCTION__; } -s32 sceIoChstat(vm::ptr name, vm::ptr buf, u32 cbit) +s32 sceIoChstat(vm::cptr name, vm::cptr buf, u32 cbit) { throw __FUNCTION__; } -s32 sceIoGetstat(vm::ptr name, vm::ptr buf) +s32 sceIoGetstat(vm::cptr name, vm::ptr buf) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp b/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp index 476ac2ec67..5c51b5a581 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp @@ -4,7 +4,7 @@ #include "sceMd5.h" -s32 sceMd5Digest(vm::ptr plain, u32 len, vm::ptr digest) +s32 sceMd5Digest(vm::cptr plain, u32 len, vm::ptr digest) { throw __FUNCTION__; } @@ -14,7 +14,7 @@ s32 sceMd5BlockInit(vm::ptr pContext) throw __FUNCTION__; } -s32 sceMd5BlockUpdate(vm::ptr pContext, vm::ptr plain, u32 len) +s32 sceMd5BlockUpdate(vm::ptr pContext, vm::cptr plain, u32 len) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceNet.cpp b/rpcs3/Emu/ARMv7/Modules/sceNet.cpp index 619eb12eef..f2fcf10fdf 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNet.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNet.cpp @@ -14,7 +14,7 @@ s32 sceNetClearDnsCache(s32 flags) throw __FUNCTION__; } -s32 sceNetDumpCreate(vm::ptr name, s32 len, s32 flags) +s32 sceNetDumpCreate(vm::cptr name, s32 len, s32 flags) { throw __FUNCTION__; } @@ -34,7 +34,7 @@ s32 sceNetDumpAbort(s32 id, s32 flags) throw __FUNCTION__; } -s32 sceNetEpollCreate(vm::ptr name, s32 flags) +s32 sceNetEpollCreate(vm::cptr name, s32 flags) { throw __FUNCTION__; } @@ -69,12 +69,12 @@ vm::ptr sceNetErrnoLoc() throw __FUNCTION__; } -s32 sceNetEtherStrton(vm::ptr str, vm::ptr n) +s32 sceNetEtherStrton(vm::cptr str, vm::ptr n) { throw __FUNCTION__; } -s32 sceNetEtherNtostr(vm::ptr n, vm::ptr str, u32 len) +s32 sceNetEtherNtostr(vm::cptr n, vm::ptr str, u32 len) { throw __FUNCTION__; } @@ -84,12 +84,12 @@ s32 sceNetGetMacAddress(vm::ptr addr, s32 flags) throw __FUNCTION__; } -vm::ptr sceNetInetNtop(s32 af, vm::ptr src, vm::ptr dst, SceNetSocklen_t size) +vm::cptr sceNetInetNtop(s32 af, vm::cptr src, vm::ptr dst, SceNetSocklen_t size) { throw __FUNCTION__; } -s32 sceNetInetPton(s32 af, vm::ptr src, vm::ptr dst) +s32 sceNetInetPton(s32 af, vm::cptr src, vm::ptr dst) { throw __FUNCTION__; } @@ -159,17 +159,17 @@ s32 sceNetEmulationGet(vm::ptr param, s32 flags) throw __FUNCTION__; } -s32 sceNetResolverCreate(vm::ptr name, vm::ptr param, s32 flags) +s32 sceNetResolverCreate(vm::cptr name, vm::ptr param, s32 flags) { throw __FUNCTION__; } -s32 sceNetResolverStartNtoa(s32 rid, vm::ptr hostname, vm::ptr addr, s32 timeout, s32 retry, s32 flags) +s32 sceNetResolverStartNtoa(s32 rid, vm::cptr hostname, vm::ptr addr, s32 timeout, s32 retry, s32 flags) { throw __FUNCTION__; } -s32 sceNetResolverStartAton(s32 rid, vm::ptr addr, vm::ptr hostname, s32 len, s32 timeout, s32 retry, s32 flags) +s32 sceNetResolverStartAton(s32 rid, vm::cptr addr, vm::ptr hostname, s32 len, s32 timeout, s32 retry, s32 flags) { throw __FUNCTION__; } @@ -189,7 +189,7 @@ s32 sceNetResolverAbort(s32 rid, s32 flags) throw __FUNCTION__; } -s32 sceNetSocket(vm::ptr name, s32 domain, s32 type, s32 protocol) +s32 sceNetSocket(vm::cptr name, s32 domain, s32 type, s32 protocol) { throw __FUNCTION__; } @@ -199,12 +199,12 @@ s32 sceNetAccept(s32 s, vm::ptr addr, vm::ptr a throw __FUNCTION__; } -s32 sceNetBind(s32 s, vm::ptr addr, SceNetSocklen_t addrlen) +s32 sceNetBind(s32 s, vm::cptr addr, SceNetSocklen_t addrlen) { throw __FUNCTION__; } -s32 sceNetConnect(s32 s, vm::ptr name, SceNetSocklen_t namelen) +s32 sceNetConnect(s32 s, vm::cptr name, SceNetSocklen_t namelen) { throw __FUNCTION__; } @@ -244,22 +244,22 @@ s32 sceNetRecvmsg(s32 s, vm::ptr msg, s32 flags) throw __FUNCTION__; } -s32 sceNetSend(s32 s, vm::ptr msg, u32 len, s32 flags) +s32 sceNetSend(s32 s, vm::cptr msg, u32 len, s32 flags) { throw __FUNCTION__; } -s32 sceNetSendto(s32 s, vm::ptr msg, u32 len, s32 flags, vm::ptr to, SceNetSocklen_t tolen) +s32 sceNetSendto(s32 s, vm::cptr msg, u32 len, s32 flags, vm::cptr to, SceNetSocklen_t tolen) { throw __FUNCTION__; } -s32 sceNetSendmsg(s32 s, vm::ptr msg, s32 flags) +s32 sceNetSendmsg(s32 s, vm::cptr msg, s32 flags) { throw __FUNCTION__; } -s32 sceNetSetsockopt(s32 s, s32 level, s32 optname, vm::ptr optval, SceNetSocklen_t optlen) +s32 sceNetSetsockopt(s32 s, s32 level, s32 optname, vm::cptr optval, SceNetSocklen_t optlen) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp b/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp index 8abeacf645..d4014057e1 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp @@ -4,12 +4,12 @@ #include "sceNgs.h" -s32 sceNgsSystemGetRequiredMemorySize(vm::ptr pSynthParams, vm::ptr pnSize) +s32 sceNgsSystemGetRequiredMemorySize(vm::cptr pSynthParams, vm::ptr pnSize) { throw __FUNCTION__; } -s32 sceNgsSystemInit(vm::ptr pSynthSysMemory, const u32 uMemSize, vm::ptr pSynthParams, vm::ptr pSystemHandle) +s32 sceNgsSystemInit(vm::ptr pSynthSysMemory, const u32 uMemSize, vm::cptr pSynthParams, vm::ptr pSystemHandle) { throw __FUNCTION__; } @@ -44,12 +44,12 @@ s32 sceNgsSystemSetFlags(SceNgsHSynSystem hSystemHandle, const u32 uSystemFlags) throw __FUNCTION__; } -s32 sceNgsRackGetRequiredMemorySize(SceNgsHSynSystem hSystemHandle, vm::ptr pRackDesc, vm::ptr pnSize) +s32 sceNgsRackGetRequiredMemorySize(SceNgsHSynSystem hSystemHandle, vm::cptr pRackDesc, vm::ptr pnSize) { throw __FUNCTION__; } -s32 sceNgsRackInit(SceNgsHSynSystem hSystemHandle, vm::ptr pRackBuffer, vm::ptr pRackDesc, vm::ptr pRackHandle) +s32 sceNgsRackInit(SceNgsHSynSystem hSystemHandle, vm::ptr pRackBuffer, vm::cptr pRackDesc, vm::ptr pRackHandle) { throw __FUNCTION__; } @@ -69,7 +69,7 @@ s32 sceNgsRackSetParamErrorCallback(SceNgsHRack hRackHandle, vm::ptr pPreset, const u32 uInitFlags) +s32 sceNgsVoiceInit(SceNgsHVoice hVoiceHandle, vm::cptr pPreset, const u32 uInitFlags) { throw __FUNCTION__; } @@ -99,7 +99,7 @@ s32 sceNgsVoiceResume(SceNgsHVoice hVoiceHandle) throw __FUNCTION__; } -s32 sceNgsVoiceSetPreset(SceNgsHVoice hVoiceHandle, vm::ptr pVoicePreset) +s32 sceNgsVoiceSetPreset(SceNgsHVoice hVoiceHandle, vm::cptr pVoicePreset) { throw __FUNCTION__; } @@ -114,7 +114,7 @@ s32 sceNgsVoiceUnlockParams(SceNgsHVoice hVoiceHandle, const u32 uModule) throw __FUNCTION__; } -s32 sceNgsVoiceSetParamsBlock(SceNgsHVoice hVoiceHandle, vm::ptr pParamData, const u32 uSize, vm::ptr pnErrorCount) +s32 sceNgsVoiceSetParamsBlock(SceNgsHVoice hVoiceHandle, vm::cptr pParamData, const u32 uSize, vm::ptr pnErrorCount) { throw __FUNCTION__; } @@ -159,7 +159,7 @@ s32 sceNgsVoiceGetParamsOutOfRange(SceNgsHVoice hVoiceHandle, const u32 uModule, throw __FUNCTION__; } -s32 sceNgsPatchCreateRouting(vm::ptr pPatchInfo, vm::ptr pPatchHandle) +s32 sceNgsPatchCreateRouting(vm::cptr pPatchInfo, vm::ptr pPatchHandle) { throw __FUNCTION__; } @@ -184,12 +184,12 @@ s32 sceNgsVoicePatchSetVolume(SceNgsHPatch hPatchHandle, const s32 nOutputChanne throw __FUNCTION__; } -s32 sceNgsVoicePatchSetVolumes(SceNgsHPatch hPatchHandle, const s32 nOutputChannel, vm::ptr pVolumes, const s32 nVols) +s32 sceNgsVoicePatchSetVolumes(SceNgsHPatch hPatchHandle, const s32 nOutputChannel, vm::cptr pVolumes, const s32 nVols) { throw __FUNCTION__; } -s32 sceNgsVoicePatchSetVolumesMatrix(SceNgsHPatch hPatchHandle, vm::ptr pMatrix) +s32 sceNgsVoicePatchSetVolumesMatrix(SceNgsHPatch hPatchHandle, vm::cptr pMatrix) { throw __FUNCTION__; } @@ -204,72 +204,72 @@ s32 sceNgsModuleGetPreset(SceNgsHSynSystem hSystemHandle, const u32 uModuleID, c throw __FUNCTION__; } -vm::ptr sceNgsVoiceDefGetCompressorBuss() +vm::cptr sceNgsVoiceDefGetCompressorBuss() { throw __FUNCTION__; } -vm::ptr sceNgsVoiceDefGetCompressorSideChainBuss() +vm::cptr sceNgsVoiceDefGetCompressorSideChainBuss() { throw __FUNCTION__; } -vm::ptr sceNgsVoiceDefGetDelayBuss() +vm::cptr sceNgsVoiceDefGetDelayBuss() { throw __FUNCTION__; } -vm::ptr sceNgsVoiceDefGetDistortionBuss() +vm::cptr sceNgsVoiceDefGetDistortionBuss() { throw __FUNCTION__; } -vm::ptr sceNgsVoiceDefGetEnvelopeBuss() +vm::cptr sceNgsVoiceDefGetEnvelopeBuss() { throw __FUNCTION__; } -vm::ptr sceNgsVoiceDefGetEqBuss() +vm::cptr sceNgsVoiceDefGetEqBuss() { throw __FUNCTION__; } -vm::ptr sceNgsVoiceDefGetMasterBuss() +vm::cptr sceNgsVoiceDefGetMasterBuss() { throw __FUNCTION__; } -vm::ptr sceNgsVoiceDefGetMixerBuss() +vm::cptr sceNgsVoiceDefGetMixerBuss() { throw __FUNCTION__; } -vm::ptr sceNgsVoiceDefGetPauserBuss() +vm::cptr sceNgsVoiceDefGetPauserBuss() { throw __FUNCTION__; } -vm::ptr sceNgsVoiceDefGetReverbBuss() +vm::cptr sceNgsVoiceDefGetReverbBuss() { throw __FUNCTION__; } -vm::ptr sceNgsVoiceDefGetSasEmuVoice() +vm::cptr sceNgsVoiceDefGetSasEmuVoice() { throw __FUNCTION__; } -vm::ptr sceNgsVoiceDefGetSimpleVoice() +vm::cptr sceNgsVoiceDefGetSimpleVoice() { throw __FUNCTION__; } -vm::ptr sceNgsVoiceDefGetTemplate1() +vm::cptr sceNgsVoiceDefGetTemplate1() { throw __FUNCTION__; } -vm::ptr sceNgsVoiceDefGetAtrac9Voice() +vm::cptr sceNgsVoiceDefGetAtrac9Voice() { throw __FUNCTION__; } @@ -279,12 +279,12 @@ s32 sceSulphaNgsGetDefaultConfig(vm::ptr config) throw __FUNCTION__; } -s32 sceSulphaNgsGetNeededMemory(vm::ptr config, vm::ptr sizeInBytes) +s32 sceSulphaNgsGetNeededMemory(vm::cptr config, vm::ptr sizeInBytes) { throw __FUNCTION__; } -s32 sceSulphaNgsInit(vm::ptr config, vm::ptr buffer, u32 sizeInBytes) +s32 sceSulphaNgsInit(vm::cptr config, vm::ptr buffer, u32 sizeInBytes) { throw __FUNCTION__; } @@ -294,27 +294,27 @@ s32 sceSulphaNgsShutdown() throw __FUNCTION__; } -s32 sceSulphaNgsSetSynthName(SceNgsHSynSystem synthHandle, vm::ptr name) +s32 sceSulphaNgsSetSynthName(SceNgsHSynSystem synthHandle, vm::cptr name) { throw __FUNCTION__; } -s32 sceSulphaNgsSetRackName(SceNgsHRack rackHandle, vm::ptr name) +s32 sceSulphaNgsSetRackName(SceNgsHRack rackHandle, vm::cptr name) { throw __FUNCTION__; } -s32 sceSulphaNgsSetVoiceName(SceNgsHVoice voiceHandle, vm::ptr name) +s32 sceSulphaNgsSetVoiceName(SceNgsHVoice voiceHandle, vm::cptr name) { throw __FUNCTION__; } -s32 sceSulphaNgsSetSampleName(vm::ptr location, u32 length, vm::ptr name) +s32 sceSulphaNgsSetSampleName(vm::cptr location, u32 length, vm::cptr name) { throw __FUNCTION__; } -s32 sceSulphaNgsTrace(vm::ptr message) +s32 sceSulphaNgsTrace(vm::cptr message) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceNgs.h b/rpcs3/Emu/ARMv7/Modules/sceNgs.h index 720085cb46..c9955aa814 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNgs.h +++ b/rpcs3/Emu/ARMv7/Modules/sceNgs.h @@ -46,7 +46,7 @@ struct SceNgsSystemInitParams struct SceNgsRackDescription { - vm::lptr pVoiceDefn; + vm::lcptr pVoiceDefn; le_t nVoices; le_t nChannelsPerVoice; le_t nMaxPatchesPerInput; diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp index 381a2e71f3..1cb1328049 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp @@ -14,7 +14,7 @@ s32 sceNpBasicTerm(ARMv7Context&) throw __FUNCTION__; } -s32 sceNpBasicRegisterHandler(vm::ptr handlers, vm::ptr context, vm::ptr userdata) +s32 sceNpBasicRegisterHandler(vm::cptr handlers, vm::cptr context, vm::ptr userdata) { throw __FUNCTION__; } @@ -29,12 +29,12 @@ s32 sceNpBasicCheckCallback() throw __FUNCTION__; } -s32 sceNpBasicGetFriendOnlineStatus(vm::ptr friendId, vm::ptr status) +s32 sceNpBasicGetFriendOnlineStatus(vm::cptr friendId, vm::ptr status) { throw __FUNCTION__; } -s32 sceNpBasicGetGamePresenceOfFriend(vm::ptr friendId, vm::ptr presence) +s32 sceNpBasicGetGamePresenceOfFriend(vm::cptr friendId, vm::ptr presence) { throw __FUNCTION__; } @@ -59,12 +59,12 @@ s32 sceNpBasicGetBlockListEntries(u32 startIndex, vm::ptr entries, u32 throw __FUNCTION__; } -s32 sceNpBasicCheckIfPlayerIsBlocked(vm::ptr player, vm::ptr playerIsBlocked) +s32 sceNpBasicCheckIfPlayerIsBlocked(vm::cptr player, vm::ptr playerIsBlocked) { throw __FUNCTION__; } -s32 sceNpBasicSetInGamePresence(vm::ptr presence) +s32 sceNpBasicSetInGamePresence(vm::cptr presence) { throw __FUNCTION__; } @@ -74,12 +74,12 @@ s32 sceNpBasicUnsetInGamePresence() throw __FUNCTION__; } -s32 sceNpBasicSendInGameDataMessage(vm::ptr to, vm::ptr message) +s32 sceNpBasicSendInGameDataMessage(vm::cptr to, vm::cptr message) { throw __FUNCTION__; } -s32 sceNpBasicRecordPlaySessionLog(vm::ptr withWhom, vm::ptr description) +s32 sceNpBasicRecordPlaySessionLog(vm::cptr withWhom, vm::cptr description) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp index cfae8ae437..c3c0840178 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp @@ -14,7 +14,7 @@ s32 sceNpAuthTerm() throw __FUNCTION__; } -s32 sceNpAuthCreateStartRequest(vm::ptr param) +s32 sceNpAuthCreateStartRequest(vm::cptr param) { throw __FUNCTION__; } @@ -34,27 +34,27 @@ s32 sceNpAuthGetTicket(s32 id, vm::ptr buf, u32 len) throw __FUNCTION__; } -s32 sceNpAuthGetTicketParam(vm::ptr ticket, u32 ticketSize, s32 paramId, vm::ptr param) +s32 sceNpAuthGetTicketParam(vm::cptr ticket, u32 ticketSize, s32 paramId, vm::ptr param) { throw __FUNCTION__; } -s32 sceNpAuthGetEntitlementIdList(vm::ptr ticket, u32 ticketSize, vm::ptr entIdList, u32 entIdListNum) +s32 sceNpAuthGetEntitlementIdList(vm::cptr ticket, u32 ticketSize, vm::ptr entIdList, u32 entIdListNum) { throw __FUNCTION__; } -s32 sceNpAuthGetEntitlementById(vm::ptr ticket, u32 ticketSize, vm::ptr entId, vm::ptr ent) +s32 sceNpAuthGetEntitlementById(vm::cptr ticket, u32 ticketSize, vm::cptr entId, vm::ptr ent) { throw __FUNCTION__; } -s32 sceNpCmpNpId(vm::ptr npid1, vm::ptr npid2) +s32 sceNpCmpNpId(vm::cptr npid1, vm::cptr npid2) { throw __FUNCTION__; } -s32 sceNpCmpNpIdInOrder(vm::ptr npid1, vm::ptr npid2, vm::ptr order) +s32 sceNpCmpNpIdInOrder(vm::cptr npid1, vm::cptr npid2, vm::ptr order) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h index ddc685a6d5..56e2a65252 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h +++ b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h @@ -28,9 +28,9 @@ struct SceNpCommunicationSignature struct SceNpCommunicationConfig { - vm::lptr commId; - vm::lptr commPassphrase; - vm::lptr commSignature; + vm::lcptr commId; + vm::lcptr commPassphrase; + vm::lcptr commSignature; }; struct SceNpCountryCode @@ -123,10 +123,10 @@ struct SceNpAuthRequestParameter { le_t size; SceNpTicketVersion version; - vm::lptr serviceId; - vm::lptr cookie; + vm::lcptr serviceId; + vm::lcptr cookie; le_t cookieSize; - vm::lptr entitlementId; + vm::lcptr entitlementId; le_t consumedCount; vm::lptr ticketCb; vm::lptr cbArg; diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp index 04a30b894b..e06ac49b47 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp @@ -4,7 +4,7 @@ #include "sceNpManager.h" -s32 sceNpInit(vm::ptr commConf, vm::ptr opt) +s32 sceNpInit(vm::cptr commConf, vm::ptr opt) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp index 502a2b16ee..c285e2b4b1 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp @@ -17,9 +17,9 @@ s32 sceNpMatching2Term() } s32 sceNpMatching2CreateContext( - vm::ptr npId, - vm::ptr commId, - vm::ptr passPhrase, + vm::cptr npId, + vm::cptr commId, + vm::cptr passPhrase, vm::ptr ctxId) { throw __FUNCTION__; @@ -45,7 +45,7 @@ s32 sceNpMatching2ContextStop(u16 ctxId) throw __FUNCTION__; } -s32 sceNpMatching2SetDefaultRequestOptParam(u16 ctxId, vm::ptr optParam) +s32 sceNpMatching2SetDefaultRequestOptParam(u16 ctxId, vm::cptr optParam) { throw __FUNCTION__; } @@ -87,8 +87,8 @@ s32 sceNpMatching2GetServerLocal(u16 ctxId, vm::ptr server s32 sceNpMatching2GetWorldInfoList( u16 ctxId, - vm::ptr reqParam, - vm::ptr optParam, + vm::cptr reqParam, + vm::cptr optParam, vm::ptr assignedReqId) { throw __FUNCTION__; @@ -96,8 +96,8 @@ s32 sceNpMatching2GetWorldInfoList( s32 sceNpMatching2CreateJoinRoom( u16 ctxId, - vm::ptr reqParam, - vm::ptr optParam, + vm::cptr reqParam, + vm::cptr optParam, vm::ptr assignedReqId) { throw __FUNCTION__; @@ -105,8 +105,8 @@ s32 sceNpMatching2CreateJoinRoom( s32 sceNpMatching2SearchRoom( u16 ctxId, - vm::ptr reqParam, - vm::ptr optParam, + vm::cptr reqParam, + vm::cptr optParam, vm::ptr assignedReqId) { throw __FUNCTION__; @@ -114,8 +114,8 @@ s32 sceNpMatching2SearchRoom( s32 sceNpMatching2JoinRoom( u16 ctxId, - vm::ptr reqParam, - vm::ptr optParam, + vm::cptr reqParam, + vm::cptr optParam, vm::ptr assignedReqId) { throw __FUNCTION__; @@ -123,8 +123,8 @@ s32 sceNpMatching2JoinRoom( s32 sceNpMatching2LeaveRoom( u16 ctxId, - vm::ptr reqParam, - vm::ptr optParam, + vm::cptr reqParam, + vm::cptr optParam, vm::ptr assignedReqId) { throw __FUNCTION__; @@ -140,8 +140,8 @@ s32 sceNpMatching2GetSignalingOptParamLocal( s32 sceNpMatching2SetRoomDataExternal( u16 ctxId, - vm::ptr reqParam, - vm::ptr optParam, + vm::cptr reqParam, + vm::cptr optParam, vm::ptr assignedReqId) { throw __FUNCTION__; @@ -149,8 +149,8 @@ s32 sceNpMatching2SetRoomDataExternal( s32 sceNpMatching2KickoutRoomMember( u16 ctxId, - vm::ptr reqParam, - vm::ptr optParam, + vm::cptr reqParam, + vm::cptr optParam, vm::ptr assignedReqId) { throw __FUNCTION__; @@ -158,8 +158,8 @@ s32 sceNpMatching2KickoutRoomMember( s32 sceNpMatching2SendRoomChatMessage( u16 ctxId, - vm::ptr reqParam, - vm::ptr optParam, + vm::cptr reqParam, + vm::cptr optParam, vm::ptr assignedReqId) { throw __FUNCTION__; @@ -167,8 +167,8 @@ s32 sceNpMatching2SendRoomChatMessage( s32 sceNpMatching2SendRoomMessage( u16 ctxId, - vm::ptr reqParam, - vm::ptr optParam, + vm::cptr reqParam, + vm::cptr optParam, vm::ptr assignedReqId) { throw __FUNCTION__; diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.h b/rpcs3/Emu/ARMv7/Modules/sceNpMatching.h index a27b259903..75b2053649 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.h +++ b/rpcs3/Emu/ARMv7/Modules/sceNpMatching.h @@ -472,7 +472,7 @@ struct SceNpMatching2GetRoomDataExternalListRequest { vm::lptr roomId; le_t roomIdNum; - vm::lptr attrId; + vm::lcptr attrId; le_t attrIdNum; }; @@ -629,7 +629,7 @@ struct SceNpMatching2SendRoomChatMessageRequest u8 castType; u8 padding[3]; SceNpMatching2RoomMessageDestination dst; - vm::lptr msg; + vm::lcptr msg; le_t msgLen; le_t option; }; diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp index 2154831edb..0a708ac9aa 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp @@ -14,7 +14,7 @@ s32 sceNpScoreTerm(ARMv7Context&) throw __FUNCTION__; } -s32 sceNpScoreCreateTitleCtx(vm::ptr titleId, vm::ptr passphrase, vm::ptr selfNpId) +s32 sceNpScoreCreateTitleCtx(vm::cptr titleId, vm::cptr passphrase, vm::cptr selfNpId) { throw __FUNCTION__; } @@ -58,10 +58,10 @@ s32 sceNpScoreRecordScore( s32 reqId, u32 boardId, s64 score, - vm::ptr scoreComment, - vm::ptr gameInfo, + vm::cptr scoreComment, + vm::cptr gameInfo, vm::ptr tmpRank, - vm::ptr compareDate, + vm::cptr compareDate, vm::ptr option) { throw __FUNCTION__; @@ -73,7 +73,7 @@ s32 sceNpScoreRecordGameData( s64 score, u32 totalSize, u32 sendSize, - vm::ptr data, + vm::cptr data, vm::ptr option) { throw __FUNCTION__; @@ -82,7 +82,7 @@ s32 sceNpScoreRecordGameData( s32 sceNpScoreGetGameData( s32 reqId, u32 boardId, - vm::ptr npId, + vm::cptr npId, vm::ptr totalSize, u32 recvSize, vm::ptr data, @@ -94,7 +94,7 @@ s32 sceNpScoreGetGameData( s32 sceNpScoreGetRankingByNpId( s32 reqId, u32 boardId, - vm::ptr npIdArray, + vm::cptr npIdArray, u32 npIdArraySize, vm::ptr rankArray, u32 rankArraySize, @@ -132,7 +132,7 @@ s32 sceNpScoreGetRankingByRange( s32 sceNpScoreGetRankingByNpIdPcId( s32 reqId, u32 boardId, - vm::ptr idArray, + vm::cptr idArray, u32 idArraySize, vm::ptr rankArray, u32 rankArraySize, @@ -148,12 +148,12 @@ s32 sceNpScoreGetRankingByNpIdPcId( throw __FUNCTION__; } -s32 sceNpScoreCensorComment(s32 reqId, vm::ptr comment, vm::ptr option) +s32 sceNpScoreCensorComment(s32 reqId, vm::cptr comment, vm::ptr option) { throw __FUNCTION__; } -s32 sceNpScoreSanitizeComment(s32 reqId, vm::ptr comment, vm::ptr sanitizedComment, vm::ptr option) +s32 sceNpScoreSanitizeComment(s32 reqId, vm::cptr comment, vm::ptr sanitizedComment, vm::ptr option) { throw __FUNCTION__; } @@ -177,10 +177,10 @@ s32 sceNpScoreRecordScoreAsync( s32 reqId, u32 boardId, s64 score, - vm::ptr scoreComment, - vm::ptr gameInfo, + vm::cptr scoreComment, + vm::cptr gameInfo, vm::ptr tmpRank, - vm::ptr compareDate, + vm::cptr compareDate, vm::ptr option) { throw __FUNCTION__; @@ -192,7 +192,7 @@ s32 sceNpScoreRecordGameDataAsync( s64 score, u32 totalSize, u32 sendSize, - vm::ptr data, + vm::cptr data, vm::ptr option) { throw __FUNCTION__; @@ -201,7 +201,7 @@ s32 sceNpScoreRecordGameDataAsync( s32 sceNpScoreGetGameDataAsync( s32 reqId, u32 boardId, - vm::ptr npId, + vm::cptr npId, vm::ptr totalSize, u32 recvSize, vm::ptr data, @@ -213,7 +213,7 @@ s32 sceNpScoreGetGameDataAsync( s32 sceNpScoreGetRankingByNpIdAsync( s32 reqId, u32 boardId, - vm::ptr npIdArray, + vm::cptr npIdArray, u32 npIdArraySize, vm::ptr rankArray, u32 rankArraySize, @@ -250,7 +250,7 @@ s32 sceNpScoreGetRankingByRangeAsync( s32 sceNpScoreGetRankingByNpIdPcIdAsync( s32 reqId, u32 boardId, - vm::ptr idArray, + vm::cptr idArray, u32 idArraySize, vm::ptr rankArray, u32 rankArraySize, @@ -266,12 +266,12 @@ s32 sceNpScoreGetRankingByNpIdPcIdAsync( throw __FUNCTION__; } -s32 sceNpScoreCensorCommentAsync(s32 reqId, vm::ptr comment, vm::ptr option) +s32 sceNpScoreCensorCommentAsync(s32 reqId, vm::cptr comment, vm::ptr option) { throw __FUNCTION__; } -s32 sceNpScoreSanitizeCommentAsync(s32 reqId, vm::ptr comment, vm::ptr sanitizedComment, vm::ptr option) +s32 sceNpScoreSanitizeCommentAsync(s32 reqId, vm::cptr comment, vm::ptr sanitizedComment, vm::ptr option) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp index a4ad08746a..fb1c159a1c 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp @@ -14,7 +14,7 @@ s32 sceNpLookupTerm(ARMv7Context&) throw __FUNCTION__; } -s32 sceNpLookupCreateTitleCtx(vm::ptr titleId, vm::ptr selfNpId) +s32 sceNpLookupCreateTitleCtx(vm::cptr titleId, vm::cptr selfNpId) { throw __FUNCTION__; } @@ -54,12 +54,12 @@ s32 sceNpLookupPollAsync(s32 reqId, vm::ptr result) throw __FUNCTION__; } -s32 sceNpLookupNpId(s32 reqId, vm::ptr onlineId, vm::ptr npId, vm::ptr option) +s32 sceNpLookupNpId(s32 reqId, vm::cptr onlineId, vm::ptr npId, vm::ptr option) { throw __FUNCTION__; } -s32 sceNpLookupNpIdAsync(s32 reqId, vm::ptr onlineId, vm::ptr npId, vm::ptr option) +s32 sceNpLookupNpIdAsync(s32 reqId, vm::cptr onlineId, vm::ptr npId, vm::ptr option) { throw __FUNCTION__; } @@ -67,7 +67,7 @@ s32 sceNpLookupNpIdAsync(s32 reqId, vm::ptr onlineId, vm::p s32 sceNpLookupUserProfile( s32 reqId, s32 avatarSizeType, - vm::ptr npId, + vm::cptr npId, vm::ptr userInfo, vm::ptr aboutMe, vm::ptr languages, @@ -83,7 +83,7 @@ s32 sceNpLookupUserProfile( s32 sceNpLookupUserProfileAsync( s32 reqId, s32 avatarSizeType, - vm::ptr npId, + vm::cptr npId, vm::ptr userInfo, vm::ptr aboutMe, vm::ptr languages, @@ -96,12 +96,12 @@ s32 sceNpLookupUserProfileAsync( throw __FUNCTION__; } -s32 sceNpLookupAvatarImage(s32 reqId, vm::ptr avatarUrl, vm::ptr avatarImage, vm::ptr option) +s32 sceNpLookupAvatarImage(s32 reqId, vm::cptr avatarUrl, vm::ptr avatarImage, vm::ptr option) { throw __FUNCTION__; } -s32 sceNpLookupAvatarImageAsync(s32 reqId, vm::ptr avatarUrl, vm::ptr avatarImage, vm::ptr option) +s32 sceNpLookupAvatarImageAsync(s32 reqId, vm::cptr avatarUrl, vm::ptr avatarImage, vm::ptr option) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp b/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp index 7c432a7101..1027f5f616 100644 --- a/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp +++ b/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp @@ -5,9 +5,9 @@ #include "scePhotoExport.h" s32 scePhotoExportFromData( - vm::ptr photodata, + vm::cptr photodata, s32 photodataSize, - vm::ptr param, + vm::cptr param, vm::ptr workMemory, vm::ptr cancelFunc, vm::ptr userdata, @@ -18,8 +18,8 @@ s32 scePhotoExportFromData( } s32 scePhotoExportFromFile( - vm::ptr photodataPath, - vm::ptr param, + vm::cptr photodataPath, + vm::cptr param, vm::ptr workMemory, vm::ptr cancelFunc, vm::ptr userdata, diff --git a/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp b/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp index 1235065b71..51145d0101 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp @@ -4,12 +4,12 @@ #include "sceRazorCapture.h" -void sceRazorCaptureSetTrigger(u32 frameIndex, vm::ptr captureFilename) +void sceRazorCaptureSetTrigger(u32 frameIndex, vm::cptr captureFilename) { throw __FUNCTION__; } -void sceRazorCaptureSetTriggerNextFrame(vm::ptr captureFilename) +void sceRazorCaptureSetTriggerNextFrame(vm::cptr captureFilename) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp b/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp index 8851e2573b..7ed5aac4cd 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp @@ -29,12 +29,12 @@ s32 sceRtcGetCurrentNetworkTick(vm::ptr pTick) throw __FUNCTION__; } -s32 sceRtcConvertUtcToLocalTime(vm::ptr pUtc, vm::ptr pLocalTime) +s32 sceRtcConvertUtcToLocalTime(vm::cptr pUtc, vm::ptr pLocalTime) { throw __FUNCTION__; } -s32 sceRtcConvertLocalTimeToUtc(vm::ptr pLocalTime, vm::ptr pUtc) +s32 sceRtcConvertLocalTimeToUtc(vm::cptr pLocalTime, vm::ptr pUtc) { throw __FUNCTION__; } @@ -54,7 +54,7 @@ s32 sceRtcGetDayOfWeek(s32 year, s32 month, s32 day) throw __FUNCTION__; } -s32 sceRtcCheckValid(vm::ptr pTime) +s32 sceRtcCheckValid(vm::cptr pTime) { throw __FUNCTION__; } @@ -69,12 +69,12 @@ s32 sceRtcSetTime64_t(vm::ptr pTime, u64 ullTime) throw __FUNCTION__; } -s32 sceRtcGetTime_t(vm::ptr pTime, vm::ptr piTime) +s32 sceRtcGetTime_t(vm::cptr pTime, vm::ptr piTime) { throw __FUNCTION__; } -s32 sceRtcGetTime64_t(vm::ptr pTime, vm::ptr pullTime) +s32 sceRtcGetTime64_t(vm::cptr pTime, vm::ptr pullTime) { throw __FUNCTION__; } @@ -84,7 +84,7 @@ s32 sceRtcSetDosTime(vm::ptr pTime, u32 uiDosTime) throw __FUNCTION__; } -s32 sceRtcGetDosTime(vm::ptr pTime, vm::ptr puiDosTime) +s32 sceRtcGetDosTime(vm::cptr pTime, vm::ptr puiDosTime) { throw __FUNCTION__; } @@ -94,97 +94,97 @@ s32 sceRtcSetWin32FileTime(vm::ptr pTime, u64 ulWin32Time) throw __FUNCTION__; } -s32 sceRtcGetWin32FileTime(vm::ptr pTime, vm::ptr ulWin32Time) +s32 sceRtcGetWin32FileTime(vm::cptr pTime, vm::ptr ulWin32Time) { throw __FUNCTION__; } -s32 sceRtcSetTick(vm::ptr pTime, vm::ptr pTick) +s32 sceRtcSetTick(vm::ptr pTime, vm::cptr pTick) { throw __FUNCTION__; } -s32 sceRtcGetTick(vm::ptr pTime, vm::ptr pTick) +s32 sceRtcGetTick(vm::cptr pTime, vm::ptr pTick) { throw __FUNCTION__; } -s32 sceRtcCompareTick(vm::ptr pTick1, vm::ptr pTick2) +s32 sceRtcCompareTick(vm::cptr pTick1, vm::cptr pTick2) { throw __FUNCTION__; } -s32 sceRtcTickAddTicks(vm::ptr pTick0, vm::ptr pTick1, u64 lAdd) +s32 sceRtcTickAddTicks(vm::ptr pTick0, vm::cptr pTick1, u64 lAdd) { throw __FUNCTION__; } -s32 sceRtcTickAddMicroseconds(vm::ptr pTick0, vm::ptr pTick1, u64 lAdd) +s32 sceRtcTickAddMicroseconds(vm::ptr pTick0, vm::cptr pTick1, u64 lAdd) { throw __FUNCTION__; } -s32 sceRtcTickAddSeconds(vm::ptr pTick0, vm::ptr pTick1, u64 lAdd) +s32 sceRtcTickAddSeconds(vm::ptr pTick0, vm::cptr pTick1, u64 lAdd) { throw __FUNCTION__; } -s32 sceRtcTickAddMinutes(vm::ptr pTick0, vm::ptr pTick1, u64 lAdd) +s32 sceRtcTickAddMinutes(vm::ptr pTick0, vm::cptr pTick1, u64 lAdd) { throw __FUNCTION__; } -s32 sceRtcTickAddHours(vm::ptr pTick0, vm::ptr pTick1, s32 lAdd) +s32 sceRtcTickAddHours(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { throw __FUNCTION__; } -s32 sceRtcTickAddDays(vm::ptr pTick0, vm::ptr pTick1, s32 lAdd) +s32 sceRtcTickAddDays(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { throw __FUNCTION__; } -s32 sceRtcTickAddWeeks(vm::ptr pTick0, vm::ptr pTick1, s32 lAdd) +s32 sceRtcTickAddWeeks(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { throw __FUNCTION__; } -s32 sceRtcTickAddMonths(vm::ptr pTick0, vm::ptr pTick1, s32 lAdd) +s32 sceRtcTickAddMonths(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { throw __FUNCTION__; } -s32 sceRtcTickAddYears(vm::ptr pTick0, vm::ptr pTick1, s32 lAdd) +s32 sceRtcTickAddYears(vm::ptr pTick0, vm::cptr pTick1, s32 lAdd) { throw __FUNCTION__; } -s32 sceRtcFormatRFC2822(vm::ptr pszDateTime, vm::ptr pUtc, s32 iTimeZoneMinutes) +s32 sceRtcFormatRFC2822(vm::ptr pszDateTime, vm::cptr pUtc, s32 iTimeZoneMinutes) { throw __FUNCTION__; } -s32 sceRtcFormatRFC2822LocalTime(vm::ptr pszDateTime, vm::ptr pUtc) +s32 sceRtcFormatRFC2822LocalTime(vm::ptr pszDateTime, vm::cptr pUtc) { throw __FUNCTION__; } -s32 sceRtcFormatRFC3339(vm::ptr pszDateTime, vm::ptr pUtc, s32 iTimeZoneMinutes) +s32 sceRtcFormatRFC3339(vm::ptr pszDateTime, vm::cptr pUtc, s32 iTimeZoneMinutes) { throw __FUNCTION__; } -s32 sceRtcFormatRFC3339LocalTime(vm::ptr pszDateTime, vm::ptr pUtc) +s32 sceRtcFormatRFC3339LocalTime(vm::ptr pszDateTime, vm::cptr pUtc) { throw __FUNCTION__; } -s32 sceRtcParseDateTime(vm::ptr pUtc, vm::ptr pszDateTime) +s32 sceRtcParseDateTime(vm::ptr pUtc, vm::cptr pszDateTime) { throw __FUNCTION__; } -s32 sceRtcParseRFC3339(vm::ptr pUtc, vm::ptr pszDateTime) +s32 sceRtcParseRFC3339(vm::ptr pUtc, vm::cptr pszDateTime) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceSas.cpp b/rpcs3/Emu/ARMv7/Modules/sceSas.cpp index b0753f5aa5..e332cc5cf7 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceSas.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceSas.cpp @@ -4,17 +4,17 @@ #include "sceSas.h" -s32 sceSasGetNeededMemorySize(vm::ptr config, vm::ptr outSize) +s32 sceSasGetNeededMemorySize(vm::cptr config, vm::ptr outSize) { throw __FUNCTION__; } -s32 sceSasInit(vm::ptr config, vm::ptr buffer, u32 bufferSize) +s32 sceSasInit(vm::cptr config, vm::ptr buffer, u32 bufferSize) { throw __FUNCTION__; } -s32 sceSasInitWithGrain(vm::ptr config, u32 grain, vm::ptr buffer, u32 bufferSize) +s32 sceSasInitWithGrain(vm::cptr config, u32 grain, vm::ptr buffer, u32 bufferSize) { throw __FUNCTION__; } @@ -54,12 +54,12 @@ s32 sceSasCoreWithMix(vm::ptr inOut, s32 lvol, s32 rvol) throw __FUNCTION__; } -s32 sceSasSetVoice(s32 iVoiceNum, vm::ptr vagBuf, u32 size, u32 loopflag) +s32 sceSasSetVoice(s32 iVoiceNum, vm::cptr vagBuf, u32 size, u32 loopflag) { throw __FUNCTION__; } -s32 sceSasSetVoicePCM(s32 iVoiceNum, vm::ptr pcmBuf, u32 size, s32 loopsize) +s32 sceSasSetVoicePCM(s32 iVoiceNum, vm::cptr pcmBuf, u32 size, s32 loopsize) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp b/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp index c8e7009fd2..fb5ad71876 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp @@ -4,12 +4,12 @@ #include "sceScreenShot.h" -s32 sceScreenShotSetParam(vm::ptr param) +s32 sceScreenShotSetParam(vm::cptr param) { throw __FUNCTION__; } -s32 sceScreenShotSetOverlayImage(vm::ptr filePath, s32 offsetX, s32 offsetY) +s32 sceScreenShotSetOverlayImage(vm::cptr filePath, s32 offsetX, s32 offsetY) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp b/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp index 43d62b6e05..193b6e4bc3 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp @@ -19,7 +19,7 @@ s32 sceSslGetMemoryPoolStats(vm::ptr currentStat) throw __FUNCTION__; } -s32 sceSslGetSerialNumber(vm::ptr sslCert, vm::pptr sboData, vm::ptr sboLen) +s32 sceSslGetSerialNumber(vm::ptr sslCert, vm::cpptr sboData, vm::ptr sboLen) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp b/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp index 3cc3e43bb3..2f23e1f251 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp @@ -19,12 +19,12 @@ s32 sceSulphaGetDefaultConfig(vm::ptr config) throw __FUNCTION__; } -s32 sceSulphaGetNeededMemory(vm::ptr config, vm::ptr sizeInBytes) +s32 sceSulphaGetNeededMemory(vm::cptr config, vm::ptr sizeInBytes) { throw __FUNCTION__; } -s32 sceSulphaInit(vm::ptr config, vm::ptr buffer, u32 sizeInBytes) +s32 sceSulphaInit(vm::cptr config, vm::ptr buffer, u32 sizeInBytes) { throw __FUNCTION__; } @@ -39,7 +39,7 @@ s32 sceSulphaUpdate() throw __FUNCTION__; } -s32 sceSulphaFileConnect(vm::ptr filename) +s32 sceSulphaFileConnect(vm::cptr filename) { throw __FUNCTION__; } @@ -49,22 +49,22 @@ s32 sceSulphaFileDisconnect() throw __FUNCTION__; } -s32 sceSulphaSetBookmark(vm::ptr name, s32 id) +s32 sceSulphaSetBookmark(vm::cptr name, s32 id) { throw __FUNCTION__; } -s32 sceSulphaAgentsGetNeededMemory(vm::ptr config, vm::ptr sizeInBytes) +s32 sceSulphaAgentsGetNeededMemory(vm::cptr config, vm::ptr sizeInBytes) { throw __FUNCTION__; } -s32 sceSulphaAgentsRegister(vm::ptr config, vm::ptr buffer, u32 sizeInBytes, vm::ptr handles) +s32 sceSulphaAgentsRegister(vm::cptr config, vm::ptr buffer, u32 sizeInBytes, vm::ptr handles) { throw __FUNCTION__; } -s32 sceSulphaAgentsUnregister(vm::ptr handles, u32 agentCount) +s32 sceSulphaAgentsUnregister(vm::cptr handles, u32 agentCount) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp b/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp index b52ff4506c..76ab420216 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp @@ -19,7 +19,7 @@ s32 sceSystemGestureResetPrimitiveTouchRecognizer() throw __FUNCTION__; } -s32 sceSystemGestureUpdatePrimitiveTouchRecognizer(vm::ptr pFrontData, vm::ptr pBackData) +s32 sceSystemGestureUpdatePrimitiveTouchRecognizer(vm::cptr pFrontData, vm::cptr pBackData) { throw __FUNCTION__; } @@ -44,12 +44,12 @@ s32 sceSystemGestureGetPrimitiveTouchEventByPrimitiveID(const u16 primitiveID, v throw __FUNCTION__; } -s32 sceSystemGestureCreateTouchRecognizer(vm::ptr touchRecognizer, const SceSystemGestureType gestureType, const u8 touchPanelPortID, vm::ptr rectangle, vm::ptr touchRecognizerParameter) +s32 sceSystemGestureCreateTouchRecognizer(vm::ptr touchRecognizer, const SceSystemGestureType gestureType, const u8 touchPanelPortID, vm::cptr rectangle, vm::cptr touchRecognizerParameter) { throw __FUNCTION__; } -s32 sceSystemGestureGetTouchRecognizerInformation(vm::ptr touchRecognizer, vm::ptr information) +s32 sceSystemGestureGetTouchRecognizerInformation(vm::cptr touchRecognizer, vm::ptr information) { throw __FUNCTION__; } @@ -64,27 +64,27 @@ s32 sceSystemGestureUpdateTouchRecognizer(vm::ptr touchRecognizer, vm::ptr rectangle) +s32 sceSystemGestureUpdateTouchRecognizerRectangle(vm::ptr touchRecognizer, vm::cptr rectangle) { throw __FUNCTION__; } -s32 sceSystemGestureGetTouchEvents(vm::ptr touchRecognizer, vm::ptr eventBuffer, const u32 capacityOfBuffer, vm::ptr numberOfEvent) +s32 sceSystemGestureGetTouchEvents(vm::cptr touchRecognizer, vm::ptr eventBuffer, const u32 capacityOfBuffer, vm::ptr numberOfEvent) { throw __FUNCTION__; } -s32 sceSystemGestureGetTouchEventsCount(vm::ptr touchRecognizer) +s32 sceSystemGestureGetTouchEventsCount(vm::cptr touchRecognizer) { throw __FUNCTION__; } -s32 sceSystemGestureGetTouchEventByIndex(vm::ptr touchRecognizer, const u32 index, vm::ptr touchEvent) +s32 sceSystemGestureGetTouchEventByIndex(vm::cptr touchRecognizer, const u32 index, vm::ptr touchEvent) { throw __FUNCTION__; } -s32 sceSystemGestureGetTouchEventByEventID(vm::ptr touchRecognizer, const u32 eventID, vm::ptr touchEvent) +s32 sceSystemGestureGetTouchEventByEventID(vm::cptr touchRecognizer, const u32 eventID, vm::ptr touchEvent) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp b/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp index 5a5e76362a..f1d3b29a6b 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp @@ -18,11 +18,11 @@ u32 sceUltWaitingQueueResourcePoolGetWorkAreaSize(u32 numThreads, u32 numSyncObj s32 _sceUltWaitingQueueResourcePoolCreate( vm::ptr pool, - vm::ptr name, + vm::cptr name, u32 numThreads, u32 numSyncObjects, vm::ptr workArea, - vm::ptr optParam, + vm::cptr optParam, u32 buildVersion) { throw __FUNCTION__; @@ -45,13 +45,13 @@ u32 sceUltQueueDataResourcePoolGetWorkAreaSize(u32 numData, u32 dataSize, u32 nu s32 _sceUltQueueDataResourcePoolCreate( vm::ptr pool, - vm::ptr name, + vm::cptr name, u32 numData, u32 dataSize, u32 numQueueObject, vm::ptr waitingQueueResourcePool, vm::ptr workArea, - vm::ptr optParam, + vm::cptr optParam, u32 buildVersion) { throw __FUNCTION__; @@ -74,9 +74,9 @@ s32 _sceUltMutexOptParamInitialize(vm::ptr optParam, u32 bu s32 _sceUltMutexCreate( vm::ptr mutex, - vm::ptr name, + vm::cptr name, vm::ptr waitingQueueResourcePool, - vm::ptr optParam, + vm::cptr optParam, u32 buildVersion) { throw __FUNCTION__; @@ -84,11 +84,11 @@ s32 _sceUltMutexCreate( s32 _sceUltMutexCreateStandalone( vm::ptr mutex, - vm::ptr name, + vm::cptr name, u32 numConditionVariable, u32 maxNumThreads, vm::ptr workArea, - vm::ptr optParam, + vm::cptr optParam, u32 buildVersion) { throw __FUNCTION__; @@ -121,9 +121,9 @@ s32 _sceUltConditionVariableOptParamInitialize(vm::ptr conditionVariable, - vm::ptr name, + vm::cptr name, vm::ptr mutex, - vm::ptr optParam, + vm::cptr optParam, u32 buildVersion) { throw __FUNCTION__; @@ -163,11 +163,11 @@ u32 sceUltQueueGetStandaloneWorkAreaSize(u32 queueDepth, s32 _sceUltQueueCreate( vm::ptr queue, - vm::ptr _name, + vm::cptr _name, u32 dataSize, vm::ptr resourcePool, vm::ptr queueResourcePool, - vm::ptr optParam, + vm::cptr optParam, u32 buildVersion) { throw __FUNCTION__; @@ -175,23 +175,23 @@ s32 _sceUltQueueCreate( s32 _sceUltQueueCreateStandalone( vm::ptr queue, - vm::ptr name, + vm::cptr name, u32 queueDepth, u32 dataSize, u32 waitingQueueLength, vm::ptr workArea, - vm::ptr optParam, + vm::cptr optParam, u32 buildVersion) { throw __FUNCTION__; } -s32 sceUltQueuePush(vm::ptr queue, vm::ptr data) +s32 sceUltQueuePush(vm::ptr queue, vm::cptr data) { throw __FUNCTION__; } -s32 sceUltQueueTryPush(vm::ptr queue, vm::ptr data) +s32 sceUltQueueTryPush(vm::ptr queue, vm::cptr data) { throw __FUNCTION__; } @@ -218,9 +218,9 @@ s32 _sceUltReaderWriterLockOptParamInitialize(vm::ptr rwlock, - vm::ptr name, + vm::cptr name, vm::ptr waitingQueueResourcePool, - vm::ptr optParam, + vm::cptr optParam, u32 buildVersion) { throw __FUNCTION__; @@ -228,10 +228,10 @@ s32 _sceUltReaderWriterLockCreate( s32 _sceUltReaderWriterLockCreateStandalone( vm::ptr rwlock, - vm::ptr name, + vm::cptr name, u32 waitingQueueDepth, vm::ptr workArea, - vm::ptr optParam, + vm::cptr optParam, u32 buildVersion) { throw __FUNCTION__; @@ -284,10 +284,10 @@ s32 _sceUltSemaphoreOptParamInitialize(vm::ptr optParam s32 _sceUltSemaphoreCreate( vm::ptr semaphore, - vm::ptr name, + vm::cptr name, s32 numInitialResource, vm::ptr waitingQueueResourcePool, - vm::ptr optParam, + vm::cptr optParam, u32 buildVersion) { throw __FUNCTION__; @@ -325,11 +325,11 @@ u32 sceUltUlthreadRuntimeGetWorkAreaSize(u32 numMaxUlthread, u32 numWorkerThread s32 _sceUltUlthreadRuntimeCreate( vm::ptr runtime, - vm::ptr name, + vm::cptr name, u32 numMaxUlthread, u32 numWorkerThread, vm::ptr workArea, - vm::ptr optParam, + vm::cptr optParam, u32 buildVersion) { throw __FUNCTION__; @@ -347,13 +347,13 @@ s32 _sceUltUlthreadOptParamInitialize(vm::ptr optParam, s32 _sceUltUlthreadCreate( vm::ptr ulthread, - vm::ptr name, + vm::cptr name, vm::ptr entry, u32 arg, vm::ptr context, u32 sizeContext, vm::ptr runtime, - vm::ptr optParam, + vm::cptr optParam, u32 buildVersion) { throw __FUNCTION__; diff --git a/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp b/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp index 99290af045..1f1402bd38 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp @@ -4,7 +4,7 @@ #include "sceVideodec.h" -s32 sceVideodecInitLibrary(u32 codecType, vm::ptr pInitInfo) +s32 sceVideodecInitLibrary(u32 codecType, vm::cptr pInitInfo) { throw __FUNCTION__; } @@ -14,12 +14,12 @@ s32 sceVideodecTermLibrary(u32 codecType) throw __FUNCTION__; } -s32 sceAvcdecQueryDecoderMemSize(u32 codecType, vm::ptr pDecoderInfo, vm::ptr pMemInfo) +s32 sceAvcdecQueryDecoderMemSize(u32 codecType, vm::cptr pDecoderInfo, vm::ptr pMemInfo) { throw __FUNCTION__; } -s32 sceAvcdecCreateDecoder(u32 codecType, vm::ptr pCtrl, vm::ptr pDecoderInfo) +s32 sceAvcdecCreateDecoder(u32 codecType, vm::ptr pCtrl, vm::cptr pDecoderInfo) { throw __FUNCTION__; } @@ -34,7 +34,7 @@ s32 sceAvcdecDecodeAvailableSize(vm::ptr pCtrl) throw __FUNCTION__; } -s32 sceAvcdecDecode(vm::ptr pCtrl, vm::ptr pAu, vm::ptr pArrayPicture) +s32 sceAvcdecDecode(vm::ptr pCtrl, vm::cptr pAu, vm::ptr pArrayPicture) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp b/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp index 9d4949c0fb..fd4a7df39a 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp @@ -29,12 +29,12 @@ s32 sceVoiceResetPort(u32 portId) throw __FUNCTION__; } -s32 sceVoiceCreatePort(vm::ptr portId, vm::ptr pArg) +s32 sceVoiceCreatePort(vm::ptr portId, vm::cptr pArg) { throw __FUNCTION__; } -s32 sceVoiceUpdatePort(u32 portId, vm::ptr pArg) +s32 sceVoiceUpdatePort(u32 portId, vm::cptr pArg) { throw __FUNCTION__; } @@ -54,7 +54,7 @@ s32 sceVoiceDeletePort(u32 portId) throw __FUNCTION__; } -s32 sceVoiceWriteToIPort(u32 ips, vm::ptr data, vm::ptr size, s16 frameGaps) +s32 sceVoiceWriteToIPort(u32 ips, vm::cptr data, vm::ptr size, s16 frameGaps) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp b/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp index 166bcb6344..46448f486b 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp @@ -54,7 +54,7 @@ s32 sceVoiceQoSGetRemoteEndpoint(s32 connectionId, vm::ptr pRemoteId) throw __FUNCTION__; } -s32 sceVoiceQoSSetLocalEndpointAttribute(s32 localId, SceVoiceQoSAttributeId attributeId, vm::ptr pAttributeValue, s32 attributeSize) +s32 sceVoiceQoSSetLocalEndpointAttribute(s32 localId, SceVoiceQoSAttributeId attributeId, vm::cptr pAttributeValue, s32 attributeSize) { throw __FUNCTION__; } @@ -64,7 +64,7 @@ s32 sceVoiceQoSGetLocalEndpointAttribute(s32 localId, SceVoiceQoSAttributeId att throw __FUNCTION__; } -s32 sceVoiceQoSSetConnectionAttribute(s32 connectionId, SceVoiceQoSAttributeId attributeId, vm::ptr pAttributeValue, s32 attributeSize) +s32 sceVoiceQoSSetConnectionAttribute(s32 connectionId, SceVoiceQoSAttributeId attributeId, vm::cptr pAttributeValue, s32 attributeSize) { throw __FUNCTION__; } @@ -79,7 +79,7 @@ s32 sceVoiceQoSGetStatus(s32 connectionId, SceVoiceQoSStatusId statusId, vm::ptr throw __FUNCTION__; } -s32 sceVoiceQoSWritePacket(s32 connectionId, vm::ptr pData, vm::ptr pSize) +s32 sceVoiceQoSWritePacket(s32 connectionId, vm::cptr pData, vm::ptr pSize) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/Memory/vm_ptr.h b/rpcs3/Emu/Memory/vm_ptr.h index a691b7b405..0f8d05840a 100644 --- a/rpcs3/Emu/Memory/vm_ptr.h +++ b/rpcs3/Emu/Memory/vm_ptr.h @@ -171,6 +171,9 @@ namespace vm // BE pointer to const BE data template using bcptr = bptr; + + template using cpptr = pptr; + template using bcpptr = bpptr; } namespace psv @@ -192,6 +195,9 @@ namespace vm // LE pointer to const LE data template using lcptr = lptr; + + template using cpptr = pptr; + template using lcpptr = lpptr; } struct null_t @@ -224,7 +230,7 @@ namespace vm return{ other.m_addr }; } - // perform const_cast (for example, vm::ptr to vm::ptr) + // perform const_cast (for example, vm::cptr to vm::ptr) template(std::declval()))> inline _ptr_base const_ptr_cast(const _ptr_base& other) { return{ other.m_addr }; diff --git a/rpcs3/Emu/SysCalls/Modules.cpp b/rpcs3/Emu/SysCalls/Modules.cpp index a73da6981c..3cfe404d2a 100644 --- a/rpcs3/Emu/SysCalls/Modules.cpp +++ b/rpcs3/Emu/SysCalls/Modules.cpp @@ -478,7 +478,7 @@ void hook_ppu_funcs(vm::ptr base, u32 size) bool patch_ppu_import(u32 addr, u32 index) { - const auto data = vm::ptr::make(addr); + const auto data = vm::cptr::make(addr); using namespace PPU_instr; @@ -512,7 +512,7 @@ bool patch_ppu_import(u32 addr, u32 index) (data[1] & 0xffff0000) == ORIS(r0, r0, 0) && (data[2] & 0xfc000003) == B(0, 0, 0)) { - const auto sub = vm::ptr::make(addr + 8 + ((s32)data[2] << 6 >> 8 << 2)); + const auto sub = vm::cptr::make(addr + 8 + ((s32)data[2] << 6 >> 8 << 2)); if (vm::check_addr(sub.addr(), 60) && sub[0x0] == STDU(r1, r1, -0x80) && diff --git a/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp b/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp index 4e410636b1..d754cd53c9 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp @@ -605,7 +605,7 @@ s32 cellAdecStartSeq(u32 handle, u32 param) case CELL_ADEC_TYPE_ATRACX_6CH: case CELL_ADEC_TYPE_ATRACX_8CH: { - const auto atx = vm::ptr::make(param); + const auto atx = vm::cptr::make(param); task.at3p.sample_rate = atx->sampling_freq; task.at3p.channel_config = atx->ch_config_idx; @@ -621,7 +621,7 @@ s32 cellAdecStartSeq(u32 handle, u32 param) } case CELL_ADEC_TYPE_MP3: { - const auto mp3 = vm::ptr::make(param); + const auto mp3 = vm::cptr::make(param); cellAdec.Todo("*** CellAdecParamMP3: bw_pcm=%d", mp3->bw_pcm); break; diff --git a/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp b/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp index 7bb177751f..1ed9b97ec0 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp @@ -284,7 +284,7 @@ void dmuxQueryAttr(u32 info_addr /* may be 0 */, vm::ptr attr) attr->memSize = 0x10000; // 0x3e8e6 from ps3 } -void dmuxQueryEsAttr(u32 info /* may be 0 */, vm::ptr esFilterId, u32 esSpecificInfo, vm::ptr attr) +void dmuxQueryEsAttr(u32 info /* may be 0 */, vm::cptr esFilterId, u32 esSpecificInfo, vm::ptr attr) { if (esFilterId->filterIdMajor >= 0xe0) { @@ -772,7 +772,7 @@ void dmuxOpen(u32 dmux_id) // TODO: call from the constructor }); } -s32 cellDmuxQueryAttr(vm::ptr type, vm::ptr attr) +s32 cellDmuxQueryAttr(vm::cptr type, vm::ptr attr) { cellDmux.Warning("cellDmuxQueryAttr(type=*0x%x, attr=*0x%x)", type, attr); @@ -785,7 +785,7 @@ s32 cellDmuxQueryAttr(vm::ptr type, vm::ptr at return CELL_OK; } -s32 cellDmuxQueryAttr2(vm::ptr type2, vm::ptr attr) +s32 cellDmuxQueryAttr2(vm::cptr type2, vm::ptr attr) { cellDmux.Warning("cellDmuxQueryAttr2(demuxerType2=*0x%x, demuxerAttr=*0x%x)", type2, attr); @@ -798,7 +798,7 @@ s32 cellDmuxQueryAttr2(vm::ptr type2, vm::ptr return CELL_OK; } -s32 cellDmuxOpen(vm::ptr type, vm::ptr res, vm::ptr cb, vm::ptr handle) +s32 cellDmuxOpen(vm::cptr type, vm::cptr res, vm::cptr cb, vm::ptr handle) { cellDmux.Warning("cellDmuxOpen(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); @@ -814,7 +814,7 @@ s32 cellDmuxOpen(vm::ptr type, vm::ptr type, vm::ptr resEx, vm::ptr cb, vm::ptr handle) +s32 cellDmuxOpenEx(vm::cptr type, vm::cptr resEx, vm::cptr cb, vm::ptr handle) { cellDmux.Warning("cellDmuxOpenEx(type=*0x%x, resEx=*0x%x, cb=*0x%x, handle=*0x%x)", type, resEx, cb, handle); @@ -830,12 +830,12 @@ s32 cellDmuxOpenEx(vm::ptr type, vm::ptr type, vm::ptr resEx, vm::ptr cb, vm::ptr handle) +s32 _nid_e075fabc(vm::cptr type, vm::cptr resEx, vm::cptr cb, vm::ptr handle) { return cellDmuxOpenEx(type, resEx, cb, handle); } -s32 cellDmuxOpen2(vm::ptr type2, vm::ptr res2, vm::ptr cb, vm::ptr handle) +s32 cellDmuxOpen2(vm::cptr type2, vm::cptr res2, vm::cptr cb, vm::ptr handle) { cellDmux.Warning("cellDmuxOpen2(type2=*0x%x, res2=*0x%x, cb=*0x%x, handle=*0x%x)", type2, res2, cb, handle); @@ -957,7 +957,7 @@ s32 cellDmuxResetStreamAndWaitDone(u32 handle) return CELL_OK; } -s32 cellDmuxQueryEsAttr(vm::ptr type, vm::ptr esFilterId, u32 esSpecificInfo, vm::ptr esAttr) +s32 cellDmuxQueryEsAttr(vm::cptr type, vm::cptr esFilterId, u32 esSpecificInfo, vm::ptr esAttr) { cellDmux.Warning("cellDmuxQueryEsAttr(demuxerType=*0x%x, esFilterId=*0x%x, esSpecificInfo=*0x%x, esAttr=*0x%x)", type, esFilterId, esSpecificInfo, esAttr); @@ -971,7 +971,7 @@ s32 cellDmuxQueryEsAttr(vm::ptr type, vm::ptr type2, vm::ptr esFilterId, u32 esSpecificInfo, vm::ptr esAttr) +s32 cellDmuxQueryEsAttr2(vm::cptr type2, vm::cptr esFilterId, u32 esSpecificInfo, vm::ptr esAttr) { cellDmux.Warning("cellDmuxQueryEsAttr2(type2=*0x%x, esFilterId=*0x%x, esSpecificInfo=*0x%x, esAttr=*0x%x)", type2, esFilterId, esSpecificInfo, esAttr); @@ -985,7 +985,7 @@ s32 cellDmuxQueryEsAttr2(vm::ptr type2, vm::ptr esFilterId, vm::ptr esResourceInfo, vm::ptr esCb, u32 esSpecificInfo, vm::ptr esHandle) +s32 cellDmuxEnableEs(u32 handle, vm::cptr esFilterId, vm::cptr esResourceInfo, vm::cptr esCb, u32 esSpecificInfo, vm::ptr esHandle) { cellDmux.Warning("cellDmuxEnableEs(handle=0x%x, esFilterId=*0x%x, esResourceInfo=*0x%x, esCb=*0x%x, esSpecificInfo=*0x%x, esHandle=*0x%x)", handle, esFilterId, esResourceInfo, esCb, esSpecificInfo, esHandle); diff --git a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp index 3d574a2486..7d2e4c0d8b 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp @@ -83,7 +83,7 @@ int cellFontOpenFontMemory(vm::ptr library, u32 fontAddr, u32 f return CELL_FONT_OK; } -int cellFontOpenFontFile(vm::ptr library, vm::ptr fontPath, u32 subNum, s32 uniqueId, vm::ptr font) +int cellFontOpenFontFile(vm::ptr library, vm::cptr fontPath, u32 subNum, s32 uniqueId, vm::ptr font) { std::string fp(fontPath.get_ptr()); cellFont.Warning("cellFontOpenFontFile(library_addr=0x%x, fontPath=\"%s\", subNum=%d, uniqueId=%d, font_addr=0x%x)", diff --git a/rpcs3/Emu/SysCalls/Modules/cellFs.cpp b/rpcs3/Emu/SysCalls/Modules/cellFs.cpp index c0aa4254d2..7caf96266a 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFs.cpp @@ -15,7 +15,7 @@ extern Module cellFs; -s32 cellFsOpen(vm::ptr path, s32 flags, vm::ptr fd, vm::ptr arg, u64 size) +s32 cellFsOpen(vm::cptr path, s32 flags, vm::ptr fd, vm::cptr arg, u64 size) { cellFs.Warning("cellFsOpen(path=*0x%x, flags=%#o, fd=*0x%x, arg=*0x%x, size=0x%llx) -> sys_fs_open()", path, flags, fd, arg, size); @@ -33,7 +33,7 @@ s32 cellFsRead(PPUThread& CPU, u32 fd, vm::ptr buf, u64 nbytes, vm::ptr>(CPU)); } -s32 cellFsWrite(PPUThread& CPU, u32 fd, vm::ptr buf, u64 nbytes, vm::ptr nwrite) +s32 cellFsWrite(PPUThread& CPU, u32 fd, vm::cptr buf, u64 nbytes, vm::ptr nwrite) { cellFs.Log("cellFsWrite(fd=0x%x, buf=*0x%x, nbytes=0x%llx, nwrite=*0x%x)", fd, buf, nbytes, nwrite); @@ -49,7 +49,7 @@ s32 cellFsClose(u32 fd) return sys_fs_close(fd); } -s32 cellFsOpendir(vm::ptr path, vm::ptr fd) +s32 cellFsOpendir(vm::cptr path, vm::ptr fd) { cellFs.Warning("cellFsOpendir(path=*0x%x, fd=*0x%x) -> sys_fs_opendir()", path, fd); @@ -75,7 +75,7 @@ s32 cellFsClosedir(u32 fd) return sys_fs_closedir(fd); } -s32 cellFsStat(vm::ptr path, vm::ptr sb) +s32 cellFsStat(vm::cptr path, vm::ptr sb) { cellFs.Warning("cellFsStat(path=*0x%x, sb=*0x%x) -> sys_fs_stat()", path, sb); @@ -93,7 +93,7 @@ s32 cellFsFstat(u32 fd, vm::ptr sb) return sys_fs_fstat(fd, sb); } -s32 cellFsMkdir(vm::ptr path, s32 mode) +s32 cellFsMkdir(vm::cptr path, s32 mode) { cellFs.Warning("cellFsMkdir(path=*0x%x, mode=%#o) -> sys_fs_mkdir()", path, mode); @@ -103,7 +103,7 @@ s32 cellFsMkdir(vm::ptr path, s32 mode) return sys_fs_mkdir(path, mode); } -s32 cellFsRename(vm::ptr from, vm::ptr to) +s32 cellFsRename(vm::cptr from, vm::cptr to) { cellFs.Warning("cellFsRename(from=*0x%x, to=*0x%x) -> sys_fs_rename()", from, to); @@ -113,7 +113,7 @@ s32 cellFsRename(vm::ptr from, vm::ptr to) return sys_fs_rename(from, to); } -s32 cellFsRmdir(vm::ptr path) +s32 cellFsRmdir(vm::cptr path) { cellFs.Warning("cellFsRmdir(path=*0x%x) -> sys_fs_rmdir()", path); @@ -123,7 +123,7 @@ s32 cellFsRmdir(vm::ptr path) return sys_fs_rmdir(path); } -s32 cellFsUnlink(vm::ptr path) +s32 cellFsUnlink(vm::cptr path) { cellFs.Warning("cellFsUnlink(path=*0x%x) -> sys_fs_unlink()", path); @@ -156,7 +156,7 @@ s32 cellFsFGetBlockSize(PPUThread& CPU, u32 fd, vm::ptr sector_size, vm::pt return sector_size && block_size ? sys_fs_fget_block_size(fd, sector_size, block_size, vm::stackvar>(CPU), vm::stackvar>(CPU)) : CELL_FS_EFAULT; } -s32 cellFsGetBlockSize(PPUThread& CPU, vm::ptr path, vm::ptr sector_size, vm::ptr block_size) +s32 cellFsGetBlockSize(PPUThread& CPU, vm::cptr path, vm::ptr sector_size, vm::ptr block_size) { cellFs.Warning("cellFsGetBlockSize(path=*0x%x, sector_size=*0x%x, block_size=*0x%x) -> sys_fs_get_block_size()", path, sector_size, block_size); @@ -166,7 +166,7 @@ s32 cellFsGetBlockSize(PPUThread& CPU, vm::ptr path, vm::ptr se return sys_fs_get_block_size(path, sector_size, block_size, vm::stackvar>(CPU)); } -s32 cellFsTruncate(vm::ptr path, u64 size) +s32 cellFsTruncate(vm::cptr path, u64 size) { cellFs.Warning("cellFsTruncate(path=*0x%x, size=0x%llx) -> sys_fs_truncate()", path, size); @@ -184,7 +184,7 @@ s32 cellFsFtruncate(u32 fd, u64 size) return sys_fs_ftruncate(fd, size); } -s32 cellFsChmod(vm::ptr path, s32 mode) +s32 cellFsChmod(vm::cptr path, s32 mode) { cellFs.Warning("cellFsChmod(path=*0x%x, mode=%#o) -> sys_fs_chmod()", path, mode); @@ -194,7 +194,7 @@ s32 cellFsChmod(vm::ptr path, s32 mode) return sys_fs_chmod(path, mode); } -s32 cellFsGetFreeSize(vm::ptr path, vm::ptr block_size, vm::ptr block_count) +s32 cellFsGetFreeSize(vm::cptr path, vm::ptr block_size, vm::ptr block_count) { cellFs.Warning("cellFsGetFreeSize(path=*0x%x, block_size=*0x%x, block_count=*0x%x)", path, block_size, block_count); cellFs.Warning("*** path = '%s'", path.get_ptr()); @@ -280,7 +280,7 @@ s32 cellFsReadWithOffset(u32 fd, u64 offset, vm::ptr buf, u64 buffer_size, return CELL_OK; } -s32 cellFsWriteWithOffset(u32 fd, u64 offset, vm::ptr buf, u64 data_size, vm::ptr nwrite) +s32 cellFsWriteWithOffset(u32 fd, u64 offset, vm::cptr buf, u64 data_size, vm::ptr nwrite) { cellFs.Log("cellFsWriteWithOffset(fd=0x%x, offset=0x%llx, buf=*0x%x, data_size=0x%llx, nwrite=*0x%x)", fd, offset, buf, data_size, nwrite); @@ -311,7 +311,7 @@ s32 cellFsWriteWithOffset(u32 fd, u64 offset, vm::ptr buf, u64 data_ return CELL_OK; } -s32 cellFsStReadInit(u32 fd, vm::ptr ringbuf) +s32 cellFsStReadInit(u32 fd, vm::cptr ringbuf) { cellFs.Warning("cellFsStReadInit(fd=0x%x, ringbuf=*0x%x)", fd, ringbuf); @@ -831,7 +831,7 @@ int sdata_unpack(const std::string& packed_file, const std::string& unpacked_fil return CELL_OK; } -s32 cellFsSdataOpen(PPUThread& CPU, vm::ptr path, s32 flags, vm::ptr fd, vm::ptr arg, u64 size) +s32 cellFsSdataOpen(PPUThread& CPU, vm::cptr path, s32 flags, vm::ptr fd, vm::cptr arg, u64 size) { cellFs.Log("cellFsSdataOpen(path=*0x%x, flags=%#o, fd=*0x%x, arg=*0x%x, size=0x%llx)", path, flags, fd, arg, size); @@ -861,7 +861,7 @@ s32 cellFsSdataOpen(PPUThread& CPU, vm::ptr path, s32 flags, vm::ptr */ } -s32 cellFsSdataOpenByFd(u32 mself_fd, s32 flags, vm::ptr sdata_fd, u64 offset, vm::ptr arg, u64 size) +s32 cellFsSdataOpenByFd(u32 mself_fd, s32 flags, vm::ptr sdata_fd, u64 offset, vm::cptr arg, u64 size) { cellFs.Todo("cellFsSdataOpenByFd(mself_fd=0x%x, flags=%#o, sdata_fd=*0x%x, offset=0x%llx, arg=*0x%x, size=0x%llx)", mself_fd, flags, sdata_fd, offset, arg, size); @@ -905,7 +905,7 @@ void fsAio(vm::ptr aio, bool write, s32 xid, fs_aio_cb_t func) }); } -s32 cellFsAioInit(vm::ptr mount_point) +s32 cellFsAioInit(vm::cptr mount_point) { cellFs.Warning("cellFsAioInit(mount_point=*0x%x)", mount_point); cellFs.Warning("*** mount_point = '%s'", mount_point.get_ptr()); @@ -915,7 +915,7 @@ s32 cellFsAioInit(vm::ptr mount_point) return CELL_OK; } -s32 cellFsAioFinish(vm::ptr mount_point) +s32 cellFsAioFinish(vm::cptr mount_point) { cellFs.Warning("cellFsAioFinish(mount_point=*0x%x)", mount_point); cellFs.Warning("*** mount_point = '%s'", mount_point.get_ptr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp index d89d3dbbb6..808be8b119 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp @@ -17,7 +17,7 @@ std::string contentInfo; std::string usrdir; bool path_set = false; -s32 cellHddGameCheck(PPUThread& CPU, u32 version, vm::ptr dirName, u32 errDialog, vm::ptr funcStat, u32 container) +s32 cellHddGameCheck(PPUThread& CPU, u32 version, vm::cptr dirName, u32 errDialog, vm::ptr funcStat, u32 container) { cellGame.Warning("cellHddGameCheck(version=%d, dirName=*0x%x, errDialog=%d, funcStat=*0x%x, container=%d)", version, dirName, errDialog, funcStat, container); @@ -188,7 +188,7 @@ s32 cellGamePatchCheck(vm::ptr size, vm::ptr reserved return CELL_GAME_RET_OK; } -s32 cellGameDataCheck(u32 type, vm::ptr dirName, vm::ptr size) +s32 cellGameDataCheck(u32 type, vm::cptr dirName, vm::ptr size) { cellGame.Warning("cellGameDataCheck(type=%d, dirName=*0x%x, size=*0x%x)", type, dirName, size); @@ -283,7 +283,7 @@ s32 cellGameContentPermit(vm::ptr contentInfoPath, vm: return CELL_GAME_RET_OK; } -s32 cellGameDataCheckCreate2(PPUThread& CPU, u32 version, vm::ptr dirName, u32 errDialog, vm::ptr funcStat, u32 container) +s32 cellGameDataCheckCreate2(PPUThread& CPU, u32 version, vm::cptr dirName, u32 errDialog, vm::ptr funcStat, u32 container) { cellGame.Warning("cellGameDataCheckCreate2(version=0x%x, dirName=*0x%x, errDialog=0x%x, funcStat=*0x%x, container=%d)", version, dirName, errDialog, funcStat, container); @@ -380,7 +380,7 @@ s32 cellGameDataCheckCreate2(PPUThread& CPU, u32 version, vm::ptr di } } -s32 cellGameDataCheckCreate(PPUThread& CPU, u32 version, vm::ptr dirName, u32 errDialog, vm::ptr funcStat, u32 container) +s32 cellGameDataCheckCreate(PPUThread& CPU, u32 version, vm::cptr dirName, u32 errDialog, vm::ptr funcStat, u32 container) { cellGame.Warning("cellGameDataCheckCreate(version=0x%x, dirName=*0x%x, errDialog=0x%x, funcStat=*0x%x, container=%d)", version, dirName, errDialog, funcStat, container); @@ -528,7 +528,7 @@ s32 cellGameGetLocalWebContentPath() return CELL_OK; } -s32 cellGameContentErrorDialog(s32 type, s32 errNeedSizeKB, vm::ptr dirName) +s32 cellGameContentErrorDialog(s32 type, s32 errNeedSizeKB, vm::cptr dirName) { cellGame.Warning("cellGameContentErrorDialog(type=%d, errNeedSizeKB=%d, dirName=*0x%x)", type, errNeedSizeKB, dirName); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp index c1717474df..3803069015 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp @@ -20,7 +20,7 @@ extern Module cellGifDec; s32 cellGifDecCreate( vm::ptr mainHandle, - vm::ptr threadInParam, + vm::cptr threadInParam, vm::ptr threadOutParam) { UNIMPLEMENTED_FUNC(cellGifDec); @@ -29,9 +29,9 @@ s32 cellGifDecCreate( s32 cellGifDecExtCreate( vm::ptr mainHandle, - vm::ptr threadInParam, + vm::cptr threadInParam, vm::ptr threadOutParam, - vm::ptr extThreadInParam, + vm::cptr extThreadInParam, vm::ptr extThreadOutParam) { UNIMPLEMENTED_FUNC(cellGifDec); @@ -41,7 +41,7 @@ s32 cellGifDecExtCreate( s32 cellGifDecOpen( CellGifDecMainHandle mainHandle, vm::ptr subHandle, - vm::ptr src, + vm::cptr src, vm::ptr openInfo) { cellGifDec.Warning("cellGifDecOpen(mainHandle=0x%x, subHandle=*0x%x, src=*0x%x, openInfo=*0x%x)", mainHandle, subHandle, src, openInfo); @@ -134,7 +134,7 @@ s32 cellGifDecReadHeader( s32 cellGifDecSetParameter( CellGifDecMainHandle mainHandle, CellGifDecSubHandle subHandle, - vm::ptr inParam, + vm::cptr inParam, vm::ptr outParam) { cellGifDec.Warning("cellGifDecSetParameter(mainHandle=0x%x, subHandle=0x%x, inParam=*0x%x, outParam=*0x%x)", mainHandle, subHandle, inParam, outParam); @@ -171,7 +171,7 @@ s32 cellGifDecDecodeData( CellGifDecMainHandle mainHandle, CellGifDecSubHandle subHandle, vm::ptr data, - vm::ptr dataCtrlParam, + vm::cptr dataCtrlParam, vm::ptr dataOutInfo) { cellGifDec.Warning("cellGifDecDecodeData(mainHandle=0x%x, subHandle=0x%x, data=*0x%x, dataCtrlParam=*0x%x, dataOutInfo=*0x%x)", mainHandle, subHandle, data, dataCtrlParam, dataOutInfo); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGifDec.h b/rpcs3/Emu/SysCalls/Modules/cellGifDec.h index ebb959dfd0..5e17576136 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGifDec.h +++ b/rpcs3/Emu/SysCalls/Modules/cellGifDec.h @@ -92,7 +92,7 @@ struct CellGifDecExtThreadOutParam struct CellGifDecSrc { be_t srcSelect; // CellGifDecStreamSrcSel - vm::bptr fileName; + vm::bcptr fileName; be_t fileOffset; be_t fileSize; vm::bptr streamPtr; diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp index 4f04d0ab20..244cc9d483 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp @@ -157,7 +157,7 @@ s32 cellJpgDecReadHeader(u32 mainHandle, u32 subHandle, vm::ptr return CELL_OK; } -s32 cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr data, vm::ptr dataCtrlParam, vm::ptr dataOutInfo) +s32 cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr data, vm::cptr dataCtrlParam, vm::ptr dataOutInfo) { cellJpgDec.Log("cellJpgDecDecodeData(mainHandle=0x%x, subHandle=0x%x, data=*0x%x, dataCtrlParam=*0x%x, dataOutInfo=*0x%x)", mainHandle, subHandle, data, dataCtrlParam, dataOutInfo); @@ -293,7 +293,7 @@ s32 cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr data, vm::pt return CELL_OK; } -s32 cellJpgDecSetParameter(u32 mainHandle, u32 subHandle, vm::ptr inParam, vm::ptr outParam) +s32 cellJpgDecSetParameter(u32 mainHandle, u32 subHandle, vm::cptr inParam, vm::ptr outParam) { cellJpgDec.Log("cellJpgDecSetParameter(mainHandle=0x%x, subHandle=0x%x, inParam=*0x%x, outParam=*0x%x)", mainHandle, subHandle, inParam, outParam); diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.h b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.h index cbcc60fce9..3b9e030405 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.h +++ b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.h @@ -58,7 +58,7 @@ struct CellJpgDecInfo struct CellJpgDecSrc { be_t srcSelect; // CellJpgDecStreamSrcSel - vm::bptr fileName; + vm::bcptr fileName; be_t fileOffset; // int64_t be_t fileSize; be_t streamPtr; diff --git a/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp b/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp index 22e62a3fbd..2bc6c23804 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp @@ -13,7 +13,7 @@ extern Module cellL10n; -s32 UTF16stoUTF8s(vm::ptr utf16, vm::ref utf16_len, vm::ptr utf8, vm::ref utf8_len) +s32 UTF16stoUTF8s(vm::cptr utf16, vm::ref utf16_len, vm::ptr utf8, vm::ref utf8_len) { cellL10n.Todo("UTF16stoUTF8s(utf16=*0x%x, utf16_len=*0x%x, utf8=*0x%x, utf8_len=*0x%x)", utf16, utf16_len, utf8, utf8_len); @@ -55,7 +55,7 @@ s32 UTF16stoUTF8s(vm::ptr utf16, vm::ref utf16_len, vm::ptr return ConversionOK; } -s32 jstrchk(vm::ptr jstr) +s32 jstrchk(vm::cptr jstr) { cellL10n.Warning("jstrchk(jstr_addr=0x%x) -> utf8", jstr.addr()); @@ -297,7 +297,7 @@ s32 _L10nConvertStr(s32 src_code, const void* src, size_t * src_len, s32 dst_cod #endif //TODO: Check the code in emulation. If support for UTF8/UTF16/UTF32/UCS2/UCS4 should use wider chars.. awful. -s32 L10nConvertStr(s32 src_code, vm::ptr src, vm::ptr src_len, s32 dst_code, vm::ptr dst, vm::ptr dst_len) +s32 L10nConvertStr(s32 src_code, vm::cptr src, vm::ptr src_len, s32 dst_code, vm::ptr dst, vm::ptr dst_len) { cellL10n.Error("L10nConvertStr(src_code=%d, srca_addr=0x%x, src_len_addr=0x%x, dst_code=%d, dst_addr=0x%x, dst_len_addr=0x%x)", src_code, src.addr(), src_len.addr(), dst_code, dst.addr(), dst_len.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp index cbf57a31aa..0ab72b65ab 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp @@ -24,7 +24,7 @@ void MsgDialogInstance::Close() wait_until = get_system_time(); } -s32 cellMsgDialogOpen2(u32 type, vm::ptr msgString, vm::ptr callback, vm::ptr userData, vm::ptr extParam) +s32 cellMsgDialogOpen2(u32 type, vm::cptr msgString, vm::ptr callback, vm::ptr userData, vm::ptr extParam) { cellSysutil.Warning("cellMsgDialogOpen2(type=0x%x, msgString=*0x%x, callback=*0x%x, userData=*0x%x, extParam=*0x%x)", type, msgString, callback, userData, extParam); @@ -293,7 +293,7 @@ s32 cellMsgDialogAbort() return CELL_OK; } -s32 cellMsgDialogProgressBarSetMsg(u32 progressBarIndex, vm::ptr msgString) +s32 cellMsgDialogProgressBarSetMsg(u32 progressBarIndex, vm::cptr msgString) { cellSysutil.Warning("cellMsgDialogProgressBarSetMsg(progressBarIndex=%d, msgString=*0x%x)", progressBarIndex, msgString); diff --git a/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp b/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp index eccb31c7ef..c866bf53d9 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp @@ -14,7 +14,7 @@ enum CELL_OVIS_ERROR_ALIGN = 0x80410410, }; -int cellOvisGetOverlayTableSize(vm::ptr elf) +int cellOvisGetOverlayTableSize(vm::cptr elf) { cellOvis.Todo("cellOvisGetOverlayTableSize(elf_addr=0x%x)", elf.addr()); return CELL_OK; diff --git a/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp b/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp index 22ad3eb8e8..3237b584bb 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp @@ -214,7 +214,7 @@ s32 cellPamfVerify(vm::ptr pAddr, u64 fileSize) return CELL_OK; } -s32 cellPamfReaderInitialize(vm::ptr pSelf, vm::ptr pAddr, u64 fileSize, u32 attribute) +s32 cellPamfReaderInitialize(vm::ptr pSelf, vm::cptr pAddr, u64 fileSize, u32 attribute) { cellPamf.Warning("cellPamfReaderInitialize(pSelf=0x%x, pAddr=0x%x, fileSize=%d, attribute=0x%x)", pSelf.addr(), pAddr.addr(), fileSize, attribute); diff --git a/rpcs3/Emu/SysCalls/Modules/cellPamf.h b/rpcs3/Emu/SysCalls/Modules/cellPamf.h index 213d83c83b..b32d75374b 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPamf.h +++ b/rpcs3/Emu/SysCalls/Modules/cellPamf.h @@ -386,7 +386,7 @@ CHECK_SIZE(PamfEpHeader, 12); // not directly accessed by virtual CPU, fields are unknown struct CellPamfReader { - vm::ptr pAddr; + vm::cptr pAddr; s32 stream; u64 fileSize; u32 internalData[28]; @@ -394,4 +394,4 @@ struct CellPamfReader CHECK_SIZE(CellPamfReader, 128); -s32 cellPamfReaderInitialize(vm::ptr pSelf, vm::ptr pAddr, u64 fileSize, u32 attribute); \ No newline at end of file +s32 cellPamfReaderInitialize(vm::ptr pSelf, vm::cptr pAddr, u64 fileSize, u32 attribute); diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp index c6180006a1..7fa8544d73 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp @@ -19,8 +19,8 @@ extern Module cellPngDec; s32 pngDecCreate( vm::ptr mainHandle, - vm::ptr param, - vm::ptr ext = vm::null) + vm::cptr param, + vm::cptr ext = vm::null) { // alloc memory (should probably use param->cbCtrlMallocFunc) auto dec = CellPngDecMainHandle::make(Memory.Alloc(sizeof(PngDecoder), 128)); @@ -59,10 +59,10 @@ s32 pngDecDestroy(CellPngDecMainHandle dec) s32 pngDecOpen( CellPngDecMainHandle dec, vm::ptr subHandle, - vm::ptr src, + vm::cptr src, vm::ptr openInfo, - vm::ptr cb = vm::null, - vm::ptr param = vm::null) + vm::cptr cb = vm::null, + vm::cptr param = vm::null) { // alloc memory (should probably use dec->malloc) auto stream = CellPngDecSubHandle::make(Memory.Alloc(sizeof(PngStream), 128)); @@ -192,9 +192,9 @@ s32 pngReadHeader( s32 pngDecSetParameter( CellPngDecSubHandle stream, - vm::ptr inParam, + vm::cptr inParam, vm::ptr outParam, - vm::ptr extInParam = vm::null, + vm::cptr extInParam = vm::null, vm::ptr extOutParam = vm::null) { CellPngDecInfo& current_info = stream->info; @@ -238,9 +238,9 @@ s32 pngDecSetParameter( s32 pngDecodeData( CellPngDecSubHandle stream, vm::ptr data, - vm::ptr dataCtrlParam, + vm::cptr dataCtrlParam, vm::ptr dataOutInfo, - vm::ptr cbCtrlDisp = vm::null, + vm::cptr cbCtrlDisp = vm::null, vm::ptr dispParam = vm::null) { dataOutInfo->status = CELL_PNGDEC_DEC_STATUS_STOP; @@ -368,7 +368,7 @@ s32 pngDecodeData( s32 cellPngDecCreate( vm::ptr mainHandle, - vm::ptr threadInParam, + vm::cptr threadInParam, vm::ptr threadOutParam) { cellPngDec.Warning("cellPngDecCreate(mainHandle=**0x%x, threadInParam=*0x%x, threadOutParam=*0x%x)", mainHandle, threadInParam, threadOutParam); @@ -384,9 +384,9 @@ s32 cellPngDecCreate( s32 cellPngDecExtCreate( vm::ptr mainHandle, - vm::ptr threadInParam, + vm::cptr threadInParam, vm::ptr threadOutParam, - vm::ptr extThreadInParam, + vm::cptr extThreadInParam, vm::ptr extThreadOutParam) { cellPngDec.Warning("cellPngDecCreate(mainHandle=**0x%x, threadInParam=*0x%x, threadOutParam=*0x%x, extThreadInParam=*0x%x, extThreadOutParam=*0x%x)", @@ -414,7 +414,7 @@ s32 cellPngDecDestroy(CellPngDecMainHandle mainHandle) s32 cellPngDecOpen( CellPngDecMainHandle mainHandle, vm::ptr subHandle, - vm::ptr src, + vm::cptr src, vm::ptr openInfo) { cellPngDec.Warning("cellPngDecOpen(mainHandle=*0x%x, subHandle=**0x%x, src=*0x%x, openInfo=*0x%x)", mainHandle, subHandle, src, openInfo); @@ -426,10 +426,10 @@ s32 cellPngDecOpen( s32 cellPngDecExtOpen( CellPngDecMainHandle mainHandle, vm::ptr subHandle, - vm::ptr src, + vm::cptr src, vm::ptr openInfo, - vm::ptr cbCtrlStrm, - vm::ptr opnParam) + vm::cptr cbCtrlStrm, + vm::cptr opnParam) { cellPngDec.Warning("cellPngDecExtOpen(mainHandle=*0x%x, subHandle=**0x%x, src=*0x%x, openInfo=*0x%x, cbCtrlStrm=*0x%x, opnParam=*0x%x)", mainHandle, subHandle, src, openInfo, cbCtrlStrm, opnParam); @@ -465,7 +465,7 @@ s32 cellPngDecExtReadHeader( s32 cellPngDecSetParameter( CellPngDecMainHandle mainHandle, CellPngDecSubHandle subHandle, - vm::ptr inParam, + vm::cptr inParam, vm::ptr outParam) { cellPngDec.Warning("cellPngDecSetParameter(mainHandle=*0x%x, subHandle=*0x%x, inParam=*0x%x, outParam=*0x%x)", mainHandle, subHandle, inParam, outParam); @@ -476,9 +476,9 @@ s32 cellPngDecSetParameter( s32 cellPngDecExtSetParameter( CellPngDecMainHandle mainHandle, CellPngDecSubHandle subHandle, - vm::ptr inParam, + vm::cptr inParam, vm::ptr outParam, - vm::ptr extInParam, + vm::cptr extInParam, vm::ptr extOutParam) { cellPngDec.Warning("cellPngDecExtSetParameter(mainHandle=*0x%x, subHandle=*0x%x, inParam=*0x%x, outParam=*0x%x, extInParam=*0x%x, extOutParam=*0x%x", mainHandle, subHandle, inParam, outParam, extInParam, extOutParam); @@ -490,7 +490,7 @@ s32 cellPngDecDecodeData( CellPngDecMainHandle mainHandle, CellPngDecSubHandle subHandle, vm::ptr data, - vm::ptr dataCtrlParam, + vm::cptr dataCtrlParam, vm::ptr dataOutInfo) { cellPngDec.Warning("cellPngDecDecodeData(mainHandle=*0x%x, subHandle=*0x%x, data=*0x%x, dataCtrlParam=*0x%x, dataOutInfo=*0x%x)", @@ -503,9 +503,9 @@ s32 cellPngDecExtDecodeData( CellPngDecMainHandle mainHandle, CellPngDecSubHandle subHandle, vm::ptr data, - vm::ptr dataCtrlParam, + vm::cptr dataCtrlParam, vm::ptr dataOutInfo, - vm::ptr cbCtrlDisp, + vm::cptr cbCtrlDisp, vm::ptr dispParam) { cellPngDec.Warning("cellPngDecExtDecodeData(mainHandle=*0x%x, subHandle=*0x%x, data=*0x%x, dataCtrlParam=*0x%x, dataOutInfo=*0x%x, cbCtrlDisp=*0x%x, dispParam=*0x%x)", diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.h b/rpcs3/Emu/SysCalls/Modules/cellPngDec.h index 74eced5635..9606576d2f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.h +++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.h @@ -123,7 +123,7 @@ struct CellPngDecExtThreadOutParam struct CellPngDecSrc { be_t srcSelect; // CellPngDecStreamSrcSel - vm::bptr fileName; + vm::bcptr fileName; be_t fileOffset; be_t fileSize; vm::bptr streamPtr; diff --git a/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp b/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp index 21e33c2d01..c3b4b19524 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp @@ -133,7 +133,7 @@ int cellRtcFormatRfc3339LocalTime(vm::ptr pszDateTime, vm::ptr pUtc, vm::ptr pszDateTime) +int cellRtcParseDateTime(vm::ptr pUtc, vm::cptr pszDateTime) { cellRtc.Log("cellRtcParseDateTime(pUtc=0x%x, pszDateTime_addr=0x%x)", pUtc.addr(), pszDateTime.addr()); @@ -146,7 +146,7 @@ int cellRtcParseDateTime(vm::ptr pUtc, vm::ptr pszDateT return CELL_OK; } -int cellRtcParseRfc3339(vm::ptr pUtc, vm::ptr pszDateTime) +int cellRtcParseRfc3339(vm::ptr pUtc, vm::cptr pszDateTime) { cellRtc.Log("cellRtcParseRfc3339(pUtc=0x%x, pszDateTime_addr=0x%x)", pUtc.addr(), pszDateTime.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp index 0ca3f285f6..e503c7dd59 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp @@ -632,7 +632,7 @@ int cellSailPlayerAddDescriptor(vm::ptr pSelf, vm::ptr pSelf, s32 streamType, vm::ptr pMediaInfo, vm::ptr pUri, vm::ptr ppDesc) +int cellSailPlayerCreateDescriptor(vm::ptr pSelf, s32 streamType, vm::ptr pMediaInfo, vm::cptr pUri, vm::ptr ppDesc) { cellSail.Warning("cellSailPlayerCreateDescriptor(pSelf_addr=0x%x, streamType=%d, pMediaInfo_addr=0x%x, pUri_addr=0x%x, ppDesc_addr=0x%x)", pSelf.addr(), streamType, pMediaInfo.addr(), pUri.addr(), ppDesc.addr()); @@ -657,7 +657,7 @@ int cellSailPlayerCreateDescriptor(vm::ptr pSelf, s32 streamType if (f.Open(path)) { u64 size = f.GetSize(); u32 buf_ = Memory.Alloc(size, 1); - auto bufPtr = vm::ptr::make(buf_); + auto bufPtr = vm::cptr::make(buf_); PamfHeader *buf = const_cast(bufPtr.get_ptr()); assert(f.Read(buf, size) == size); u32 sp_ = Memory.Alloc(sizeof(CellPamfReader), 1); @@ -944,7 +944,6 @@ Module cellSail("cellSail", []() REG_FUNC(cellSail, cellSailSourceNotifyStreamOut); REG_FUNC(cellSail, cellSailSourceNotifySessionError); REG_FUNC(cellSail, cellSailSourceNotifyMediaStateChanged); - //cellSail.AddFunc(, cellSailSourceCheck); REG_FUNC(cellSail, cellSailSourceNotifyOpenCompleted); REG_FUNC(cellSail, cellSailSourceNotifyStartCompleted); REG_FUNC(cellSail, cellSailSourceNotifyStopCompleted); @@ -961,7 +960,6 @@ Module cellSail("cellSail", []() REG_FUNC(cellSail, cellSailMp4TrackGetTrackInfo); REG_FUNC(cellSail, cellSailMp4TrackGetTrackReferenceCount); REG_FUNC(cellSail, cellSailMp4TrackGetTrackReference); - //cellSail.AddFunc(, cellSailMp4ConvertTimeScale); REG_FUNC(cellSail, cellSailAviMovieGetMovieInfo); REG_FUNC(cellSail, cellSailAviMovieGetStreamByIndex); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp index a585717aff..7d492cf87c 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp @@ -37,7 +37,7 @@ never_inline s32 savedata_op( PPUThread& CPU, u32 operation, u32 version, - vm::ptr dirName, + vm::cptr dirName, u32 errDialog, vm::ptr setList, vm::ptr setBuf, @@ -685,7 +685,7 @@ s32 cellSaveDataFixedLoad2( s32 cellSaveDataAutoSave2( PPUThread& CPU, u32 version, - vm::ptr dirName, + vm::cptr dirName, u32 errDialog, vm::ptr setBuf, vm::ptr funcStat, @@ -702,7 +702,7 @@ s32 cellSaveDataAutoSave2( s32 cellSaveDataAutoLoad2( PPUThread& CPU, u32 version, - vm::ptr dirName, + vm::cptr dirName, u32 errDialog, vm::ptr setBuf, vm::ptr funcStat, @@ -850,7 +850,7 @@ s32 cellSaveDataUserAutoSave( PPUThread& CPU, u32 version, u32 userId, - vm::ptr dirName, + vm::cptr dirName, u32 errDialog, vm::ptr setBuf, vm::ptr funcStat, @@ -868,7 +868,7 @@ s32 cellSaveDataUserAutoLoad( PPUThread& CPU, u32 version, u32 userId, - vm::ptr dirName, + vm::cptr dirName, u32 errDialog, vm::ptr setBuf, vm::ptr funcStat, @@ -987,7 +987,7 @@ s32 cellSaveDataListExport( s32 cellSaveDataFixedImport( PPUThread& CPU, - vm::ptr dirName, + vm::cptr dirName, u32 maxSizeKB, vm::ptr funcDone, u32 container, @@ -1000,7 +1000,7 @@ s32 cellSaveDataFixedImport( s32 cellSaveDataFixedExport( PPUThread& CPU, - vm::ptr dirName, + vm::cptr dirName, u32 maxSizeKB, vm::ptr funcDone, u32 container, @@ -1012,7 +1012,7 @@ s32 cellSaveDataFixedExport( } s32 cellSaveDataGetListItem( - vm::ptr dirName, + vm::cptr dirName, vm::ptr dir, vm::ptr sysFileParam, vm::ptr bind, @@ -1069,7 +1069,7 @@ s32 cellSaveDataUserListExport( s32 cellSaveDataUserFixedImport( PPUThread& CPU, u32 userId, - vm::ptr dirName, + vm::cptr dirName, u32 maxSizeKB, vm::ptr funcDone, u32 container, @@ -1083,7 +1083,7 @@ s32 cellSaveDataUserFixedImport( s32 cellSaveDataUserFixedExport( PPUThread& CPU, u32 userId, - vm::ptr dirName, + vm::cptr dirName, u32 maxSizeKB, vm::ptr funcDone, u32 container, @@ -1096,7 +1096,7 @@ s32 cellSaveDataUserFixedExport( s32 cellSaveDataUserGetListItem( u32 userId, - vm::ptr dirName, + vm::cptr dirName, vm::ptr dir, vm::ptr sysFileParam, vm::ptr bind, diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp index 8671a67c7d..a98f319a4f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp @@ -388,7 +388,7 @@ s32 cellSpursInitialize(vm::ptr spurs, s32 nSpus, s32 spuPriority, s3 0); } -s32 cellSpursInitializeWithAttribute(vm::ptr spurs, vm::ptr attr) +s32 cellSpursInitializeWithAttribute(vm::ptr spurs, vm::cptr attr) { cellSpurs.Warning("cellSpursInitializeWithAttribute(spurs_addr=0x%x, attr_addr=0x%x)", spurs.addr(), attr.addr()); @@ -421,7 +421,7 @@ s32 cellSpursInitializeWithAttribute(vm::ptr spurs, vm::ptrswlIsPreem); } -s32 cellSpursInitializeWithAttribute2(vm::ptr spurs, vm::ptr attr) +s32 cellSpursInitializeWithAttribute2(vm::ptr spurs, vm::cptr attr) { cellSpurs.Warning("cellSpursInitializeWithAttribute2(spurs_addr=0x%x, attr_addr=0x%x)", spurs.addr(), attr.addr()); @@ -501,7 +501,7 @@ s32 cellSpursAttributeSetMemoryContainerForSpuThread(vm::ptr return CELL_OK; } -s32 cellSpursAttributeSetNamePrefix(vm::ptr attr, vm::ptr prefix, u32 size) +s32 cellSpursAttributeSetNamePrefix(vm::ptr attr, vm::cptr prefix, u32 size) { cellSpurs.Warning("cellSpursAttributeSetNamePrefix(attr_addr=0x%x, prefix_addr=0x%x, size=%d)", attr.addr(), prefix.addr(), size); @@ -573,7 +573,7 @@ s32 cellSpursAttributeSetSpuThreadGroupType(vm::ptr attr, s3 return CELL_OK; } -s32 cellSpursAttributeEnableSystemWorkload(vm::ptr attr, vm::ptr priority, u32 maxSpu, vm::ptr isPreemptible) +s32 cellSpursAttributeEnableSystemWorkload(vm::ptr attr, vm::cptr priority, u32 maxSpu, vm::cptr isPreemptible) { cellSpurs.Warning("cellSpursAttributeEnableSystemWorkload(attr_addr=0x%x, priority_addr=0x%x, maxSpu=%d, isPreemptible_addr=0x%x)", attr.addr(), priority.addr(), maxSpu, isPreemptible.addr()); @@ -794,13 +794,13 @@ s32 cellSpursSetMaxContention(vm::ptr spurs, u32 workloadId, u32 maxC return CELL_OK; } -s32 cellSpursSetPriorities(vm::ptr spurs, u32 workloadId, vm::ptr priorities) +s32 cellSpursSetPriorities(vm::ptr spurs, u32 workloadId, vm::cptr priorities) { UNIMPLEMENTED_FUNC(cellSpurs); return CELL_OK; } -s32 cellSpursSetPreemptionVictimHints(vm::ptr spurs, vm::ptr isPreemptible) +s32 cellSpursSetPreemptionVictimHints(vm::ptr spurs, vm::cptr isPreemptible) { UNIMPLEMENTED_FUNC(cellSpurs); return CELL_OK; @@ -874,14 +874,14 @@ s32 cellSpursWakeUp(PPUThread& CPU, vm::ptr spurs) s32 spursAddWorkload( vm::ptr spurs, vm::ptr wid, - vm::ptr pm, + vm::cptr pm, u32 size, u64 data, const u8 priorityTable[], u32 minContention, u32 maxContention, - vm::ptr nameClass, - vm::ptr nameInstance, + vm::cptr nameClass, + vm::cptr nameInstance, vm::ptr hook, vm::ptr hookArg) { @@ -1039,10 +1039,10 @@ s32 spursAddWorkload( s32 cellSpursAddWorkload( vm::ptr spurs, vm::ptr wid, - vm::ptr pm, + vm::cptr pm, u32 size, u64 data, - vm::ptr priorityTable, + vm::cptr priorityTable, u32 minContention, u32 maxContention) { @@ -1068,10 +1068,10 @@ s32 _cellSpursWorkloadAttributeInitialize( vm::ptr attr, u32 revision, u32 sdkVersion, - vm::ptr pm, + vm::cptr pm, u32 size, u64 data, - vm::ptr priorityTable, + vm::cptr priorityTable, u32 minContention, u32 maxContention) { @@ -1111,7 +1111,7 @@ s32 _cellSpursWorkloadAttributeInitialize( return CELL_OK; } -s32 cellSpursWorkloadAttributeSetName(vm::ptr attr, vm::ptr nameClass, vm::ptr nameInstance) +s32 cellSpursWorkloadAttributeSetName(vm::ptr attr, vm::cptr nameClass, vm::cptr nameInstance) { cellSpurs.Warning("%s(attr_addr=0x%x, nameClass_addr=0x%x, nameInstance_addr=0x%x)", __FUNCTION__, attr.addr(), nameClass.addr(), nameInstance.addr()); @@ -1147,7 +1147,7 @@ s32 cellSpursWorkloadAttributeSetShutdownCompletionEventHook(vm::ptr spurs, const vm::ptr wid, vm::ptr attr) +s32 cellSpursAddWorkloadWithAttribute(vm::ptr spurs, const vm::ptr wid, vm::cptr attr) { cellSpurs.Warning("%s(spurs_addr=0x%x, wid_addr=0x%x, attr_addr=0x%x)", __FUNCTION__, spurs.addr(), wid.addr(), attr.addr()); @@ -1552,7 +1552,7 @@ s32 cellSpursEventFlagAttachLv2EventQueue(vm::ptr eventFlag) if (eventFlag->direction == CELL_SPURS_EVENT_FLAG_ANY2ANY) { vm::var> eventPortId; - rc = sys_event_port_create(vm::ref::make(eventPortId.addr()), SYS_EVENT_PORT_LOCAL, 0); + rc = sys_event_port_create(vm::ptr::make(eventPortId.addr()), SYS_EVENT_PORT_LOCAL, 0); if (rc == CELL_OK) { rc = sys_event_port_connect_local(eventPortId.value(), eventQueueId); @@ -2160,8 +2160,8 @@ s32 cellSpursJobChainGetSpursAddress() return CELL_OK; } -s32 spursCreateTaskset(vm::ptr spurs, vm::ptr taskset, u64 args, vm::ptr priority, - u32 max_contention, vm::ptr name, u32 size, s32 enable_clear_ls) +s32 spursCreateTaskset(vm::ptr spurs, vm::ptr taskset, u64 args, vm::cptr priority, + u32 max_contention, vm::cptr name, u32 size, s32 enable_clear_ls) { if (!spurs || !taskset) { @@ -2181,7 +2181,7 @@ s32 spursCreateTaskset(vm::ptr spurs, vm::ptr tasks taskset->size = size; vm::var wkl_attr; - _cellSpursWorkloadAttributeInitialize(wkl_attr, 1 /*revision*/, 0x33 /*sdk_version*/, vm::ptr::make(SPURS_IMG_ADDR_TASKSET_PM), 0x1E40 /*pm_size*/, + _cellSpursWorkloadAttributeInitialize(wkl_attr, 1 /*revision*/, 0x33 /*sdk_version*/, vm::cptr::make(SPURS_IMG_ADDR_TASKSET_PM), 0x1E40 /*pm_size*/, taskset.addr(), priority, 8 /*min_contention*/, max_contention); // TODO: Check return code @@ -2222,8 +2222,8 @@ s32 cellSpursCreateTasksetWithAttribute(vm::ptr spurs, vm::ptrargs, vm::ptr::make(attr.addr() + offsetof(CellSpursTasksetAttribute, priority)), - attr->max_contention, vm::ptr::make(attr->name.addr()), attr->taskset_size, attr->enable_clear_ls); + auto rc = spursCreateTaskset(spurs, taskset, attr->args, vm::cptr::make(attr.addr() + offsetof(CellSpursTasksetAttribute, priority)), + attr->max_contention, vm::cptr::make(attr->name.addr()), attr->taskset_size, attr->enable_clear_ls); if (attr->taskset_size >= sizeof32(CellSpursTaskset2)) { @@ -2233,7 +2233,7 @@ s32 cellSpursCreateTasksetWithAttribute(vm::ptr spurs, vm::ptr spurs, vm::ptr taskset, u64 args, vm::ptr priority, u32 maxContention) +s32 cellSpursCreateTaskset(vm::ptr spurs, vm::ptr taskset, u64 args, vm::cptr priority, u32 maxContention) { cellSpurs.Warning("cellSpursCreateTaskset(spurs_addr=0x%x, taskset_addr=0x%x, args=0x%llx, priority_addr=0x%x, maxContention=%d)", spurs.addr(), taskset.addr(), args, priority.addr(), maxContention); @@ -2503,7 +2503,7 @@ s32 cellSpursCreateTaskWithAttribute() return CELL_OK; } -s32 cellSpursTasksetAttributeSetName(vm::ptr attr, vm::ptr name) +s32 cellSpursTasksetAttributeSetName(vm::ptr attr, vm::cptr name) { cellSpurs.Warning("%s(attr=0x%x, name=0x%x)", __FUNCTION__, attr.addr(), name.addr()); @@ -2667,7 +2667,7 @@ s32 cellSpursCreateTaskset2(vm::ptr spurs, vm::ptr } auto rc = spursCreateTaskset(spurs, vm::ptr::make(taskset.addr()), attr->args, - vm::ptr::make(attr.addr() + offsetof(CellSpursTasksetAttribute, priority)), + vm::cptr::make(attr.addr() + offsetof(CellSpursTasksetAttribute, priority)), attr->max_contention, attr->name, sizeof32(CellSpursTaskset2), (u8)attr->enable_clear_ls); if (rc != CELL_OK) @@ -2788,7 +2788,7 @@ s32 cellSpursLookUpTasksetAddress(vm::ptr spurs, vm::ptr taskset, vm::ptr spurs) +s32 cellSpursTasksetGetSpursAddress(vm::cptr taskset, vm::ptr spurs) { cellSpurs.Warning("%s(taskset=0x%x, spurs=0x%x)", __FUNCTION__, taskset.addr(), spurs.addr()); @@ -2817,7 +2817,7 @@ s32 cellSpursGetTasksetInfo() return CELL_OK; } -s32 _cellSpursTasksetAttributeInitialize(vm::ptr attribute, u32 revision, u32 sdk_version, u64 args, vm::ptr priority, u32 max_contention) +s32 _cellSpursTasksetAttributeInitialize(vm::ptr attribute, u32 revision, u32 sdk_version, u64 args, vm::cptr priority, u32 max_contention) { cellSpurs.Warning("%s(attribute=0x%x, revision=%d, skd_version=%d, args=0x%llx, priority=0x%x, max_contention=%d)", __FUNCTION__, attribute.addr(), revision, sdk_version, args, priority.addr(), max_contention); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.h b/rpcs3/Emu/SysCalls/Modules/cellSpurs.h index 0093d8a6e3..31e276d32a 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.h +++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.h @@ -827,7 +827,7 @@ struct SpursKernelContext vm::bptr spurs; // 0x1C0 be_t spuNum; // 0x1C8 be_t dmaTagId; // 0x1CC - vm::bptr wklCurrentAddr; // 0x1D0 + vm::bcptr wklCurrentAddr; // 0x1D0 be_t wklCurrentUniqueId; // 0x1D8 be_t wklCurrentId; // 0x1DC be_t exitToKernelAddr; // 0x1E0 diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp index bdfa28615c..33e2b95508 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp @@ -403,7 +403,7 @@ s32 syncRwmTryWriteBeginOp(CellSyncRwm::data_t& rwm) return CELL_OK; } -s32 cellSyncRwmWrite(vm::ptr rwm, vm::ptr buffer) +s32 cellSyncRwmWrite(vm::ptr rwm, vm::cptr buffer) { cellSync.Log("cellSyncRwmWrite(rwm=*0x%x, buffer=*0x%x)", rwm, buffer); @@ -438,7 +438,7 @@ s32 cellSyncRwmWrite(vm::ptr rwm, vm::ptr buffer) return CELL_OK; } -s32 cellSyncRwmTryWrite(vm::ptr rwm, vm::ptr buffer) +s32 cellSyncRwmTryWrite(vm::ptr rwm, vm::cptr buffer) { cellSync.Log("cellSyncRwmTryWrite(rwm=*0x%x, buffer=*0x%x)", rwm, buffer); @@ -525,7 +525,7 @@ s32 syncQueueTryPushOp(CellSyncQueue::data_t& queue, u32 depth, u32& position) return CELL_OK; } -s32 cellSyncQueuePush(vm::ptr queue, vm::ptr buffer) +s32 cellSyncQueuePush(vm::ptr queue, vm::cptr buffer) { cellSync.Log("cellSyncQueuePush(queue=*0x%x, buffer=*0x%x)", queue, buffer); @@ -563,7 +563,7 @@ s32 cellSyncQueuePush(vm::ptr queue, vm::ptr buffer) return CELL_OK; } -s32 cellSyncQueueTryPush(vm::ptr queue, vm::ptr buffer) +s32 cellSyncQueueTryPush(vm::ptr queue, vm::cptr buffer) { cellSync.Log("cellSyncQueueTryPush(queue=*0x%x, buffer=*0x%x)", queue, buffer); @@ -1298,7 +1298,7 @@ s32 _cellSyncLFQueueCompletePushPointer2(vm::ptr queue, s32 poi return syncLFQueueCompletePushPointer2(queue, pointer, fpSendSignal); } -s32 _cellSyncLFQueuePushBody(PPUThread& CPU, vm::ptr queue, vm::ptr buffer, u32 isBlocking) +s32 _cellSyncLFQueuePushBody(PPUThread& CPU, vm::ptr queue, vm::cptr buffer, u32 isBlocking) { // cellSyncLFQueuePush has 1 in isBlocking param, cellSyncLFQueueTryPush has 0 cellSync.Warning("_cellSyncLFQueuePushBody(queue=*0x%x, buffer=*0x%x, isBlocking=%d)", queue, buffer, isBlocking); @@ -1811,7 +1811,7 @@ s32 cellSyncLFQueueDepth(vm::ptr queue, vm::ptr depth) return CELL_OK; } -s32 _cellSyncLFQueueGetSignalAddress(vm::ptr queue, vm::pptr ppSignal) +s32 _cellSyncLFQueueGetSignalAddress(vm::cptr queue, vm::pptr ppSignal) { cellSync.Log("_cellSyncLFQueueGetSignalAddress(queue=*0x%x, ppSignal=**0x%x)", queue, ppSignal); @@ -1829,7 +1829,7 @@ s32 _cellSyncLFQueueGetSignalAddress(vm::ptr queue, vm::p return CELL_OK; } -s32 cellSyncLFQueueGetDirection(vm::ptr queue, vm::ptr direction) +s32 cellSyncLFQueueGetDirection(vm::cptr queue, vm::ptr direction) { cellSync.Log("cellSyncLFQueueGetDirection(queue=*0x%x, direction=*0x%x)", queue, direction); @@ -1846,7 +1846,7 @@ s32 cellSyncLFQueueGetDirection(vm::ptr queue, vm::ptr queue, vm::ptr entry_size) +s32 cellSyncLFQueueGetEntrySize(vm::cptr queue, vm::ptr entry_size) { cellSync.Log("cellSyncLFQueueGetEntrySize(queue=*0x%x, entry_size=*0x%x)", queue, entry_size); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp index 3b7daeaa0a..e49894c7d7 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp @@ -22,7 +22,7 @@ s32 _cellSync2MutexAttributeInitialize(vm::ptr attr, u3 return CELL_OK; } -s32 cellSync2MutexEstimateBufferSize(vm::ptr attr, vm::ptr bufferSize) +s32 cellSync2MutexEstimateBufferSize(vm::cptr attr, vm::ptr bufferSize) { cellSync2.Todo("cellSync2MutexEstimateBufferSize(attr_addr=0x%x, bufferSize_addr=0x%x)", attr.addr(), bufferSize.addr()); @@ -73,7 +73,7 @@ s32 _cellSync2CondAttributeInitialize(vm::ptr attr, u32 return CELL_OK; } -s32 cellSync2CondEstimateBufferSize(vm::ptr attr, vm::ptr bufferSize) +s32 cellSync2CondEstimateBufferSize(vm::cptr attr, vm::ptr bufferSize) { cellSync2.Todo("cellSync2CondEstimateBufferSize(attr_addr=0x%x, bufferSize_addr=0x%x)", attr.addr(), bufferSize.addr()); @@ -127,7 +127,7 @@ s32 _cellSync2SemaphoreAttributeInitialize(vm::ptr return CELL_OK; } -s32 cellSync2SemaphoreEstimateBufferSize(vm::ptr attr, vm::ptr bufferSize) +s32 cellSync2SemaphoreEstimateBufferSize(vm::cptr attr, vm::ptr bufferSize) { cellSync2.Todo("cellSync2SemaphoreEstimateBufferSize(attr_addr=0x%x, bufferSize_addr=0x%x)", attr.addr(), bufferSize.addr()); @@ -190,7 +190,7 @@ s32 _cellSync2QueueAttributeInitialize(vm::ptr attr, u3 return CELL_OK; } -s32 cellSync2QueueEstimateBufferSize(vm::ptr attr, vm::ptr bufferSize) +s32 cellSync2QueueEstimateBufferSize(vm::cptr attr, vm::ptr bufferSize) { cellSync2.Todo("cellSync2QueueEstimateBufferSize(attr_addr=0x%x, bufferSize_addr=0x%x)", attr.addr(), bufferSize.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp index 3bf5579681..fd3b2d59bd 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp @@ -753,7 +753,7 @@ int cellSysutilGetBgmPlaybackStatus2(vm::ptr stat return CELL_OK; } -int cellWebBrowserEstimate2(const vm::ptr config, vm::ptr memSize) +int cellWebBrowserEstimate2(const vm::cptr config, vm::ptr memSize) { cellSysutil.Warning("cellWebBrowserEstimate2(config_addr=0x%x, memSize_addr=0x%x)", config.addr(), memSize.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil.h b/rpcs3/Emu/SysCalls/Modules/cellSysutil.h index 3eb6435e93..0c5f744232 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, }; -typedef void(CellSysutilCallback)(u64 status, u64 param, vm::ptr userdata); +using CellSysutilCallback = func_def userdata)>; void sysutilSendSystemCommand(u64 status, u64 param); @@ -154,22 +154,20 @@ enum CELL_SYSCACHE_ERROR_NOTMOUNTED = 0x8002bc04, // We don't really need to simulate the mounting, so this is probably useless }; -typedef s32 CellWebBrowserId; -typedef vm::ptr CellWebBrowserClientSession; -typedef void(CellWebBrowserCallback)(s32 cb_type, CellWebBrowserClientSession, vm::ptr usrdata); -typedef void(CellWebComponentCallback)(CellWebBrowserId, s32 cb_type, CellWebBrowserClientSession, vm::ptr usrdata); -typedef void(CellWebBrowserSystemCallback)(s32 cb_type, vm::ptr usrdata); +using CellWebBrowserCallback = func_def client_session, vm::ptr usrdata)>; +using CellWebComponentCallback = func_def client_session, vm::ptr usrdata)>; +using CellWebBrowserSystemCallback = func_def usrdata)>; -typedef void(CellWebBrowserMIMETypeCallback)(vm::ptr mimetype, vm::ptr url, vm::ptr usrdata); -typedef void(CellWebBrowserErrorCallback)(s32 err_type, vm::ptr usrdata); -typedef void(CellWebBrowserStatusCallback)(s32 err_type, vm::ptr usrdata); -typedef void(CellWebBrowserNotify)(vm::ptr message, vm::ptr usrdata); -typedef void(CellWebBrowserUsrdata)(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)>; struct CellWebBrowserMimeSet { - const vm::bptr type; - const vm::bptr directory; + vm::bcptr type; + vm::bcptr directory; }; struct CellWebBrowserPos @@ -194,7 +192,7 @@ struct CellWebBrowserConfig { be_t version; be_t heap_size; - vm::bptr mimesets; + vm::bcptr mimesets; be_t mimeset_num; be_t functions; be_t tab_count; diff --git a/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp b/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp index 8315babc45..18a5207841 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp @@ -550,21 +550,21 @@ void vdecOpen(u32 vdec_id) // TODO: call from the constructor }); } -s32 cellVdecQueryAttr(vm::ptr type, vm::ptr attr) +s32 cellVdecQueryAttr(vm::cptr type, vm::ptr attr) { cellVdec.Warning("cellVdecQueryAttr(type=*0x%x, attr=*0x%x)", type, attr); return vdecQueryAttr(type->codecType, type->profileLevel, 0, attr); } -s32 cellVdecQueryAttrEx(vm::ptr type, vm::ptr attr) +s32 cellVdecQueryAttrEx(vm::cptr type, vm::ptr attr) { cellVdec.Warning("cellVdecQueryAttrEx(type=*0x%x, attr=*0x%x)", type, attr); return vdecQueryAttr(type->codecType, type->profileLevel, type->codecSpecificInfo_addr, attr); } -s32 cellVdecOpen(vm::ptr type, vm::ptr res, vm::ptr cb, vm::ptr handle) +s32 cellVdecOpen(vm::cptr type, vm::cptr res, vm::cptr cb, vm::ptr handle) { cellVdec.Warning("cellVdecOpen(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); @@ -573,7 +573,7 @@ s32 cellVdecOpen(vm::ptr type, vm::ptr type, vm::ptr res, vm::ptr cb, vm::ptr handle) +s32 cellVdecOpenEx(vm::cptr type, vm::cptr res, vm::cptr cb, vm::ptr handle) { cellVdec.Warning("cellVdecOpenEx(type=*0x%x, res=*0x%x, cb=*0x%x, handle=*0x%x)", type, res, cb, handle); @@ -641,7 +641,7 @@ s32 cellVdecEndSeq(u32 handle) return CELL_OK; } -s32 cellVdecDecodeAu(u32 handle, CellVdecDecodeMode mode, vm::ptr auInfo) +s32 cellVdecDecodeAu(u32 handle, CellVdecDecodeMode mode, vm::cptr auInfo) { cellVdec.Log("cellVdecDecodeAu(handle=0x%x, mode=%d, auInfo=*0x%x)", handle, mode, auInfo); @@ -671,7 +671,7 @@ s32 cellVdecDecodeAu(u32 handle, CellVdecDecodeMode mode, vm::ptr format, vm::ptr outBuff) +s32 cellVdecGetPicture(u32 handle, vm::cptr format, vm::ptr outBuff) { cellVdec.Log("cellVdecGetPicture(handle=0x%x, format=*0x%x, outBuff=*0x%x)", handle, format, outBuff); @@ -778,7 +778,7 @@ s32 cellVdecGetPicture(u32 handle, vm::ptr format, vm:: return CELL_OK; } -s32 _nid_a21aa896(PPUThread& CPU, u32 handle, vm::ptr format2, vm::ptr outBuff, u32 arg4) +s32 _nid_a21aa896(PPUThread& CPU, u32 handle, vm::cptr format2, vm::ptr outBuff, u32 arg4) { cellVdec.Warning("_nid_a21aa896(handle=0x%x, format2=*0x%x, outBuff=*0x%x, arg4=*0x%x)", handle, format2, outBuff, arg4); diff --git a/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp b/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp index dab1201638..a4a109f178 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp @@ -13,7 +13,7 @@ extern "C" extern Module cellVpost; -s32 cellVpostQueryAttr(vm::ptr cfgParam, vm::ptr attr) +s32 cellVpostQueryAttr(vm::cptr cfgParam, vm::ptr attr) { cellVpost.Warning("cellVpostQueryAttr(cfgParam=*0x%x, attr=*0x%x)", cfgParam, attr); @@ -27,7 +27,7 @@ s32 cellVpostQueryAttr(vm::ptr cfgParam, vm::ptr cfgParam, vm::ptr resource, vm::ptr handle) +s32 cellVpostOpen(vm::cptr cfgParam, vm::cptr resource, vm::ptr handle) { cellVpost.Warning("cellVpostOpen(cfgParam=*0x%x, resource=*0x%x, handle=*0x%x)", cfgParam, resource, handle); @@ -36,7 +36,7 @@ s32 cellVpostOpen(vm::ptr cfgParam, vm::ptr cfgParam, vm::ptr resource, vm::ptr handle) +s32 cellVpostOpenEx(vm::cptr cfgParam, vm::cptr resource, vm::ptr handle) { cellVpost.Warning("cellVpostOpenEx(cfgParam=*0x%x, resource=*0x%x, handle=*0x%x)", cfgParam, resource, handle); @@ -60,7 +60,7 @@ s32 cellVpostClose(u32 handle) return CELL_OK; } -s32 cellVpostExec(u32 handle, vm::ptr inPicBuff, vm::ptr ctrlParam, vm::ptr outPicBuff, vm::ptr picInfo) +s32 cellVpostExec(u32 handle, vm::cptr inPicBuff, vm::cptr ctrlParam, vm::ptr outPicBuff, vm::ptr picInfo) { cellVpost.Log("cellVpostExec(handle=0x%x, inPicBuff=*0x%x, ctrlParam=*0x%x, outPicBuff=*0x%x, picInfo=*0x%x)", handle, inPicBuff, ctrlParam, outPicBuff, picInfo); diff --git a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp index 69eb7ea158..dac5fbe273 100644 --- a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp +++ b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp @@ -292,7 +292,7 @@ int cellSSPlayerGetState(u32 handle) return CELL_SSPLAYER_STATE_OFF; } -int cellSurMixerCreate(vm::ptr config) +int cellSurMixerCreate(vm::cptr config) { libmixer.Warning("cellSurMixerCreate(config_addr=0x%x)", config.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp index 8c30d2951e..cad54e5583 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp @@ -80,7 +80,7 @@ int sceNp2Term() return CELL_OK; } -int npDrmIsAvailable(u32 k_licensee_addr, vm::ptr drm_path) +int npDrmIsAvailable(u32 k_licensee_addr, vm::cptr drm_path) { if (!Emu.GetVFS().ExistsFile(drm_path.get_ptr())) { @@ -146,28 +146,28 @@ int npDrmIsAvailable(u32 k_licensee_addr, vm::ptr drm_path) return CELL_OK; } -int sceNpDrmIsAvailable(u32 k_licensee_addr, vm::ptr drm_path) +int sceNpDrmIsAvailable(u32 k_licensee_addr, vm::cptr drm_path) { sceNp.Warning("sceNpDrmIsAvailable(k_licensee_addr=0x%x, drm_path_addr=0x%x('%s'))", k_licensee_addr, drm_path.addr(), drm_path.get_ptr()); return npDrmIsAvailable(k_licensee_addr, drm_path); } -int sceNpDrmIsAvailable2(u32 k_licensee_addr, vm::ptr drm_path) +int sceNpDrmIsAvailable2(u32 k_licensee_addr, vm::cptr drm_path) { sceNp.Warning("sceNpDrmIsAvailable2(k_licensee_addr=0x%x, drm_path_addr=0x%x('%s'))", k_licensee_addr, drm_path.addr(), drm_path.get_ptr()); return npDrmIsAvailable(k_licensee_addr, drm_path); } -int sceNpDrmVerifyUpgradeLicense(vm::ptr content_id) +int sceNpDrmVerifyUpgradeLicense(vm::cptr content_id) { sceNp.Todo("sceNpDrmVerifyUpgradeLicense(content_id_addr=0x%x)", content_id.addr()); return CELL_OK; } -int sceNpDrmVerifyUpgradeLicense2(vm::ptr content_id) +int sceNpDrmVerifyUpgradeLicense2(vm::cptr content_id) { sceNp.Todo("sceNpDrmVerifyUpgradeLicense2(content_id_addr=0x%x)", content_id.addr()); @@ -189,7 +189,7 @@ int sceNpDrmGetTimelimit(vm::ptr path, vm::ptr time_remain) return CELL_OK; } -int sceNpDrmProcessExitSpawn(vm::ptr path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags) +int sceNpDrmProcessExitSpawn(vm::cptr path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags) { sceNp.Warning("sceNpDrmProcessExitSpawn()"); sceNp.Warning("path: %s", path.get_ptr()); @@ -205,7 +205,7 @@ int sceNpDrmProcessExitSpawn(vm::ptr path, u32 argv_addr, u32 envp_a return CELL_OK; } -int sceNpDrmProcessExitSpawn2(vm::ptr path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags) +int sceNpDrmProcessExitSpawn2(vm::cptr path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags) { sceNp.Warning("sceNpDrmProcessExitSpawn2()"); sceNp.Warning("path: %s", path.get_ptr()); diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp index 3ea66374d1..a91075932f 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp @@ -80,7 +80,7 @@ int sceNpClansAbortRequest(vm::ptr handle) return CELL_OK; } -int sceNpClansCreateClan(vm::ptr handle, vm::ptr name, vm::ptr tag, vm::ptr clanId) +int sceNpClansCreateClan(vm::ptr handle, vm::cptr name, vm::cptr tag, vm::ptr clanId) { UNIMPLEMENTED_FUNC(sceNpClans); @@ -100,7 +100,7 @@ int sceNpClansDisbandClan(vm::ptr handle, u32 clanId) return CELL_OK; } -int sceNpClansGetClanList(vm::ptr handle, vm::ptr paging, vm::ptr clanList, vm::ptr pageResult) +int sceNpClansGetClanList(vm::ptr handle, vm::cptr paging, vm::ptr clanList, vm::ptr pageResult) { UNIMPLEMENTED_FUNC(sceNpClans); diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp index 4c941ebf70..cbbfcec90e 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp @@ -91,7 +91,7 @@ int sceNpTrophyInit(u32 pool_addr, u32 poolSize, u32 containerId, u64 options) return CELL_OK; } -int sceNpTrophyCreateContext(vm::ptr context, vm::ptr commID, vm::ptr commSign, u64 options) +int sceNpTrophyCreateContext(vm::ptr context, vm::cptr commID, vm::cptr commSign, u64 options) { sceNpTrophy.Warning("sceNpTrophyCreateContext(context=*0x%x, commID=*0x%x, commSign=*0x%x, options=0x%llx)", context, commID, commSign, options); diff --git a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp index b916a50550..bb793e49f3 100644 --- a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp @@ -629,7 +629,7 @@ s32 sys_lwcond_wait(PPUThread& CPU, vm::ptr lwcond, u64 timeout) return res; } -std::string ps3_fmt(PPUThread& context, vm::ptr fmt, u32 g_count, u32 f_count, u32 v_count) +std::string ps3_fmt(PPUThread& context, vm::cptr fmt, u32 g_count, u32 f_count, u32 v_count) { std::string result; @@ -743,7 +743,7 @@ std::string ps3_fmt(PPUThread& context, vm::ptr fmt, u32 g_count, u3 case 's': { // string - auto string = vm::ptr::make(context.get_next_gpr_arg(g_count, f_count, v_count)); + auto string = vm::cptr::make(context.get_next_gpr_arg(g_count, f_count, v_count)); if (plus_sign || minus_sign || space_sign || number_sign || zero_padding || width || prec) break; @@ -762,7 +762,7 @@ std::string ps3_fmt(PPUThread& context, vm::ptr fmt, u32 g_count, u3 return result; } -u32 _sys_heap_create_heap(vm::ptr name, u32 arg2, u32 arg3, u32 arg4) +u32 _sys_heap_create_heap(vm::cptr name, u32 arg2, u32 arg3, u32 arg4) { sysPrxForUser.Warning("_sys_heap_create_heap(name=*0x%x, arg2=0x%x, arg3=0x%x, arg4=0x%x)", name, arg2, arg3, arg4); @@ -860,7 +860,7 @@ s32 sys_spu_image_close(vm::ptr img) return CELL_OK; } -s32 sys_raw_spu_load(s32 id, vm::ptr path, vm::ptr entry) +s32 sys_raw_spu_load(s32 id, vm::cptr path, vm::ptr entry) { sysPrxForUser.Warning("sys_raw_spu_load(id=%d, path=*0x%x, entry=*0x%x)", id, path, entry); sysPrxForUser.Warning("*** path = '%s'", path.get_ptr()); @@ -938,7 +938,7 @@ vm::ptr _sys_memset(vm::ptr dst, s32 value, u32 size) return dst; } -vm::ptr _sys_memcpy(vm::ptr dst, vm::ptr src, u32 size) +vm::ptr _sys_memcpy(vm::ptr dst, vm::cptr src, u32 size) { sysPrxForUser.Log("_sys_memcpy(dst=*0x%x, src=*0x%x, size=0x%x)", dst, src, size); @@ -947,35 +947,35 @@ vm::ptr _sys_memcpy(vm::ptr dst, vm::ptr src, u32 size) return dst; } -s32 _sys_memcmp(vm::ptr buf1, vm::ptr buf2, u32 size) +s32 _sys_memcmp(vm::cptr buf1, vm::cptr buf2, u32 size) { sysPrxForUser.Log("_sys_memcmp(buf1=*0x%x, buf2=*0x%x, size=%d)", buf1, buf2, size); return memcmp(buf1.get_ptr(), buf2.get_ptr(), size); } -s64 _sys_strlen(vm::ptr str) +s64 _sys_strlen(vm::cptr str) { sysPrxForUser.Log("_sys_strlen(str=*0x%x)", str); return strlen(str.get_ptr()); } -s32 _sys_strcmp(vm::ptr str1, vm::ptr str2) +s32 _sys_strcmp(vm::cptr str1, vm::cptr str2) { sysPrxForUser.Log("_sys_strcmp(str1=*0x%x, str2=*0x%x)", str1, str2); return strcmp(str1.get_ptr(), str2.get_ptr()); } -s32 _sys_strncmp(vm::ptr str1, vm::ptr str2, s32 max) +s32 _sys_strncmp(vm::cptr str1, vm::cptr str2, s32 max) { sysPrxForUser.Log("_sys_strncmp(str1=*0x%x, str2=*0x%x, max=%d)", str1, str2, max); return strncmp(str1.get_ptr(), str2.get_ptr(), max); } -vm::ptr _sys_strcat(vm::ptr dest, vm::ptr source) +vm::ptr _sys_strcat(vm::ptr dest, vm::cptr source) { sysPrxForUser.Log("_sys_strcat(dest=*0x%x, source=*0x%x)", dest, source); @@ -987,14 +987,14 @@ vm::ptr _sys_strcat(vm::ptr dest, vm::ptr source) return dest; } -vm::ptr _sys_strchr(vm::ptr str, s32 ch) +vm::cptr _sys_strchr(vm::cptr str, s32 ch) { sysPrxForUser.Log("_sys_strchr(str=*0x%x, ch=0x%x)", str, ch); - return vm::ptr::make(vm::get_addr(strchr(str.get_ptr(), ch))); + return vm::cptr::make(vm::get_addr(strchr(str.get_ptr(), ch))); } -vm::ptr _sys_strncat(vm::ptr dest, vm::ptr source, u32 len) +vm::ptr _sys_strncat(vm::ptr dest, vm::cptr source, u32 len) { sysPrxForUser.Log("_sys_strncat(dest=*0x%x, source=*0x%x, len=%d)", dest, source, len); @@ -1006,7 +1006,7 @@ vm::ptr _sys_strncat(vm::ptr dest, vm::ptr source, u32 l return dest; } -vm::ptr _sys_strcpy(vm::ptr dest, vm::ptr source) +vm::ptr _sys_strcpy(vm::ptr dest, vm::cptr source) { sysPrxForUser.Log("_sys_strcpy(dest=*0x%x, source=*0x%x)", dest, source); @@ -1018,7 +1018,7 @@ vm::ptr _sys_strcpy(vm::ptr dest, vm::ptr source) return dest; } -vm::ptr _sys_strncpy(vm::ptr dest, vm::ptr source, u32 len) +vm::ptr _sys_strncpy(vm::ptr dest, vm::cptr source, u32 len) { sysPrxForUser.Log("_sys_strncpy(dest=*0x%x, source=*0x%x, len=%d)", dest, source, len); @@ -1134,7 +1134,7 @@ s32 _sys_free(u32 addr) return CELL_OK; } -s32 _sys_snprintf(PPUThread& CPU, vm::ptr dst, u32 count, vm::ptr fmt) // va_args... +s32 _sys_snprintf(PPUThread& CPU, vm::ptr dst, u32 count, vm::cptr fmt) // va_args... { sysPrxForUser.Warning("_sys_snprintf(dst=*0x%x, count=%d, fmt=*0x%x, ...)", dst, count, fmt); @@ -1156,7 +1156,7 @@ s32 _sys_snprintf(PPUThread& CPU, vm::ptr dst, u32 count, vm::ptr fmt) // va_args... +s32 _sys_printf(vm::cptr fmt) // va_args... { sysPrxForUser.Todo("_sys_printf(fmt=*0x%x, ...)", fmt); @@ -1222,7 +1222,7 @@ void sys_spinlock_unlock(vm::ptr> lock) g_sys_spinlock_wm.notify(lock.addr()); } -s32 sys_ppu_thread_create(PPUThread& CPU, vm::ptr thread_id, u32 entry, u64 arg, s32 prio, u32 stacksize, u64 flags, vm::ptr threadname) +s32 sys_ppu_thread_create(PPUThread& CPU, vm::ptr thread_id, u32 entry, u64 arg, s32 prio, u32 stacksize, u64 flags, vm::cptr threadname) { sysPrxForUser.Warning("sys_ppu_thread_create(thread_id=*0x%x, entry=0x%x, arg=0x%llx, prio=%d, stacksize=0x%x, flags=0x%llx, threadname=*0x%x)", thread_id, entry, arg, prio, stacksize, flags, threadname); diff --git a/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp b/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp index 2b181989c2..89eaaef878 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp @@ -10,7 +10,7 @@ extern Module sys_libc; namespace sys_libc_func { - void memcpy(vm::ptr dst, vm::ptr src, u32 size) + void memcpy(vm::ptr dst, vm::cptr src, u32 size) { sys_libc.Log("memcpy(dst=0x%x, src=0x%x, size=0x%x)", dst, src, size); diff --git a/rpcs3/Emu/SysCalls/Modules/sys_net.cpp b/rpcs3/Emu/SysCalls/Modules/sys_net.cpp index 4dcfe97863..c79821c549 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_net.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_net.cpp @@ -171,7 +171,7 @@ namespace sys_net_func return CELL_OK; } - s32 inet_addr(vm::ptr cp) + s32 inet_addr(vm::cptr cp) { sys_net.Warning("inet_addr(cp_addr=0x%x['%s'])", cp.addr(), cp.get_ptr()); return htonl(::inet_addr(cp.get_ptr())); // return a big-endian IP address (WTF? function should return LITTLE-ENDIAN value) @@ -219,7 +219,7 @@ namespace sys_net_func return CELL_OK; } - s32 inet_pton(s32 af, vm::ptr src, vm::ptr dst) + s32 inet_pton(s32 af, vm::cptr src, vm::ptr dst) { sys_net.Warning("inet_pton(af=%d, src_addr=0x%x, dst_addr=0x%x)", af, src.addr(), dst.addr()); @@ -264,7 +264,7 @@ namespace sys_net_func return CELL_OK; } - s32 send(s32 s, vm::ptr buf, u32 len, s32 flags) + s32 send(s32 s, vm::cptr buf, u32 len, s32 flags) { sys_net.Warning("send(s=%d, buf_addr=0x%x, len=%d, flags=0x%x)", s, buf.addr(), len, flags); @@ -279,7 +279,7 @@ namespace sys_net_func return CELL_OK; } - s32 sendto(s32 s, vm::ptr buf, u32 len, s32 flags, vm::ptr addr, u32 addrlen) + s32 sendto(s32 s, vm::cptr buf, u32 len, s32 flags, vm::ptr addr, u32 addrlen) { sys_net.Warning("sendto(s=%d, buf_addr=0x%x, len=%d, flags=0x%x, addr=0x%x, addrlen=%d)", s, buf.addr(), len, flags, addr.addr(), addrlen); @@ -292,7 +292,7 @@ namespace sys_net_func return ret; } - s32 setsockopt(s32 s, s32 level, s32 optname, vm::ptr optval, u32 optlen) + s32 setsockopt(s32 s, s32 level, s32 optname, vm::cptr optval, u32 optlen) { sys_net.Warning("socket(s=%d, level=%d, optname=%d, optval_addr=0x%x, optlen=%d)", s, level, optname, optval.addr(), optlen); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp b/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp index 581d2cde88..a0d5d227e4 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp @@ -13,7 +13,7 @@ SysCallBase sys_cond("sys_cond"); -s32 sys_cond_create(vm::ref cond_id, u32 mutex_id, vm::ptr attr) +s32 sys_cond_create(vm::ptr cond_id, u32 mutex_id, vm::ptr attr) { sys_cond.Warning("sys_cond_create(cond_id=*0x%x, mutex_id=0x%x, attr=*0x%x)", cond_id, mutex_id, attr); @@ -37,7 +37,7 @@ s32 sys_cond_create(vm::ref cond_id, u32 mutex_id, vm::ptr(mutex, attr->name_u64); + *cond_id = Emu.GetIdManager().make(mutex, attr->name_u64); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/lv2/sys_cond.h b/rpcs3/Emu/SysCalls/lv2/sys_cond.h index 0bd5e7923e..786f3f5f18 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_cond.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_cond.h @@ -42,7 +42,7 @@ REG_ID_TYPE(lv2_cond_t, 0x86); // SYS_COND_OBJECT class PPUThread; // SysCalls -s32 sys_cond_create(vm::ref cond_id, u32 mutex_id, vm::ptr attr); +s32 sys_cond_create(vm::ptr cond_id, u32 mutex_id, vm::ptr attr); s32 sys_cond_destroy(u32 cond_id); s32 sys_cond_wait(PPUThread& CPU, u32 cond_id, u64 timeout); s32 sys_cond_signal(u32 cond_id); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_event.cpp b/rpcs3/Emu/SysCalls/lv2/sys_event.cpp index 107e080a86..a278bbaccf 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_event.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_event.cpp @@ -13,7 +13,7 @@ SysCallBase sys_event("sys_event"); -s32 sys_event_queue_create(vm::ref equeue_id, vm::ptr attr, u64 event_queue_key, s32 size) +s32 sys_event_queue_create(vm::ptr equeue_id, vm::ptr attr, u64 event_queue_key, s32 size) { sys_event.Warning("sys_event_queue_create(equeue_id=*0x%x, attr=*0x%x, event_queue_key=0x%llx, size=%d)", equeue_id, attr, event_queue_key, size); @@ -47,7 +47,7 @@ s32 sys_event_queue_create(vm::ref equeue_id, vm::ptr return CELL_EEXIST; } - equeue_id = Emu.GetIdManager().add(std::move(queue)); + *equeue_id = Emu.GetIdManager().add(std::move(queue)); return CELL_OK; } @@ -91,7 +91,7 @@ s32 sys_event_queue_destroy(u32 equeue_id, s32 mode) return CELL_OK; } -s32 sys_event_queue_tryreceive(u32 equeue_id, vm::ptr event_array, s32 size, vm::ref number) +s32 sys_event_queue_tryreceive(u32 equeue_id, vm::ptr event_array, s32 size, vm::ptr number) { sys_event.Log("sys_event_queue_tryreceive(equeue_id=0x%x, event_array=*0x%x, size=%d, number=*0x%x)", equeue_id, event_array, size, number); @@ -129,7 +129,7 @@ s32 sys_event_queue_tryreceive(u32 equeue_id, vm::ptr event_array, queue->events.pop_front(); } - number = count; + *number = count; return CELL_OK; } @@ -211,7 +211,7 @@ s32 sys_event_queue_drain(u32 equeue_id) return CELL_OK; } -s32 sys_event_port_create(vm::ref eport_id, s32 port_type, u64 name) +s32 sys_event_port_create(vm::ptr eport_id, s32 port_type, u64 name) { sys_event.Warning("sys_event_port_create(eport_id=*0x%x, port_type=%d, name=0x%llx)", eport_id, port_type, name); @@ -221,7 +221,7 @@ s32 sys_event_port_create(vm::ref eport_id, s32 port_type, u64 name) return CELL_EINVAL; } - eport_id = Emu.GetIdManager().make(port_type, name); + *eport_id = Emu.GetIdManager().make(port_type, name); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/lv2/sys_event.h b/rpcs3/Emu/SysCalls/lv2/sys_event.h index 23ad59f319..e6f8e44080 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_event.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_event.h @@ -130,13 +130,13 @@ REG_ID_TYPE(lv2_event_port_t, 0x0E); // SYS_EVENT_PORT_OBJECT class PPUThread; // SysCalls -s32 sys_event_queue_create(vm::ref equeue_id, vm::ptr attr, u64 event_queue_key, s32 size); +s32 sys_event_queue_create(vm::ptr equeue_id, vm::ptr attr, u64 event_queue_key, s32 size); s32 sys_event_queue_destroy(u32 equeue_id, s32 mode); s32 sys_event_queue_receive(PPUThread& CPU, u32 equeue_id, vm::ptr dummy_event, u64 timeout); -s32 sys_event_queue_tryreceive(u32 equeue_id, vm::ptr event_array, s32 size, vm::ref number); +s32 sys_event_queue_tryreceive(u32 equeue_id, vm::ptr event_array, s32 size, vm::ptr number); s32 sys_event_queue_drain(u32 event_queue_id); -s32 sys_event_port_create(vm::ref eport_id, s32 port_type, u64 name); +s32 sys_event_port_create(vm::ptr eport_id, s32 port_type, u64 name); s32 sys_event_port_destroy(u32 eport_id); s32 sys_event_port_connect_local(u32 event_port_id, u32 event_queue_id); s32 sys_event_port_disconnect(u32 eport_id); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_fs.cpp b/rpcs3/Emu/SysCalls/lv2/sys_fs.cpp index c420585167..cdc95245c7 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_fs.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_fs.cpp @@ -20,7 +20,7 @@ s32 sys_fs_test(u32 arg1, u32 arg2, vm::ptr arg3, u32 arg4, vm::ptr a return CELL_OK; } -s32 sys_fs_open(vm::ptr path, s32 flags, vm::ptr fd, s32 mode, vm::ptr arg, u64 size) +s32 sys_fs_open(vm::cptr path, s32 flags, vm::ptr fd, s32 mode, vm::cptr arg, u64 size) { sys_fs.Warning("sys_fs_open(path=*0x%x, flags=%#o, fd=*0x%x, mode=%#o, arg=*0x%x, size=0x%llx)", path, flags, fd, mode, arg, size); sys_fs.Warning("*** path = '%s'", path.get_ptr()); @@ -137,7 +137,7 @@ s32 sys_fs_read(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr nread) return CELL_OK; } -s32 sys_fs_write(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr nwrite) +s32 sys_fs_write(u32 fd, vm::cptr buf, u64 nbytes, vm::ptr nwrite) { sys_fs.Log("sys_fs_write(fd=0x%x, buf=*0x%x, nbytes=0x%llx, nwrite=*0x%x)", fd, buf, nbytes, nwrite); @@ -175,7 +175,7 @@ s32 sys_fs_close(u32 fd) return CELL_OK; } -s32 sys_fs_opendir(vm::ptr path, vm::ptr fd) +s32 sys_fs_opendir(vm::cptr path, vm::ptr fd) { sys_fs.Warning("sys_fs_opendir(path=*0x%x, fd=*0x%x)", path, fd); sys_fs.Warning("*** path = '%s'", path.get_ptr()); @@ -237,7 +237,7 @@ s32 sys_fs_closedir(u32 fd) return CELL_OK; } -s32 sys_fs_stat(vm::ptr path, vm::ptr sb) +s32 sys_fs_stat(vm::cptr path, vm::ptr sb) { sys_fs.Warning("sys_fs_stat(path=*0x%x, sb=*0x%x)", path, sb); sys_fs.Warning("*** path = '%s'", path.get_ptr()); @@ -310,7 +310,7 @@ s32 sys_fs_fstat(u32 fd, vm::ptr sb) return CELL_OK; } -s32 sys_fs_mkdir(vm::ptr path, s32 mode) +s32 sys_fs_mkdir(vm::cptr path, s32 mode) { sys_fs.Warning("sys_fs_mkdir(path=*0x%x, mode=%#o)", path, mode); sys_fs.Warning("*** path = '%s'", path.get_ptr()); @@ -331,7 +331,7 @@ s32 sys_fs_mkdir(vm::ptr path, s32 mode) return CELL_OK; } -s32 sys_fs_rename(vm::ptr from, vm::ptr to) +s32 sys_fs_rename(vm::cptr from, vm::cptr to) { sys_fs.Warning("sys_fs_rename(from=*0x%x, to=*0x%x)", from, to); sys_fs.Warning("*** from = '%s'", from.get_ptr()); @@ -364,7 +364,7 @@ s32 sys_fs_rename(vm::ptr from, vm::ptr to) return CELL_FS_ENOENT; } -s32 sys_fs_rmdir(vm::ptr path) +s32 sys_fs_rmdir(vm::cptr path) { sys_fs.Warning("sys_fs_rmdir(path=*0x%x)", path); sys_fs.Warning("*** path = '%s'", path.get_ptr()); @@ -385,7 +385,7 @@ s32 sys_fs_rmdir(vm::ptr path) return CELL_OK; } -s32 sys_fs_unlink(vm::ptr path) +s32 sys_fs_unlink(vm::cptr path) { sys_fs.Warning("sys_fs_unlink(path=*0x%x)", path); sys_fs.Warning("*** path = '%s'", path.get_ptr()); @@ -454,7 +454,7 @@ s32 sys_fs_fget_block_size(u32 fd, vm::ptr sector_size, vm::ptr block_ return CELL_OK; } -s32 sys_fs_get_block_size(vm::ptr path, vm::ptr sector_size, vm::ptr block_size, vm::ptr arg4) +s32 sys_fs_get_block_size(vm::cptr path, vm::ptr sector_size, vm::ptr block_size, vm::ptr arg4) { sys_fs.Todo("sys_fs_get_block_size(path=*0x%x, sector_size=*0x%x, block_size=*0x%x, arg4=*0x%x, arg5=*0x%x)", path, sector_size, block_size, arg4); sys_fs.Todo("*** path = '%s'", path.get_ptr()); @@ -465,7 +465,7 @@ s32 sys_fs_get_block_size(vm::ptr path, vm::ptr sector_size, vm return CELL_OK; } -s32 sys_fs_truncate(vm::ptr path, u64 size) +s32 sys_fs_truncate(vm::cptr path, u64 size) { sys_fs.Warning("sys_fs_truncate(path=*0x%x, size=0x%llx)", path, size); sys_fs.Warning("*** path = '%s'", path.get_ptr()); @@ -514,7 +514,7 @@ s32 sys_fs_ftruncate(u32 fd, u64 size) return CELL_OK; } -s32 sys_fs_chmod(vm::ptr path, s32 mode) +s32 sys_fs_chmod(vm::cptr path, s32 mode) { sys_fs.Todo("sys_fs_chmod(path=*0x%x, mode=%#o) -> CELL_OK", path, mode); sys_fs.Todo("*** path = '%s'", path.get_ptr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_fs.h b/rpcs3/Emu/SysCalls/lv2/sys_fs.h index 7597b0a845..abe6bb0f04 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_fs.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_fs.h @@ -213,23 +213,23 @@ REG_ID_TYPE(lv2_dir_t, 0x73); // SYS_FS_FD_OBJECT // SysCalls s32 sys_fs_test(u32 arg1, u32 arg2, vm::ptr arg3, u32 arg4, vm::ptr arg5, u32 arg6); -s32 sys_fs_open(vm::ptr path, s32 flags, vm::ptr fd, s32 mode, vm::ptr arg, u64 size); +s32 sys_fs_open(vm::cptr path, s32 flags, vm::ptr fd, s32 mode, vm::cptr arg, u64 size); s32 sys_fs_read(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr nread); -s32 sys_fs_write(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr nwrite); +s32 sys_fs_write(u32 fd, vm::cptr buf, u64 nbytes, vm::ptr nwrite); s32 sys_fs_close(u32 fd); -s32 sys_fs_opendir(vm::ptr path, vm::ptr fd); +s32 sys_fs_opendir(vm::cptr path, vm::ptr fd); s32 sys_fs_readdir(u32 fd, vm::ptr dir, vm::ptr nread); s32 sys_fs_closedir(u32 fd); -s32 sys_fs_stat(vm::ptr path, vm::ptr sb); +s32 sys_fs_stat(vm::cptr path, vm::ptr sb); s32 sys_fs_fstat(u32 fd, vm::ptr sb); -s32 sys_fs_mkdir(vm::ptr path, s32 mode); -s32 sys_fs_rename(vm::ptr from, vm::ptr to); -s32 sys_fs_rmdir(vm::ptr path); -s32 sys_fs_unlink(vm::ptr path); +s32 sys_fs_mkdir(vm::cptr path, s32 mode); +s32 sys_fs_rename(vm::cptr from, vm::cptr to); +s32 sys_fs_rmdir(vm::cptr path); +s32 sys_fs_unlink(vm::cptr path); s32 sys_fs_fcntl(u32 fd, s32 flags, u32 addr, u32 arg4, u32 arg5, u32 arg6); s32 sys_fs_lseek(u32 fd, s64 offset, s32 whence, vm::ptr pos); s32 sys_fs_fget_block_size(u32 fd, vm::ptr sector_size, vm::ptr block_size, vm::ptr arg4, vm::ptr arg5); -s32 sys_fs_get_block_size(vm::ptr path, vm::ptr sector_size, vm::ptr block_size, vm::ptr arg4); -s32 sys_fs_truncate(vm::ptr path, u64 size); +s32 sys_fs_get_block_size(vm::cptr path, vm::ptr sector_size, vm::ptr block_size, vm::ptr arg4); +s32 sys_fs_truncate(vm::cptr path, u64 size); s32 sys_fs_ftruncate(u32 fd, u64 size); -s32 sys_fs_chmod(vm::ptr path, s32 mode); +s32 sys_fs_chmod(vm::cptr path, s32 mode); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp index e40550a097..a5b9c46b44 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp @@ -186,7 +186,7 @@ u32 ppu_thread_create(u32 entry, u64 arg, s32 prio, u32 stacksize, bool is_joina return ppu.GetId(); } -s32 _sys_ppu_thread_create(vm::ptr thread_id, vm::ptr param, u64 arg, u64 unk, s32 prio, u32 stacksize, u64 flags, vm::ptr threadname) +s32 _sys_ppu_thread_create(vm::ptr thread_id, vm::ptr param, u64 arg, u64 unk, s32 prio, u32 stacksize, u64 flags, vm::cptr threadname) { sys_ppu_thread.Warning("_sys_ppu_thread_create(thread_id=*0x%x, param=*0x%x, arg=0x%llx, unk=0x%llx, prio=%d, stacksize=0x%x, flags=0x%llx, threadname=*0x%x)", thread_id, param, arg, unk, prio, stacksize, flags, threadname); @@ -244,7 +244,7 @@ s32 sys_ppu_thread_start(u32 thread_id) return CELL_OK; } -s32 sys_ppu_thread_rename(u32 thread_id, vm::ptr name) +s32 sys_ppu_thread_rename(u32 thread_id, vm::cptr name) { sys_ppu_thread.Error("sys_ppu_thread_rename(thread_id=0x%x, name=*0x%x)", thread_id, name); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.h b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.h index e827040afd..8fe954c6cf 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.h @@ -43,6 +43,6 @@ s32 sys_ppu_thread_get_priority(u32 thread_id, vm::ptr priop); s32 sys_ppu_thread_get_stack_information(PPUThread& CPU, vm::ptr sp); s32 sys_ppu_thread_stop(u32 thread_id); s32 sys_ppu_thread_restart(u32 thread_id); -s32 _sys_ppu_thread_create(vm::ptr thread_id, vm::ptr param, u64 arg, u64 arg4, s32 prio, u32 stacksize, u64 flags, vm::ptr threadname); +s32 _sys_ppu_thread_create(vm::ptr thread_id, vm::ptr param, u64 arg, u64 arg4, s32 prio, u32 stacksize, u64 flags, vm::cptr threadname); s32 sys_ppu_thread_start(u32 thread_id); -s32 sys_ppu_thread_rename(u32 thread_id, vm::ptr name); +s32 sys_ppu_thread_rename(u32 thread_id, vm::cptr name); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_process.cpp b/rpcs3/Emu/SysCalls/lv2/sys_process.cpp index 1effa3cd6c..2987f31fa4 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_process.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_process.cpp @@ -54,7 +54,7 @@ s32 sys_process_exit(s32 status) return CELL_OK; } -void sys_game_process_exitspawn(vm::ptr path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags) +void sys_game_process_exitspawn(vm::cptr path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags) { std::string _path = path.get_ptr(); const std::string& from = "//"; @@ -80,7 +80,7 @@ void sys_game_process_exitspawn(vm::ptr path, u32 argv_addr, u32 env if (argv_addr) { - auto argvp = vm::pptr::make(argv_addr); + auto argvp = vm::cpptr::make(argv_addr); while (argvp && *argvp) { argv.push_back(argvp[0].get_ptr()); @@ -94,7 +94,7 @@ void sys_game_process_exitspawn(vm::ptr path, u32 argv_addr, u32 env if (envp_addr) { - auto envp = vm::pptr::make(envp_addr); + auto envp = vm::cpptr::make(envp_addr); while (envp && *envp) { env.push_back(envp[0].get_ptr()); @@ -128,7 +128,7 @@ void sys_game_process_exitspawn(vm::ptr path, u32 argv_addr, u32 env return; } -void sys_game_process_exitspawn2(vm::ptr path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags) +void sys_game_process_exitspawn2(vm::cptr path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags) { std::string _path = path.get_ptr(); const std::string& from = "//"; @@ -154,7 +154,7 @@ void sys_game_process_exitspawn2(vm::ptr path, u32 argv_addr, u32 en if (argv_addr) { - auto argvp = vm::pptr::make(argv_addr); + auto argvp = vm::cpptr::make(argv_addr); while (argvp && *argvp) { argv.push_back(argvp[0].get_ptr()); @@ -169,7 +169,7 @@ void sys_game_process_exitspawn2(vm::ptr path, u32 argv_addr, u32 en if (envp_addr) { - auto envp = vm::pptr::make(envp_addr); + auto envp = vm::cpptr::make(envp_addr); while (envp && *envp) { env.push_back(envp[0].get_ptr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_process.h b/rpcs3/Emu/SysCalls/lv2/sys_process.h index cb43cd5cb1..416a49fd72 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_process.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_process.h @@ -44,7 +44,5 @@ s32 sys_process_kill(u32 pid); s32 sys_process_wait_for_child(u32 pid, vm::ptr status, u64 unk); s32 sys_process_wait_for_child2(u64 unk1, u64 unk2, u64 unk3, u64 unk4, u64 unk5, u64 unk6); s32 sys_process_detach_child(u64 unk); -void sys_game_process_exitspawn(vm::ptr path, u32 argv_addr, u32 envp_addr, - u32 data_addr, u32 data_size, u32 prio, u64 flags); -void sys_game_process_exitspawn2(vm::ptr path, u32 argv_addr, u32 envp_addr, - u32 data_addr, u32 data_size, u32 prio, u64 flags); +void sys_game_process_exitspawn(vm::cptr path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags); +void sys_game_process_exitspawn2(vm::cptr path, u32 argv_addr, u32 envp_addr, u32 data_addr, u32 data_size, u32 prio, u64 flags); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp b/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp index 377e40ceff..1380af5ba5 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp @@ -133,14 +133,14 @@ s32 prx_load_module(std::string path, u64 flags, vm::ptr path, u64 flags, vm::ptr pOpt) +s32 sys_prx_load_module(vm::cptr path, u64 flags, vm::ptr pOpt) { sys_prx.Warning("sys_prx_load_module(path=*0x%x, flags=0x%llx, pOpt=*0x%x)", path, flags, pOpt); return prx_load_module(path.get_ptr(), flags, pOpt); } -s32 sys_prx_load_module_list(s32 count, vm::pptr path_list, u64 flags, vm::ptr pOpt, vm::ptr id_list) +s32 sys_prx_load_module_list(s32 count, vm::cpptr path_list, u64 flags, vm::ptr pOpt, vm::ptr id_list) { sys_prx.Warning("sys_prx_load_module_list(count=%d, path_list=*0x%x, flags=0x%llx, pOpt=*0x%x, id_list=*0x%x)", count, path_list, flags, pOpt, id_list); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_prx.h b/rpcs3/Emu/SysCalls/lv2/sys_prx.h index 61cfd740b8..60d87cc82a 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_prx.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_prx.h @@ -39,7 +39,7 @@ struct sys_stub be_t s_imports; be_t s_unk2; // = 0x0 be_t s_unk3; // = 0x0 - vm::bptr s_modulename; + vm::bcptr s_modulename; vm::bptr s_nid; vm::bptr s_text; be_t s_unk4; // = 0x0 @@ -169,8 +169,8 @@ struct lv2_prx_t REG_ID_TYPE(lv2_prx_t, 0x23); // SYS_PRX_OBJECT // SysCalls -s32 sys_prx_load_module(vm::ptr path, u64 flags, vm::ptr pOpt); -s32 sys_prx_load_module_list(s32 count, vm::pptr path_list, u64 flags, vm::ptr pOpt, vm::ptr id_list); +s32 sys_prx_load_module(vm::cptr path, u64 flags, vm::ptr pOpt); +s32 sys_prx_load_module_list(s32 count, vm::cpptr path_list, u64 flags, vm::ptr pOpt, vm::ptr id_list); s32 sys_prx_load_module_on_memcontainer(); s32 sys_prx_load_module_by_fd(); s32 sys_prx_load_module_on_memcontainer_by_fd(); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp b/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp index dd39861734..68e9ca41c5 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp @@ -58,7 +58,7 @@ s32 sys_spu_initialize(u32 max_usable_spu, u32 max_raw_spu) return CELL_OK; } -s32 sys_spu_image_open(vm::ptr img, vm::ptr path) +s32 sys_spu_image_open(vm::ptr img, vm::cptr path) { sys_spu.Warning("sys_spu_image_open(img_addr=0x%x, path_addr=0x%x [%s])", img.addr(), path.addr(), path.get_ptr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_spu.h b/rpcs3/Emu/SysCalls/lv2/sys_spu.h index 1e7a49c519..d5e89258f3 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_spu.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_spu.h @@ -59,7 +59,7 @@ enum : s32 struct sys_spu_thread_group_attribute { be_t nsize; // name length including NULL terminator - vm::bptr name; + vm::bcptr name; be_t type; be_t ct; // memory container id }; @@ -73,7 +73,7 @@ enum : u32 struct sys_spu_thread_attribute { - vm::bptr name; + vm::bcptr name; be_t name_len; be_t option; }; @@ -219,7 +219,7 @@ u32 spu_thread_initialize(u32 group, u32 spu_num, vm::ptr img, co // SysCalls s32 sys_spu_initialize(u32 max_usable_spu, u32 max_raw_spu); -s32 sys_spu_image_open(vm::ptr img, vm::ptr path); +s32 sys_spu_image_open(vm::ptr img, vm::cptr path); s32 sys_spu_thread_initialize(vm::ptr thread, u32 group, u32 spu_num, vm::ptr img, vm::ptr attr, vm::ptr arg); s32 sys_spu_thread_set_argument(u32 id, vm::ptr arg); s32 sys_spu_thread_group_create(vm::ptr id, u32 num, s32 prio, vm::ptr attr); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp b/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp index c9dd634062..52dc84bbac 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp @@ -59,11 +59,11 @@ lv2_timer_t::~lv2_timer_t() thread.join(); } -s32 sys_timer_create(vm::ref timer_id) +s32 sys_timer_create(vm::ptr timer_id) { sys_timer.Warning("sys_timer_create(timer_id=*0x%x)", timer_id); - timer_id = Emu.GetIdManager().make(); + *timer_id = Emu.GetIdManager().make(); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/lv2/sys_timer.h b/rpcs3/Emu/SysCalls/lv2/sys_timer.h index 52d9a9b5f4..7f7ea56b0a 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_timer.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_timer.h @@ -40,7 +40,7 @@ struct lv2_timer_t REG_ID_TYPE(lv2_timer_t, 0x11); // SYS_TIMER_OBJECT -s32 sys_timer_create(vm::ref timer_id); +s32 sys_timer_create(vm::ptr timer_id); s32 sys_timer_destroy(u32 timer_id); s32 sys_timer_get_information(u32 timer_id, vm::ptr info); s32 _sys_timer_start(u32 timer_id, u64 basetime, u64 period); // basetime type changed from s64 diff --git a/rpcs3/Emu/SysCalls/lv2/sys_tty.cpp b/rpcs3/Emu/SysCalls/lv2/sys_tty.cpp index 0263ac023d..0c63d21500 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_tty.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_tty.cpp @@ -18,7 +18,7 @@ s32 sys_tty_read(s32 ch, vm::ptr buf, u32 len, vm::ptr preadlen) return CELL_OK; } -s32 sys_tty_write(s32 ch, vm::ptr buf, u32 len, vm::ptr pwritelen) +s32 sys_tty_write(s32 ch, vm::cptr buf, u32 len, vm::ptr pwritelen) { sys_tty.Log("sys_tty_write(ch=%d, buf_addr=0x%x, len=%d, preadlen_addr=0x%x)", ch, buf.addr(), len, pwritelen.addr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_tty.h b/rpcs3/Emu/SysCalls/lv2/sys_tty.h index 6207a51b4f..244d4d2d8c 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_tty.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_tty.h @@ -26,4 +26,4 @@ enum // SysCalls s32 sys_tty_read(s32 ch, vm::ptr buf, u32 len, vm::ptr preadlen); -s32 sys_tty_write(s32 ch, vm::ptr buf, u32 len, vm::ptr pwritelen); +s32 sys_tty_write(s32 ch, vm::cptr buf, u32 len, vm::ptr pwritelen); diff --git a/rpcs3/Loader/ELF32.cpp b/rpcs3/Loader/ELF32.cpp index cb52e8ea8a..41766f9443 100644 --- a/rpcs3/Loader/ELF32.cpp +++ b/rpcs3/Loader/ELF32.cpp @@ -299,7 +299,7 @@ namespace loader u32 data = 0; - for (auto code = vm::ptr::make(shdr.data_le.sh_addr); code.addr() < shdr.data_le.sh_addr + shdr.data_le.sh_size; code++) + for (auto code = vm::cptr::make(shdr.data_le.sh_addr); code.addr() < shdr.data_le.sh_addr + shdr.data_le.sh_size; code++) { switch (*code) { diff --git a/rpcs3/Loader/ELF64.cpp b/rpcs3/Loader/ELF64.cpp index e0d1f65af5..4b8e9c70e4 100644 --- a/rpcs3/Loader/ELF64.cpp +++ b/rpcs3/Loader/ELF64.cpp @@ -365,7 +365,7 @@ namespace loader { for (auto &e : m.second.exports) { - auto code = vm::ptr::make(vm::check_addr(e.second, 8) ? vm::read32(e.second) : 0); + auto code = vm::cptr::make(vm::check_addr(e.second, 8) ? vm::read32(e.second) : 0); bool is_empty = !code || (code[0] == 0x38600000 && code[1] == BLR());