From 9e5403aeb3b73df27983875cffd04c96a02a6bb6 Mon Sep 17 00:00:00 2001 From: Raul Tambre Date: Sat, 11 Oct 2014 20:20:01 +0300 Subject: [PATCH] Remove unneeded be_t --- rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp | 4 +-- rpcs3/Emu/RSX/RSXThread.cpp | 6 ++--- rpcs3/Emu/SysCalls/Modules/cellAdec.cpp | 6 ++--- rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp | 28 ++++++++++---------- rpcs3/Emu/SysCalls/Modules/cellAudio.cpp | 12 ++++----- rpcs3/Emu/SysCalls/Modules/cellDmux.cpp | 16 +++++------ rpcs3/Emu/SysCalls/Modules/cellFont.cpp | 6 ++--- rpcs3/Emu/SysCalls/Modules/cellGame.cpp | 4 +-- rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp | 4 +-- rpcs3/Emu/SysCalls/Modules/cellGcmSys.h | 4 +-- rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp | 12 ++++----- rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp | 12 ++++----- rpcs3/Emu/SysCalls/Modules/cellL10n.cpp | 4 +-- rpcs3/Emu/SysCalls/Modules/cellNetCtl.h | 2 +- rpcs3/Emu/SysCalls/Modules/cellPamf.cpp | 6 ++--- rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp | 10 +++---- rpcs3/Emu/SysCalls/Modules/cellResc.cpp | 16 +++++------ rpcs3/Emu/SysCalls/Modules/cellRtc.cpp | 6 ++--- rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp | 4 +-- rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp | 22 +++++++-------- rpcs3/Emu/SysCalls/Modules/cellSync.cpp | 18 ++++++------- rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp | 4 +-- rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp | 2 +- rpcs3/Emu/SysCalls/Modules/cellVdec.cpp | 6 ++--- rpcs3/Emu/SysCalls/Modules/cellVpost.cpp | 4 +-- rpcs3/Emu/SysCalls/Modules/libmixer.cpp | 10 +++---- rpcs3/Emu/SysCalls/Modules/sceNp.cpp | 4 +-- rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp | 10 +++---- rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp | 4 +-- rpcs3/Emu/SysCalls/Modules/sys_fs.cpp | 12 ++++----- rpcs3/Emu/SysCalls/Modules/sys_net.cpp | 6 ++--- rpcs3/Emu/SysCalls/lv2/lv2Fs.cpp | 28 ++++++++++---------- rpcs3/Emu/SysCalls/lv2/lv2Fs.h | 28 ++++++++++---------- rpcs3/Emu/SysCalls/lv2/sys_cond.cpp | 2 +- rpcs3/Emu/SysCalls/lv2/sys_cond.h | 2 +- rpcs3/Emu/SysCalls/lv2/sys_event.cpp | 6 ++--- rpcs3/Emu/SysCalls/lv2/sys_event.h | 6 ++--- rpcs3/Emu/SysCalls/lv2/sys_event_flag.cpp | 10 +++---- rpcs3/Emu/SysCalls/lv2/sys_event_flag.h | 10 +++---- rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp | 2 +- rpcs3/Emu/SysCalls/lv2/sys_interrupt.h | 2 +- rpcs3/Emu/SysCalls/lv2/sys_memory.cpp | 2 +- rpcs3/Emu/SysCalls/lv2/sys_memory.h | 2 +- rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp | 4 +-- rpcs3/Emu/SysCalls/lv2/sys_mmapper.h | 4 +-- rpcs3/Emu/SysCalls/lv2/sys_mutex.cpp | 2 +- rpcs3/Emu/SysCalls/lv2/sys_mutex.h | 2 +- rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp | 6 ++--- rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.h | 6 ++--- rpcs3/Emu/SysCalls/lv2/sys_process.cpp | 8 +++--- rpcs3/Emu/SysCalls/lv2/sys_process.h | 8 +++--- rpcs3/Emu/SysCalls/lv2/sys_prx.cpp | 4 +-- rpcs3/Emu/SysCalls/lv2/sys_prx.h | 4 +-- rpcs3/Emu/SysCalls/lv2/sys_rsx.cpp | 6 ++--- rpcs3/Emu/SysCalls/lv2/sys_rsx.h | 6 ++--- rpcs3/Emu/SysCalls/lv2/sys_rwlock.cpp | 2 +- rpcs3/Emu/SysCalls/lv2/sys_rwlock.h | 2 +- rpcs3/Emu/SysCalls/lv2/sys_semaphore.cpp | 4 +-- rpcs3/Emu/SysCalls/lv2/sys_semaphore.h | 4 +-- rpcs3/Emu/SysCalls/lv2/sys_spu.cpp | 26 +++++++++--------- rpcs3/Emu/SysCalls/lv2/sys_spu.h | 26 +++++++++--------- rpcs3/Emu/SysCalls/lv2/sys_time.cpp | 4 +-- rpcs3/Emu/SysCalls/lv2/sys_time.h | 2 +- rpcs3/Emu/SysCalls/lv2/sys_timer.cpp | 2 +- rpcs3/Emu/SysCalls/lv2/sys_timer.h | 2 +- rpcs3/Emu/System.cpp | 6 ++--- rpcs3/Gui/RSXDebugger.cpp | 2 +- rpcs3/Loader/ELF64.cpp | 4 +-- 68 files changed, 255 insertions(+), 255 deletions(-) diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp index e761b90f65..0c65d26982 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp @@ -90,7 +90,7 @@ std::string GLFragmentDecompilerThread::AddConst() return name; } - auto data = vm::ptr>::make(m_addr + m_size + m_offset); + auto data = vm::ptr::make(m_addr + m_size + m_offset); m_offset += 4 * 4; u32 x = GetData(data[0]); @@ -279,7 +279,7 @@ std::string GLFragmentDecompilerThread::BuildCode() void GLFragmentDecompilerThread::Task() { - auto data = vm::ptr>::make(m_addr); + auto data = vm::ptr::make(m_addr); m_size = 0; m_location = 0; m_loop_count = 0; diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index a32426936c..b12a07a312 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -144,7 +144,7 @@ u32 RSXVertexData::GetTypeSize() u32 RSXThread::OutOfArgsCount(const uint x, const u32 cmd, const u32 count, const u32 args_addr) { - auto args = vm::ptr>::make(args_addr); + auto args = vm::ptr::make(args_addr); std::string debug = GetMethodName(cmd); debug += "("; for(u32 i=0; i>::make(args_addr); + auto args = vm::ptr::make(args_addr); #if CMD_DEBUG std::string debug = GetMethodName(cmd); @@ -2246,7 +2246,7 @@ void RSXThread::Task() continue; } - auto args = vm::ptr>::make((u32)Memory.RSXIOMem.RealAddr(get + 4)); + auto args = vm::ptr::make((u32)Memory.RSXIOMem.RealAddr(get + 4)); for(u32 i=0; i type, vm::ptr attr) return CELL_OK; } -int cellAdecOpen(vm::ptr type, vm::ptr res, vm::ptr cb, vm::ptr> handle) +int cellAdecOpen(vm::ptr type, vm::ptr res, vm::ptr cb, vm::ptr handle) { cellAdec->Warning("cellAdecOpen(type_addr=0x%x, res_addr=0x%x, cb_addr=0x%x, handle_addr=0x%x)", type.addr(), res.addr(), cb.addr(), handle.addr()); @@ -617,7 +617,7 @@ int cellAdecOpen(vm::ptr type, vm::ptr res, vm:: return CELL_OK; } -int cellAdecOpenEx(vm::ptr type, vm::ptr res, vm::ptr cb, vm::ptr> handle) +int cellAdecOpenEx(vm::ptr type, vm::ptr res, vm::ptr cb, vm::ptr handle) { cellAdec->Warning("cellAdecOpenEx(type_addr=0x%x, res_addr=0x%x, cb_addr=0x%x, handle_addr=0x%x)", type.addr(), res.addr(), cb.addr(), handle.addr()); @@ -757,7 +757,7 @@ int cellAdecGetPcm(u32 handle, vm::ptr outBuffer) return CELL_OK; } -int cellAdecGetPcmItem(u32 handle, vm::ptr> pcmItem_ptr) +int cellAdecGetPcmItem(u32 handle, vm::ptr pcmItem_ptr) { cellAdec->Log("cellAdecGetPcmItem(handle=%d, pcmItem_ptr_addr=0x%x)", handle, pcmItem_ptr.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp b/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp index 6e9a72d357..d619d0ff9f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp @@ -6,7 +6,7 @@ Module *cellAtrac = nullptr; #include "cellAtrac.h" -int cellAtracSetDataAndGetMemSize(vm::ptr pHandle, u32 pucBufferAddr, u32 uiReadByte, u32 uiBufferByte, vm::ptr> puiWorkMemByte) +int cellAtracSetDataAndGetMemSize(vm::ptr pHandle, u32 pucBufferAddr, u32 uiReadByte, u32 uiBufferByte, vm::ptr puiWorkMemByte) { cellAtrac->Todo("cellAtracSetDataAndGetMemSize(pHandle=0x%x, pucBufferAddr=0x%x, uiReadByte=0x%x, uiBufferByte=0x%x, puiWorkMemByte_addr=0x%x)", pHandle.addr(), pucBufferAddr, uiReadByte, uiBufferByte, puiWorkMemByte.addr()); @@ -39,7 +39,7 @@ int cellAtracDeleteDecoder(vm::ptr pHandle) return CELL_OK; } -int cellAtracDecode(vm::ptr pHandle, u32 pfOutAddr, vm::ptr> puiSamples, vm::ptr> puiFinishflag, vm::ptr> piRemainFrame) +int cellAtracDecode(vm::ptr pHandle, u32 pfOutAddr, vm::ptr puiSamples, vm::ptr puiFinishflag, vm::ptr piRemainFrame) { cellAtrac->Todo("cellAtracDecode(pHandle=0x%x, pfOutAddr=0x%x, puiSamples_addr=0x%x, puiFinishFlag_addr=0x%x, piRemainFrame_addr=0x%x)", pHandle.addr(), pfOutAddr, puiSamples.addr(), puiFinishflag.addr(), piRemainFrame.addr()); @@ -50,7 +50,7 @@ int cellAtracDecode(vm::ptr pHandle, u32 pfOutAddr, vm::ptr pHandle, vm::ptr> ppucWritePointer, vm::ptr> puiWritableByte, vm::ptr> puiReadPosition) +int cellAtracGetStreamDataInfo(vm::ptr pHandle, vm::ptr ppucWritePointer, vm::ptr puiWritableByte, vm::ptr puiReadPosition) { cellAtrac->Todo("cellAtracGetStreamDataInfo(pHandle=0x%x, ppucWritePointer_addr=0x%x, puiWritableByte_addr=0x%x, puiReadPosition_addr=0x%x)", pHandle.addr(), ppucWritePointer.addr(), puiWritableByte.addr(), puiReadPosition.addr()); @@ -67,7 +67,7 @@ int cellAtracAddStreamData(vm::ptr pHandle, u32 uiAddByte) return CELL_OK; } -int cellAtracGetRemainFrame(vm::ptr pHandle, vm::ptr> piRemainFrame) +int cellAtracGetRemainFrame(vm::ptr pHandle, vm::ptr piRemainFrame) { cellAtrac->Todo("cellAtracGetRemainFrame(pHandle=0x%x, piRemainFrame_addr=0x%x)", pHandle.addr(), piRemainFrame.addr()); @@ -75,7 +75,7 @@ int cellAtracGetRemainFrame(vm::ptr pHandle, vm::ptr> return CELL_OK; } -int cellAtracGetVacantSize(vm::ptr pHandle, vm::ptr> puiVacantSize) +int cellAtracGetVacantSize(vm::ptr pHandle, vm::ptr puiVacantSize) { cellAtrac->Todo("cellAtracGetVacantSize(pHandle=0x%x, puiVacantSize_addr=0x%x)", pHandle.addr(), puiVacantSize.addr()); @@ -89,7 +89,7 @@ int cellAtracIsSecondBufferNeeded(vm::ptr pHandle) return CELL_OK; } -int cellAtracGetSecondBufferInfo(vm::ptr pHandle, vm::ptr> puiReadPosition, vm::ptr> puiDataByte) +int cellAtracGetSecondBufferInfo(vm::ptr pHandle, vm::ptr puiReadPosition, vm::ptr puiDataByte) { cellAtrac->Todo("cellAtracGetSecondBufferInfo(pHandle=0x%x, puiReadPosition_addr=0x%x, puiDataByte_addr=0x%x)", pHandle.addr(), puiReadPosition.addr(), puiDataByte.addr()); @@ -106,7 +106,7 @@ int cellAtracSetSecondBuffer(vm::ptr pHandle, u32 pucSecondBuff return CELL_OK; } -int cellAtracGetChannel(vm::ptr pHandle, vm::ptr> puiChannel) +int cellAtracGetChannel(vm::ptr pHandle, vm::ptr puiChannel) { cellAtrac->Todo("cellAtracGetChannel(pHandle=0x%x, puiChannel_addr=0x%x)", pHandle.addr(), puiChannel.addr()); @@ -114,7 +114,7 @@ int cellAtracGetChannel(vm::ptr pHandle, vm::ptr> pui return CELL_OK; } -int cellAtracGetMaxSample(vm::ptr pHandle, vm::ptr> puiMaxSample) +int cellAtracGetMaxSample(vm::ptr pHandle, vm::ptr puiMaxSample) { cellAtrac->Todo("cellAtracGetMaxSample(pHandle=0x%x, puiMaxSample_addr=0x%x)", pHandle.addr(), puiMaxSample.addr()); @@ -122,7 +122,7 @@ int cellAtracGetMaxSample(vm::ptr pHandle, vm::ptr> p return CELL_OK; } -int cellAtracGetNextSample(vm::ptr pHandle, vm::ptr> puiNextSample) +int cellAtracGetNextSample(vm::ptr pHandle, vm::ptr puiNextSample) { cellAtrac->Todo("cellAtracGetNextSample(pHandle=0x%x, puiNextSample_addr=0x%x)", pHandle.addr(), puiNextSample.addr()); @@ -130,7 +130,7 @@ int cellAtracGetNextSample(vm::ptr pHandle, vm::ptr> return CELL_OK; } -int cellAtracGetSoundInfo(vm::ptr pHandle, vm::ptr> piEndSample, vm::ptr> piLoopStartSample, vm::ptr> piLoopEndSample) +int cellAtracGetSoundInfo(vm::ptr pHandle, vm::ptr piEndSample, vm::ptr piLoopStartSample, vm::ptr piLoopEndSample) { cellAtrac->Todo("cellAtracGetSoundInfo(pHandle=0x%x, piEndSample_addr=0x%x, piLoopStartSample_addr=0x%x, piLoopEndSample_addr=0x%x)", pHandle.addr(), piEndSample.addr(), piLoopStartSample.addr(), piLoopEndSample.addr()); @@ -141,7 +141,7 @@ int cellAtracGetSoundInfo(vm::ptr pHandle, vm::ptr> p return CELL_OK; } -int cellAtracGetNextDecodePosition(vm::ptr pHandle, vm::ptr> puiSamplePosition) +int cellAtracGetNextDecodePosition(vm::ptr pHandle, vm::ptr puiSamplePosition) { cellAtrac->Todo("cellAtracGetNextDecodePosition(pHandle=0x%x, puiSamplePosition_addr=0x%x)", pHandle.addr(), puiSamplePosition.addr()); @@ -150,7 +150,7 @@ int cellAtracGetNextDecodePosition(vm::ptr pHandle, vm::ptr pHandle, vm::ptr> puiBitrate) +int cellAtracGetBitrate(vm::ptr pHandle, vm::ptr puiBitrate) { cellAtrac->Todo("cellAtracGetBitrate(pHandle=0x%x, puiBitrate_addr=0x%x)", pHandle.addr(), puiBitrate.addr()); @@ -159,7 +159,7 @@ int cellAtracGetBitrate(vm::ptr pHandle, vm::ptr> pui return CELL_OK; } -int cellAtracGetLoopInfo(vm::ptr pHandle, vm::ptr> piLoopNum, vm::ptr> puiLoopStatus) +int cellAtracGetLoopInfo(vm::ptr pHandle, vm::ptr piLoopNum, vm::ptr puiLoopStatus) { cellAtrac->Todo("cellAtracGetLoopInfo(pHandle=0x%x, piLoopNum_addr=0x%x, puiLoopStatus_addr=0x%x)", pHandle.addr(), piLoopNum.addr(), puiLoopStatus.addr()); @@ -194,7 +194,7 @@ int cellAtracResetPlayPosition(vm::ptr pHandle, u32 uiSample, u return CELL_OK; } -int cellAtracGetInternalErrorInfo(vm::ptr pHandle, vm::ptr> piResult) +int cellAtracGetInternalErrorInfo(vm::ptr pHandle, vm::ptr piResult) { cellAtrac->Todo("cellAtracGetInternalErrorInfo(pHandle=0x%x, piResult_addr=0x%x)", pHandle.addr(), piResult.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp b/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp index 262ae847aa..8ffb250aa3 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp @@ -385,7 +385,7 @@ int cellAudioInit() { std::lock_guard lock(audioMutex); // update indexes: - auto indexes = vm::ptr>::make(m_config.m_indexes); + auto indexes = vm::ptr::make(m_config.m_indexes); for (u32 i = 0; i < m_config.AUDIO_PORT_COUNT; i++) { if (!m_config.m_ports[i].m_is_audio_port_started) continue; @@ -505,7 +505,7 @@ int cellAudioQuit() return CELL_OK; } -int cellAudioPortOpen(vm::ptr audioParam, vm::ptr> portNum) +int cellAudioPortOpen(vm::ptr audioParam, vm::ptr portNum) { cellAudio->Warning("cellAudioPortOpen(audioParam_addr=0x%x, portNum_addr=0x%x)", audioParam.addr(), portNum.addr()); @@ -657,7 +657,7 @@ int cellAudioPortStop(u32 portNum) return CELL_OK; } -int cellAudioGetPortTimestamp(u32 portNum, u64 tag, vm::ptr> stamp) +int cellAudioGetPortTimestamp(u32 portNum, u64 tag, vm::ptr stamp) { cellAudio->Log("cellAudioGetPortTimestamp(portNum=0x%x, tag=0x%llx, stamp_addr=0x%x)", portNum, tag, stamp.addr()); @@ -685,7 +685,7 @@ int cellAudioGetPortTimestamp(u32 portNum, u64 tag, vm::ptr> stamp) return CELL_OK; } -int cellAudioGetPortBlockTag(u32 portNum, u64 blockNo, vm::ptr> tag) +int cellAudioGetPortBlockTag(u32 portNum, u64 blockNo, vm::ptr tag) { cellAudio->Log("cellAudioGetPortBlockTag(portNum=0x%x, blockNo=0x%llx, tag_addr=0x%x)", portNum, blockNo, tag.addr()); @@ -736,7 +736,7 @@ int cellAudioSetPortLevel(u32 portNum, float level) } // Utility Functions -int cellAudioCreateNotifyEventQueue(vm::ptr> id, vm::ptr> key) +int cellAudioCreateNotifyEventQueue(vm::ptr id, vm::ptr key) { cellAudio->Warning("cellAudioCreateNotifyEventQueue(id_addr=0x%x, key_addr=0x%x)", id.addr(), key.addr()); @@ -764,7 +764,7 @@ int cellAudioCreateNotifyEventQueue(vm::ptr> id, vm::ptr> ke return CELL_OK; } -int cellAudioCreateNotifyEventQueueEx(vm::ptr> id, vm::ptr> key, u32 iFlags) +int cellAudioCreateNotifyEventQueueEx(vm::ptr id, vm::ptr key, u32 iFlags) { cellAudio->Todo("cellAudioCreateNotifyEventQueueEx(id_addr=0x%x, key_addr=0x%x, iFlags=0x%x)", id.addr(), key.addr(), iFlags); return CELL_OK; diff --git a/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp b/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp index 3e715a2dfb..410153cdbd 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp @@ -720,7 +720,7 @@ int cellDmuxQueryAttr2(vm::ptr demuxerType2, vm::ptr demuxerType, vm::ptr demuxerResource, - vm::ptr demuxerCb, vm::ptr> demuxerHandle) + vm::ptr demuxerCb, vm::ptr demuxerHandle) { cellDmux->Warning("cellDmuxOpen(demuxerType_addr=0x%x, demuxerResource_addr=0x%x, demuxerCb_addr=0x%x, demuxerHandle_addr=0x%x)", demuxerType.addr(), demuxerResource.addr(), demuxerCb.addr(), demuxerHandle.addr()); @@ -738,7 +738,7 @@ int cellDmuxOpen(vm::ptr demuxerType, vm::ptr demuxerType, vm::ptr demuxerResourceEx, - vm::ptr demuxerCb, vm::ptr> demuxerHandle) + vm::ptr demuxerCb, vm::ptr demuxerHandle) { cellDmux->Warning("cellDmuxOpenEx(demuxerType_addr=0x%x, demuxerResourceEx_addr=0x%x, demuxerCb_addr=0x%x, demuxerHandle_addr=0x%x)", demuxerType.addr(), demuxerResourceEx.addr(), demuxerCb.addr(), demuxerHandle.addr()); @@ -756,7 +756,7 @@ int cellDmuxOpenEx(vm::ptr demuxerType, vm::ptr demuxerType2, vm::ptr demuxerResource2, - vm::ptr demuxerCb, vm::ptr> demuxerHandle) + vm::ptr demuxerCb, vm::ptr demuxerHandle) { cellDmux->Warning("cellDmuxOpen2(demuxerType2_addr=0x%x, demuxerResource2_addr=0x%x, demuxerCb_addr=0x%x, demuxerHandle_addr=0x%x)", demuxerType2.addr(), demuxerResource2.addr(), demuxerCb.addr(), demuxerHandle.addr()); @@ -923,7 +923,7 @@ int cellDmuxQueryEsAttr2(vm::ptr demuxerType2, vm::ptr esFilterId, vm::ptr esResourceInfo, vm::ptr esCb, - const u32 esSpecificInfo_addr, vm::ptr> esHandle) + const u32 esSpecificInfo_addr, vm::ptr esHandle) { cellDmux->Warning("cellDmuxEnableEs(demuxerHandle=%d, esFilterId_addr=0x%x, esResourceInfo_addr=0x%x, esCb_addr=0x%x, " "esSpecificInfo_addr=0x%x, esHandle_addr=0x%x)", demuxerHandle, esFilterId.addr(), esResourceInfo.addr(), @@ -992,7 +992,7 @@ int cellDmuxResetEs(u32 esHandle) return CELL_OK; } -int cellDmuxGetAu(u32 esHandle, vm::ptr> auInfo_ptr, vm::ptr> auSpecificInfo_ptr) +int cellDmuxGetAu(u32 esHandle, vm::ptr auInfo_ptr, vm::ptr auSpecificInfo_ptr) { cellDmux->Log("cellDmuxGetAu(esHandle=0x%x, auInfo_ptr_addr=0x%x, auSpecificInfo_ptr_addr=0x%x)", esHandle, auInfo_ptr.addr(), auSpecificInfo_ptr.addr()); @@ -1015,7 +1015,7 @@ int cellDmuxGetAu(u32 esHandle, vm::ptr> auInfo_ptr, vm::ptr return CELL_OK; } -int cellDmuxPeekAu(u32 esHandle, vm::ptr> auInfo_ptr, vm::ptr> auSpecificInfo_ptr) +int cellDmuxPeekAu(u32 esHandle, vm::ptr auInfo_ptr, vm::ptr auSpecificInfo_ptr) { cellDmux->Log("cellDmuxPeekAu(esHandle=0x%x, auInfo_ptr_addr=0x%x, auSpecificInfo_ptr_addr=0x%x)", esHandle, auInfo_ptr.addr(), auSpecificInfo_ptr.addr()); @@ -1038,7 +1038,7 @@ int cellDmuxPeekAu(u32 esHandle, vm::ptr> auInfo_ptr, vm::ptr> auInfoEx_ptr, vm::ptr> auSpecificInfo_ptr) +int cellDmuxGetAuEx(u32 esHandle, vm::ptr auInfoEx_ptr, vm::ptr auSpecificInfo_ptr) { cellDmux->Log("cellDmuxGetAuEx(esHandle=0x%x, auInfoEx_ptr_addr=0x%x, auSpecificInfo_ptr_addr=0x%x)", esHandle, auInfoEx_ptr.addr(), auSpecificInfo_ptr.addr()); @@ -1061,7 +1061,7 @@ int cellDmuxGetAuEx(u32 esHandle, vm::ptr> auInfoEx_ptr, vm::ptr> auInfoEx_ptr, vm::ptr> auSpecificInfo_ptr) +int cellDmuxPeekAuEx(u32 esHandle, vm::ptr auInfoEx_ptr, vm::ptr auSpecificInfo_ptr) { cellDmux->Log("cellDmuxPeekAuEx(esHandle=0x%x, auInfoEx_ptr_addr=0x%x, auSpecificInfo_ptr_addr=0x%x)", esHandle, auInfoEx_ptr.addr(), auSpecificInfo_ptr.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp index 010f69c9e7..171ee032cf 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp @@ -30,7 +30,7 @@ int cellFontInitializeWithRevision(u64 revisionFlags, vm::ptr co return CELL_FONT_OK; } -int cellFontGetRevisionFlags(vm::ptr> revisionFlags) +int cellFontGetRevisionFlags(vm::ptr revisionFlags) { UNIMPLEMENTED_FUNC(cellFont); return CELL_FONT_OK; @@ -40,7 +40,7 @@ int cellFontInit(vm::ptr config) { cellFont->Log("cellFontInit(config=0x%x)", config.addr()); - vm::var> revisionFlags; + vm::var revisionFlags; revisionFlags.value() = 0; cellFontGetRevisionFlags(revisionFlags); return cellFontInitializeWithRevision(revisionFlags.value(), config); @@ -383,7 +383,7 @@ int cellFontGetEffectSlant(vm::ptr font, vm::ptr> slantPar return CELL_FONT_OK; } -int cellFontGetFontIdCode(vm::ptr font, u32 code, vm::ptr> fontId, vm::ptr> fontCode) +int cellFontGetFontIdCode(vm::ptr font, u32 code, vm::ptr fontId, vm::ptr fontCode) { cellFont->Todo("cellFontGetFontIdCode(font_addr=0x%x, code=0x%x, fontId_addr=0x%x, fontCode_addr=0x%x", font.addr(), code, fontId.addr(), fontCode.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp index 5d12d644fe..2e320f6a49 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp @@ -15,7 +15,7 @@ Module *cellGame = nullptr; std::string contentInfo = ""; std::string usrdir = ""; -int cellGameBootCheck(vm::ptr> type, vm::ptr> attributes, vm::ptr size, vm::ptr dirName) +int cellGameBootCheck(vm::ptr type, vm::ptr attributes, vm::ptr size, vm::ptr dirName) { cellGame->Warning("cellGameBootCheck(type_addr=0x%x, attributes_addr=0x%x, size_addr=0x%x, dirName_addr=0x%x)", type.addr(), attributes.addr(), size.addr(), dirName.addr()); @@ -325,7 +325,7 @@ int cellGameDeleteGameData() return CELL_OK; } -int cellGameGetParamInt(u32 id, vm::ptr> value) +int cellGameGetParamInt(u32 id, vm::ptr value) { cellGame->Warning("cellGameGetParamInt(id=%d, value_addr=0x%x)", id, value.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp index 1200f9408b..b25d3959b0 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp @@ -796,7 +796,7 @@ int cellGcmSortRemapEaIoAddress() //---------------------------------------------------------------------------- // Memory Mapping //---------------------------------------------------------------------------- -s32 cellGcmAddressToOffset(u64 address, vm::ptr> offset) +s32 cellGcmAddressToOffset(u64 address, vm::ptr offset) { cellGcmSys->Log("cellGcmAddressToOffset(address=0x%x,offset_addr=0x%x)", address, offset.addr()); @@ -910,7 +910,7 @@ s32 cellGcmMapLocalMemory(u64 address, u64 size) return CELL_OK; } -s32 cellGcmMapMainMemory(u32 ea, u32 size, vm::ptr> offset) +s32 cellGcmMapMainMemory(u32 ea, u32 size, vm::ptr offset) { cellGcmSys->Warning("cellGcmMapMainMemory(ea=0x%x,size=0x%x,offset_addr=0x%x)", ea, size, offset.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.h b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.h index 5c80727595..7b4b18075f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.h +++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.h @@ -24,13 +24,13 @@ u32 gcmGetLocalMemorySize(); // SysCalls s32 cellGcmSetPrepareFlip(vm::ptr ctxt, u32 id); -s32 cellGcmAddressToOffset(u64 address, vm::ptr> offset); +s32 cellGcmAddressToOffset(u64 address, vm::ptr offset); u32 cellGcmGetMaxIoMapSize(); void cellGcmGetOffsetTable(vm::ptr table); s32 cellGcmIoOffsetToAddress(u32 ioOffset, u64 address); s32 cellGcmMapEaIoAddress(u32 ea, u32 io, u32 size); s32 cellGcmMapEaIoAddressWithFlags(u32 ea, u32 io, u32 size, u32 flags); -s32 cellGcmMapMainMemory(u32 ea, u32 size, vm::ptr> offset); +s32 cellGcmMapMainMemory(u32 ea, u32 size, vm::ptr offset); s32 cellGcmReserveIoMapSize(u32 size); s32 cellGcmUnmapEaIoAddress(u64 ea); s32 cellGcmUnmapIoAddress(u64 io); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp index c39f8ec181..a29f28b8be 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp @@ -21,7 +21,7 @@ int cellGifDecExtCreate(u32 mainHandle, u32 threadInParam, u32 threadOutParam, u return CELL_OK; } -int cellGifDecOpen(u32 mainHandle, vm::ptr> subHandle, vm::ptr src, vm::ptr openInfo) +int cellGifDecOpen(u32 mainHandle, vm::ptr subHandle, vm::ptr src, vm::ptr openInfo) { cellGifDec->Warning("cellGifDecOpen(mainHandle=0x%x, subHandle_addr=0x%x, src_addr=0x%x, openInfo_addr=0x%x)", mainHandle, subHandle.addr(), src.addr(), openInfo.addr()); @@ -38,9 +38,9 @@ int cellGifDecOpen(u32 mainHandle, vm::ptr> subHandle, vm::ptr> fd; - int ret = cellFsOpen(vm::ptr::make(src->fileName.addr()), 0, fd, vm::ptr>::make(0), 0); - current_subHandle->fd = fd->ToLE(); + vm::var fd; + int ret = cellFsOpen(vm::ptr::make(src->fileName.addr()), 0, fd, vm::ptr::make(0), 0); + current_subHandle->fd = fd; if (ret != CELL_OK) return CELL_GIFDEC_ERROR_OPEN_FILE; // Get size of file @@ -72,7 +72,7 @@ int cellGifDecReadHeader(u32 mainHandle, u32 subHandle, vm::ptr //Write the header to buffer vm::var buffer; // Alloc buffer for GIF header - vm::var> pos, nread; + vm::var pos, nread; switch(subHandle_data->src.srcSelect.ToBE()) { @@ -154,7 +154,7 @@ int cellGifDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr data, vm::pt //Copy the GIF file to a buffer vm::var gif((u32)fileSize); - vm::var> pos, nread; + vm::var pos, nread; switch(subHandle_data->src.srcSelect.ToBE()) { diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp index 7039b25c65..658aa535e8 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp @@ -26,7 +26,7 @@ int cellJpgDecDestroy(u32 mainHandle) return CELL_OK; } -int cellJpgDecOpen(u32 mainHandle, vm::ptr> subHandle, vm::ptr src, vm::ptr openInfo) +int cellJpgDecOpen(u32 mainHandle, vm::ptr subHandle, vm::ptr src, vm::ptr openInfo) { cellJpgDec->Warning("cellJpgDecOpen(mainHandle=0x%x, subHandle_addr=0x%x, src_addr=0x%x, openInfo_addr=0x%x)", mainHandle, subHandle.addr(), src.addr(), openInfo.addr()); @@ -44,9 +44,9 @@ int cellJpgDecOpen(u32 mainHandle, vm::ptr> subHandle, vm::ptr> fd; - int ret = cellFsOpen(vm::ptr::make(src->fileName.addr()), 0, fd, vm::ptr>::make(0), 0); - current_subHandle->fd = fd->ToLE(); + vm::var fd; + int ret = cellFsOpen(vm::ptr::make(src->fileName.addr()), 0, fd, vm::ptr::make(0), 0); + current_subHandle->fd = fd; if (ret != CELL_OK) return CELL_JPGDEC_ERROR_OPEN_FILE; // Get size of file @@ -92,7 +92,7 @@ int cellJpgDecReadHeader(u32 mainHandle, u32 subHandle, vm::ptr //Write the header to buffer vm::var buffer((u32)fileSize); - vm::var> pos, nread; + vm::var pos, nread; switch(subHandle_data->src.srcSelect.ToBE()) { @@ -161,7 +161,7 @@ int cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr data, vm::pt //Copy the JPG file to a buffer vm::var jpg((u32)fileSize); - vm::var> pos, nread; + vm::var pos, nread; switch(subHandle_data->src.srcSelect.ToBE()) { diff --git a/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp b/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp index 6c06746ebb..60bae80ecc 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp @@ -16,7 +16,7 @@ Module *cellL10n = nullptr; -int UTF16stoUTF8s(vm::lptrl utf16, vm::ptr> utf16_len, vm::ptr utf8, vm::ptr> utf8_len) +int UTF16stoUTF8s(vm::lptrl utf16, vm::ptr utf16_len, vm::ptr utf8, vm::ptr utf8_len) { cellL10n->Warning("UTF16stoUTF8s(utf16_addr=0x%x, utf16_len_addr=0x%x, utf8_addr=0x%x, utf8_len_addr=0x%x)", utf16.addr(), utf16_len.addr(), utf8.addr(), utf8_len.addr()); @@ -281,7 +281,7 @@ int _L10nConvertStr(int src_code, const void* src, size_t * src_len, int dst_cod #endif //TODO: Check the code in emulation. If support for UTF8/UTF16/UTF32/UCS2/UCS4 should use wider chars.. awful. -int L10nConvertStr(int src_code, vm::ptr src, vm::ptr> src_len, int dst_code, vm::ptr dst, vm::ptr> dst_len) +int L10nConvertStr(int src_code, vm::ptr src, vm::ptr src_len, int 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/cellNetCtl.h b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.h index 11b6695518..4cb89a6962 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.h +++ b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.h @@ -257,4 +257,4 @@ struct CellNetCtlNatInfo be_t mapped_addr; }; -typedef void(*cellNetCtlHandler)(s32 prev_state, s32 new_state, s32 event, s32 error_code, vm::ptr> arg); +typedef void(*cellNetCtlHandler)(s32 prev_state, s32 new_state, s32 event, s32 error_code, vm::ptr arg); diff --git a/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp b/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp index ae5095c809..93438d8029 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp @@ -124,7 +124,7 @@ u8 pamfGetStreamChannel(vm::ptr pSelf, u8 stream) } -int cellPamfGetHeaderSize(vm::ptr pAddr, u64 fileSize, vm::ptr> pSize) +int cellPamfGetHeaderSize(vm::ptr pAddr, u64 fileSize, vm::ptr pSize) { cellPamf->Warning("cellPamfGetHeaderSize(pAddr=0x%x, fileSize=%d, pSize_addr=0x%x)", pAddr.addr(), fileSize, pSize.addr()); @@ -136,7 +136,7 @@ int cellPamfGetHeaderSize(vm::ptr pAddr, u64 fileSize, vm::ptr pAddr, u64 fileSize, u32 attribute, vm::ptr> pSize) +int cellPamfGetHeaderSize2(vm::ptr pAddr, u64 fileSize, u32 attribute, vm::ptr pSize) { cellPamf->Warning("cellPamfGetHeaderSize2(pAddr=0x%x, fileSize=%d, attribute=0x%x, pSize_addr=0x%x)", pAddr.addr(), fileSize, attribute, pSize.addr()); @@ -148,7 +148,7 @@ int cellPamfGetHeaderSize2(vm::ptr pAddr, u64 fileSize, u32 attribut return CELL_OK; } -int cellPamfGetStreamOffsetAndSize(vm::ptr pAddr, u64 fileSize, vm::ptr> pOffset, vm::ptr> pSize) +int cellPamfGetStreamOffsetAndSize(vm::ptr pAddr, u64 fileSize, vm::ptr pOffset, vm::ptr pSize) { cellPamf->Warning("cellPamfGetStreamOffsetAndSize(pAddr=0x%x, fileSize=%d, pOffset_addr=0x%x, pSize_addr=0x%x)", pAddr.addr(), fileSize, pOffset.addr(), pSize.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp index 609096d59c..15c51fc612 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp @@ -83,9 +83,9 @@ s32 pngDecOpen( case se32(CELL_PNGDEC_FILE): // Get file descriptor - vm::var> fd; - int ret = cellFsOpen(vm::ptr::make(src->fileName.addr()), 0, fd, vm::ptr>::make(0), 0); - stream->fd = fd->ToLE(); + vm::var fd; + int ret = cellFsOpen(vm::ptr::make(src->fileName.addr()), 0, fd, vm::ptr::make(0), 0); + stream->fd = fd; if (ret != CELL_OK) return CELL_PNGDEC_ERROR_OPEN_FILE; // Get size of file @@ -141,7 +141,7 @@ s32 pngReadHeader( //Write the header to buffer vm::var buffer; // Alloc buffer for PNG header auto buffer_32 = buffer.To>(); - vm::var> pos, nread; + vm::var pos, nread; switch (stream->src.srcSelect.ToBE()) { @@ -246,7 +246,7 @@ s32 pngDecodeData( //Copy the PNG file to a buffer vm::var png((u32)fileSize); - vm::var> pos, nread; + vm::var pos, nread; switch (stream->src.srcSelect.ToBE()) { diff --git a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp index 8c7961e5b1..ef7868f4b0 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp @@ -14,7 +14,7 @@ extern s32 cellVideoOutConfigure(u32 videoOut, vm::ptr handler); extern void cellGcmSetVBlankHandler(vm::ptr handler); -extern int cellGcmAddressToOffset(u64 address, vm::ptr> offset); +extern int cellGcmAddressToOffset(u64 address, vm::ptr offset); extern int cellGcmSetDisplayBuffer(u32 id, u32 offset, u32 pitch, u32 width, u32 height); extern int cellGcmSetPrepareFlip(vm::ptr ctx, u32 id); extern int cellGcmSetSecondVFrequency(u32 freq); @@ -620,7 +620,7 @@ void cellRescExit() s_rescInternalInstance->m_bInitialized = false; } -int cellRescVideoOutResolutionId2RescBufferMode(u32 resolutionId, vm::ptr> bufferMode) +int cellRescVideoOutResolutionId2RescBufferMode(u32 resolutionId, vm::ptr bufferMode) { cellResc->Log("cellRescVideoOutResolutionId2RescBufferMode(resolutionId=%d, bufferMode_addr=0x%x)", resolutionId, bufferMode.addr()); @@ -858,7 +858,7 @@ int cellRescSetPalInterpolateDropFlexRatio(float ratio) return CELL_OK; } -int cellRescGetBufferSize(vm::ptr> colorBuffers, vm::ptr> vertexArray, vm::ptr> fragmentShader) +int cellRescGetBufferSize(vm::ptr colorBuffers, vm::ptr vertexArray, vm::ptr fragmentShader) { cellResc->Warning("cellRescGetBufferSize(colorBuffers_addr=0x%x, vertexArray_addr=0x%x, fragmentShader_addr=0x%x)", colorBuffers.addr(), vertexArray.addr(), fragmentShader.addr()); @@ -1029,7 +1029,7 @@ int cellRescSetWaitFlip() return CELL_OK; } -int cellRescSetBufferAddress(vm::ptr> colorBuffers, vm::ptr> vertexArray, vm::ptr> fragmentShader) +int cellRescSetBufferAddress(vm::ptr colorBuffers, vm::ptr vertexArray, vm::ptr fragmentShader) { cellResc->Warning("cellRescSetBufferAddress(colorBuffers_addr=0x%x, vertexArray_addr=0x%x, fragmentShader_addr=0x%x)", colorBuffers.addr(), vertexArray.addr(), fragmentShader.addr()); @@ -1049,12 +1049,12 @@ int cellRescSetBufferAddress(vm::ptr> colorBuffers, vm::ptr> s_rescInternalInstance->m_vertexArrayEA = vertexArray.addr(); s_rescInternalInstance->m_fragmentUcodeEA = fragmentShader.addr(); - vm::var> dstOffset; + vm::var dstOffset; cellGcmAddressToOffset(s_rescInternalInstance->m_colorBuffersEA, dstOffset); for (int i=0; im_dstOffsets[i] = dstOffset->ToLE() + i * s_rescInternalInstance->m_dstBufInterval; + s_rescInternalInstance->m_dstOffsets[i] = dstOffset + i * s_rescInternalInstance->m_dstBufInterval; } for (int i=0; i>::make(ea_addr); - auto buf32 = vm::ptr>::make(ea_addr); + auto buf16 = vm::ptr::make(ea_addr); + auto buf32 = vm::ptr::make(ea_addr); blackman(window); diff --git a/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp b/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp index 99f281514c..aae606a4d1 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp @@ -310,7 +310,7 @@ int cellRtcConvertLocalTimeToUtc(vm::ptr pLocalTime, vm::ptr pDateTime, vm::ptr> puiDosTime) +int cellRtcGetDosTime(vm::ptr pDateTime, vm::ptr puiDosTime) { cellRtc->Log("cellRtcGetDosTime(pDateTime=0x%x, puiDosTime=0x%x)", pDateTime.addr(), puiDosTime.addr()); @@ -321,7 +321,7 @@ int cellRtcGetDosTime(vm::ptr pDateTime, vm::ptr> pui return CELL_OK; } -int cellRtcGetTime_t(vm::ptr pDateTime, vm::ptr> piTime) +int cellRtcGetTime_t(vm::ptr pDateTime, vm::ptr piTime) { cellRtc->Log("cellRtcGetTime_t(pDateTime=0x%x, piTime=0x%x)", pDateTime.addr(), piTime.addr()); @@ -333,7 +333,7 @@ int cellRtcGetTime_t(vm::ptr pDateTime, vm::ptr> piTi return CELL_OK; } -int cellRtcGetWin32FileTime(vm::ptr pDateTime, vm::ptr> pulWin32FileTime) +int cellRtcGetWin32FileTime(vm::ptr pDateTime, vm::ptr pulWin32FileTime) { cellRtc->Log("cellRtcGetWin32FileTime(pDateTime=0x%x, pulWin32FileTime=0x%x)", pDateTime.addr(), pulWin32FileTime.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp index 5f12fc853b..e5796c775a 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp @@ -989,7 +989,7 @@ int cellSaveDataFixedExport() //const char *dirName, u32 maxSizeKB, CellSaveData return CELL_SAVEDATA_RET_OK; } -int cellSaveDataGetListItem() //const char *dirName, CellSaveDataDirStat *dir, CellSaveDataSystemFileParam *sysFileParam, vm::ptr> bind, vm::ptr> sizeKB +int cellSaveDataGetListItem() //const char *dirName, CellSaveDataDirStat *dir, CellSaveDataSystemFileParam *sysFileParam, vm::ptr bind, vm::ptr sizeKB { UNIMPLEMENTED_FUNC(cellSysutil); return CELL_SAVEDATA_RET_OK; @@ -1025,7 +1025,7 @@ int cellSaveDataUserFixedExport() //CellSysutilUserId userId, const char *dirNam return CELL_SAVEDATA_RET_OK; } -int cellSaveDataUserGetListItem() //CellSysutilUserId userId, const char *dirName, CellSaveDataDirStat *dir, CellSaveDataSystemFileParam *sysFileParam, vm::ptr> bind, vm::ptr> sizeKB +int cellSaveDataUserGetListItem() //CellSysutilUserId userId, const char *dirName, CellSaveDataDirStat *dir, CellSaveDataSystemFileParam *sysFileParam, vm::ptr bind, vm::ptr sizeKB { UNIMPLEMENTED_FUNC(cellSysutil); return CELL_SAVEDATA_RET_OK; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp index ac46056b38..5ca4bb1fde 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp @@ -25,7 +25,7 @@ s64 spursCreateLv2EventQueue(vm::ptr spurs, u32& queue_id, vm::ptr> queue; - s32 res = cb_call, vm::ptr>, vm::ptr, s32, u32>(GetCurrentPPUThread(), libsre + 0xB14C, libsre_rtoc, + s32 res = cb_call, vm::ptr, vm::ptr, s32, u32>(GetCurrentPPUThread(), libsre + 0xB14C, libsre_rtoc, spurs, queue, port, size, vm::read32(libsre_rtoc - 0x7E2C)); queue_id = queue->ToLE(); return res; @@ -346,7 +346,7 @@ s64 spursInit( if (Emu.IsStopped()) continue; assert(sys_spu_thread_group_start(spurs->m.spuTG) == CELL_OK); - if (s32 res = sys_spu_thread_group_join(spurs->m.spuTG, vm::ptr>::make(0), vm::ptr>::make(0))) + if (s32 res = sys_spu_thread_group_join(spurs->m.spuTG, vm::ptr::make(0), vm::ptr::make(0))) { if (res == CELL_ESTAT) { @@ -796,7 +796,7 @@ s64 cellSpursGetSpuGuid() #endif } -s64 cellSpursGetSpuThreadGroupId(vm::ptr spurs, vm::ptr> group) +s64 cellSpursGetSpuThreadGroupId(vm::ptr spurs, vm::ptr group) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursGetSpuThreadGroupId(spurs_addr=0x%x, group_addr=0x%x)", spurs.addr(), group.addr()); @@ -807,7 +807,7 @@ s64 cellSpursGetSpuThreadGroupId(vm::ptr spurs, vm::ptr> gr #endif } -s64 cellSpursGetNumSpuThread(vm::ptr spurs, vm::ptr> nThreads) +s64 cellSpursGetNumSpuThread(vm::ptr spurs, vm::ptr nThreads) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursGetNumSpuThread(spurs_addr=0x%x, nThreads_addr=0x%x)", spurs.addr(), nThreads.addr()); @@ -818,7 +818,7 @@ s64 cellSpursGetNumSpuThread(vm::ptr spurs, vm::ptr> nThrea #endif } -s64 cellSpursGetSpuThreadId(vm::ptr spurs, vm::ptr> thread, vm::ptr> nThreads) +s64 cellSpursGetSpuThreadId(vm::ptr spurs, vm::ptr thread, vm::ptr nThreads) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursGetSpuThreadId(spurs_addr=0x%x, thread_addr=0x%x, nThreads_addr=0x%x)", spurs.addr(), thread.addr(), nThreads.addr()); @@ -1569,7 +1569,7 @@ s64 cellSpursEventFlagDetachLv2EventQueue(vm::ptr eventFlag) #endif } -s64 cellSpursEventFlagWait(vm::ptr eventFlag, vm::ptr> mask, u32 mode) +s64 cellSpursEventFlagWait(vm::ptr eventFlag, vm::ptr mask, u32 mode) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursEventFlagWait(eventFlag_addr=0x%x, mask_addr=0x%x, mode=%d)", eventFlag.addr(), mask.addr(), mode); @@ -1602,7 +1602,7 @@ s64 cellSpursEventFlagSet(vm::ptr eventFlag, u16 bits) #endif } -s64 cellSpursEventFlagTryWait(vm::ptr eventFlag, vm::ptr> mask, u32 mode) +s64 cellSpursEventFlagTryWait(vm::ptr eventFlag, vm::ptr mask, u32 mode) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursEventFlagTryWait(eventFlag_addr=0x%x, mask_addr=0x%x, mode=0x%x)", eventFlag.addr(), mask.addr(), mode); @@ -1613,7 +1613,7 @@ s64 cellSpursEventFlagTryWait(vm::ptr eventFlag, vm::ptr eventFlag, vm::ptr> direction) +s64 cellSpursEventFlagGetDirection(vm::ptr eventFlag, vm::ptr direction) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursEventFlagGetDirection(eventFlag_addr=0x%x, direction_addr=0x%x)", eventFlag.addr(), direction.addr()); @@ -1624,7 +1624,7 @@ s64 cellSpursEventFlagGetDirection(vm::ptr eventFlag, vm::pt #endif } -s64 cellSpursEventFlagGetClearMode(vm::ptr eventFlag, vm::ptr> clear_mode) +s64 cellSpursEventFlagGetClearMode(vm::ptr eventFlag, vm::ptr clear_mode) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursEventFlagGetClearMode(eventFlag_addr=0x%x, clear_mode_addr=0x%x)", eventFlag.addr(), clear_mode.addr()); @@ -1980,7 +1980,7 @@ s64 cellSpursJoinTaskset(vm::ptr taskset) #endif } -s64 cellSpursGetTasksetId(vm::ptr taskset, vm::ptr> workloadId) +s64 cellSpursGetTasksetId(vm::ptr taskset, vm::ptr workloadId) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursGetTasksetId(taskset_addr=0x%x, workloadId_addr=0x%x)", taskset.addr(), workloadId.addr()); @@ -2002,7 +2002,7 @@ s64 cellSpursShutdownTaskset(vm::ptr taskset) #endif } -s64 cellSpursCreateTask(vm::ptr taskset, vm::ptr> taskID, u32 elf_addr, u32 context_addr, u32 context_size, vm::ptr lsPattern, +s64 cellSpursCreateTask(vm::ptr taskset, vm::ptr taskID, u32 elf_addr, u32 context_addr, u32 context_size, vm::ptr lsPattern, vm::ptr argument) { #ifdef PRX_DEBUG diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp index 4a0e1a3ccd..32f39e721c 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp @@ -1092,7 +1092,7 @@ s32 syncLFQueueGetPushPointer(vm::ptr queue, s32& pointer, u32 } } -s32 _cellSyncLFQueueGetPushPointer(vm::ptr queue, vm::ptr> pointer, u32 isBlocking, u32 useEventQueue) +s32 _cellSyncLFQueueGetPushPointer(vm::ptr queue, vm::ptr pointer, u32 isBlocking, u32 useEventQueue) { cellSync->Todo("_cellSyncLFQueueGetPushPointer(queue_addr=0x%x, pointer_addr=0x%x, isBlocking=%d, useEventQueue=%d)", queue.addr(), pointer.addr(), isBlocking, useEventQueue); @@ -1111,7 +1111,7 @@ s32 syncLFQueueGetPushPointer2(vm::ptr queue, s32& pointer, u32 return CELL_OK; } -s32 _cellSyncLFQueueGetPushPointer2(vm::ptr queue, vm::ptr> pointer, u32 isBlocking, u32 useEventQueue) +s32 _cellSyncLFQueueGetPushPointer2(vm::ptr queue, vm::ptr pointer, u32 isBlocking, u32 useEventQueue) { // arguments copied from _cellSyncLFQueueGetPushPointer cellSync->Todo("_cellSyncLFQueueGetPushPointer2(queue_addr=0x%x, pointer_addr=0x%x, isBlocking=%d, useEventQueue=%d)", @@ -1471,7 +1471,7 @@ s32 syncLFQueueGetPopPointer(vm::ptr queue, s32& pointer, u32 i } } -s32 _cellSyncLFQueueGetPopPointer(vm::ptr queue, vm::ptr> pointer, u32 isBlocking, u32 arg4, u32 useEventQueue) +s32 _cellSyncLFQueueGetPopPointer(vm::ptr queue, vm::ptr pointer, u32 isBlocking, u32 arg4, u32 useEventQueue) { cellSync->Todo("_cellSyncLFQueueGetPopPointer(queue_addr=0x%x, pointer_addr=0x%x, isBlocking=%d, arg4=%d, useEventQueue=%d)", queue.addr(), pointer.addr(), isBlocking, arg4, useEventQueue); @@ -1490,7 +1490,7 @@ s32 syncLFQueueGetPopPointer2(vm::ptr queue, s32& pointer, u32 return CELL_OK; } -s32 _cellSyncLFQueueGetPopPointer2(vm::ptr queue, vm::ptr> pointer, u32 isBlocking, u32 useEventQueue) +s32 _cellSyncLFQueueGetPopPointer2(vm::ptr queue, vm::ptr pointer, u32 isBlocking, u32 useEventQueue) { // arguments copied from _cellSyncLFQueueGetPopPointer cellSync->Todo("_cellSyncLFQueueGetPopPointer2(queue_addr=0x%x, pointer_addr=0x%x, isBlocking=%d, useEventQueue=%d)", @@ -1797,7 +1797,7 @@ s32 cellSyncLFQueueClear(vm::ptr queue) return CELL_OK; } -s32 cellSyncLFQueueSize(vm::ptr queue, vm::ptr> size) +s32 cellSyncLFQueueSize(vm::ptr queue, vm::ptr size) { cellSync->Warning("cellSyncLFQueueSize(queue_addr=0x%x, size_addr=0x%x)", queue.addr(), size.addr()); @@ -1832,7 +1832,7 @@ s32 cellSyncLFQueueSize(vm::ptr queue, vm::ptr> size) } } -s32 cellSyncLFQueueDepth(vm::ptr queue, vm::ptr> depth) +s32 cellSyncLFQueueDepth(vm::ptr queue, vm::ptr depth) { cellSync->Log("cellSyncLFQueueDepth(queue_addr=0x%x, depth_addr=0x%x)", queue.addr(), depth.addr()); @@ -1849,7 +1849,7 @@ s32 cellSyncLFQueueDepth(vm::ptr queue, vm::ptr> dept return CELL_OK; } -s32 _cellSyncLFQueueGetSignalAddress(vm::ptr queue, vm::ptr> ppSignal) +s32 _cellSyncLFQueueGetSignalAddress(vm::ptr queue, vm::ptr ppSignal) { cellSync->Log("_cellSyncLFQueueGetSignalAddress(queue_addr=0x%x, ppSignal_addr=0x%x)", queue.addr(), ppSignal.addr()); @@ -1866,7 +1866,7 @@ s32 _cellSyncLFQueueGetSignalAddress(vm::ptr queue, vm::p return CELL_OK; } -s32 cellSyncLFQueueGetDirection(vm::ptr queue, vm::ptr> direction) +s32 cellSyncLFQueueGetDirection(vm::ptr queue, vm::ptr direction) { cellSync->Log("cellSyncLFQueueGetDirection(queue_addr=0x%x, direction_addr=0x%x)", queue.addr(), direction.addr()); @@ -1883,7 +1883,7 @@ s32 cellSyncLFQueueGetDirection(vm::ptr queue, vm::ptr queue, vm::ptr> entry_size) +s32 cellSyncLFQueueGetEntrySize(vm::ptr queue, vm::ptr entry_size) { cellSync->Log("cellSyncLFQueueGetEntrySize(queue_addr=0x%x, entry_size_addr=0x%x)", queue.addr(), entry_size.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp index e096a7e657..2c4271e8ff 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp @@ -23,7 +23,7 @@ typedef void (*CellHddGameStatCallback)(vm::ptr cbResult, v Module *cellSysutil = nullptr; -int cellSysutilGetSystemParamInt(int id, vm::ptr> value) +int cellSysutilGetSystemParamInt(int id, vm::ptr value) { cellSysutil->Log("cellSysutilGetSystemParamInt(id=0x%x, value_addr=0x%x)", id, value.addr()); @@ -825,7 +825,7 @@ int cellSysutilGetBgmPlaybackStatus2(vm::ptr stat return CELL_OK; } -int cellWebBrowserEstimate2(const vm::ptr config, vm::ptr> memSize) +int cellWebBrowserEstimate2(const vm::ptr 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/cellUserInfo.cpp b/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp index 8c4d653abc..8815280edc 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp @@ -55,7 +55,7 @@ int cellUserInfoEnableOverlay() return CELL_OK; } -int cellUserInfoGetList(vm::ptr> listNum, vm::ptr listBuf, vm::ptr> currentUserId) +int cellUserInfoGetList(vm::ptr listNum, vm::ptr listBuf, vm::ptr currentUserId) { cellUserInfo->Warning("cellUserInfoGetList(listNum_addr=0x%x, listBuf_addr=0x%x, currentUserId_addr=0x%x)", listNum.addr(), listBuf.addr(), currentUserId.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp b/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp index 55dc0e5c1e..e14cf2413c 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp @@ -484,7 +484,7 @@ int cellVdecQueryAttrEx(vm::ptr type, vm::ptrcodecType, type->profileLevel, type->codecSpecificInfo_addr, attr); } -int cellVdecOpen(vm::ptr type, vm::ptr res, vm::ptr cb, vm::ptr> handle) +int cellVdecOpen(vm::ptr type, vm::ptr res, vm::ptr cb, vm::ptr handle) { cellVdec->Warning("cellVdecOpen(type_addr=0x%x, res_addr=0x%x, cb_addr=0x%x, handle_addr=0x%x)", type.addr(), res.addr(), cb.addr(), handle.addr()); @@ -494,7 +494,7 @@ int cellVdecOpen(vm::ptr type, vm::ptr type, vm::ptr res, vm::ptr cb, vm::ptr> handle) +int cellVdecOpenEx(vm::ptr type, vm::ptr res, vm::ptr cb, vm::ptr handle) { cellVdec->Warning("cellVdecOpenEx(type_addr=0x%x, res_addr=0x%x, cb_addr=0x%x, handle_addr=0x%x)", type.addr(), res.addr(), cb.addr(), handle.addr()); @@ -658,7 +658,7 @@ int cellVdecGetPicture(u32 handle, vm::ptr format, vm:: return CELL_OK; } -int cellVdecGetPicItem(u32 handle, vm::ptr> picItem_ptr) +int cellVdecGetPicItem(u32 handle, vm::ptr picItem_ptr) { cellVdec->Log("cellVdecGetPicItem(handle=%d, picItem_ptr_addr=0x%x)", handle, picItem_ptr.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp b/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp index 749dc18f42..d4790ca782 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp @@ -35,7 +35,7 @@ u32 vpostOpen(VpostInstance* data) return id; } -int cellVpostOpen(vm::ptr cfgParam, vm::ptr resource, vm::ptr> handle) +int cellVpostOpen(vm::ptr cfgParam, vm::ptr resource, vm::ptr handle) { cellVpost->Warning("cellVpostOpen(cfgParam_addr=0x%x, resource_addr=0x%x, handle_addr=0x%x)", cfgParam.addr(), resource.addr(), handle.addr()); @@ -45,7 +45,7 @@ int cellVpostOpen(vm::ptr cfgParam, vm::ptr cfgParam, vm::ptr resource, vm::ptr> handle) +int cellVpostOpenEx(vm::ptr cfgParam, vm::ptr resource, vm::ptr handle) { cellVpost->Warning("cellVpostOpenEx(cfgParam_addr=0x%x, resource_addr=0x%x, handle_addr=0x%x)", cfgParam.addr(), resource.addr(), handle.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp index 618be0c3c2..fb55cca939 100644 --- a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp +++ b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp @@ -140,7 +140,7 @@ int cellAANDisconnect(u32 receive, u32 receivePortNo, u32 source, u32 sourcePort return CELL_OK; } -int cellSSPlayerCreate(vm::ptr> handle, vm::ptr config) +int cellSSPlayerCreate(vm::ptr handle, vm::ptr config) { libmixer->Warning("cellSSPlayerCreate(handle_addr=0x%x, config_addr=0x%x)", handle.addr(), config.addr()); @@ -471,14 +471,14 @@ int cellSurMixerCreate(vm::ptr config) return CELL_OK; } -int cellSurMixerGetAANHandle(vm::ptr> handle) +int cellSurMixerGetAANHandle(vm::ptr handle) { libmixer->Warning("cellSurMixerGetAANHandle(handle_addr=0x%x) -> %d", handle.addr(), 0x11111111); *handle = 0x11111111; return CELL_OK; } -int cellSurMixerChStripGetAANPortNo(vm::ptr> port, u32 type, u32 index) +int cellSurMixerChStripGetAANPortNo(vm::ptr port, u32 type, u32 index) { libmixer->Warning("cellSurMixerChStripGetAANPortNo(port_addr=0x%x, type=0x%x, index=0x%x) -> 0x%x", port.addr(), type, index, (type << 16) | index); *port = (type << 16) | index; @@ -593,7 +593,7 @@ int cellSurMixerPause(u32 type) return CELL_OK; } -int cellSurMixerGetCurrentBlockTag(vm::ptr> tag) +int cellSurMixerGetCurrentBlockTag(vm::ptr tag) { libmixer->Log("cellSurMixerGetCurrentBlockTag(tag_addr=0x%x)", tag.addr()); @@ -601,7 +601,7 @@ int cellSurMixerGetCurrentBlockTag(vm::ptr> tag) return CELL_OK; } -int cellSurMixerGetTimestamp(u64 tag, vm::ptr> stamp) +int cellSurMixerGetTimestamp(u64 tag, vm::ptr stamp) { libmixer->Log("cellSurMixerGetTimestamp(tag=0x%llx, stamp_addr=0x%x)", tag, stamp.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp index add879bb34..1495a6dff9 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp @@ -181,7 +181,7 @@ int sceNpDrmExecuteGamePurchase() return CELL_OK; } -int sceNpDrmGetTimelimit(u32 drm_path_addr, vm::ptr> time_remain_usec) +int sceNpDrmGetTimelimit(u32 drm_path_addr, vm::ptr time_remain_usec) { UNIMPLEMENTED_FUNC(sceNp); return CELL_OK; @@ -901,7 +901,7 @@ int sceNpManagerUnregisterCallback() return CELL_OK; } -int sceNpManagerGetStatus(vm::ptr> status) +int sceNpManagerGetStatus(vm::ptr status) { sceNp->Log("sceNpManagerGetStatus(status_addr=0x%x)", status.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp index 612ddb9e2f..375a830aa3 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp @@ -84,7 +84,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::ptr commID, vm::ptr commSign, u64 options) { sceNpTrophy->Warning("sceNpTrophyCreateContext(context_addr=0x%x, commID_addr=0x%x, commSign_addr=0x%x, options=0x%llx)", context.addr(), commID.addr(), commSign.addr(), options); @@ -122,7 +122,7 @@ int sceNpTrophyCreateContext(vm::ptr> context, vm::ptr> handle) +int sceNpTrophyCreateHandle(vm::ptr handle) { sceNpTrophy->Warning("sceNpTrophyCreateHandle(handle_addr=0x%x)", handle.addr()); @@ -212,7 +212,7 @@ int sceNpTrophySetSoundLevel() return CELL_OK; } -int sceNpTrophyGetRequiredDiskSpace(u32 context, u32 handle, vm::ptr> reqspace, u64 options) +int sceNpTrophyGetRequiredDiskSpace(u32 context, u32 handle, vm::ptr reqspace, u64 options) { sceNpTrophy->Warning("sceNpTrophyGetRequiredDiskSpace(context=%d, handle=%d, reqspace_addr=0x%x, options=0x%llx)", context, handle, reqspace.addr(), options); @@ -307,7 +307,7 @@ int sceNpTrophyDestroyHandle() return CELL_OK; } -int sceNpTrophyUnlockTrophy(u32 context, u32 handle, s32 trophyId, vm::ptr> platinumId) +int sceNpTrophyUnlockTrophy(u32 context, u32 handle, s32 trophyId, vm::ptr platinumId) { sceNpTrophy->Warning("sceNpTrophyUnlockTrophy(context=%d, handle=%d, trophyId=%d, platinumId_addr=0x%x)", context, handle, trophyId, platinumId.addr()); @@ -344,7 +344,7 @@ int sceNpTrophyTerm() return CELL_OK; } -int sceNpTrophyGetTrophyUnlockState(u32 context, u32 handle, vm::ptr flags, vm::ptr> count) +int sceNpTrophyGetTrophyUnlockState(u32 context, u32 handle, vm::ptr flags, vm::ptr count) { sceNpTrophy->Warning("sceNpTrophyGetTrophyUnlockState(context=%d, handle=%d, flags_addr=0x%x, count_addr=0x%x)", context, handle, flags.addr(), count.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp index d445a37911..61430024f0 100644 --- a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp @@ -81,7 +81,7 @@ s64 sys_prx_exitspawn_with_level() return CELL_OK; } -int sys_spu_elf_get_information(u32 elf_img, vm::ptr> entry, vm::ptr> nseg) +int sys_spu_elf_get_information(u32 elf_img, vm::ptr entry, vm::ptr nseg) { sysPrxForUser->Todo("sys_spu_elf_get_information(elf_img=0x%x, entry_addr=0x%x, nseg_addr=0x%x)", elf_img, entry.addr(), nseg.addr()); return CELL_OK; @@ -106,7 +106,7 @@ int sys_spu_image_close(vm::ptr img) return CELL_OK; } -int sys_raw_spu_load(s32 id, vm::ptr path, vm::ptr> entry) +int sys_raw_spu_load(s32 id, vm::ptr path, vm::ptr entry) { sysPrxForUser->Warning("sys_raw_spu_load(id=0x%x, path_addr=0x%x('%s'), entry_addr=0x%x)", id, path.addr(), path.get_ptr(), entry.addr()); diff --git a/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp b/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp index 0c3c18224b..a9bbdcde3e 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp @@ -111,7 +111,7 @@ int sdata_unpack(const std::string& packed_file, const std::string& unpacked_fil } -int cellFsSdataOpen(vm::ptr path, int flags, vm::ptr> fd, vm::ptr> arg, u64 size) +int cellFsSdataOpen(vm::ptr path, int flags, vm::ptr fd, vm::ptr arg, u64 size) { sys_fs->Warning("cellFsSdataOpen(path=\"%s\", flags=0x%x, fd_addr=0x%x, arg_addr=0x%x, size=0x%llx) -> cellFsOpen()", path.get_ptr(), flags, fd.addr(), arg.addr(), size); @@ -136,7 +136,7 @@ int cellFsSdataOpen(vm::ptr path, int flags, vm::ptr> fd, return cellFsOpen(path, flags, fd, arg, size); } -int cellFsSdataOpenByFd(int mself_fd, int flags, vm::ptr> sdata_fd, u64 offset, vm::ptr> arg, u64 size) +int cellFsSdataOpenByFd(int mself_fd, int flags, vm::ptr sdata_fd, u64 offset, vm::ptr arg, u64 size) { sys_fs->Todo("cellFsSdataOpenByFd(mself_fd=0x%x, flags=0x%x, sdata_fd_addr=0x%x, offset=0x%llx, arg_addr=0x%x, size=0x%llx) -> cellFsOpen()", mself_fd, flags, sdata_fd.addr(), offset, arg.addr(), size); @@ -208,7 +208,7 @@ void fsAioRead(u32 fd, vm::ptr aio, int xid, vm::ptr aio, vm::ptr> aio_id, vm::ptr xaio, int error, int xid, u64 size)> func) +int cellFsAioRead(vm::ptr aio, vm::ptr aio_id, vm::ptr xaio, int error, int xid, u64 size)> func) { sys_fs->Warning("cellFsAioRead(aio_addr=0x%x, id_addr=0x%x, func_addr=0x%x)", aio.addr(), aio_id.addr(), func.addr()); @@ -239,7 +239,7 @@ int cellFsAioRead(vm::ptr aio, vm::ptr> aio_id, vm::ptr aio, vm::ptr> aio_id, vm::ptr xaio, int error, int xid, u64 size)> func) +int cellFsAioWrite(vm::ptr aio, vm::ptr aio_id, vm::ptr xaio, int error, int xid, u64 size)> func) { sys_fs->Todo("cellFsAioWrite(aio_addr=0x%x, id_addr=0x%x, func_addr=0x%x)", aio.addr(), aio_id.addr(), func.addr()); @@ -270,7 +270,7 @@ int cellFsAioFinish(vm::ptr mount_point) return CELL_OK; } -int cellFsReadWithOffset(u32 fd, u64 offset, vm::ptr buf, u64 buffer_size, vm::ptr> nread) +int cellFsReadWithOffset(u32 fd, u64 offset, vm::ptr buf, u64 buffer_size, vm::ptr nread) { sys_fs->Warning("cellFsReadWithOffset(fd=%d, offset=0x%llx, buf_addr=0x%x, buffer_size=%lld nread=0x%llx)", fd, offset, buf.addr(), buffer_size, nread.addr()); @@ -278,7 +278,7 @@ int cellFsReadWithOffset(u32 fd, u64 offset, vm::ptr buf, u64 buffer_size, LV2_LOCK(0); int ret; - vm::var> oldPos, newPos; + vm::var oldPos, newPos; ret = cellFsLseek(fd, 0, CELL_SEEK_CUR, oldPos); // Save the current position if (ret) return ret; ret = cellFsLseek(fd, offset, CELL_SEEK_SET, newPos); // Move to the specified offset diff --git a/rpcs3/Emu/SysCalls/Modules/sys_net.cpp b/rpcs3/Emu/SysCalls/Modules/sys_net.cpp index a98f61d002..90e781ead1 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_net.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_net.cpp @@ -19,7 +19,7 @@ extern "C" Module *sys_net = nullptr; -vm::ptr> g_lastError = vm::ptr>::make(0); +vm::ptr g_lastError = vm::ptr::make(0); // Auxiliary Functions @@ -341,7 +341,7 @@ int socketselect() int sys_net_initialize_network_ex(vm::ptr param) { sys_net->Warning("sys_net_initialize_network_ex(param_addr=0x%x)", param.addr()); - g_lastError = vm::ptr>::make((u32)Memory.Alloc(4, 1)); + g_lastError = vm::ptr::make((u32)Memory.Alloc(4, 1)); #ifdef _WIN32 WSADATA wsaData; WORD wVersionRequested = MAKEWORD(1,1); @@ -474,7 +474,7 @@ int sys_net_finalize_network() { sys_net->Warning("sys_net_initialize_network_ex()"); Memory.Free(g_lastError.addr()); - g_lastError = vm::ptr>::make(0); + g_lastError = vm::ptr::make(0); #ifdef _WIN32 WSACleanup(); #endif diff --git a/rpcs3/Emu/SysCalls/lv2/lv2Fs.cpp b/rpcs3/Emu/SysCalls/lv2/lv2Fs.cpp index e7dceb38c6..fee2232d3a 100644 --- a/rpcs3/Emu/SysCalls/lv2/lv2Fs.cpp +++ b/rpcs3/Emu/SysCalls/lv2/lv2Fs.cpp @@ -30,7 +30,7 @@ struct FsRingBufferConfig } fs_config; -s32 cellFsOpen(vm::ptr path, s32 flags, vm::ptr> fd, vm::ptr> arg, u64 size) +s32 cellFsOpen(vm::ptr path, s32 flags, vm::ptr fd, vm::ptr arg, u64 size) { sys_fs->Log("cellFsOpen(path=\"%s\", flags=0x%x, fd_addr=0x%x, arg_addr=0x%x, size=0x%llx)", path.get_ptr(), flags, fd.addr(), arg.addr(), size); @@ -116,7 +116,7 @@ s32 cellFsOpen(vm::ptr path, s32 flags, vm::ptr> fd, vm::p return CELL_OK; } -s32 cellFsRead(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr> nread) +s32 cellFsRead(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr nread) { sys_fs->Log("cellFsRead(fd=%d, buf_addr=0x%x, nbytes=0x%llx, nread_addr=0x%x)", fd, buf.addr(), nbytes, nread.addr()); @@ -137,7 +137,7 @@ s32 cellFsRead(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr> nread) return CELL_OK; } -s32 cellFsWrite(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr> nwrite) +s32 cellFsWrite(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr nwrite) { sys_fs->Log("cellFsWrite(fd=%d, buf_addr=0x%x, nbytes=0x%llx, nwrite_addr=0x%x)", fd, buf.addr(), nbytes, nwrite.addr()); @@ -170,7 +170,7 @@ s32 cellFsClose(u32 fd) return CELL_OK; } -s32 cellFsOpendir(vm::ptr path, vm::ptr> fd) +s32 cellFsOpendir(vm::ptr path, vm::ptr fd) { sys_fs->Warning("cellFsOpendir(path=\"%s\", fd_addr=0x%x)", path.get_ptr(), fd.addr()); @@ -187,7 +187,7 @@ s32 cellFsOpendir(vm::ptr path, vm::ptr> fd) return CELL_OK; } -s32 cellFsReaddir(u32 fd, vm::ptr dir, vm::ptr> nread) +s32 cellFsReaddir(u32 fd, vm::ptr dir, vm::ptr nread) { sys_fs->Warning("cellFsReaddir(fd=%d, dir_addr=0x%x, nread_addr=0x%x)", fd, dir.addr(), nread.addr()); @@ -407,7 +407,7 @@ s32 cellFsUnlink(vm::ptr path) return CELL_OK; } -s32 cellFsLseek(u32 fd, s64 offset, u32 whence, vm::ptr> pos) +s32 cellFsLseek(u32 fd, s64 offset, u32 whence, vm::ptr pos) { sys_fs->Log("cellFsLseek(fd=%d, offset=0x%llx, whence=0x%x, pos_addr=0x%x)", fd, offset, whence, pos.addr()); @@ -496,7 +496,7 @@ s32 cellFsTruncate(vm::ptr path, u64 size) return CELL_OK; } -s32 cellFsFGetBlockSize(u32 fd, vm::ptr> sector_size, vm::ptr> block_size) +s32 cellFsFGetBlockSize(u32 fd, vm::ptr sector_size, vm::ptr block_size) { sys_fs->Warning("cellFsFGetBlockSize(fd=%d, sector_size_addr=0x%x, block_size_addr=0x%x)", fd, sector_size.addr(), block_size.addr()); @@ -512,7 +512,7 @@ s32 cellFsFGetBlockSize(u32 fd, vm::ptr> sector_size, vm::ptr path, vm::ptr> sector_size, vm::ptr> block_size) +s32 cellFsGetBlockSize(vm::ptr path, vm::ptr sector_size, vm::ptr block_size) { sys_fs->Warning("cellFsGetBlockSize(file='%s', sector_size_addr=0x%x, block_size_addr=0x%x)", path.get_ptr(), sector_size.addr(), block_size.addr()); @@ -525,7 +525,7 @@ s32 cellFsGetBlockSize(vm::ptr path, vm::ptr> sector_size, return CELL_OK; } -s32 cellFsGetFreeSize(vm::ptr path, vm::ptr> block_size, vm::ptr> block_count) +s32 cellFsGetFreeSize(vm::ptr path, vm::ptr block_size, vm::ptr block_count) { sys_fs->Warning("cellFsGetFreeSize(path=\"%s\", block_size_addr=0x%x, block_count_addr=0x%x)", path.get_ptr(), block_size.addr(), block_count.addr()); @@ -539,7 +539,7 @@ s32 cellFsGetFreeSize(vm::ptr path, vm::ptr> block_size, v return CELL_OK; } -s32 cellFsGetDirectoryEntries(u32 fd, vm::ptr entries, u32 entries_size, vm::ptr> data_count) +s32 cellFsGetDirectoryEntries(u32 fd, vm::ptr entries, u32 entries_size, vm::ptr data_count) { sys_fs->Warning("cellFsGetDirectoryEntries(fd=%d, entries_addr=0x%x, entries_size=0x%x, data_count_addr=0x%x)", fd, entries.addr(), entries_size, data_count.addr()); @@ -637,7 +637,7 @@ s32 cellFsStReadGetRingBuf(u32 fd, vm::ptr ringbuf) return CELL_OK; } -s32 cellFsStReadGetStatus(u32 fd, vm::ptr> status) +s32 cellFsStReadGetStatus(u32 fd, vm::ptr status) { sys_fs->Warning("cellFsStReadGetRingBuf(fd=%d, status_addr=0x%x)", fd, status.addr()); @@ -651,7 +651,7 @@ s32 cellFsStReadGetStatus(u32 fd, vm::ptr> status) return CELL_OK; } -s32 cellFsStReadGetRegid(u32 fd, vm::ptr> regid) +s32 cellFsStReadGetRegid(u32 fd, vm::ptr regid) { sys_fs->Warning("cellFsStReadGetRingBuf(fd=%d, regid_addr=0x%x)", fd, regid.addr()); @@ -694,7 +694,7 @@ s32 cellFsStReadStop(u32 fd) return CELL_OK; } -s32 cellFsStRead(u32 fd, u32 buf_addr, u64 size, vm::ptr> rsize) +s32 cellFsStRead(u32 fd, u32 buf_addr, u64 size, vm::ptr rsize) { sys_fs->Warning("cellFsStRead(fd=%d, buf_addr=0x%x, size=0x%llx, rsize_addr=0x%x)", fd, buf_addr, size, rsize.addr()); @@ -714,7 +714,7 @@ s32 cellFsStRead(u32 fd, u32 buf_addr, u64 size, vm::ptr> rsize) return CELL_OK; } -s32 cellFsStReadGetCurrentAddr(u32 fd, vm::ptr> addr, vm::ptr> size) +s32 cellFsStReadGetCurrentAddr(u32 fd, vm::ptr addr, vm::ptr size) { sys_fs->Todo("cellFsStReadGetCurrentAddr(fd=%d, addr_addr=0x%x, size_addr=0x%x)", fd, addr.addr(), size.addr()); diff --git a/rpcs3/Emu/SysCalls/lv2/lv2Fs.h b/rpcs3/Emu/SysCalls/lv2/lv2Fs.h index c7cf8814fe..6703ca34cf 100644 --- a/rpcs3/Emu/SysCalls/lv2/lv2Fs.h +++ b/rpcs3/Emu/SysCalls/lv2/lv2Fs.h @@ -128,12 +128,12 @@ struct CellFsRingBuffer }; // SysCalls -s32 cellFsOpen(vm::ptr path, s32 flags, vm::ptr> fd, vm::ptr> arg, u64 size); -s32 cellFsRead(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr> nread); -s32 cellFsWrite(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr> nwrite); +s32 cellFsOpen(vm::ptr path, s32 flags, vm::ptr fd, vm::ptr arg, u64 size); +s32 cellFsRead(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr nread); +s32 cellFsWrite(u32 fd, vm::ptr buf, u64 nbytes, vm::ptr nwrite); s32 cellFsClose(u32 fd); -s32 cellFsOpendir(vm::ptr path, vm::ptr> fd); -s32 cellFsReaddir(u32 fd, vm::ptr dir, vm::ptr> nread); +s32 cellFsOpendir(vm::ptr path, vm::ptr fd); +s32 cellFsReaddir(u32 fd, vm::ptr dir, vm::ptr nread); s32 cellFsClosedir(u32 fd); s32 cellFsStat(vm::ptr path, vm::ptr sb); s32 cellFsFstat(u32 fd, vm::ptr sb); @@ -143,22 +143,22 @@ s32 cellFsChmod(vm::ptr path, u32 mode); s32 cellFsFsync(u32 fd); s32 cellFsRmdir(vm::ptr path); s32 cellFsUnlink(vm::ptr path); -s32 cellFsLseek(u32 fd, s64 offset, u32 whence, vm::ptr> pos); +s32 cellFsLseek(u32 fd, s64 offset, u32 whence, vm::ptr pos); s32 cellFsFtruncate(u32 fd, u64 size); s32 cellFsTruncate(vm::ptr path, u64 size); -s32 cellFsFGetBlockSize(u32 fd, vm::ptr> sector_size, vm::ptr> block_size); -s32 cellFsGetBlockSize(vm::ptr path, vm::ptr> sector_size, vm::ptr> block_size); -s32 cellFsGetFreeSize(vm::ptr path, vm::ptr> block_size, vm::ptr> block_count); -s32 cellFsGetDirectoryEntries(u32 fd, vm::ptr entries, u32 entries_size, vm::ptr> data_count); +s32 cellFsFGetBlockSize(u32 fd, vm::ptr sector_size, vm::ptr block_size); +s32 cellFsGetBlockSize(vm::ptr path, vm::ptr sector_size, vm::ptr block_size); +s32 cellFsGetFreeSize(vm::ptr path, vm::ptr block_size, vm::ptr block_count); +s32 cellFsGetDirectoryEntries(u32 fd, vm::ptr entries, u32 entries_size, vm::ptr data_count); s32 cellFsStReadInit(u32 fd, vm::ptr ringbuf); s32 cellFsStReadFinish(u32 fd); s32 cellFsStReadGetRingBuf(u32 fd, vm::ptr ringbuf); -s32 cellFsStReadGetStatus(u32 fd, vm::ptr> status); -s32 cellFsStReadGetRegid(u32 fd, vm::ptr> regid); +s32 cellFsStReadGetStatus(u32 fd, vm::ptr status); +s32 cellFsStReadGetRegid(u32 fd, vm::ptr regid); s32 cellFsStReadStart(u32 fd, u64 offset, u64 size); s32 cellFsStReadStop(u32 fd); -s32 cellFsStRead(u32 fd, u32 buf_addr, u64 size, vm::ptr> rsize); -s32 cellFsStReadGetCurrentAddr(u32 fd, vm::ptr> addr_addr, vm::ptr> size); +s32 cellFsStRead(u32 fd, u32 buf_addr, u64 size, vm::ptr rsize); +s32 cellFsStReadGetCurrentAddr(u32 fd, vm::ptr addr_addr, vm::ptr size); s32 cellFsStReadPutCurrentAddr(u32 fd, u32 addr_addr, u64 size); s32 cellFsStReadWait(u32 fd, u64 size); s32 cellFsStReadWaitCallback(u32 fd, u64 size, vm::ptr func); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp b/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp index a51b9f977a..97d4c5ab4e 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_cond.cpp @@ -9,7 +9,7 @@ SysCallBase sys_cond("sys_cond"); -s32 sys_cond_create(vm::ptr> cond_id, u32 mutex_id, vm::ptr attr) +s32 sys_cond_create(vm::ptr cond_id, u32 mutex_id, vm::ptr attr) { sys_cond.Log("sys_cond_create(cond_id_addr=0x%x, mutex_id=%d, attr_addr=0x%x)", cond_id.addr(), mutex_id, attr.addr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_cond.h b/rpcs3/Emu/SysCalls/lv2/sys_cond.h index c6ea124172..f1278a484d 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_cond.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_cond.h @@ -32,7 +32,7 @@ struct Cond }; // SysCalls -s32 sys_cond_create(vm::ptr> 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(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 e2f76cb351..701c827c40 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_event.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_event.cpp @@ -27,7 +27,7 @@ u32 event_queue_create(u32 protocol, s32 type, u64 name_u64, u64 event_queue_key return id; } -s32 sys_event_queue_create(vm::ptr> 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_addr=0x%x, attr_addr=0x%x, event_queue_key=0x%llx, size=%d)", equeue_id.addr(), attr.addr(), event_queue_key, size); @@ -112,7 +112,7 @@ s32 sys_event_queue_destroy(u32 equeue_id, int mode) return CELL_OK; } -s32 sys_event_queue_tryreceive(u32 equeue_id, vm::ptr event_array, s32 size, vm::ptr> number) +s32 sys_event_queue_tryreceive(u32 equeue_id, vm::ptr event_array, s32 size, vm::ptr number) { sys_event.Todo("sys_event_queue_tryreceive(equeue_id=%d, event_array_addr=0x%x, size=%d, number_addr=0x%x)", equeue_id, event_array.addr(), size, number.addr()); @@ -246,7 +246,7 @@ u32 event_port_create(u64 name) return id; } -s32 sys_event_port_create(vm::ptr> 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_addr=0x%x, port_type=0x%x, name=0x%llx)", eport_id.addr(), port_type, name); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_event.h b/rpcs3/Emu/SysCalls/lv2/sys_event.h index 16b99d7ec9..61180f5982 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_event.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_event.h @@ -221,13 +221,13 @@ u32 event_port_create(u64 name); u32 event_queue_create(u32 protocol, s32 type, u64 name_u64, u64 event_queue_key, s32 size); // SysCalls -s32 sys_event_queue_create(vm::ptr> 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(u32 equeue_id, vm::ptr dummy_event, u64 timeout); -s32 sys_event_queue_tryreceive(u32 equeue_id, vm::ptr event_array, s32 size, vm::ptr> 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::ptr> 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_event_flag.cpp b/rpcs3/Emu/SysCalls/lv2/sys_event_flag.cpp index 22cd01956a..244d19cec4 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_event_flag.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_event_flag.cpp @@ -37,7 +37,7 @@ u32 EventFlag::check() return target; } -s32 sys_event_flag_create(vm::ptr> eflag_id, vm::ptr attr, u64 init) +s32 sys_event_flag_create(vm::ptr eflag_id, vm::ptr attr, u64 init) { sys_event_flag.Warning("sys_event_flag_create(eflag_id_addr=0x%x, attr_addr=0x%x, init=0x%llx)", eflag_id.addr(), attr.addr(), init); @@ -88,7 +88,7 @@ s32 sys_event_flag_destroy(u32 eflag_id) return CELL_OK; } -s32 sys_event_flag_wait(u32 eflag_id, u64 bitptn, u32 mode, vm::ptr> result, u64 timeout) +s32 sys_event_flag_wait(u32 eflag_id, u64 bitptn, u32 mode, vm::ptr result, u64 timeout) { sys_event_flag.Log("sys_event_flag_wait(eflag_id=%d, bitptn=0x%llx, mode=0x%x, result_addr=0x%x, timeout=%lld)", eflag_id, bitptn, mode, result.addr(), timeout); @@ -225,7 +225,7 @@ s32 sys_event_flag_wait(u32 eflag_id, u64 bitptn, u32 mode, vm::ptr> r } } -s32 sys_event_flag_trywait(u32 eflag_id, u64 bitptn, u32 mode, vm::ptr> result) +s32 sys_event_flag_trywait(u32 eflag_id, u64 bitptn, u32 mode, vm::ptr result) { sys_event_flag.Log("sys_event_flag_trywait(eflag_id=%d, bitptn=0x%llx, mode=0x%x, result_addr=0x%x)", eflag_id, bitptn, mode, result.addr()); @@ -316,7 +316,7 @@ s32 sys_event_flag_clear(u32 eflag_id, u64 bitptn) return CELL_OK; } -s32 sys_event_flag_cancel(u32 eflag_id, vm::ptr> num) +s32 sys_event_flag_cancel(u32 eflag_id, vm::ptr num) { sys_event_flag.Log("sys_event_flag_cancel(eflag_id=%d, num_addr=0x%x)", eflag_id, num.addr()); @@ -354,7 +354,7 @@ s32 sys_event_flag_cancel(u32 eflag_id, vm::ptr> num) return CELL_OK; } -s32 sys_event_flag_get(u32 eflag_id, vm::ptr> flags) +s32 sys_event_flag_get(u32 eflag_id, vm::ptr flags) { sys_event_flag.Log("sys_event_flag_get(eflag_id=%d, flags_addr=0x%x)", eflag_id, flags.addr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_event_flag.h b/rpcs3/Emu/SysCalls/lv2/sys_event_flag.h index b3c12f18de..05309fb748 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_event_flag.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_event_flag.h @@ -52,11 +52,11 @@ struct EventFlag u32 check(); }; -s32 sys_event_flag_create(vm::ptr> eflag_id, vm::ptr attr, u64 init); +s32 sys_event_flag_create(vm::ptr eflag_id, vm::ptr attr, u64 init); s32 sys_event_flag_destroy(u32 eflag_id); -s32 sys_event_flag_wait(u32 eflag_id, u64 bitptn, u32 mode, vm::ptr> result, u64 timeout); -s32 sys_event_flag_trywait(u32 eflag_id, u64 bitptn, u32 mode, vm::ptr> result); +s32 sys_event_flag_wait(u32 eflag_id, u64 bitptn, u32 mode, vm::ptr result, u64 timeout); +s32 sys_event_flag_trywait(u32 eflag_id, u64 bitptn, u32 mode, vm::ptr result); s32 sys_event_flag_set(u32 eflag_id, u64 bitptn); s32 sys_event_flag_clear(u32 eflag_id, u64 bitptn); -s32 sys_event_flag_cancel(u32 eflag_id, vm::ptr> num); -s32 sys_event_flag_get(u32 eflag_id, vm::ptr> flags); \ No newline at end of file +s32 sys_event_flag_cancel(u32 eflag_id, vm::ptr num); +s32 sys_event_flag_get(u32 eflag_id, vm::ptr flags); \ No newline at end of file diff --git a/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp b/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp index 94e8cd2eaa..cd7f229b71 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_interrupt.cpp @@ -37,7 +37,7 @@ s32 sys_interrupt_tag_destroy(u32 intrtag) return CELL_OK; } -s32 sys_interrupt_thread_establish(vm::ptr> ih, u32 intrtag, u64 intrthread, u64 arg) +s32 sys_interrupt_thread_establish(vm::ptr ih, u32 intrtag, u64 intrthread, u64 arg) { sys_interrupt.Warning("sys_interrupt_thread_establish(ih_addr=0x%x, intrtag=%d, intrthread=%lld, arg=0x%llx)", ih.addr(), intrtag, intrthread, arg); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_interrupt.h b/rpcs3/Emu/SysCalls/lv2/sys_interrupt.h index 9ada3e84d7..7cef6ced32 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_interrupt.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_interrupt.h @@ -2,6 +2,6 @@ // SysCalls s32 sys_interrupt_tag_destroy(u32 intrtag); -s32 sys_interrupt_thread_establish(vm::ptr> ih, u32 intrtag, u64 intrthread, u64 arg); +s32 sys_interrupt_thread_establish(vm::ptr ih, u32 intrtag, u64 intrthread, u64 arg); s32 sys_interrupt_thread_disestablish(u32 ih); void sys_interrupt_thread_eoi(); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_memory.cpp b/rpcs3/Emu/SysCalls/lv2/sys_memory.cpp index 9f89e0bebb..02b3ae4662 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_memory.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_memory.cpp @@ -108,7 +108,7 @@ s32 sys_memory_get_user_memory_size(vm::ptr mem_info) return CELL_OK; } -s32 sys_memory_container_create(vm::ptr> cid, u32 yield_size) +s32 sys_memory_container_create(vm::ptr cid, u32 yield_size) { sys_memory.Warning("sys_memory_container_create(cid_addr=0x%x, yield_size=0x%x)", cid.addr(), yield_size); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_memory.h b/rpcs3/Emu/SysCalls/lv2/sys_memory.h index fd4c9102b9..f0cf7e7ac4 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_memory.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_memory.h @@ -57,6 +57,6 @@ s32 sys_memory_allocate_from_container(u32 size, u32 cid, u32 flags, u32 alloc_a s32 sys_memory_free(u32 start_addr); s32 sys_memory_get_page_attribute(u32 addr, vm::ptr attr); s32 sys_memory_get_user_memory_size(vm::ptr mem_info); -s32 sys_memory_container_create(vm::ptr> cid, u32 yield_size); +s32 sys_memory_container_create(vm::ptr cid, u32 yield_size); s32 sys_memory_container_destroy(u32 cid); s32 sys_memory_container_get_size(vm::ptr mem_info, u32 cid); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp b/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp index bfba1da9a4..53891b7565 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp @@ -53,7 +53,7 @@ s32 sys_mmapper_allocate_fixed_address() return CELL_OK; } -s32 sys_mmapper_allocate_memory(u32 size, u64 flags, vm::ptr> mem_id) +s32 sys_mmapper_allocate_memory(u32 size, u64 flags, vm::ptr mem_id) { sys_mmapper.Warning("sys_mmapper_allocate_memory(size=0x%x, flags=0x%llx, mem_id_addr=0x%x)", size, flags, mem_id.addr()); @@ -80,7 +80,7 @@ s32 sys_mmapper_allocate_memory(u32 size, u64 flags, vm::ptr> mem_id) return CELL_OK; } -s32 sys_mmapper_allocate_memory_from_container(u32 size, u32 cid, u64 flags, vm::ptr> mem_id) +s32 sys_mmapper_allocate_memory_from_container(u32 size, u32 cid, u64 flags, vm::ptr mem_id) { sys_mmapper.Warning("sys_mmapper_allocate_memory_from_container(size=0x%x, cid=%d, flags=0x%llx, mem_id_addr=0x%x)", size, cid, flags, mem_id.addr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_mmapper.h b/rpcs3/Emu/SysCalls/lv2/sys_mmapper.h index 7e71de3730..608f6b8dac 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_mmapper.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_mmapper.h @@ -22,8 +22,8 @@ struct mmapper_info // SysCalls s32 sys_mmapper_allocate_address(u32 size, u64 flags, u32 alignment, u32 alloc_addr); s32 sys_mmapper_allocate_fixed_address(); -s32 sys_mmapper_allocate_memory(u32 size, u64 flags, vm::ptr> mem_id); -s32 sys_mmapper_allocate_memory_from_container(u32 size, u32 cid, u64 flags, vm::ptr> mem_id); +s32 sys_mmapper_allocate_memory(u32 size, u64 flags, vm::ptr mem_id); +s32 sys_mmapper_allocate_memory_from_container(u32 size, u32 cid, u64 flags, vm::ptr mem_id); s32 sys_mmapper_change_address_access_right(u32 start_addr, u64 flags); s32 sys_mmapper_free_address(u32 start_addr); s32 sys_mmapper_free_memory(u32 mem_id); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_mutex.cpp b/rpcs3/Emu/SysCalls/lv2/sys_mutex.cpp index 75a23f43cc..92eff86687 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_mutex.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_mutex.cpp @@ -26,7 +26,7 @@ Mutex::~Mutex() m_queue.m_mutex.unlock(); } -s32 sys_mutex_create(vm::ptr> mutex_id, vm::ptr attr) +s32 sys_mutex_create(vm::ptr mutex_id, vm::ptr attr) { sys_mutex.Log("sys_mutex_create(mutex_id_addr=0x%x, attr_addr=0x%x)", mutex_id.addr(), attr.addr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_mutex.h b/rpcs3/Emu/SysCalls/lv2/sys_mutex.h index d3d261138e..74a7378e63 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_mutex.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_mutex.h @@ -41,7 +41,7 @@ struct Mutex }; // SysCalls -s32 sys_mutex_create(vm::ptr> mutex_id, vm::ptr attr); +s32 sys_mutex_create(vm::ptr mutex_id, vm::ptr attr); s32 sys_mutex_destroy(u32 mutex_id); s32 sys_mutex_lock(u32 mutex_id, u64 timeout); s32 sys_mutex_trylock(u32 mutex_id); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp index f9e931ad60..e96a833861 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp @@ -47,7 +47,7 @@ s32 sys_ppu_thread_yield() return CELL_OK; } -s32 sys_ppu_thread_join(u64 thread_id, vm::ptr> vptr) +s32 sys_ppu_thread_join(u64 thread_id, vm::ptr vptr) { sys_ppu_thread.Warning("sys_ppu_thread_join(thread_id=%lld, vptr_addr=0x%x)", thread_id, vptr.addr()); @@ -182,7 +182,7 @@ PPUThread* ppu_thread_create(u32 entry, u64 arg, s32 prio, u32 stacksize, bool i return &new_thread; } -s32 sys_ppu_thread_create(vm::ptr> thread_id, u32 entry, u64 arg, s32 prio, u32 stacksize, u64 flags, vm::ptr threadname) +s32 sys_ppu_thread_create(vm::ptr thread_id, u32 entry, u64 arg, s32 prio, u32 stacksize, u64 flags, vm::ptr threadname) { sys_ppu_thread.Log("sys_ppu_thread_create(thread_id_addr=0x%x, entry=0x%x, arg=0x%llx, prio=%d, stacksize=0x%x, flags=0x%llx, threadname_addr=0x%x('%s'))", thread_id.addr(), entry, arg, prio, stacksize, flags, threadname.addr(), threadname ? threadname.get_ptr() : ""); @@ -223,7 +223,7 @@ void sys_ppu_thread_once(PPUThread& CPU, vm::ptr> once_ctrl, vm::p } } -s32 sys_ppu_thread_get_id(PPUThread& CPU, vm::ptr> thread_id) +s32 sys_ppu_thread_get_id(PPUThread& CPU, vm::ptr thread_id) { sys_ppu_thread.Log("sys_ppu_thread_get_id(thread_id_addr=0x%x)", thread_id.addr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.h b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.h index 923ef045fe..83fe511b8f 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.h @@ -21,7 +21,7 @@ PPUThread* ppu_thread_create(u32 entry, u64 arg, s32 prio, u32 stacksize, bool i void sys_ppu_thread_exit(PPUThread& CPU, u64 errorcode); void sys_internal_ppu_thread_exit(PPUThread& CPU, u64 errorcode); s32 sys_ppu_thread_yield(); -s32 sys_ppu_thread_join(u64 thread_id, vm::ptr> vptr); +s32 sys_ppu_thread_join(u64 thread_id, vm::ptr vptr); s32 sys_ppu_thread_detach(u64 thread_id); void sys_ppu_thread_get_join_state(PPUThread& CPU, vm::ptr isjoinable); s32 sys_ppu_thread_set_priority(u64 thread_id, s32 prio); @@ -29,7 +29,7 @@ s32 sys_ppu_thread_get_priority(u64 thread_id, u32 prio_addr); s32 sys_ppu_thread_get_stack_information(PPUThread& CPU, u32 info_addr); s32 sys_ppu_thread_stop(u64 thread_id); s32 sys_ppu_thread_restart(u64 thread_id); -s32 sys_ppu_thread_create(vm::ptr> thread_id, u32 entry, u64 arg, s32 prio, u32 stacksize, u64 flags, vm::ptr threadname); +s32 sys_ppu_thread_create(vm::ptr thread_id, u32 entry, u64 arg, s32 prio, u32 stacksize, u64 flags, vm::ptr threadname); void sys_ppu_thread_once(PPUThread& CPU, vm::ptr> once_ctrl, vm::ptr init); -s32 sys_ppu_thread_get_id(PPUThread& CPU, vm::ptr> thread_id); +s32 sys_ppu_thread_get_id(PPUThread& CPU, vm::ptr thread_id); s32 sys_ppu_thread_rename(u64 thread_id, vm::ptr name); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_process.cpp b/rpcs3/Emu/SysCalls/lv2/sys_process.cpp index 039bbe66b2..964bafcc4b 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_process.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_process.cpp @@ -134,7 +134,7 @@ void sys_game_process_exitspawn2( return; } -s32 sys_process_get_number_of_object(u32 object, vm::ptr> nump) +s32 sys_process_get_number_of_object(u32 object, vm::ptr nump) { sys_process.Warning("sys_process_get_number_of_object(object=%d, nump_addr=0x%x)", object, nump.addr()); @@ -169,7 +169,7 @@ s32 sys_process_get_number_of_object(u32 object, vm::ptr> nump) return CELL_OK; } -s32 sys_process_get_id(u32 object, vm::ptr> buffer, u32 size, vm::ptr> set_size) +s32 sys_process_get_id(u32 object, vm::ptr buffer, u32 size, vm::ptr set_size) { sys_process.Todo("sys_process_get_id(object=%d, buffer_addr=0x%x, size=%d, set_size_addr=0x%x)", object, buffer.addr(), size, set_size.addr()); @@ -258,7 +258,7 @@ s32 process_get_sdk_version(u32 pid, s32& ver) return CELL_OK; } -s32 sys_process_get_sdk_version(u32 pid, vm::ptr> version) +s32 sys_process_get_sdk_version(u32 pid, vm::ptr version) { sys_process.Warning("sys_process_get_sdk_version(pid=%d, version_addr=0x%x)", pid, version.addr()); @@ -281,7 +281,7 @@ s32 sys_process_kill(u32 pid) return CELL_OK; } -s32 sys_process_wait_for_child(u32 pid, vm::ptr> status, u64 unk) +s32 sys_process_wait_for_child(u32 pid, vm::ptr status, u64 unk) { sys_process.Todo("sys_process_wait_for_child(pid=%d, status_addr=0x%x, unk=0x%llx", pid, status.addr(), unk); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_process.h b/rpcs3/Emu/SysCalls/lv2/sys_process.h index faa8194bbe..e7a1240444 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_process.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_process.h @@ -31,15 +31,15 @@ s32 process_is_spu_lock_line_reservation_address(u32 addr, u64 flags); // SysCalls s32 sys_process_getpid(); s32 sys_process_getppid(); -s32 sys_process_get_number_of_object(u32 object, vm::ptr> nump); -s32 sys_process_get_id(u32 object, vm::ptr> buffer, u32 size, vm::ptr> set_size); +s32 sys_process_get_number_of_object(u32 object, vm::ptr nump); +s32 sys_process_get_id(u32 object, vm::ptr buffer, u32 size, vm::ptr set_size); s32 sys_process_get_paramsfo(vm::ptr buffer); -s32 sys_process_get_sdk_version(u32 pid, vm::ptr> version); +s32 sys_process_get_sdk_version(u32 pid, vm::ptr version); s32 sys_process_get_status(u64 unk); s32 sys_process_is_spu_lock_line_reservation_address(u32 addr, u64 flags); s32 sys_process_exit(s32 errorcode); s32 sys_process_kill(u32 pid); -s32 sys_process_wait_for_child(u32 pid, vm::ptr> status, u64 unk); +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, diff --git a/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp b/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp index 43e1d449e5..3f1ff87e22 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp @@ -61,7 +61,7 @@ s32 sys_prx_load_module_on_memcontainer_by_fd() return CELL_OK; } -s32 sys_prx_start_module(s32 id, u32 args, u32 argp_addr, vm::ptr> modres, u64 flags, vm::ptr pOpt) +s32 sys_prx_start_module(s32 id, u32 args, u32 argp_addr, vm::ptr modres, u64 flags, vm::ptr pOpt) { sys_prx.Todo("sys_prx_start_module(id=%d, args=%d, argp_addr=0x%x, modres_addr=0x%x, flags=0x%llx, pOpt=0x%x)", id, args, argp_addr, modres.addr(), flags, pOpt.addr()); @@ -76,7 +76,7 @@ s32 sys_prx_start_module(s32 id, u32 args, u32 argp_addr, vm::ptr> mod return CELL_OK; } -s32 sys_prx_stop_module(s32 id, u32 args, u32 argp_addr, vm::ptr> modres, u64 flags, vm::ptr pOpt) +s32 sys_prx_stop_module(s32 id, u32 args, u32 argp_addr, vm::ptr modres, u64 flags, vm::ptr pOpt) { sys_prx.Todo("sys_prx_stop_module(id=%d, args=%d, argp_addr=0x%x, modres_addr=0x%x, flags=0x%llx, pOpt=0x%x)", id, args, argp_addr, modres.addr(), flags, pOpt.addr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_prx.h b/rpcs3/Emu/SysCalls/lv2/sys_prx.h index 8ff2af9b8f..e83daad0be 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_prx.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_prx.h @@ -69,8 +69,8 @@ s32 sys_prx_load_module(vm::ptr path, u64 flags, vm::ptr> modres, u64 flags, vm::ptr pOpt); -s32 sys_prx_stop_module(s32 id, u32 args, u32 argp_addr, vm::ptr> modres, u64 flags, vm::ptr pOpt); +s32 sys_prx_start_module(s32 id, u32 args, u32 argp_addr, vm::ptr modres, u64 flags, vm::ptr pOpt); +s32 sys_prx_stop_module(s32 id, u32 args, u32 argp_addr, vm::ptr modres, u64 flags, vm::ptr pOpt); s32 sys_prx_unload_module(s32 id, u64 flags, vm::ptr pOpt); s32 sys_prx_get_module_list(); s32 sys_prx_get_my_module_id(); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_rsx.cpp b/rpcs3/Emu/SysCalls/lv2/sys_rsx.cpp index c6e6ec7d53..21b572a4b4 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_rsx.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_rsx.cpp @@ -29,7 +29,7 @@ s32 sys_rsx_device_close() * @param a6 (IN): E.g. Immediate value passed in cellGcmSys is 16. * @param a7 (IN): E.g. Immediate value passed in cellGcmSys is 8. */ -s32 sys_rsx_memory_allocate(vm::ptr> mem_handle, vm::ptr> mem_addr, u32 size, u64 flags, u64 a5, u64 a6, u64 a7) +s32 sys_rsx_memory_allocate(vm::ptr mem_handle, vm::ptr mem_addr, u32 size, u64 flags, u64 a5, u64 a6, u64 a7) { sys_rsx.Todo("sys_rsx_memory_allocate(mem_handle_addr=0x%x, local_mem_addr=0x%x, size=0x%x, flags=0x%x, a5=%d, a6=%d, a7=%d)", mem_handle.addr(), mem_addr.addr(), size, flags, a5, a6, a7); @@ -55,7 +55,7 @@ s32 sys_rsx_memory_free(u32 mem_handle) * @param mem_ctx (IN): mem_ctx given by sys_rsx_memory_allocate * @param system_mode (IN): */ -s32 sys_rsx_context_allocate(vm::ptr> context_id, vm::ptr> lpar_dma_control, vm::ptr> lpar_driver_info, vm::ptr> lpar_reports, u64 mem_ctx, u64 system_mode) +s32 sys_rsx_context_allocate(vm::ptr context_id, vm::ptr lpar_dma_control, vm::ptr lpar_driver_info, vm::ptr lpar_reports, u64 mem_ctx, u64 system_mode) { sys_rsx.Todo("sys_rsx_context_allocate(context_id_addr=0x%x, lpar_dma_control_addr=0x%x, lpar_driver_info_addr=0x%x, lpar_reports_addr=0x%x, mem_ctx=0x%x, system_mode=0x%x)", context_id.addr(), lpar_dma_control.addr(), lpar_driver_info.addr(), lpar_reports.addr(), mem_ctx, system_mode); @@ -170,7 +170,7 @@ s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u6 * @param a2 (OUT): Unused? * @param dev_id (IN): An immediate value and always 8. (cellGcmInitPerfMon uses 11, 10, 9, 7, 12 successively). */ -s32 sys_rsx_device_map(vm::ptr> a1, vm::ptr> a2, u32 dev_id) +s32 sys_rsx_device_map(vm::ptr a1, vm::ptr a2, u32 dev_id) { sys_rsx.Todo("sys_rsx_device_map(a1_addr=0x%x, a2_addr=0x%x, a3=%d)", a1.addr(), a2.addr(), dev_id); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_rsx.h b/rpcs3/Emu/SysCalls/lv2/sys_rsx.h index 244588c8c7..f44254cef5 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_rsx.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_rsx.h @@ -3,13 +3,13 @@ // SysCalls s32 sys_rsx_device_open(); s32 sys_rsx_device_close(); -s32 sys_rsx_memory_allocate(vm::ptr> mem_handle, vm::ptr> mem_addr, u32 size, u64 flags, u64 a5, u64 a6, u64 a7); +s32 sys_rsx_memory_allocate(vm::ptr mem_handle, vm::ptr mem_addr, u32 size, u64 flags, u64 a5, u64 a6, u64 a7); s32 sys_rsx_memory_free(u32 mem_handle); -s32 sys_rsx_context_allocate(vm::ptr> context_id, vm::ptr> lpar_dma_control, vm::ptr> lpar_driver_info, vm::ptr> lpar_reports, u64 mem_ctx, u64 system_mode); +s32 sys_rsx_context_allocate(vm::ptr context_id, vm::ptr lpar_dma_control, vm::ptr lpar_driver_info, vm::ptr lpar_reports, u64 mem_ctx, u64 system_mode); s32 sys_rsx_context_free(u32 context_id); s32 sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags); s32 sys_rsx_context_iounmap(u32 context_id, u32 a2, u32 io_addr, u32 size); s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u64 a5, u64 a6); -s32 sys_rsx_device_map(vm::ptr> a1, vm::ptr> a2, u32 dev_id); +s32 sys_rsx_device_map(vm::ptr a1, vm::ptr a2, u32 dev_id); s32 sys_rsx_device_unmap(u32 dev_id); s32 sys_rsx_attribute(); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_rwlock.cpp b/rpcs3/Emu/SysCalls/lv2/sys_rwlock.cpp index aec4007308..b35ff563ff 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_rwlock.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_rwlock.cpp @@ -9,7 +9,7 @@ SysCallBase sys_rwlock("sys_rwlock"); -s32 sys_rwlock_create(vm::ptr> rw_lock_id, vm::ptr attr) +s32 sys_rwlock_create(vm::ptr rw_lock_id, vm::ptr attr) { sys_rwlock.Warning("sys_rwlock_create(rw_lock_id_addr=0x%x, attr_addr=0x%x)", rw_lock_id.addr(), attr.addr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_rwlock.h b/rpcs3/Emu/SysCalls/lv2/sys_rwlock.h index 9b3dcff1a3..eab184f21f 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_rwlock.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_rwlock.h @@ -150,7 +150,7 @@ struct RWLock }; // SysCalls -s32 sys_rwlock_create(vm::ptr> rw_lock_id, vm::ptr attr); +s32 sys_rwlock_create(vm::ptr rw_lock_id, vm::ptr attr); s32 sys_rwlock_destroy(u32 rw_lock_id); s32 sys_rwlock_rlock(u32 rw_lock_id, u64 timeout); s32 sys_rwlock_tryrlock(u32 rw_lock_id); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_semaphore.cpp b/rpcs3/Emu/SysCalls/lv2/sys_semaphore.cpp index 7d26df4c05..85960095b1 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_semaphore.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_semaphore.cpp @@ -21,7 +21,7 @@ u32 semaphore_create(s32 initial_count, s32 max_count, u32 protocol, u64 name_u6 return id; } -s32 sys_semaphore_create(vm::ptr> sem, vm::ptr attr, s32 initial_count, s32 max_count) +s32 sys_semaphore_create(vm::ptr sem, vm::ptr attr, s32 initial_count, s32 max_count) { sys_semaphore.Warning("sys_semaphore_create(sem_addr=0x%x, attr_addr=0x%x, initial_count=%d, max_count=%d)", sem.addr(), attr.addr(), initial_count, max_count); @@ -202,7 +202,7 @@ s32 sys_semaphore_post(u32 sem_id, s32 count) return CELL_OK; } -s32 sys_semaphore_get_value(u32 sem_id, vm::ptr> count) +s32 sys_semaphore_get_value(u32 sem_id, vm::ptr count) { sys_semaphore.Log("sys_semaphore_get_value(sem_id=%d, count_addr=0x%x)", sem_id, count.addr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_semaphore.h b/rpcs3/Emu/SysCalls/lv2/sys_semaphore.h index d0deccb14e..19956ad377 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_semaphore.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_semaphore.h @@ -41,9 +41,9 @@ struct Semaphore u32 semaphore_create(s32 initial_count, s32 max_count, u32 protocol, u64 name_u64); // SysCalls -s32 sys_semaphore_create(vm::ptr> sem, vm::ptr attr, s32 initial_count, s32 max_count); +s32 sys_semaphore_create(vm::ptr sem, vm::ptr attr, s32 initial_count, s32 max_count); s32 sys_semaphore_destroy(u32 sem_id); s32 sys_semaphore_wait(u32 sem_id, u64 timeout); s32 sys_semaphore_trywait(u32 sem_id); s32 sys_semaphore_post(u32 sem_id, s32 count); -s32 sys_semaphore_get_value(u32 sem_id, vm::ptr> count); +s32 sys_semaphore_get_value(u32 sem_id, vm::ptr count); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp b/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp index 431fcc3bcd..4c7163f3d2 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp @@ -106,7 +106,7 @@ SPUThread* spu_thread_initialize(SpuGroupInfo* group, u32 spu_num, sys_spu_image return &new_thread; } -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_initialize(vm::ptr thread, u32 group, u32 spu_num, vm::ptr img, vm::ptr attr, vm::ptr arg) { sys_spu.Warning("sys_spu_thread_initialize(thread_addr=0x%x, group=0x%x, spu_num=%d, img_addr=0x%x, attr_addr=0x%x, arg_addr=0x%x)", thread.addr(), group, spu_num, img.addr(), attr.addr(), arg.addr()); @@ -161,7 +161,7 @@ s32 sys_spu_thread_set_argument(u32 id, vm::ptr arg) return CELL_OK; } -s32 sys_spu_thread_get_exit_status(u32 id, vm::ptr> status) +s32 sys_spu_thread_get_exit_status(u32 id, vm::ptr status) { sys_spu.Warning("sys_spu_thread_get_exit_status(id=%d, status_addr=0x%x)", id, status.addr()); @@ -451,7 +451,7 @@ SpuGroupInfo* spu_thread_group_create(const std::string& name, u32 num, s32 prio return group; } -s32 sys_spu_thread_group_create(vm::ptr> id, u32 num, s32 prio, vm::ptr attr) +s32 sys_spu_thread_group_create(vm::ptr id, u32 num, s32 prio, vm::ptr attr) { sys_spu.Warning("sys_spu_thread_group_create(id_addr=0x%x, num=%d, prio=%d, attr_addr=0x%x)", id.addr(), num, prio, attr.addr()); @@ -465,7 +465,7 @@ s32 sys_spu_thread_group_create(vm::ptr> id, u32 num, s32 prio, vm::pt return CELL_OK; } -s32 sys_spu_thread_group_join(u32 id, vm::ptr> cause, vm::ptr> status) +s32 sys_spu_thread_group_join(u32 id, vm::ptr cause, vm::ptr status) { sys_spu.Warning("sys_spu_thread_group_join(id=%d, cause_addr=0x%x, status_addr=0x%x)", id, cause.addr(), status.addr()); @@ -518,7 +518,7 @@ s32 sys_spu_thread_group_join(u32 id, vm::ptr> cause, vm::ptr> thread_id, vm::ptr> entry, u64 arg, int prio, u32 stacksize, u64 flags, u32 threadname_addr) +s32 sys_spu_thread_create(vm::ptr thread_id, vm::ptr entry, u64 arg, int prio, u32 stacksize, u64 flags, u32 threadname_addr) { sys_spu.Todo("sys_spu_thread_create(thread_id_addr=0x%x, entry_addr=0x%x, arg=0x%llx, prio=%d, stacksize=0x%x, flags=0x%llx, threadname_addr=0x%x", thread_id.addr(), entry.addr(), arg, prio, stacksize, flags, threadname_addr); @@ -569,7 +569,7 @@ s32 sys_spu_thread_write_ls(u32 id, u32 address, u64 value, u32 type) } } -s32 sys_spu_thread_read_ls(u32 id, u32 address, vm::ptr> value, u32 type) +s32 sys_spu_thread_read_ls(u32 id, u32 address, vm::ptr value, u32 type) { sys_spu.Log("sys_spu_thread_read_ls(id=%d, address=0x%x, value_addr=0x%x, type=0x%x)", id, address, value.addr(), type); @@ -638,7 +638,7 @@ s32 sys_spu_thread_set_spu_cfg(u32 id, u64 value) return CELL_OK; } -s32 sys_spu_thread_get_spu_cfg(u32 id, vm::ptr> value) +s32 sys_spu_thread_get_spu_cfg(u32 id, vm::ptr value) { sys_spu.Warning("sys_spu_thread_get_spu_cfg(id=%d, value_addr=0x%x)", id, value.addr()); @@ -914,7 +914,7 @@ s32 sys_spu_thread_group_disconnect_event_all_threads(u32 id, u8 spup) return CELL_OK; } -s32 sys_raw_spu_create(vm::ptr> id, u32 attr_addr) +s32 sys_raw_spu_create(vm::ptr id, u32 attr_addr) { sys_spu.Warning("sys_raw_spu_create(id_addr=0x%x, attr_addr=0x%x)", id.addr(), attr_addr); @@ -947,7 +947,7 @@ s32 sys_raw_spu_destroy(u32 id) return CELL_OK; } -s32 sys_raw_spu_create_interrupt_tag(u32 id, u32 class_id, u32 hwthread, vm::ptr> intrtag) +s32 sys_raw_spu_create_interrupt_tag(u32 id, u32 class_id, u32 hwthread, vm::ptr intrtag) { sys_spu.Warning("sys_raw_spu_create_interrupt_tag(id=%d, class_id=%d, hwthread=0x%x, intrtag_addr=0x%x)", id, class_id, hwthread, intrtag.addr()); @@ -993,7 +993,7 @@ s32 sys_raw_spu_set_int_mask(u32 id, u32 class_id, u64 mask) return CELL_OK; } -s32 sys_raw_spu_get_int_mask(u32 id, u32 class_id, vm::ptr> mask) +s32 sys_raw_spu_get_int_mask(u32 id, u32 class_id, vm::ptr mask) { sys_spu.Log("sys_raw_spu_get_int_mask(id=%d, class_id=%d, mask_addr=0x%x)", id, class_id, mask.addr()); @@ -1031,7 +1031,7 @@ s32 sys_raw_spu_set_int_stat(u32 id, u32 class_id, u64 stat) return CELL_OK; } -s32 sys_raw_spu_get_int_stat(u32 id, u32 class_id, vm::ptr> stat) +s32 sys_raw_spu_get_int_stat(u32 id, u32 class_id, vm::ptr stat) { sys_spu.Log("sys_raw_spu_get_int_stat(id=%d, class_id=%d, stat_addr=0xx)", id, class_id, stat.addr()); @@ -1050,7 +1050,7 @@ s32 sys_raw_spu_get_int_stat(u32 id, u32 class_id, vm::ptr> stat) return CELL_OK; } -s32 sys_raw_spu_read_puint_mb(u32 id, vm::ptr> value) +s32 sys_raw_spu_read_puint_mb(u32 id, vm::ptr value) { sys_spu.Log("sys_raw_spu_read_puint_mb(id=%d, value_addr=0x%x)", id, value.addr()); @@ -1080,7 +1080,7 @@ s32 sys_raw_spu_set_spu_cfg(u32 id, u32 value) return CELL_OK; } -s32 sys_raw_spu_get_spu_cfg(u32 id, vm::ptr> value) +s32 sys_raw_spu_get_spu_cfg(u32 id, vm::ptr value) { sys_spu.Log("sys_raw_spu_get_spu_afg(id=%d, value_addr=0x%x)", id, value.addr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_spu.h b/rpcs3/Emu/SysCalls/lv2/sys_spu.h index 203138e8c8..e9886b0e0d 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_spu.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_spu.h @@ -163,7 +163,7 @@ SPUThread* spu_thread_initialize(SpuGroupInfo* group, u32 spu_num, sys_spu_image // 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_thread_initialize(vm::ptr> thread, u32 group, u32 spu_num, vm::ptr img, vm::ptr attr, vm::ptr arg); +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_destroy(u32 id); s32 sys_spu_thread_group_start(u32 id); @@ -171,32 +171,32 @@ s32 sys_spu_thread_group_suspend(u32 id); s32 sys_spu_thread_group_resume(u32 id); s32 sys_spu_thread_group_yield(u32 id); s32 sys_spu_thread_group_terminate(u32 id, int value); -s32 sys_spu_thread_group_create(vm::ptr> id, u32 num, int prio, vm::ptr attr); -s32 sys_spu_thread_create(vm::ptr> thread_id, vm::ptr> entry, u64 arg, int prio, u32 stacksize, u64 flags, u32 threadname_addr); -s32 sys_spu_thread_group_join(u32 id, vm::ptr> cause, vm::ptr> status); +s32 sys_spu_thread_group_create(vm::ptr id, u32 num, int prio, vm::ptr attr); +s32 sys_spu_thread_create(vm::ptr thread_id, vm::ptr entry, u64 arg, int prio, u32 stacksize, u64 flags, u32 threadname_addr); +s32 sys_spu_thread_group_join(u32 id, vm::ptr cause, vm::ptr status); s32 sys_spu_thread_group_connect_event(u32 id, u32 eq, u32 et); s32 sys_spu_thread_group_disconnect_event(u32 id, u32 et); s32 sys_spu_thread_group_connect_event_all_threads(u32 id, u32 eq_id, u64 req, vm::ptr spup); s32 sys_spu_thread_group_disconnect_event_all_threads(u32 id, u8 spup); s32 sys_spu_thread_write_ls(u32 id, u32 address, u64 value, u32 type); -s32 sys_spu_thread_read_ls(u32 id, u32 address, vm::ptr> value, u32 type); +s32 sys_spu_thread_read_ls(u32 id, u32 address, vm::ptr value, u32 type); s32 sys_spu_thread_write_spu_mb(u32 id, u32 value); s32 sys_spu_thread_set_spu_cfg(u32 id, u64 value); -s32 sys_spu_thread_get_spu_cfg(u32 id, vm::ptr> value); +s32 sys_spu_thread_get_spu_cfg(u32 id, vm::ptr value); s32 sys_spu_thread_write_snr(u32 id, u32 number, u32 value); s32 sys_spu_thread_connect_event(u32 id, u32 eq, u32 et, u8 spup); s32 sys_spu_thread_disconnect_event(u32 id, u32 event_type, u8 spup); s32 sys_spu_thread_bind_queue(u32 id, u32 spuq, u32 spuq_num); s32 sys_spu_thread_unbind_queue(u32 id, u32 spuq_num); -s32 sys_spu_thread_get_exit_status(u32 id, vm::ptr> status); +s32 sys_spu_thread_get_exit_status(u32 id, vm::ptr status); -s32 sys_raw_spu_create(vm::ptr> id, u32 attr_addr); +s32 sys_raw_spu_create(vm::ptr id, u32 attr_addr); s32 sys_raw_spu_destroy(u32 id); -s32 sys_raw_spu_create_interrupt_tag(u32 id, u32 class_id, u32 hwthread, vm::ptr> intrtag); +s32 sys_raw_spu_create_interrupt_tag(u32 id, u32 class_id, u32 hwthread, vm::ptr intrtag); s32 sys_raw_spu_set_int_mask(u32 id, u32 class_id, u64 mask); -s32 sys_raw_spu_get_int_mask(u32 id, u32 class_id, vm::ptr> mask); +s32 sys_raw_spu_get_int_mask(u32 id, u32 class_id, vm::ptr mask); s32 sys_raw_spu_set_int_stat(u32 id, u32 class_id, u64 stat); -s32 sys_raw_spu_get_int_stat(u32 id, u32 class_id, vm::ptr> stat); -s32 sys_raw_spu_read_puint_mb(u32 id, vm::ptr> value); +s32 sys_raw_spu_get_int_stat(u32 id, u32 class_id, vm::ptr stat); +s32 sys_raw_spu_read_puint_mb(u32 id, vm::ptr value); s32 sys_raw_spu_set_spu_cfg(u32 id, u32 value); -s32 sys_raw_spu_get_spu_cfg(u32 id, vm::ptr> value); +s32 sys_raw_spu_get_spu_cfg(u32 id, vm::ptr value); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_time.cpp b/rpcs3/Emu/SysCalls/lv2/sys_time.cpp index ee65e07e19..c408931bad 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_time.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_time.cpp @@ -18,7 +18,7 @@ SysCallBase sys_time("sys_time"); static const u64 timebase_frequency = /*79800000*/ 80000000; // 80 Mhz -extern int cellSysutilGetSystemParamInt(int id, vm::ptr> value); +extern int cellSysutilGetSystemParamInt(int id, vm::ptr value); // Auxiliary functions u64 get_time() @@ -59,7 +59,7 @@ u64 get_system_time() // Functions -s32 sys_time_get_timezone(vm::ptr> timezone, vm::ptr> summertime) +s32 sys_time_get_timezone(vm::ptr timezone, vm::ptr summertime) { sys_time.Warning("sys_time_get_timezone(timezone_addr=0x%x, summertime_addr=0x%x)", timezone.addr(), summertime.addr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_time.h b/rpcs3/Emu/SysCalls/lv2/sys_time.h index 28863999e5..34d755db8a 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_time.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_time.h @@ -7,7 +7,7 @@ u64 get_time(); u64 get_system_time(); // SysCalls -s32 sys_time_get_timezone(vm::ptr> timezone, vm::ptr> summertime); +s32 sys_time_get_timezone(vm::ptr timezone, vm::ptr summertime); s32 sys_time_get_current_time(u32 sec_addr, u32 nsec_addr); s64 sys_time_get_system_time(); u64 sys_time_get_timebase_frequency(); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp b/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp index 31cd0699ae..c2f5d259d7 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp @@ -8,7 +8,7 @@ SysCallBase sys_timer("sys_timer"); -s32 sys_timer_create(vm::ptr> timer_id) +s32 sys_timer_create(vm::ptr timer_id) { sys_timer.Warning("sys_timer_create(timer_id_addr=0x%x)", timer_id.addr()); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_timer.h b/rpcs3/Emu/SysCalls/lv2/sys_timer.h index 1d65520047..61cd8bbe8e 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_timer.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_timer.h @@ -19,7 +19,7 @@ struct timer sys_timer_information_t timer_information_t; }; -s32 sys_timer_create(vm::ptr> 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, s64 basetime, u64 period); diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 53af9489b8..07475922c0 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -340,14 +340,14 @@ void Emulator::Load() m_rsx_callback = (u32)Memory.MainMem.AllocAlign(4 * 4) + 4; vm::write32(m_rsx_callback - 4, m_rsx_callback); - auto callback_data = vm::ptr>::make(m_rsx_callback); + auto callback_data = vm::ptr::make(m_rsx_callback); callback_data[0] = ADDI(11, 0, 0x3ff); callback_data[1] = SC(2); callback_data[2] = BCLR(0x10 | 0x04, 0, 0, 0); m_ppu_thr_exit = (u32)Memory.MainMem.AllocAlign(4 * 4); - auto ppu_thr_exit_data = vm::ptr>::make(m_ppu_thr_exit); + auto ppu_thr_exit_data = vm::ptr::make(m_ppu_thr_exit); //ppu_thr_exit_data += ADDI(3, 0, 0); // why it kills return value (GPR[3]) ? ppu_thr_exit_data[0] = ADDI(11, 0, 41); ppu_thr_exit_data[1] = SC(2); @@ -355,7 +355,7 @@ void Emulator::Load() m_ppu_thr_stop = (u32)Memory.MainMem.AllocAlign(2 * 4); - auto ppu_thr_stop_data = vm::ptr>::make(m_ppu_thr_stop); + auto ppu_thr_stop_data = vm::ptr::make(m_ppu_thr_stop); ppu_thr_stop_data[0] = SC(4); ppu_thr_stop_data[1] = BCLR(0x10 | 0x04, 0, 0, 0); diff --git a/rpcs3/Gui/RSXDebugger.cpp b/rpcs3/Gui/RSXDebugger.cpp index 2fb700cb6f..85ab9a5672 100644 --- a/rpcs3/Gui/RSXDebugger.cpp +++ b/rpcs3/Gui/RSXDebugger.cpp @@ -831,7 +831,7 @@ wxString RSXDebugger::DisAsmCommand(u32 cmd, u32 count, u32 currentAddr, u32 ioA } else if(!(cmd & (CELL_GCM_METHOD_FLAG_JUMP | CELL_GCM_METHOD_FLAG_CALL)) && cmd != CELL_GCM_METHOD_FLAG_RETURN) { - auto args = vm::ptr>::make(currentAddr + 4); + auto args = vm::ptr::make(currentAddr + 4); u32 index = 0; switch(cmd & 0x3ffff) diff --git a/rpcs3/Loader/ELF64.cpp b/rpcs3/Loader/ELF64.cpp index 2b236aace5..119a4913b9 100644 --- a/rpcs3/Loader/ELF64.cpp +++ b/rpcs3/Loader/ELF64.cpp @@ -470,11 +470,11 @@ bool ELF64Loader::LoadPhdrData(u64 offset) #endif vm::write32(stub.s_text + i*4, (u32)tbl + i*8); - auto out_tbl = vm::ptr>::make((u32)tbl + i * 8); + auto out_tbl = vm::ptr::make((u32)tbl + i * 8); out_tbl[0] = (u32)dst + i*section; out_tbl[1] = Emu.GetModuleManager().GetFuncNumById(nid); - auto out_dst = vm::ptr>::make((u32)dst + i * section); + auto out_dst = vm::ptr::make((u32)dst + i * section); out_dst[0] = OR(11, 2, 2, 0); out_dst[1] = SC(2); out_dst[2] = BLR();