HLE: fix some types

RPCS3 · Oct 30, 2021 · ace0e46 · ace0e46
1 parent 33e80a7
commit ace0e46
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 45 deletions.
diff --git a/rpcs3/Emu/Cell/Modules/cellAtrac.cpp b/rpcs3/Emu/Cell/Modules/cellAtrac.cpp
@@ -51,15 +51,15 @@ error_code cellAtracCreateDecoder(vm::ptr<CellAtracHandle> pHandle, vm::ptr<u8>
 {
 	cellAtrac.warning("cellAtracCreateDecoder(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, uiSpuThreadPriority=%d)", pHandle, pucWorkMem, uiPpuThreadPriority, uiSpuThreadPriority);
 
-	pHandle->pucWorkMem = pucWorkMem;
+	std::memcpy(pHandle->ucWorkMem, pucWorkMem.get_ptr(), CELL_ATRAC_HANDLE_SIZE);
 	return CELL_OK;
 }
 
 error_code cellAtracCreateDecoderExt(vm::ptr<CellAtracHandle> pHandle, vm::ptr<u8> pucWorkMem, u32 uiPpuThreadPriority, vm::ptr<CellAtracExtRes> pExtRes)
 {
 	cellAtrac.warning("cellAtracCreateDecoderExt(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, pExtRes=*0x%x)", pHandle, pucWorkMem, uiPpuThreadPriority, pExtRes);
 
-	pHandle->pucWorkMem = pucWorkMem;
+	std::memcpy(pHandle->ucWorkMem, pucWorkMem.get_ptr(), CELL_ATRAC_HANDLE_SIZE);
 	return CELL_OK;
 }
 
@@ -84,7 +84,7 @@ error_code cellAtracGetStreamDataInfo(vm::ptr<CellAtracHandle> pHandle, vm::pptr
 {
 	cellAtrac.warning("cellAtracGetStreamDataInfo(pHandle=*0x%x, ppucWritePointer=**0x%x, puiWritableByte=*0x%x, puiReadPosition=*0x%x)", pHandle, ppucWritePointer, puiWritableByte, puiReadPosition);
 
-	*ppucWritePointer = pHandle->pucWorkMem;
+	ppucWritePointer->set(pHandle.addr());
 	*puiWritableByte = 0x1000;
 	*puiReadPosition = 0;
 	return CELL_OK;
@@ -206,7 +206,7 @@ error_code cellAtracGetBufferInfoForResetting(vm::ptr<CellAtracHandle> pHandle,
 {
 	cellAtrac.warning("cellAtracGetBufferInfoForResetting(pHandle=*0x%x, uiSample=0x%x, pBufferInfo=*0x%x)", pHandle, uiSample, pBufferInfo);
 
-	pBufferInfo->pucWriteAddr = pHandle->pucWorkMem;
+	pBufferInfo->pucWriteAddr = pHandle->ucWorkMem;
 	pBufferInfo->uiWritableByte = 0x1000;
 	pBufferInfo->uiMinWriteByte = 0;
 	pBufferInfo->uiReadPosition = 0;

diff --git a/rpcs3/Emu/Cell/Modules/cellAtrac.h b/rpcs3/Emu/Cell/Modules/cellAtrac.h
@@ -43,22 +43,19 @@ enum
 
 struct alignas(8) CellAtracHandle
 {
-	vm::ptr<u8> pucWorkMem;
-	// ...
+	u8 ucWorkMem[CELL_ATRAC_HANDLE_SIZE];
 };
 
-CHECK_MAX_SIZE(CellAtracHandle, 512);
-
 struct CellAtracBufferInfo
 {
-	vm::ptr<u8> pucWriteAddr;
+	vm::bptr<u8> pucWriteAddr;
 	be_t<u32> uiWritableByte;
 	be_t<u32> uiMinWriteByte;
 	be_t<u32> uiReadPosition;
 };
 
 struct CellAtracExtRes
 {
-	vm::ptr<struct CellSpurs> pSpurs;
+	vm::bptr<struct CellSpurs> pSpurs;
 	u8 priority[8];
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp b/rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp
@@ -53,15 +53,15 @@ error_code cellAtracMultiCreateDecoder(vm::ptr<CellAtracMultiHandle> pHandle, vm
 {
 	cellAtracMulti.warning("cellAtracMultiCreateDecoder(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, uiSpuThreadPriority=%d)", pHandle, pucWorkMem, uiPpuThreadPriority, uiSpuThreadPriority);
 
-	pHandle->pucWorkMem = pucWorkMem;
+	std::memcpy(pHandle->ucWorkMem, pucWorkMem.get_ptr(), CELL_ATRACMULTI_HANDLE_SIZE);
 	return CELL_OK;
 }
 
 error_code cellAtracMultiCreateDecoderExt(vm::ptr<CellAtracMultiHandle> pHandle, vm::ptr<u8> pucWorkMem, u32 uiPpuThreadPriority, vm::ptr<CellAtracMultiExtRes> pExtRes)
 {
 	cellAtracMulti.warning("cellAtracMultiCreateDecoderExt(pHandle=*0x%x, pucWorkMem=*0x%x, uiPpuThreadPriority=%d, pExtRes=*0x%x)", pHandle, pucWorkMem, uiPpuThreadPriority, pExtRes);
 
-	pHandle->pucWorkMem = pucWorkMem;
+	std::memcpy(pHandle->ucWorkMem, pucWorkMem.get_ptr(), CELL_ATRACMULTI_HANDLE_SIZE);
 	return CELL_OK;
 }
 
@@ -86,7 +86,7 @@ error_code cellAtracMultiGetStreamDataInfo(vm::ptr<CellAtracMultiHandle> pHandle
 {
 	cellAtracMulti.warning("cellAtracMultiGetStreamDataInfo(pHandle=*0x%x, ppucWritePointer=**0x%x, puiWritableByte=*0x%x, puiReadPosition=*0x%x)", pHandle, ppucWritePointer, puiWritableByte, puiReadPosition);
 
-	*ppucWritePointer = pHandle->pucWorkMem;
+	ppucWritePointer->set(pHandle.addr());
 	*puiWritableByte = 0x1000;
 	*puiReadPosition = 0;
 	return CELL_OK;
@@ -215,7 +215,7 @@ error_code cellAtracMultiGetBufferInfoForResetting(vm::ptr<CellAtracMultiHandle>
 {
 	cellAtracMulti.warning("cellAtracMultiGetBufferInfoForResetting(pHandle=*0x%x, uiSample=0x%x, pBufferInfo=*0x%x)", pHandle, uiSample, pBufferInfo);
 
-	pBufferInfo->pucWriteAddr = pHandle->pucWorkMem;
+	pBufferInfo->pucWriteAddr = pHandle->ucWorkMem;
 	pBufferInfo->uiWritableByte = 0x1000;
 	pBufferInfo->uiMinWriteByte = 0;
 	pBufferInfo->uiReadPosition = 0;

diff --git a/rpcs3/Emu/Cell/Modules/cellAtracMulti.h b/rpcs3/Emu/Cell/Modules/cellAtracMulti.h
@@ -44,22 +44,19 @@ enum
 
 struct alignas(8) CellAtracMultiHandle
 {
-	vm::ptr<u8> pucWorkMem;
-	// ...
+	u8 ucWorkMem[CELL_ATRACMULTI_HANDLE_SIZE];
 };
 
-CHECK_MAX_SIZE(CellAtracMultiHandle, 512);
-
 struct CellAtracMultiBufferInfo
 {
-	vm::ptr<u8> pucWriteAddr;
+	vm::bptr<u8> pucWriteAddr;
 	be_t<u32> uiWritableByte;
 	be_t<u32> uiMinWriteByte;
 	be_t<u32> uiReadPosition;
 };
 
 struct CellAtracMultiExtRes
 {
-	vm::ptr<struct CellSpurs> pSpurs;
+	vm::bptr<struct CellSpurs> pSpurs;
 	u8 priority[8];
 };
diff --git a/rpcs3/Emu/Cell/Modules/cellFiber.h b/rpcs3/Emu/Cell/Modules/cellFiber.h
@@ -59,7 +59,7 @@ struct alignas(8) CellFiberPpuAttribute
 {
 	u8 privateHeader[16];
 	char name[32];
-	vm::ptr<CellFiberPpuOnExitCallback> onExitCallback;
+	vm::bptr<CellFiberPpuOnExitCallback> onExitCallback;
 	be_t<u32> __reserved0__;
 	be_t<u64> onExitCallbackArg;
 	be_t<u64> __reserved1__;

diff --git a/rpcs3/Emu/Cell/Modules/cellGifDec.h b/rpcs3/Emu/Cell/Modules/cellGifDec.h
@@ -136,7 +136,7 @@ struct CellGifDecOutParam
 struct CellGifDecExtension
 {
 	u8 label;
-	vm::ptr<u8> data;
+	vm::bptr<u8> data;
 };
 
 struct CellGifDecDataOutInfo

diff --git a/rpcs3/Emu/Cell/Modules/cellPamf.cpp b/rpcs3/Emu/Cell/Modules/cellPamf.cpp
@@ -237,7 +237,7 @@ error_code cellPamfGetStreamOffsetAndSize(vm::ptr<PamfHeader> pAddr, u64 fileSiz
 	return CELL_OK;
 }
 
-error_code cellPamfVerify(vm::ptr<PamfHeader> pAddr, u64 fileSize)
+error_code cellPamfVerify(vm::cptr<PamfHeader> pAddr, u64 fileSize)
 {
 	cellPamf.todo("cellPamfVerify(pAddr=*0x%x, fileSize=0x%llx)", pAddr, fileSize);
 

diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp
@@ -716,7 +716,7 @@ error_code sceNpBasicUnregisterHandler()
 	return CELL_OK;
 }
 
-error_code sceNpBasicSetPresence(vm::cptr<u8> data, u64 size)
+error_code sceNpBasicSetPresence(vm::cptr<u8> data, u32 size)
 {
 	sceNp.todo("sceNpBasicSetPresence(data=*0x%x, size=%d)", data, size);
 
@@ -804,7 +804,7 @@ error_code sceNpBasicSetPresenceDetails2(vm::cptr<SceNpBasicPresenceDetails2> pr
 	return CELL_OK;
 }
 
-error_code sceNpBasicSendMessage(vm::cptr<SceNpId> to, vm::cptr<void> data, u64 size)
+error_code sceNpBasicSendMessage(vm::cptr<SceNpId> to, vm::cptr<void> data, u32 size)
 {
 	sceNp.todo("sceNpBasicSendMessage(to=*0x%x, data=*0x%x, size=%d)", to, data, size);
 
@@ -957,7 +957,7 @@ error_code sceNpBasicSendMessageGui(vm::cptr<SceNpBasicMessageDetails> msg, sys_
 	return CELL_OK;
 }
 
-error_code sceNpBasicSendMessageAttachment(vm::cptr<SceNpId> to, vm::cptr<char> subject, vm::cptr<char> body, vm::cptr<char> data, u64 size, sys_memory_container_t containerId)
+error_code sceNpBasicSendMessageAttachment(vm::cptr<SceNpId> to, vm::cptr<char> subject, vm::cptr<char> body, vm::cptr<char> data, u32 size, sys_memory_container_t containerId)
 {
 	sceNp.todo("sceNpBasicSendMessageAttachment(to=*0x%x, subject=%s, body=%s, data=%s, size=%d, containerId=%d)", to, subject, body, data, size, containerId);
 

diff --git a/rpcs3/Emu/Cell/Modules/sceNpTus.h b/rpcs3/Emu/Cell/Modules/sceNpTus.h
@@ -68,46 +68,46 @@ struct SceNpTusDataStatus
 
 struct SceNpTusAddAndGetVariableOptParam
 {
-	u64 size; // TODO: correct type?
-	vm::ptr<CellRtcTick> isLastChangedDate;
-	vm::ptr<SceNpId> isLastChangedAuthorId;
+	be_t<u32> size;
+	vm::bptr<CellRtcTick> isLastChangedDate;
+	vm::bptr<SceNpId> isLastChangedAuthorId;
 };
 
 struct SceNpTusTryAndSetVariableOptParam
 {
-	u64 size; // TODO: correct type?
-	vm::ptr<CellRtcTick> isLastChangedDate;
-	vm::ptr<SceNpId> isLastChangedAuthorId;
-	vm::ptr<s64> compareValue;
+	be_t<u32> size;
+	vm::bptr<CellRtcTick> isLastChangedDate;
+	vm::bptr<SceNpId> isLastChangedAuthorId;
+	vm::bptr<s64> compareValue;
 };
 
 struct SceNpTusSetDataOptParam
 {
-	u64 size; // TODO: correct type?
-	vm::ptr<CellRtcTick> isLastChangedDate;
-	vm::ptr<SceNpId> isLastChangedAuthorId;
+	be_t<u32> size;
+	vm::bptr<CellRtcTick> isLastChangedDate;
+	vm::bptr<SceNpId> isLastChangedAuthorId;
 };
 
 struct SceNpTssDataStatus
 {
 	CellRtcTick lastModified;
-	s32 statusCodeType;
-	u64 contentLength;
+	be_t<s32> statusCodeType;
+	be_t<u32> contentLength;
 };
 
 struct SceNpTssIfModifiedSinceParam
 {
-	s32 ifType;
+	be_t<s32> ifType;
 	u8 padding[4];
 	CellRtcTick lastModified;
 };
 
 struct SceNpTssGetDataOptParam
 {
-	u64 size; // TODO: correct type?
-	vm::ptr<u64> offset;
-	vm::ptr<u64> lastByte;
-	vm::ptr<SceNpTssIfModifiedSinceParam> ifParam;
+	be_t<u32> size;
+	vm::bptr<u64> offset;
+	vm::bptr<u64> lastByte;
+	vm::bptr<SceNpTssIfModifiedSinceParam> ifParam;
 };
 
 // fxm objects

diff --git a/rpcs3/Emu/Cell/Modules/sys_crashdump.h b/rpcs3/Emu/Cell/Modules/sys_crashdump.h
@@ -10,6 +10,6 @@ enum
 struct sys_crash_dump_log_area_info_t
 {
 	char label[SYS_CRASH_DUMP_MAX_LABEL_SIZE]; // 15 + 1 (0 terminated)
-	vm::ptr<void> addr;
-	be_t<u64> size;
+	vm::bptr<void> addr;
+	be_t<u32> size;
 };