From ffc11bfda3247f4a7cffd618528d4c9133117866 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sun, 26 Jul 2015 03:53:26 +0300 Subject: [PATCH] b8 type --- Utilities/GNU.h | 2 +- rpcs3/Emu/ARMv7/ARMv7Context.h | 8 ++-- rpcs3/Emu/ARMv7/Modules/sceDbg.cpp | 2 +- rpcs3/Emu/ARMv7/Modules/sceFios.cpp | 28 +++++++------- rpcs3/Emu/ARMv7/Modules/sceGxm.cpp | 14 +++---- rpcs3/Emu/ARMv7/Modules/sceNpMatching.h | 22 +++++------ rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp | 2 +- rpcs3/Emu/Cell/PPUThread.h | 8 ++-- rpcs3/Emu/SysCalls/Modules/cellDmux.cpp | 2 +- rpcs3/Emu/SysCalls/Modules/cellDmux.h | 10 ++--- rpcs3/Emu/SysCalls/Modules/cellPamf.h | 2 +- rpcs3/Emu/SysCalls/Modules/cellSail.cpp | 4 +- rpcs3/Emu/SysCalls/Modules/cellSail.h | 14 +++---- rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp | 20 +++++----- rpcs3/Emu/SysCalls/Modules/cellSync2.h | 2 +- rpcs3/Emu/SysCalls/Modules/cellVdec.h | 42 ++++++++++----------- rpcs3/Emu/SysCalls/Modules/sceNp.h | 24 ++++++------ rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp | 2 +- rpcs3/Emu/SysCalls/Modules/sceNpClans.h | 4 +- rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.h | 4 +- rpcs3/stdafx.h | 31 +++++++++++---- 21 files changed, 132 insertions(+), 115 deletions(-) diff --git a/Utilities/GNU.h b/Utilities/GNU.h index 00a80a57fb..5caba7d525 100644 --- a/Utilities/GNU.h +++ b/Utilities/GNU.h @@ -7,7 +7,7 @@ #define noexcept _NOEXCEPT_OP #endif -#if defined(_MSC_VER) +#if defined(_MSC_VER) && _MSC_VER <= 1800 #define thread_local __declspec(thread) #elif __APPLE__ #define thread_local __thread diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h index 592109ae60..3de2c17bc4 100644 --- a/rpcs3/Emu/ARMv7/ARMv7Context.h +++ b/rpcs3/Emu/ARMv7/ARMv7Context.h @@ -298,16 +298,16 @@ struct cast_armv7_gpr }; template<> -struct cast_armv7_gpr +struct cast_armv7_gpr { - force_inline static u32 to_gpr(const bool& value) + force_inline static u32 to_gpr(const b8& value) { return value; } - force_inline static bool from_gpr(const u32& reg) + force_inline static b8 from_gpr(const u32& reg) { - return reinterpret_cast(reg); + return reg != 0; } }; diff --git a/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp b/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp index 33d3ce6a31..262b0ea7d9 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp @@ -14,7 +14,7 @@ s32 sceDbgSetBreakOnErrorState(SceDbgBreakOnErrorState state) throw EXCEPTION(""); } -s32 sceDbgAssertionHandler(vm::cptr pFile, s32 line, bool stop, vm::cptr pComponent, vm::cptr pMessage, armv7_va_args_t va_args) +s32 sceDbgAssertionHandler(vm::cptr pFile, s32 line, b8 stop, vm::cptr pComponent, vm::cptr pMessage, armv7_va_args_t va_args) { throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceFios.cpp b/rpcs3/Emu/ARMv7/Modules/sceFios.cpp index 58ca7c3fa1..1ee3a319aa 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceFios.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceFios.cpp @@ -14,7 +14,7 @@ void sceFiosTerminate() throw EXCEPTION(""); } -bool sceFiosIsInitialized(vm::ptr pOutParameters) +b8 sceFiosIsInitialized(vm::ptr pOutParameters) { throw EXCEPTION(""); } @@ -29,7 +29,7 @@ void sceFiosSetGlobalDefaultOpAttr(vm::cptr pAttr) throw EXCEPTION(""); } -bool sceFiosGetGlobalDefaultOpAttr(vm::ptr pOutAttr) +b8 sceFiosGetGlobalDefaultOpAttr(vm::ptr pOutAttr) { throw EXCEPTION(""); } @@ -39,7 +39,7 @@ void sceFiosSetThreadDefaultOpAttr(vm::cptr pAttr) throw EXCEPTION(""); } -bool sceFiosGetThreadDefaultOpAttr(vm::ptr pOutAttr) +b8 sceFiosGetThreadDefaultOpAttr(vm::ptr pOutAttr) { throw EXCEPTION(""); } @@ -59,7 +59,7 @@ u32 sceFiosGetSuspendCount() throw EXCEPTION(""); } -bool sceFiosIsSuspended() +b8 sceFiosIsSuspended() { throw EXCEPTION(""); } @@ -84,7 +84,7 @@ void sceFiosCloseAllFiles() throw EXCEPTION(""); } -bool sceFiosIsIdle() +b8 sceFiosIsIdle() { throw EXCEPTION(""); } @@ -104,7 +104,7 @@ u32 sceFiosGetAllOps(vm::ptr pOutArray, u32 arraySize) throw EXCEPTION(""); } -bool sceFiosIsValidHandle(s32 h) +b8 sceFiosIsValidHandle(s32 h) { throw EXCEPTION(""); } @@ -129,12 +129,12 @@ s32 sceFiosVprintf(vm::cptr pFormat) // va_list throw EXCEPTION(""); } -s32 sceFiosFileExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) +s32 sceFiosFileExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) { throw EXCEPTION(""); } -bool sceFiosFileExistsSync(vm::cptr pAttr, vm::cptr pPath) +b8 sceFiosFileExistsSync(vm::cptr pAttr, vm::cptr pPath) { throw EXCEPTION(""); } @@ -159,12 +159,12 @@ s32 sceFiosFileDeleteSync(vm::cptr pAttr, vm::cptr pPath) throw EXCEPTION(""); } -s32 sceFiosDirectoryExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) +s32 sceFiosDirectoryExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) { throw EXCEPTION(""); } -bool sceFiosDirectoryExistsSync(vm::cptr pAttr, vm::cptr pPath) +b8 sceFiosDirectoryExistsSync(vm::cptr pAttr, vm::cptr pPath) { throw EXCEPTION(""); } @@ -189,12 +189,12 @@ s32 sceFiosDirectoryDeleteSync(vm::cptr pAttr, vm::cptr pPa throw EXCEPTION(""); } -s32 sceFiosExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) +s32 sceFiosExists(vm::cptr pAttr, vm::cptr pPath, vm::ptr pOutExists) { throw EXCEPTION(""); } -bool sceFiosExistsSync(vm::cptr pAttr, vm::cptr pPath) +b8 sceFiosExistsSync(vm::cptr pAttr, vm::cptr pPath) { throw EXCEPTION(""); } @@ -459,7 +459,7 @@ vm::cptr sceFiosDHGetPath(s32 dh) throw EXCEPTION(""); } -bool sceFiosOpIsDone(s32 op) +b8 sceFiosOpIsDone(s32 op) { throw EXCEPTION(""); } @@ -499,7 +499,7 @@ void sceFiosOpCancel(s32 op) throw EXCEPTION(""); } -bool sceFiosOpIsCancelled(s32 op) +b8 sceFiosOpIsCancelled(s32 op) { throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp b/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp index 0a176282a9..ae0f51a416 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp @@ -85,7 +85,7 @@ s32 sceGxmDestroyContext(vm::ptr context) throw EXCEPTION(""); } -void sceGxmSetValidationEnable(vm::ptr context, bool enable) +void sceGxmSetValidationEnable(vm::ptr context, b8 enable) { throw EXCEPTION(""); } @@ -388,7 +388,7 @@ s32 sceGxmColorSurfaceInitDisabled(vm::ptr surface) throw EXCEPTION(""); } -bool sceGxmColorSurfaceIsEnabled(vm::cptr surface) +b8 sceGxmColorSurfaceIsEnabled(vm::cptr surface) { throw EXCEPTION(""); } @@ -473,7 +473,7 @@ void sceGxmDepthStencilSurfaceSetBackgroundStencil(vm::ptr surface) +b8 sceGxmDepthStencilSurfaceIsEnabled(vm::cptr surface) { throw EXCEPTION(""); } @@ -544,17 +544,17 @@ SceGxmProgramType sceGxmProgramGetType(vm::cptr program) throw EXCEPTION(""); } -bool sceGxmProgramIsDiscardUsed(vm::cptr program) +b8 sceGxmProgramIsDiscardUsed(vm::cptr program) { throw EXCEPTION(""); } -bool sceGxmProgramIsDepthReplaceUsed(vm::cptr program) +b8 sceGxmProgramIsDepthReplaceUsed(vm::cptr program) { throw EXCEPTION(""); } -bool sceGxmProgramIsSpriteCoordUsed(vm::cptr program) +b8 sceGxmProgramIsSpriteCoordUsed(vm::cptr program) { throw EXCEPTION(""); } @@ -634,7 +634,7 @@ u32 sceGxmProgramParameterGetContainerIndex(vm::cptr par throw EXCEPTION(""); } -bool sceGxmProgramParameterIsSamplerCube(vm::cptr parameter) +b8 sceGxmProgramParameterIsSamplerCube(vm::cptr parameter) { throw EXCEPTION(""); } diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.h b/rpcs3/Emu/ARMv7/Modules/sceNpMatching.h index 75b2053649..2aa5048250 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.h +++ b/rpcs3/Emu/ARMv7/Modules/sceNpMatching.h @@ -109,7 +109,7 @@ struct SceNpMatching2World le_t curNumOfTotalLobbyMember; le_t curNumOfRoom; le_t curNumOfTotalRoomMember; - bool withEntitlementId; + b8 withEntitlementId; SceNpEntitlementId entitlementId; u8 padding[3]; }; @@ -214,9 +214,9 @@ struct SceNpMatching2GroupLabel struct SceNpMatching2RoomGroupConfig { le_t slotNum; - bool withLabel; + b8 withLabel; SceNpMatching2GroupLabel label; - bool withPassword; + b8 withPassword; u8 padding[2]; }; @@ -224,7 +224,7 @@ struct SceNpMatching2RoomGroupConfig struct SceNpMatching2RoomGroupPasswordConfig { u8 groupId; - bool withPassword; + b8 withPassword; u8 padding[1]; }; @@ -240,8 +240,8 @@ struct SceNpMatching2RoomMemberBinAttrInternal struct SceNpMatching2RoomGroup { u8 groupId; - bool withPassword; - bool withLabel; + b8 withPassword; + b8 withLabel; u8 padding[1]; SceNpMatching2GroupLabel label; le_t slotNum; @@ -638,7 +638,7 @@ struct SceNpMatching2SendRoomChatMessageRequest struct SceNpMatching2SendRoomChatMessageResponse { - bool filtered; + b8 filtered; }; @@ -794,7 +794,7 @@ struct SceNpMatching2GetLobbyMemberDataInternalListRequest le_t memberIdNum; vm::lcptr attrId; le_t attrIdNum; - bool extendedData; + b8 extendedData; u8 padding[7]; }; @@ -822,7 +822,7 @@ struct SceNpMatching2SendLobbyChatMessageRequest struct SceNpMatching2SendLobbyChatMessageResponse { - bool filtered; + b8 filtered; }; @@ -899,7 +899,7 @@ struct SceNpMatching2SignalingOptParamUpdateInfo struct SceNpMatching2RoomMessageInfo { - bool filtered; + b8 filtered; u8 castType; u8 padding[2]; vm::lptr dst; @@ -942,7 +942,7 @@ struct SceNpMatching2LobbyMemberDataInternalUpdateInfo struct SceNpMatching2LobbyMessageInfo { - bool filtered; + b8 filtered; u8 castType; u8 padding[2]; vm::lptr dst; diff --git a/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp b/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp index 0bd13559a0..9107db2660 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp @@ -14,7 +14,7 @@ void sceRazorCaptureSetTriggerNextFrame(vm::cptr captureFilename) throw EXCEPTION(""); } -bool sceRazorCaptureIsInProgress() +b8 sceRazorCaptureIsInProgress() { throw EXCEPTION(""); } diff --git a/rpcs3/Emu/Cell/PPUThread.h b/rpcs3/Emu/Cell/PPUThread.h index 5dbd52bf68..bd0a98160d 100644 --- a/rpcs3/Emu/Cell/PPUThread.h +++ b/rpcs3/Emu/Cell/PPUThread.h @@ -981,16 +981,16 @@ struct cast_ppu_gpr }; template<> -struct cast_ppu_gpr +struct cast_ppu_gpr { - force_inline static u64 to_gpr(const bool& value) + force_inline static u64 to_gpr(const b8& value) { return value; } - force_inline static bool from_gpr(const u64& reg) + force_inline static b8 from_gpr(const u64& reg) { - return reinterpret_cast(reg); + return static_cast(reg) != 0; } }; diff --git a/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp b/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp index b95078ed2b..5eb7ca3962 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp @@ -877,7 +877,7 @@ s32 cellDmuxClose(u32 handle) return CELL_OK; } -s32 cellDmuxSetStream(u32 handle, u32 streamAddress, u32 streamSize, bool discontinuity, u64 userData) +s32 cellDmuxSetStream(u32 handle, u32 streamAddress, u32 streamSize, b8 discontinuity, u64 userData) { cellDmux.Log("cellDmuxSetStream(handle=0x%x, streamAddress=0x%x, streamSize=%d, discontinuity=%d, userData=0x%llx)", handle, streamAddress, streamSize, discontinuity, userData); diff --git a/rpcs3/Emu/SysCalls/Modules/cellDmux.h b/rpcs3/Emu/SysCalls/Modules/cellDmux.h index ea7d3cc83b..60b43778ee 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellDmux.h +++ b/rpcs3/Emu/SysCalls/Modules/cellDmux.h @@ -165,7 +165,7 @@ struct CellDmuxType struct CellDmuxPamfSpecificInfo { be_t thisSize; - bool programEndCodeCb; + b8 programEndCodeCb; }; struct CellDmuxType2 @@ -198,20 +198,20 @@ struct CellDmuxResourceEx /* struct CellDmuxResource2Ex { - bool isResourceEx; //true + b8 isResourceEx; //true CellDmuxResourceEx resourceEx; }; struct CellDmuxResource2NoEx { - bool isResourceEx; //false + b8 isResourceEx; //false CellDmuxResource resource; }; */ struct CellDmuxResource2 { - bool isResourceEx; + b8 isResourceEx; be_t memAddr; be_t memSize; be_t ppuThreadPriority; @@ -270,7 +270,7 @@ struct CellDmuxAuInfoEx be_t auAddr; be_t auSize; be_t reserved; - bool isRap; + b8 isRap; be_t userData; CellCodecTimeStamp pts; CellCodecTimeStamp dts; diff --git a/rpcs3/Emu/SysCalls/Modules/cellPamf.h b/rpcs3/Emu/SysCalls/Modules/cellPamf.h index d919b491ea..823a1b564f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPamf.h +++ b/rpcs3/Emu/SysCalls/Modules/cellPamf.h @@ -157,7 +157,7 @@ struct CellPamfEp // Entry point iterator struct CellPamfEpIterator { - bool isPamf; + b8 isPamf; be_t index; be_t num; be_t pCur_addr; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp index 4f886dbec0..95014c0638 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp @@ -73,7 +73,7 @@ s32 cellSailDescriptorGetMediaInfo() return CELL_OK; } -s32 cellSailDescriptorSetAutoSelection(vm::ptr pSelf, bool autoSelection) +s32 cellSailDescriptorSetAutoSelection(vm::ptr pSelf, b8 autoSelection) { cellSail.Warning("cellSailDescriptorSetAutoSelection(pSelf_addr=0x%x, autoSelection=%s)", pSelf.addr(), autoSelection ? "true" : "false"); @@ -812,7 +812,7 @@ s32 cellSailPlayerCancel() return CELL_OK; } -s32 cellSailPlayerSetPaused(vm::ptr pSelf, bool paused) +s32 cellSailPlayerSetPaused(vm::ptr pSelf, b8 paused) { cellSail.Todo("cellSailPlayerSetPaused(pSelf_addr=0x%x, paused=%d)", pSelf.addr(), paused); return CELL_OK; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSail.h b/rpcs3/Emu/SysCalls/Modules/cellSail.h index 7d1b886748..ec66b2a85d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSail.h +++ b/rpcs3/Emu/SysCalls/Modules/cellSail.h @@ -661,8 +661,8 @@ typedef s32(CellSailRendererAudioFuncMakeup)(vm::ptr pArg); typedef s32(CellSailRendererAudioFuncCleanup)(vm::ptr pArg); typedef void(CellSailRendererAudioFuncOpen)(vm::ptr pArg, vm::ptr pInfo, u32 frameNum); typedef void(CellSailRendererAudioFuncClose)(vm::ptr pArg); -typedef void(CellSailRendererAudioFuncStart)(vm::ptr pArg, bool buffering); -typedef void(CellSailRendererAudioFuncStop)(vm::ptr pArg, bool flush); +typedef void(CellSailRendererAudioFuncStart)(vm::ptr pArg, b8 buffering); +typedef void(CellSailRendererAudioFuncStop)(vm::ptr pArg, b8 flush); typedef void(CellSailRendererAudioFuncCancel)(vm::ptr pArg); typedef s32(CellSailRendererAudioFuncCheckout)(vm::ptr pArg, vm::pptr ppInfo); typedef s32(CellSailRendererAudioFuncCheckin)(vm::ptr pArg, vm::ptr pInfo); @@ -671,8 +671,8 @@ typedef s32(CellSailRendererVideoFuncMakeup)(vm::ptr pArg); typedef s32(CellSailRendererVideoFuncCleanup)(vm::ptr pArg); typedef void(CellSailRendererVideoFuncOpen)(vm::ptr pArg, vm::ptr pInfo, u32 frameNum, u32 minFrameNum); typedef void(CellSailRendererVideoFuncClose)(vm::ptr pArg); -typedef void(CellSailRendererVideoFuncStart)(vm::ptr pArg, bool buffering); -typedef void(CellSailRendererVideoFuncStop)(vm::ptr pArg, bool flush, bool keepRendering); +typedef void(CellSailRendererVideoFuncStart)(vm::ptr pArg, b8 buffering); +typedef void(CellSailRendererVideoFuncStop)(vm::ptr pArg, b8 flush, b8 keepRendering); typedef void(CellSailRendererVideoFuncCancel)(vm::ptr pArg); typedef s32(CellSailRendererVideoFuncCheckout)(vm::ptr pArg, vm::pptr ppInfo); typedef s32(CellSailRendererVideoFuncCheckin)(vm::ptr pArg, vm::ptr pInfo); @@ -881,7 +881,7 @@ struct CellSailMp4Track struct CellSailMp4TrackInfo { - bool isTrackEnabled; + b8 isTrackEnabled; u8 reserved0[3]; be_t trackId; be_t trackDuration; @@ -1037,8 +1037,8 @@ struct CellSailMpegLayer3WaveFormat struct CellSailDescriptor { - bool autoSelection; - bool registered; + b8 autoSelection; + b8 registered; be_t streamType; be_t internalData[31]; }; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp index 456f91569e..492a227cea 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp @@ -60,25 +60,25 @@ s32 spursSignalToHandlerThread(PPUThread& ppu, vm::ptr spurs); s32 spursJoinHandlerThread(PPUThread& ppu, vm::ptr spurs); s32 spursInit(PPUThread& ppu, vm::ptr spurs, u32 revision, u32 sdkVersion, s32 nSpus, s32 spuPriority, s32 ppuPriority, u32 flags, vm::cptr prefix, u32 prefixSize, u32 container, vm::cptr swlPriority, u32 swlMaxSpu, u32 swlIsPreem); -s32 cellSpursInitialize(PPUThread& ppu, vm::ptr spurs, s32 nSpus, s32 spuPriority, s32 ppuPriority, bool exitIfNoWork); +s32 cellSpursInitialize(PPUThread& ppu, vm::ptr spurs, s32 nSpus, s32 spuPriority, s32 ppuPriority, b8 exitIfNoWork); s32 cellSpursInitializeWithAttribute(PPUThread& ppu, vm::ptr spurs, vm::cptr attr); s32 cellSpursInitializeWithAttribute2(PPUThread& ppu, vm::ptr spurs, vm::cptr attr); -s32 _cellSpursAttributeInitialize(vm::ptr attr, u32 revision, u32 sdkVersion, u32 nSpus, s32 spuPriority, s32 ppuPriority, bool exitIfNoWork); +s32 _cellSpursAttributeInitialize(vm::ptr attr, u32 revision, u32 sdkVersion, u32 nSpus, s32 spuPriority, s32 ppuPriority, b8 exitIfNoWork); s32 cellSpursAttributeSetMemoryContainerForSpuThread(vm::ptr attr, u32 container); s32 cellSpursAttributeSetNamePrefix(vm::ptr attr, vm::cptr prefix, u32 size); s32 cellSpursAttributeEnableSpuPrintfIfAvailable(vm::ptr attr); s32 cellSpursAttributeSetSpuThreadGroupType(vm::ptr attr, s32 type); -s32 cellSpursAttributeEnableSystemWorkload(vm::ptr attr, vm::cptr priority, u32 maxSpu, vm::cptr isPreemptible); +s32 cellSpursAttributeEnableSystemWorkload(vm::ptr attr, vm::cptr priority, u32 maxSpu, vm::cptr isPreemptible); s32 cellSpursFinalize(vm::ptr spurs); s32 cellSpursGetSpuThreadGroupId(vm::ptr spurs, vm::ptr group); s32 cellSpursGetNumSpuThread(vm::ptr spurs, vm::ptr nThreads); s32 cellSpursGetSpuThreadId(vm::ptr spurs, vm::ptr thread, vm::ptr nThreads); s32 cellSpursSetMaxContention(vm::ptr spurs, u32 wid, u32 maxContention); s32 cellSpursSetPriorities(vm::ptr spurs, u32 wid, vm::cptr priorities); -s32 cellSpursSetPreemptionVictimHints(vm::ptr spurs, vm::cptr isPreemptible); +s32 cellSpursSetPreemptionVictimHints(vm::ptr spurs, vm::cptr isPreemptible); s32 cellSpursAttachLv2EventQueue(PPUThread& ppu, vm::ptr spurs, u32 queue, vm::ptr port, s32 isDynamic); s32 cellSpursDetachLv2EventQueue(vm::ptr spurs, u8 port); -s32 cellSpursEnableExceptionEventHandler(vm::ptr spurs, bool flag); +s32 cellSpursEnableExceptionEventHandler(vm::ptr spurs, b8 flag); s32 cellSpursSetGlobalExceptionEventHandler(vm::ptr spurs, vm::ptr eaHandler, vm::ptr arg); s32 cellSpursUnsetGlobalExceptionEventHandler(vm::ptr spurs); s32 cellSpursGetInfo(vm::ptr spurs, vm::ptr info); @@ -1266,7 +1266,7 @@ s32 spursInit( } /// Initialise SPURS -s32 cellSpursInitialize(PPUThread& ppu, vm::ptr spurs, s32 nSpus, s32 spuPriority, s32 ppuPriority, bool exitIfNoWork) +s32 cellSpursInitialize(PPUThread& ppu, vm::ptr spurs, s32 nSpus, s32 spuPriority, s32 ppuPriority, b8 exitIfNoWork) { cellSpurs.Warning("cellSpursInitialize(spurs=*0x%x, nSpus=%d, spuPriority=%d, ppuPriority=%d, exitIfNoWork=%d)", spurs, nSpus, spuPriority, ppuPriority, exitIfNoWork); @@ -1348,7 +1348,7 @@ s32 cellSpursInitializeWithAttribute2(PPUThread& ppu, vm::ptr spurs, } /// Initialise SPURS attribute -s32 _cellSpursAttributeInitialize(vm::ptr attr, u32 revision, u32 sdkVersion, u32 nSpus, s32 spuPriority, s32 ppuPriority, bool exitIfNoWork) +s32 _cellSpursAttributeInitialize(vm::ptr attr, u32 revision, u32 sdkVersion, u32 nSpus, s32 spuPriority, s32 ppuPriority, b8 exitIfNoWork) { cellSpurs.Warning("_cellSpursAttributeInitialize(attr=*0x%x, revision=%d, sdkVersion=0x%x, nSpus=%d, spuPriority=%d, ppuPriority=%d, exitIfNoWork=%d)", attr, revision, sdkVersion, nSpus, spuPriority, ppuPriority, exitIfNoWork); @@ -1478,7 +1478,7 @@ s32 cellSpursAttributeSetSpuThreadGroupType(vm::ptr attr, s3 } /// Enable the system workload -s32 cellSpursAttributeEnableSystemWorkload(vm::ptr attr, vm::cptr priority, u32 maxSpu, vm::cptr isPreemptible) +s32 cellSpursAttributeEnableSystemWorkload(vm::ptr attr, vm::cptr priority, u32 maxSpu, vm::cptr isPreemptible) { cellSpurs.Warning("cellSpursAttributeEnableSystemWorkload(attr=*0x%x, priority=*0x%x, maxSpu=%d, isPreemptible=*0x%x)", attr, priority, maxSpu, isPreemptible); @@ -1738,7 +1738,7 @@ s32 cellSpursSetPriorities(vm::ptr spurs, u32 wid, vm::cptr prior } /// Set preemption victim SPU -s32 cellSpursSetPreemptionVictimHints(vm::ptr spurs, vm::cptr isPreemptible) +s32 cellSpursSetPreemptionVictimHints(vm::ptr spurs, vm::cptr isPreemptible) { UNIMPLEMENTED_FUNC(cellSpurs); return CELL_OK; @@ -1761,7 +1761,7 @@ s32 cellSpursDetachLv2EventQueue(vm::ptr spurs, u8 port) } /// Enable the SPU exception event handler -s32 cellSpursEnableExceptionEventHandler(vm::ptr spurs, bool flag) +s32 cellSpursEnableExceptionEventHandler(vm::ptr spurs, b8 flag) { cellSpurs.Warning("cellSpursEnableExceptionEventHandler(spurs=*0x%x, flag=%d)", spurs, flag); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync2.h b/rpcs3/Emu/SysCalls/Modules/cellSync2.h index 557562b8d7..50538dc570 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync2.h +++ b/rpcs3/Emu/SysCalls/Modules/cellSync2.h @@ -35,7 +35,7 @@ struct CellSync2MutexAttribute be_t sdkVersion; be_t threadTypes; be_t maxWaiters; - bool recursive; + b8 recursive; u8 padding; char name[CELL_SYNC2_NAME_MAX_LENGTH + 1]; u8 reserved[86]; diff --git a/rpcs3/Emu/SysCalls/Modules/cellVdec.h b/rpcs3/Emu/SysCalls/Modules/cellVdec.h index 8afb573ffa..f4d180979c 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVdec.h +++ b/rpcs3/Emu/SysCalls/Modules/cellVdec.h @@ -208,7 +208,7 @@ struct CellVdecAvcSpecificInfo be_t thisSize; be_t maxDecodedFrameWidth; be_t maxDecodedFrameHeight; - bool disableDeblockingFilter; + b8 disableDeblockingFilter; u8 numberOfDecodedFrameBuffer; }; @@ -331,26 +331,26 @@ struct CellVdecAvcInfo be_t horizontalSize; be_t verticalSize; AVC_PictureType pictureType[2]; - bool idrPictureFlag; + b8 idrPictureFlag; AVC_aspect_ratio_idc aspect_ratio_idc; be_t sar_height; be_t sar_width; AVC_pic_struct pic_struct; be_t picOrderCount[2]; - bool vui_parameters_present_flag; - bool frame_mbs_only_flag; - bool video_signal_type_present_flag; + b8 vui_parameters_present_flag; + b8 frame_mbs_only_flag; + b8 video_signal_type_present_flag; AVC_video_format video_format; - bool video_full_range_flag; - bool colour_description_present_flag; + b8 video_full_range_flag; + b8 colour_description_present_flag; AVC_colour_primaries colour_primaries; AVC_transfer_characteristics transfer_characteristics; AVC_matrix_coefficients matrix_coefficients; - bool timing_info_present_flag; + b8 timing_info_present_flag; AVC_FrameRateCode frameRateCode; // ??? - bool fixed_frame_rate_flag; - bool low_delay_hrd_flag; - bool entropy_coding_mode_flag; + b8 fixed_frame_rate_flag; + b8 low_delay_hrd_flag; + b8 entropy_coding_mode_flag; be_t nalUnitPresentFlags; u8 ccDataLength[2]; u8 ccData[2][CELL_VDEC_AVC_CCD_MAX]; @@ -462,7 +462,7 @@ struct CellVdecDivxInfo DIVX_pixelAspectRatio pixelAspectRatio; u8 parWidth; u8 parHeight; - bool colourDescription; + b8 colourDescription; DIVX_colourPrimaries colourPrimaries; DIVX_transferCharacteristics transferCharacteristics; DIVX_matrixCoefficients matrixCoefficients; @@ -615,22 +615,22 @@ struct CellVdecMpeg2Info MPEG1_aspectRatio aspect_ratio_information1; }; MPEG2_frameRate frame_rate_code; - bool progressive_sequence; - bool low_delay; + b8 progressive_sequence; + b8 low_delay; MPEG2_videoFormat video_format; - bool colour_description; + b8 colour_description; MPEG2_colourPrimaries colour_primaries; MPEG2_transferCharacteristics transfer_characteristics; MPEG2_matrixCoefficients matrix_coefficients; be_t temporal_reference[2]; MPEG2_pictureCodingType picture_coding_type[2]; MPEG2_pictureStructure picture_structure[2]; - bool top_field_first; - bool repeat_first_field; - bool progressive_frame; + b8 top_field_first; + b8 repeat_first_field; + b8 progressive_frame; be_t time_code; - bool closed_gop; - bool broken_link; + b8 closed_gop; + b8 broken_link; be_t vbv_delay[2]; be_t display_horizontal_size; be_t display_vertical_size; @@ -639,7 +639,7 @@ struct CellVdecMpeg2Info be_t frame_centre_vertical_offset[2][3]; be_t headerPresentFlags; // MPEG2_headerFlags be_t headerRetentionFlags; // MPEG2_headerFlags - bool mpeg1Flag; + b8 mpeg1Flag; u8 ccDataLength[2]; u8 ccData[2][128]; be_t reserved[2]; diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.h b/rpcs3/Emu/SysCalls/Modules/sceNp.h index abae653a66..b9fc091488 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNp.h +++ b/rpcs3/Emu/SysCalls/Modules/sceNp.h @@ -954,7 +954,7 @@ struct SceNpBasicExtendedAttachmentData be_t msgId; SceNpBasicAttachmentData data; be_t userAction; - bool markedAsUsed; + b8 markedAsUsed; //be_t reserved[3]; }; @@ -1130,7 +1130,7 @@ struct SceNpMatching2World be_t curNumOfTotalLobbyMember; be_t curNumOfRoom; be_t curNumOfTotalRoomMember; - bool withEntitlementId; + b8 withEntitlementId; SceNpEntitlementId entitlementId; u8 padding[3]; }; @@ -1234,9 +1234,9 @@ struct SceNpMatching2GroupLabel struct SceNpMatching2RoomGroupConfig { be_t slotNum; - bool withLabel; + b8 withLabel; SceNpMatching2GroupLabel label; - bool withPassword; + b8 withPassword; u8 padding[2]; }; @@ -1244,7 +1244,7 @@ struct SceNpMatching2RoomGroupConfig struct SceNpMatching2RoomGroupPasswordConfig { u8 groupId; - bool withPassword; + b8 withPassword; u8 padding[1]; }; @@ -1252,8 +1252,8 @@ struct SceNpMatching2RoomGroupPasswordConfig struct SceNpMatching2RoomGroup { u8 groupId; - bool withPassword; - bool withLabel; + b8 withPassword; + b8 withLabel; u8 padding[1]; SceNpMatching2GroupLabel label; be_t slotNum; @@ -1652,7 +1652,7 @@ struct SceNpMatching2SendRoomChatMessageRequest // Room chat message send request response data struct SceNpMatching2SendRoomChatMessageResponse { - bool filtered; + b8 filtered; }; // Internal room data configuration request parameters @@ -1778,7 +1778,7 @@ struct SceNpMatching2SendLobbyChatMessageRequest // Lobby chat message sending response data struct SceNpMatching2SendLobbyChatMessageResponse { - bool filtered; + b8 filtered; }; // Lobby invitation message sending request parameter @@ -1831,7 +1831,7 @@ struct SceNpMatching2GetLobbyMemberDataInternalListRequest be_t memberIdNum; be_t attrId; be_t attrIdNum; - bool extendedData; + b8 extendedData; u8 padding[7]; }; @@ -1925,7 +1925,7 @@ struct SceNpMatching2RoomMemberDataInternalUpdateInfo // Room message information struct SceNpMatching2RoomMessageInfo { - bool filtered; + b8 filtered; u8 castType; u8 padding[2]; SceNpMatching2RoomMessageDestination dst; @@ -1968,7 +1968,7 @@ struct SceNpMatching2LobbyMemberDataInternalUpdateInfo // Lobby message information struct SceNpMatching2LobbyMessageInfo { - bool filtered; + b8 filtered; u8 castType; u8 padding[2]; SceNpMatching2LobbyMessageDestination dst; diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp index 5dd7c04f76..2fdb0dd266 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNpClans.cpp @@ -312,7 +312,7 @@ s32 sceNpClansCancelInvitation() return CELL_OK; } -s32 sceNpClansSendInvitationResponse(vm::ptr handle, u32 clanId, vm::ptr message, bool accept) +s32 sceNpClansSendInvitationResponse(vm::ptr handle, u32 clanId, vm::ptr message, b8 accept) { UNIMPLEMENTED_FUNC(sceNpClans); diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpClans.h b/rpcs3/Emu/SysCalls/Modules/sceNpClans.h index aacd12f3d4..aae5c1e0d0 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpClans.h +++ b/rpcs3/Emu/SysCalls/Modules/sceNpClans.h @@ -154,7 +154,7 @@ struct SceNpClansEntry SceNpClansClanBasicInfo info; be_t role; be_t status; - bool allowMsg; + b8 allowMsg; u8 reserved[3]; }; @@ -219,7 +219,7 @@ struct SceNpClansUpdatableMemberInfo be_t binData1Size; u8 binAttr1[SCE_NP_CLANS_CLAN_BINARY_ATTRIBUTE1_MAX_SIZE + 1]; s8 description[SCE_NP_CLANS_MEMBER_DESCRIPTION_MAX_LENGTH + 1]; - bool allowMsg; + b8 allowMsg; u8 reserved[3]; }; diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.h b/rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.h index 06760d7d4d..8c6f72c4e3 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.h +++ b/rpcs3/Emu/SysCalls/Modules/sceNpCommerce2.h @@ -171,7 +171,7 @@ struct SceNpCommerce2SessionInfo be_t decimals; s8 currencySymbol[SCE_NP_COMMERCE2_CURRENCY_SYMBOL_LEN + 1]; be_t symbolPosition; - bool symbolWithSpace; + b8 symbolWithSpace; u8 padding1[3]; s8 thousandSeparator[SCE_NP_COMMERCE2_THOUSAND_SEPARATOR_LEN + 1]; s8 decimalLetter[SCE_NP_COMMERCE2_DECIMAL_LETTER_LEN + 1]; @@ -259,7 +259,7 @@ struct SceNpCommerce2GameSkuInfo be_t timeUntilExpiration; be_t purchasabilityFlag; be_t annotation; - bool downloadable; + b8 downloadable; u8 padding[3]; be_t price; s8 skuName; diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index 401e14293c..83d40adfec 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -42,6 +42,11 @@ #include "Utilities/GNU.h" +#define CHECK_SIZE(type, size) static_assert(sizeof(type) == size, "Invalid " #type " type size") +#define CHECK_ALIGN(type, align) static_assert(__alignof(type) == align, "Invalid " #type " type alignment") +#define CHECK_MAX_SIZE(type, size) static_assert(sizeof(type) <= size, #type " type size is too big") +#define CHECK_SIZE_ALIGN(type, size, align) CHECK_SIZE(type, size); CHECK_ALIGN(type, align) + using uint = unsigned int; using u8 = std::uint8_t; @@ -54,11 +59,28 @@ using s16 = std::int16_t; using s32 = std::int32_t; using s64 = std::int64_t; -using b8 = std::uint8_t; - using f32 = float; using f64 = double; +// bool type replacement for PS3/PSV +class b8 +{ + std::uint8_t m_value; + +public: + b8(const bool value) + : m_value(value) + { + } + + operator bool() const //template::value>> operator T() const + { + return m_value != 0; + } +}; + +CHECK_SIZE_ALIGN(b8, 1, 1); + template::value>> inline T align(const T& value, u64 align) { return static_cast((value + (align - 1)) & ~(align - 1)); @@ -122,11 +144,6 @@ template struct ID_type; #define REG_ID_TYPE(t, id) template<> struct ID_type { enum : u32 { type = id }; } -#define CHECK_SIZE(type, size) static_assert(sizeof(type) == size, "Invalid " #type " type size") -#define CHECK_ALIGN(type, align) static_assert(__alignof(type) == align, "Invalid " #type " type alignment") -#define CHECK_MAX_SIZE(type, size) static_assert(sizeof(type) <= size, #type " type size is too big") -#define CHECK_SIZE_ALIGN(type, size, align) CHECK_SIZE(type, size); CHECK_ALIGN(type, align) - #define WRAP_EXPR(expr) [&]{ return expr; } #define COPY_EXPR(expr) [=]{ return expr; } #define EXCEPTION(text, ...) fmt::exception(__FILE__, __LINE__, __FUNCTION__, text, ##__VA_ARGS__)