From f01059283a54c18b904251ad97ee368f1b90c0d1 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sat, 14 Feb 2015 00:45:36 +0300 Subject: [PATCH] Some cleanup --- Utilities/Thread.cpp | 2 + rpcs3/Emu/Cell/PPUInterpreter.h | 2 +- rpcs3/Emu/Cell/SPUThread.cpp | 6 +- rpcs3/Emu/Memory/Memory.cpp | 4 +- rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp | 158 +++++++++++----------- rpcs3/Emu/SysCalls/Modules/cellGcmSys.h | 17 +-- rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp | 4 +- rpcs3/Emu/SysCalls/Modules/cellResc.cpp | 10 +- 8 files changed, 93 insertions(+), 110 deletions(-) diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp index 24eb061d1e..926d49f8bd 100644 --- a/Utilities/Thread.cpp +++ b/Utilities/Thread.cpp @@ -9,8 +9,10 @@ #ifdef _WIN32 #include #else +#ifdef __APPLE__ #define _XOPEN_SOURCE #define __USE_GNU +#endif #include #include #endif diff --git a/rpcs3/Emu/Cell/PPUInterpreter.h b/rpcs3/Emu/Cell/PPUInterpreter.h index 83a0101e6d..fdb7cc5250 100644 --- a/rpcs3/Emu/Cell/PPUInterpreter.h +++ b/rpcs3/Emu/Cell/PPUInterpreter.h @@ -2504,7 +2504,7 @@ private: } void LWARX(u32 rd, u32 ra, u32 rb) { - const u32 addr = ra ? CPU.GPR[ra] + CPU.GPR[rb] : CPU.GPR[rb]; + const u64 addr = ra ? CPU.GPR[ra] + CPU.GPR[rb] : CPU.GPR[rb]; be_t value; vm::reservation_acquire(&value, vm::cast(addr), sizeof(value)); diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 4c38ac24fd..e8a2a2ee18 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -437,7 +437,7 @@ void SPUThread::EnqMfcCmd(MFCReg& MFCArgs) { //std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack - vm::reservation_acquire(vm::get_ptr(ls_offset + lsa), ea, 128, [this]() + vm::reservation_acquire(vm::get_ptr(ls_offset + lsa), vm::cast(ea), 128, [this]() { //std::shared_ptr t = Emu.GetCPU().GetThread(tid); @@ -457,7 +457,7 @@ void SPUThread::EnqMfcCmd(MFCReg& MFCArgs) } else if (op == MFC_PUTLLC_CMD) // store conditional { - if (vm::reservation_update(ea, vm::get_ptr(ls_offset + lsa), 128)) + if (vm::reservation_update(vm::cast(ea), vm::get_ptr(ls_offset + lsa), 128)) { MFCArgs.AtomicStat.PushUncond(MFC_PUTLLC_SUCCESS); } @@ -468,7 +468,7 @@ void SPUThread::EnqMfcCmd(MFCReg& MFCArgs) } else // store unconditional (may be wrong) { - vm::reservation_op(ea, 128, [this, tag, lsa, ea]() + vm::reservation_op(vm::cast(ea), 128, [this, tag, lsa, ea]() { memcpy(vm::get_priv_ptr(vm::cast(ea)), vm::get_ptr(ls_offset + lsa), 128); }); diff --git a/rpcs3/Emu/Memory/Memory.cpp b/rpcs3/Emu/Memory/Memory.cpp index cf7187cf9f..64e50ae1ed 100644 --- a/rpcs3/Emu/Memory/Memory.cpp +++ b/rpcs3/Emu/Memory/Memory.cpp @@ -359,7 +359,7 @@ u32 DynamicMemoryBlockBase::AllocAlign(u32 size, u32 align) addr = (addr + (align - 1)) & ~(align - 1); } - //LOG_NOTICE(MEMORY, "AllocAlign(size=0x%x) -> 0x%llx", size, addr); + //LOG_NOTICE(MEMORY, "AllocAlign(size=0x%x) -> 0x%x", size, addr); AppendMem(addr, size); @@ -382,7 +382,7 @@ bool DynamicMemoryBlockBase::Free(u32 addr) { if (addr == m_allocated[num].addr) { - //LOG_NOTICE(MEMORY, "Free(0x%llx)", addr); + //LOG_NOTICE(MEMORY, "Free(0x%x)", addr); m_allocated.erase(m_allocated.begin() + num); return true; diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp index 2b9ee49ff2..d8fc27a97d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp @@ -115,7 +115,7 @@ u64 cellGcmGetTimeStamp(u32 index) return vm::read64(Memory.RSXFBMem.GetStartAddr() + index * 0x10); } -int cellGcmGetCurrentField() +s32 cellGcmGetCurrentField() { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; @@ -226,13 +226,13 @@ u32 cellGcmGetDefaultSegmentWordSize() return 0x100; } -int cellGcmInitDefaultFifoMode(s32 mode) +s32 cellGcmInitDefaultFifoMode(s32 mode) { cellGcmSys->Warning("cellGcmInitDefaultFifoMode(mode=%d)", mode); return CELL_OK; } -int cellGcmSetDefaultFifoSize(u32 bufferSize, u32 segmentSize) +s32 cellGcmSetDefaultFifoSize(u32 bufferSize, u32 segmentSize) { cellGcmSys->Warning("cellGcmSetDefaultFifoSize(bufferSize=0x%x, segmentSize=0x%x)", bufferSize, segmentSize); return CELL_OK; @@ -242,7 +242,7 @@ int cellGcmSetDefaultFifoSize(u32 bufferSize, u32 segmentSize) // Hardware Resource Management //---------------------------------------------------------------------------- -int cellGcmBindTile(u8 index) +s32 cellGcmBindTile(u8 index) { cellGcmSys->Warning("cellGcmBindTile(index=%d)", index); @@ -258,7 +258,7 @@ int cellGcmBindTile(u8 index) return CELL_OK; } -int cellGcmBindZcull(u8 index) +s32 cellGcmBindZcull(u8 index) { cellGcmSys->Warning("cellGcmBindZcull(index=%d)", index); @@ -274,7 +274,7 @@ int cellGcmBindZcull(u8 index) return CELL_OK; } -int cellGcmGetConfiguration(vm::ptr config) +s32 cellGcmGetConfiguration(vm::ptr config) { cellGcmSys->Log("cellGcmGetConfiguration(config_addr=0x%x)", config.addr()); @@ -283,9 +283,9 @@ int cellGcmGetConfiguration(vm::ptr config) return CELL_OK; } -int cellGcmGetFlipStatus() +s32 cellGcmGetFlipStatus() { - int status = Emu.GetGSManager().GetRender().m_flip_status; + s32 status = Emu.GetGSManager().GetRender().m_flip_status; cellGcmSys->Log("cellGcmGetFlipStatus() -> %d", status); @@ -345,7 +345,7 @@ s32 _cellGcmInitBody(vm::ptr context, u32 cmdSize, u32 ioSiz Memory.RSXIOMem.SetRange(0, 0x10000000 /*256MB*/); } - if(cellGcmMapEaIoAddress(ioAddress, 0, ioSize) != CELL_OK) + if (gcmMapEaIoAddress(ioAddress, 0, ioSize, false) != CELL_OK) { cellGcmSys->Error("cellGcmInit : CELL_GCM_ERROR_FAILURE"); return CELL_GCM_ERROR_FAILURE; @@ -394,7 +394,7 @@ s32 _cellGcmInitBody(vm::ptr context, u32 cmdSize, u32 ioSiz return CELL_OK; } -int cellGcmResetFlipStatus() +s32 cellGcmResetFlipStatus() { cellGcmSys->Log("cellGcmResetFlipStatus()"); @@ -403,7 +403,7 @@ int cellGcmResetFlipStatus() return CELL_OK; } -int cellGcmSetDebugOutputLevel(int level) +s32 cellGcmSetDebugOutputLevel(s32 level) { cellGcmSys->Warning("cellGcmSetDebugOutputLevel(level=%d)", level); @@ -421,7 +421,7 @@ int cellGcmSetDebugOutputLevel(int level) return CELL_OK; } -int cellGcmSetDisplayBuffer(u32 id, u32 offset, u32 pitch, u32 width, u32 height) +s32 cellGcmSetDisplayBuffer(u32 id, u32 offset, u32 pitch, u32 width, u32 height) { cellGcmSys->Log("cellGcmSetDisplayBuffer(id=0x%x,offset=0x%x,pitch=%d,width=%d,height=%d)", id, offset, width ? pitch / width : pitch, width, height); @@ -444,14 +444,6 @@ int cellGcmSetDisplayBuffer(u32 id, u32 offset, u32 pitch, u32 width, u32 height return CELL_OK; } -int cellGcmSetFlip(vm::ptr ctxt, u32 id) -{ - cellGcmSys->Log("cellGcmSetFlip(ctx=0x%x, id=0x%x)", ctxt.addr(), id); - - int res = cellGcmSetPrepareFlip(ctxt, id); - return res < 0 ? CELL_GCM_ERROR_FAILURE : CELL_OK; -} - void cellGcmSetFlipHandler(vm::ptr handler) { cellGcmSys->Warning("cellGcmSetFlipHandler(handler_addr=%d)", handler.addr()); @@ -459,7 +451,7 @@ void cellGcmSetFlipHandler(vm::ptr handler) Emu.GetGSManager().GetRender().m_flip_handler = handler; } -int cellGcmSetFlipMode(u32 mode) +s32 cellGcmSetFlipMode(u32 mode) { cellGcmSys->Warning("cellGcmSetFlipMode(mode=%d)", mode); @@ -532,7 +524,15 @@ s32 cellGcmSetPrepareFlip(vm::ptr ctxt, u32 id) return id; } -int cellGcmSetSecondVFrequency(u32 freq) +s32 cellGcmSetFlip(vm::ptr ctxt, u32 id) +{ + cellGcmSys->Log("cellGcmSetFlip(ctx=0x%x, id=0x%x)", ctxt.addr(), id); + + s32 res = cellGcmSetPrepareFlip(ctxt, id); + return res < 0 ? CELL_GCM_ERROR_FAILURE : CELL_OK; +} + +s32 cellGcmSetSecondVFrequency(u32 freq) { cellGcmSys->Warning("cellGcmSetSecondVFrequency(level=%d)", freq); @@ -550,7 +550,7 @@ int cellGcmSetSecondVFrequency(u32 freq) return CELL_OK; } -int cellGcmSetTileInfo(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u8 comp, u16 base, u8 bank) +s32 cellGcmSetTileInfo(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u8 comp, u16 base, u8 bank) { cellGcmSys->Warning("cellGcmSetTileInfo(index=%d, location=%d, offset=%d, size=%d, pitch=%d, comp=%d, base=%d, bank=%d)", index, location, offset, size, pitch, comp, base, bank); @@ -605,7 +605,7 @@ void cellGcmSetVBlankHandler(vm::ptr handler) Emu.GetGSManager().GetRender().m_vblank_handler = handler; } -int cellGcmSetWaitFlip(vm::ptr ctxt) +s32 cellGcmSetWaitFlip(vm::ptr ctxt) { cellGcmSys->Log("cellGcmSetWaitFlip(ctx=0x%x)", ctxt.addr()); @@ -613,7 +613,7 @@ int cellGcmSetWaitFlip(vm::ptr ctxt) return CELL_OK; } -int cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart, u32 zFormat, u32 aaFormat, u32 zCullDir, u32 zCullFormat, u32 sFunc, u32 sRef, u32 sMask) +s32 cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart, u32 zFormat, u32 aaFormat, u32 zCullDir, u32 zCullFormat, u32 sFunc, u32 sRef, u32 sMask) { cellGcmSys->Todo("cellGcmSetZcull(index=%d, offset=0x%x, width=%d, height=%d, cullStart=0x%x, zFormat=0x%x, aaFormat=0x%x, zCullDir=0x%x, zCullFormat=0x%x, sFunc=0x%x, sRef=0x%x, sMask=0x%x)", index, offset, width, height, cullStart, zFormat, aaFormat, zCullDir, zCullFormat, sFunc, sRef, sMask); @@ -641,7 +641,7 @@ int cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart, return CELL_OK; } -int cellGcmUnbindTile(u8 index) +s32 cellGcmUnbindTile(u8 index) { cellGcmSys->Warning("cellGcmUnbindTile(index=%d)", index); @@ -657,7 +657,7 @@ int cellGcmUnbindTile(u8 index) return CELL_OK; } -int cellGcmUnbindZcull(u8 index) +s32 cellGcmUnbindZcull(u8 index) { cellGcmSys->Warning("cellGcmUnbindZcull(index=%d)", index); @@ -691,7 +691,7 @@ u32 cellGcmGetDisplayInfo() return Emu.GetGSManager().GetRender().m_gcm_buffers_addr; } -int cellGcmGetCurrentDisplayBufferId(u32 id_addr) +s32 cellGcmGetCurrentDisplayBufferId(u32 id_addr) { cellGcmSys->Warning("cellGcmGetCurrentDisplayBufferId(id_addr=0x%x)", id_addr); @@ -700,19 +700,19 @@ int cellGcmGetCurrentDisplayBufferId(u32 id_addr) return CELL_OK; } -int cellGcmSetInvalidateTile() +s32 cellGcmSetInvalidateTile() { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; } -int cellGcmDumpGraphicsError() +s32 cellGcmDumpGraphicsError() { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; } -int cellGcmGetDisplayBufferByFlipIndex() +s32 cellGcmGetDisplayBufferByFlipIndex() { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; @@ -725,7 +725,7 @@ u64 cellGcmGetLastFlipTime() return Emu.GetGSManager().GetRender().m_last_flip_time; } -int cellGcmGetLastSecondVTime() +s32 cellGcmGetLastSecondVTime() { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; @@ -738,7 +738,7 @@ u64 cellGcmGetVBlankCount() return Emu.GetGSManager().GetRender().m_vblank_count; } -int cellGcmInitSystemMode(u64 mode) +s32 cellGcmInitSystemMode(u64 mode) { cellGcmSys->Log("cellGcmInitSystemMode(mode=0x%x)", mode); @@ -747,7 +747,7 @@ int cellGcmInitSystemMode(u64 mode) return CELL_OK; } -int cellGcmSetFlipImmediate(u8 id) +s32 cellGcmSetFlipImmediate(u8 id) { cellGcmSys->Todo("cellGcmSetFlipImmediate(fid=0x%x)", id); @@ -762,31 +762,31 @@ int cellGcmSetFlipImmediate(u8 id) return CELL_OK; } -int cellGcmSetGraphicsHandler() +s32 cellGcmSetGraphicsHandler() { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; } -int cellGcmSetQueueHandler() +s32 cellGcmSetQueueHandler() { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; } -int cellGcmSetSecondVHandler() +s32 cellGcmSetSecondVHandler() { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; } -int cellGcmSetVBlankFrequency() +s32 cellGcmSetVBlankFrequency() { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; } -int cellGcmSortRemapEaIoAddress() +s32 cellGcmSortRemapEaIoAddress() { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; @@ -795,31 +795,35 @@ int cellGcmSortRemapEaIoAddress() //---------------------------------------------------------------------------- // Memory Mapping //---------------------------------------------------------------------------- -s32 cellGcmAddressToOffset(u64 address, vm::ptr> offset) +s32 cellGcmAddressToOffset(u32 address, vm::ptr> offset) { cellGcmSys->Log("cellGcmAddressToOffset(address=0x%x,offset_addr=0x%x)", address, offset.addr()); // Address not on main memory or local memory - if (address >= 0xD0000000) { + if (address >= 0xD0000000) + { return CELL_GCM_ERROR_FAILURE; } u32 result; // Address in local memory - if (Memory.RSXFBMem.IsInMyRange(address)) { - result = (u32)(address - Memory.RSXFBMem.GetStartAddr()); + if (Memory.RSXFBMem.IsInMyRange(address)) + { + result = address - Memory.RSXFBMem.GetStartAddr(); } // Address in main memory else check else { - u16 upper12Bits = offsetTable.ioAddress[address >> 20]; + const u32 upper12Bits = offsetTable.ioAddress[address >> 20]; // If the address is mapped in IO - if (upper12Bits != 0xFFFF) { - result = ((u64)upper12Bits << 20) | (address & 0xFFFFF); + if (upper12Bits != 0xFFFF) + { + result = (upper12Bits << 20) | (address & 0xFFFFF); } - else { + else + { return CELL_GCM_ERROR_FAILURE; } } @@ -845,7 +849,7 @@ void cellGcmGetOffsetTable(vm::ptr table) s32 cellGcmIoOffsetToAddress(u32 ioOffset, vm::ptr address) { - cellGcmSys->Log("cellGcmIoOffsetToAddress(ioOffset=0x%x, address=0x%llx)", ioOffset, address); + cellGcmSys->Log("cellGcmIoOffsetToAddress(ioOffset=0x%x, address=0x%x)", ioOffset, address); u32 realAddr; @@ -897,17 +901,14 @@ s32 cellGcmMapEaIoAddressWithFlags(u32 ea, u32 io, u32 size, u32 flags) return gcmMapEaIoAddress(ea, io, size, true); } -s32 cellGcmMapLocalMemory(u64 address, u64 size) +s32 cellGcmMapLocalMemory(vm::ptr address, vm::ptr size) { - cellGcmSys->Warning("cellGcmMapLocalMemory(address=0x%llx, size=0x%llx)", address, size); + cellGcmSys->Warning("cellGcmMapLocalMemory(address=*0x%x, size=*0x%x)", address, size); - if (!local_size && !local_addr) + if (!local_addr && !local_size && Memory.RSXFBMem.AllocFixed(local_addr = Memory.RSXFBMem.GetStartAddr(), local_size = 0xf900000 /* TODO */)) { - local_size = 0xf900000; //TODO - local_addr = (u32)Memory.RSXFBMem.GetStartAddr(); - Memory.RSXFBMem.AllocAlign(local_size); - vm::write32(address, local_addr); - vm::write32(size, local_size); + *address = local_addr; + *size = local_size; } else { @@ -970,18 +971,16 @@ s32 cellGcmReserveIoMapSize(u32 size) return CELL_OK; } -s32 cellGcmUnmapEaIoAddress(u64 ea) +s32 cellGcmUnmapEaIoAddress(u32 ea) { - cellGcmSys->Log("cellGcmUnmapEaIoAddress(ea=0x%llx)", ea); + cellGcmSys->Log("cellGcmUnmapEaIoAddress(ea=0x%x)", ea); u32 size; if (Memory.RSXIOMem.UnmapRealAddress(ea, size)) { - u64 io; - ea = ea >> 20; - io = offsetTable.ioAddress[ea]; + const u32 io = offsetTable.ioAddress[ea >>= 20]; - for (u32 i = 0; i> 20; i++) { offsetTable.ioAddress[ea + i] = 0xFFFF; offsetTable.eaAddress[io + i] = 0xFFFF; @@ -989,26 +988,23 @@ s32 cellGcmUnmapEaIoAddress(u64 ea) } else { - cellGcmSys->Error("cellGcmUnmapEaIoAddress : CELL_GCM_ERROR_FAILURE"); + cellGcmSys->Error("cellGcmUnmapEaIoAddress(ea=0x%x): UnmapRealAddress() failed"); return CELL_GCM_ERROR_FAILURE; } return CELL_OK; } -s32 cellGcmUnmapIoAddress(u64 io) +s32 cellGcmUnmapIoAddress(u32 io) { - cellGcmSys->Log("cellGcmUnmapIoAddress(io=0x%llx)", io); + cellGcmSys->Log("cellGcmUnmapIoAddress(io=0x%x)", io); u32 size; if (Memory.RSXIOMem.UnmapAddress(io, size)) { - u64 ea; - io = io >> 20; - size = size >> 20; - ea = offsetTable.eaAddress[io]; + const u32 ea = offsetTable.eaAddress[io >>= 20]; - for (u32 i = 0; i> 20; i++) { offsetTable.ioAddress[ea + i] = 0xFFFF; offsetTable.eaAddress[io + i] = 0xFFFF; @@ -1016,7 +1012,7 @@ s32 cellGcmUnmapIoAddress(u64 io) } else { - cellGcmSys->Error("cellGcmUnmapIoAddress : CELL_GCM_ERROR_FAILURE"); + cellGcmSys->Error("cellGcmUnmapIoAddress(io=0x%x): UnmapAddress() failed"); return CELL_GCM_ERROR_FAILURE; } @@ -1047,37 +1043,37 @@ s32 cellGcmUnreserveIoMapSize(u32 size) // Cursor //---------------------------------------------------------------------------- -int cellGcmInitCursor() +s32 cellGcmInitCursor() { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; } -int cellGcmSetCursorPosition(s32 x, s32 y) +s32 cellGcmSetCursorPosition(s32 x, s32 y) { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; } -int cellGcmSetCursorDisable() +s32 cellGcmSetCursorDisable() { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; } -int cellGcmUpdateCursor() +s32 cellGcmUpdateCursor() { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; } -int cellGcmSetCursorEnable() +s32 cellGcmSetCursorEnable() { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; } -int cellGcmSetCursorImageOffset(u32 offset) +s32 cellGcmSetCursorImageOffset(u32 offset) { UNIMPLEMENTED_FUNC(cellGcmSys); return CELL_OK; @@ -1097,24 +1093,24 @@ void cellGcmSetDefaultCommandBuffer() // Other //------------------------------------------------------------------------ -int cellGcmSetFlipCommand(vm::ptr ctx, u32 id) +s32 cellGcmSetFlipCommand(vm::ptr ctx, u32 id) { cellGcmSys->Log("cellGcmSetFlipCommand(ctx_addr=0x%x, id=0x%x)", ctx.addr(), id); return cellGcmSetPrepareFlip(ctx, id); } -int cellGcmSetFlipCommandWithWaitLabel(vm::ptr ctx, u32 id, u32 label_index, u32 label_value) +s32 cellGcmSetFlipCommandWithWaitLabel(vm::ptr ctx, u32 id, u32 label_index, u32 label_value) { cellGcmSys->Log("cellGcmSetFlipCommandWithWaitLabel(ctx_addr=0x%x, id=0x%x, label_index=0x%x, label_value=0x%x)", ctx.addr(), id, label_index, label_value); - int res = cellGcmSetPrepareFlip(ctx, id); + s32 res = cellGcmSetPrepareFlip(ctx, id); vm::write32(gcm_info.label_addr + 0x10 * label_index, label_value); return res < 0 ? CELL_GCM_ERROR_FAILURE : CELL_OK; } -int cellGcmSetTile(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u8 comp, u16 base, u8 bank) +s32 cellGcmSetTile(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u8 comp, u16 base, u8 bank) { cellGcmSys->Warning("cellGcmSetTile(index=%d, location=%d, offset=%d, size=%d, pitch=%d, comp=%d, base=%d, bank=%d)", index, location, offset, size, pitch, comp, base, bank); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.h b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.h index b7fad1b62f..82c53937f8 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.h +++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.h @@ -18,22 +18,7 @@ struct CellGcmOffsetTable }; // Auxiliary functions -void InitOffsetTable(); -u32 gcmGetLocalMemorySize(); - -// libgcm functions -s32 cellGcmSetPrepareFlip(vm::ptr ctxt, u32 id); - -s32 cellGcmAddressToOffset(u64 address, vm::ptr> offset); -u32 cellGcmGetMaxIoMapSize(); -void cellGcmGetOffsetTable(vm::ptr table); -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 cellGcmReserveIoMapSize(u32 size); -s32 cellGcmUnmapEaIoAddress(u64 ea); -s32 cellGcmUnmapIoAddress(u64 io); -s32 cellGcmUnreserveIoMapSize(u32 size); +s32 gcmMapEaIoAddress(u32 ea, u32 io, u32 size, bool is_strict); // Syscall s32 cellGcmCallback(vm::ptr context, u32 count); diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp index d509f4f6c7..eff513f66c 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp @@ -376,7 +376,7 @@ s64 cellPngDecCreate(vm::ptr mainHandle, vm::ptrpngCodecVersion = PNGDEC_CODEC_VERSION; @@ -400,7 +400,7 @@ s64 cellPngDecExtCreate( mainHandle.addr(), threadInParam.addr(), threadOutParam.addr(), extThreadInParam.addr(), extThreadOutParam.addr()); // create decoder - if (s32 res = pngDecCreate(mainHandle, threadInParam, extThreadInParam)) return res; + if (auto res = pngDecCreate(mainHandle, threadInParam, extThreadInParam)) return res; // set codec version threadOutParam->pngCodecVersion = PNGDEC_CODEC_VERSION; diff --git a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp index d10da00a1f..ed9bbfbb85 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp @@ -11,13 +11,13 @@ Module *cellResc = nullptr; extern s32 cellVideoOutConfigure(u32 videoOut, vm::ptr config, vm::ptr option, u32 waitForEvent); -extern int cellGcmSetFlipMode(u32 mode); +extern s32 cellGcmSetFlipMode(u32 mode); extern void cellGcmSetFlipHandler(vm::ptr handler); extern void cellGcmSetVBlankHandler(vm::ptr handler); -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); +extern s32 cellGcmAddressToOffset(u32 address, vm::ptr> offset); +extern s32 cellGcmSetDisplayBuffer(u32 id, u32 offset, u32 pitch, u32 width, u32 height); +extern s32 cellGcmSetPrepareFlip(vm::ptr ctx, u32 id); +extern s32 cellGcmSetSecondVFrequency(u32 freq); extern u32 cellGcmGetLabelAddress(u8 index); extern u32 cellGcmGetTiledPitchSize(u32 size);