diff --git a/Utilities/Log.cpp b/Utilities/Log.cpp index 46b72ca759..1f736617cf 100644 --- a/Utilities/Log.cpp +++ b/Utilities/Log.cpp @@ -14,7 +14,7 @@ LogManager *gLogManager = nullptr; u32 LogMessage::size() { //1 byte for NULL terminator - return sizeof(LogMessage::size_type) + sizeof(LogType) + sizeof(LogSeverity) + sizeof(std::string::value_type)*mText.size() + 1; + return (u32)(sizeof(LogMessage::size_type) + sizeof(LogType) + sizeof(LogSeverity) + sizeof(std::string::value_type) * mText.size() + 1); } void LogMessage::serialize(char *output) diff --git a/rpcs3/Emu/Memory/Memory.h b/rpcs3/Emu/Memory/Memory.h index e462ebd096..b339a1c500 100644 --- a/rpcs3/Emu/Memory/Memory.h +++ b/rpcs3/Emu/Memory/Memory.h @@ -162,7 +162,7 @@ public: } else { - for (u32 i = addr / 4096; i <= (addr + size - 1) / 4096; i++) + for (u32 i = (u32)addr / 4096; i <= ((u32)addr + size - 1) / 4096; i++) { if (!m_pages[i]) return false; // TODO: define page parameters } @@ -718,7 +718,7 @@ public: u32 AppendRawBytes(const u8 *bytes, size_t count) { memmove(Memory + this->m_addr, bytes, count); - this->m_addr += count; + this->m_addr += (u32)count; return this->m_addr; } @@ -835,7 +835,7 @@ class MemoryAllocator public: MemoryAllocator(u32 size = sizeof(T), u32 align = 1) : m_size(size) - , m_addr(Memory.Alloc(size, align)) + , m_addr((u32)Memory.Alloc(size, align)) , m_ptr((T*)&Memory[m_addr]) { } diff --git a/rpcs3/Emu/SysCalls/Modules.h b/rpcs3/Emu/SysCalls/Modules.h index 0f22000945..60f0f92938 100644 --- a/rpcs3/Emu/SysCalls/Modules.h +++ b/rpcs3/Emu/SysCalls/Modules.h @@ -153,7 +153,7 @@ __forceinline void Module::AddFuncSub(const char group[8], const u64 ops[], cons { SFuncOp op; op.mask = ops[i] >> 32; - op.crc = ops[i]; + op.crc = (u32)ops[i]; if (op.mask) op.crc &= op.mask; op.mask = re(op.mask); op.crc = re(op.crc); diff --git a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp index 5987358ef3..7eb1c130cf 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp @@ -96,8 +96,8 @@ int cellFontOpenFontFile(mem_ptr_t library, mem8_ptr_t fontPath if (!f.IsOpened()) return CELL_FONT_ERROR_FONT_OPEN_FAILED; - u32 fileSize = f.GetSize(); - u32 bufferAddr = Memory.Alloc(fileSize, 1); // Freed in cellFontCloseFont + u32 fileSize = (u32)f.GetSize(); + u32 bufferAddr = (u32)Memory.Alloc(fileSize, 1); // Freed in cellFontCloseFont f.Read(Memory.VirtualToRealAddr(bufferAddr), fileSize); int ret = cellFontOpenFontMemory(library.GetAddr(), bufferAddr, fileSize, subNum, uniqueId, font.GetAddr()); font->origin = CELL_FONT_OPEN_FONT_FILE; @@ -180,7 +180,7 @@ int cellFontOpenFontset(mem_ptr_t library, mem_ptr_torigin = CELL_FONT_OPEN_FONTSET; @@ -234,7 +234,7 @@ void cellFontRenderSurfaceInit(mem_ptr_t surface, u32 buf surface->height = h; if (!buffer_addr) - surface->buffer_addr = Memory.Alloc(bufferWidthByte * h, 1); // TODO: Huge memory leak + surface->buffer_addr = (u32)Memory.Alloc(bufferWidthByte * h, 1); // TODO: Huge memory leak } void cellFontRenderSurfaceSetScissor(mem_ptr_t surface, s32 x0, s32 y0, s32 w, s32 h) @@ -250,8 +250,6 @@ void cellFontRenderSurfaceSetScissor(mem_ptr_t surface, s int cellFontSetScalePixel(mem_ptr_t font, float w, float h) { - w = GetCurrentPPUThread().FPR[1]; // TODO: Something is wrong with the float arguments - h = GetCurrentPPUThread().FPR[2]; // TODO: Something is wrong with the float arguments cellFont->Log("cellFontSetScalePixel(font_addr=0x%x, w=%f, h=%f)", font.GetAddr(), w, h); font->scale_x = w; @@ -305,8 +303,6 @@ int cellFontDestroyRenderer() int cellFontSetupRenderScalePixel(mem_ptr_t font, float w, float h) { - w = GetCurrentPPUThread().FPR[1]; // TODO: Something is wrong with the float arguments - h = GetCurrentPPUThread().FPR[2]; // TODO: Something is wrong with the float arguments cellFont->Log("cellFontSetupRenderScalePixel(font_addr=0x%x, w=%f, h=%f)", font.GetAddr(), w, h); if (!font->renderer_addr) @@ -330,8 +326,6 @@ int cellFontGetRenderCharGlyphMetrics(mem_ptr_t font, u32 code, mem_pt int cellFontRenderCharGlyphImage(mem_ptr_t font, u32 code, mem_ptr_t surface, float x, float y, mem_ptr_t metrics, mem_ptr_t transInfo) { - x = GetCurrentPPUThread().FPR[1]; // TODO: Something is wrong with the float arguments - y = GetCurrentPPUThread().FPR[2]; // TODO: Something is wrong with the float arguments cellFont->Log("cellFontRenderCharGlyphImage(font_addr=0x%x, code=0x%x, surface_addr=0x%x, x=%f, y=%f, metrics_addr=0x%x, trans_addr=0x%x)", font.GetAddr(), code, surface.GetAddr(), x, y, metrics.GetAddr(), transInfo.GetAddr()); @@ -348,7 +342,7 @@ int cellFontRenderCharGlyphImage(mem_ptr_t font, u32 code, mem_ptr_tstbfont, &ascent, &descent, &lineGap); - baseLineY = ascent * scale; + baseLineY = (int)((float)ascent * scale); // ??? // Move the rendered character to the surface unsigned char* buffer = (unsigned char*)Memory.VirtualToRealAddr(surface->buffer_addr); @@ -376,7 +370,6 @@ int cellFontEndLibrary() int cellFontSetEffectSlant(mem_ptr_t font, float slantParam) { - slantParam = GetCurrentPPUThread().FPR[1]; // TODO: Something is wrong with the float arguments cellFont->Log("cellFontSetEffectSlant(font_addr=0x%x, slantParam=%f)", font.GetAddr(), slantParam); if (slantParam < -1.0 || slantParam > 1.0) @@ -386,11 +379,11 @@ int cellFontSetEffectSlant(mem_ptr_t font, float slantParam) return CELL_FONT_OK; } -int cellFontGetEffectSlant(mem_ptr_t font, mem32_t slantParam) +int cellFontGetEffectSlant(mem_ptr_t font, mem_ptr_t> slantParam) { cellFont->Warning("cellFontSetEffectSlant(font_addr=0x%x, slantParam_addr=0x%x)", font.GetAddr(), slantParam.GetAddr()); - slantParam = font->slant; //Does this conversion from be_t to *mem32_t work? + *slantParam = font->slant; return CELL_FONT_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp b/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp index 7b42bf90fd..ce0185c697 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp @@ -21,7 +21,7 @@ int cellFontInitLibraryFreeTypeWithRevision(u64 revisionFlags, mem_ptr_tm_bInitialized) //return CELL_FONT_ERROR_UNINITIALIZED; - Memory.Write32(lib_addr_addr, Memory.Alloc(sizeof(CellFontLibrary), 1)); + Memory.Write32(lib_addr_addr, (u32)Memory.Alloc(sizeof(CellFontLibrary), 1)); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp index 4a19c37968..5ef3020554 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp @@ -29,7 +29,7 @@ const u32 tiled_pitches[] = { u32 local_size = 0; u32 local_addr = 0; -u32 system_mode = 0; +u64 system_mode = 0; CellGcmConfig current_config; CellGcmContextData current_context; @@ -65,8 +65,8 @@ CellGcmOffsetTable offsetTable; void InitOffsetTable() { - offsetTable.ioAddress = Memory.Alloc(3072 * sizeof(u16), 1); - offsetTable.eaAddress = Memory.Alloc(512 * sizeof(u16), 1); + offsetTable.ioAddress = (u32)Memory.Alloc(3072 * sizeof(u16), 1); + offsetTable.eaAddress = (u32)Memory.Alloc(512 * sizeof(u16), 1); _sys_memset(offsetTable.ioAddress, 0xFF, 3072 * sizeof(u16)); _sys_memset(offsetTable.eaAddress, 0xFF, 512 * sizeof(u16)); @@ -79,7 +79,7 @@ void InitOffsetTable() u32 cellGcmGetLabelAddress(u8 index) { cellGcmSys->Log("cellGcmGetLabelAddress(index=%d)", index); - return Memory.RSXCMDMem.GetStartAddr() + 0x10 * index; + return (u32)Memory.RSXCMDMem.GetStartAddr() + 0x10 * index; } u32 cellGcmGetReportDataAddressLocation(u32 index, u32 location) @@ -91,7 +91,7 @@ u32 cellGcmGetReportDataAddressLocation(u32 index, u32 location) cellGcmSys->Error("cellGcmGetReportDataAddressLocation: Wrong local index (%d)", index); return 0; } - return Memory.RSXFBMem.GetStartAddr() + index * 0x10; + return (u32)Memory.RSXFBMem.GetStartAddr() + index * 0x10; } if (location == CELL_GCM_LOCATION_MAIN) { @@ -146,7 +146,7 @@ u32 cellGcmGetNotifyDataAddress(u32 index) */ u32 _cellGcmFunc12() { - return Memory.RSXFBMem.GetStartAddr(); // TODO + return (u32)Memory.RSXFBMem.GetStartAddr(); // TODO } u32 cellGcmGetReport(u32 type, u32 index) @@ -174,7 +174,7 @@ u32 cellGcmGetReportDataAddress(u32 index) cellGcmSys->Error("cellGcmGetReportDataAddress: Wrong local index (%d)", index); return 0; } - return Memory.RSXFBMem.GetStartAddr() + index * 0x10; + return (u32)Memory.RSXFBMem.GetStartAddr() + index * 0x10; } u32 cellGcmGetReportDataLocation(u32 index, u32 location) @@ -332,7 +332,7 @@ s32 _cellGcmInitBody(mem_ptr_t context, u32 cmdSize, u32 ioS if(!local_size && !local_addr) { local_size = 0xf900000; // TODO: Get sdk_version in _cellGcmFunc15 and pass it to gcmGetLocalMemorySize - local_addr = Memory.RSXFBMem.GetStartAddr(); + local_addr = (u32)Memory.RSXFBMem.GetStartAddr(); Memory.RSXFBMem.AllocAlign(local_size); } @@ -374,7 +374,7 @@ s32 _cellGcmInitBody(mem_ptr_t context, u32 cmdSize, u32 ioS current_context.current = current_context.begin; current_context.callback = Emu.GetRSXCallback() - 4; - gcm_info.context_addr = Memory.MainMem.AllocAlign(0x1000); + gcm_info.context_addr = (u32)Memory.MainMem.AllocAlign(0x1000); gcm_info.control_addr = gcm_info.context_addr + 0x40; Memory.WriteData(gcm_info.context_addr, current_context); @@ -387,9 +387,9 @@ s32 _cellGcmInitBody(mem_ptr_t context, u32 cmdSize, u32 ioS auto& render = Emu.GetGSManager().GetRender(); render.m_ctxt_addr = context.GetAddr(); - render.m_gcm_buffers_addr = Memory.Alloc(sizeof(CellGcmDisplayInfo) * 8, sizeof(CellGcmDisplayInfo)); - render.m_zculls_addr = Memory.Alloc(sizeof(CellGcmZcullInfo) * 8, sizeof(CellGcmZcullInfo)); - render.m_tiles_addr = Memory.Alloc(sizeof(CellGcmTileInfo) * 15, sizeof(CellGcmTileInfo)); + render.m_gcm_buffers_addr = (u32)Memory.Alloc(sizeof(CellGcmDisplayInfo) * 8, sizeof(CellGcmDisplayInfo)); + render.m_zculls_addr = (u32)Memory.Alloc(sizeof(CellGcmZcullInfo) * 8, sizeof(CellGcmZcullInfo)); + render.m_tiles_addr = (u32)Memory.Alloc(sizeof(CellGcmTileInfo) * 15, sizeof(CellGcmTileInfo)); render.m_gcm_buffers_count = 0; render.m_gcm_current_buffer = 0; render.m_main_mem_addr = 0; @@ -814,7 +814,7 @@ s32 cellGcmAddressToOffset(u64 address, mem32_t offset) // Address in local memory if (Memory.RSXFBMem.IsInMyRange(address)) { - result = address - Memory.RSXFBMem.GetStartAddr(); + result = (u32)(address - Memory.RSXFBMem.GetStartAddr()); } // Address in main memory else check else @@ -838,7 +838,7 @@ u32 cellGcmGetMaxIoMapSize() { cellGcmSys->Log("cellGcmGetMaxIoMapSize()"); - return Memory.RSXIOMem.GetEndAddr() - Memory.RSXIOMem.GetStartAddr() - Memory.RSXIOMem.GetReservedAmount(); + return (u32)(Memory.RSXIOMem.GetEndAddr() - Memory.RSXIOMem.GetStartAddr() - Memory.RSXIOMem.GetReservedAmount()); } void cellGcmGetOffsetTable(mem_ptr_t table) @@ -901,7 +901,7 @@ s32 cellGcmMapLocalMemory(u64 address, u64 size) if (!local_size && !local_addr) { local_size = 0xf900000; //TODO - local_addr = Memory.RSXFBMem.GetStartAddr(); + local_addr = (u32)Memory.RSXFBMem.GetStartAddr(); Memory.RSXFBMem.AllocAlign(local_size); Memory.Write32(address, local_addr); Memory.Write32(size, local_size); @@ -915,25 +915,25 @@ s32 cellGcmMapLocalMemory(u64 address, u64 size) return CELL_OK; } -s32 cellGcmMapMainMemory(u64 ea, u32 size, mem32_t offset) +s32 cellGcmMapMainMemory(u32 ea, u32 size, mem32_t offset) { cellGcmSys->Warning("cellGcmMapMainMemory(ea=0x%x,size=0x%x,offset_addr=0x%x)", ea, size, offset.GetAddr()); - u64 io; + u32 io; if ((ea & 0xFFFFF) || (size & 0xFFFFF)) return CELL_GCM_ERROR_FAILURE; //check if the mapping was successfull - if (io = Memory.RSXIOMem.Map(ea, size, 0)) + if (io = (u32)Memory.RSXIOMem.Map(ea, size, 0)) { // convert to offset - io = io - Memory.RSXIOMem.GetStartAddr(); + io = io - (u32)Memory.RSXIOMem.GetStartAddr(); //fill the offset table for (u32 i = 0; i<(size >> 20); i++) { - Memory.Write16(offsetTable.ioAddress + ((ea >> 20) + i)*sizeof(u16), (io >> 20) + i); - Memory.Write16(offsetTable.eaAddress + ((io >> 20) + i)*sizeof(u16), (ea >> 20) + i); + Memory.Write16(offsetTable.ioAddress + ((ea >> 20) + i) * sizeof(u16), (u16)(io >> 20) + i); + Memory.Write16(offsetTable.eaAddress + ((io >> 20) + i) * sizeof(u16), (u16)(ea >> 20) + i); } offset = io; diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.h b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.h index 66b1448a80..1da9d57321 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.h +++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.h @@ -30,7 +30,7 @@ void cellGcmGetOffsetTable(mem_ptr_t 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(u64 ea, u32 size, mem32_t offset); +s32 cellGcmMapMainMemory(u32 ea, u32 size, mem32_t 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 b684204a00..b3aa0c793b 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp @@ -84,7 +84,7 @@ int cellGifDecReadHeader(u32 mainHandle, u32 subHandle, mem_ptr_toutParam; //Copy the GIF file to a buffer - MemoryAllocator gif(fileSize); + MemoryAllocator gif((u32)fileSize); MemoryAllocator pos, nread; switch(subHandle_data->src.srcSelect.ToBE()) @@ -166,7 +166,7 @@ int cellGifDecDecodeData(u32 mainHandle, u32 subHandle, mem8_ptr_t data, const m case se32(CELL_GIFDEC_FILE): cellFsLseek(fd, 0, CELL_SEEK_SET, pos.GetAddr()); - cellFsRead(fd, gif.GetAddr(), gif.GetSize(), nread); + cellFsRead(fd, gif.GetAddr(), gif.GetSize(), nread.GetAddr()); break; } @@ -174,14 +174,14 @@ int cellGifDecDecodeData(u32 mainHandle, u32 subHandle, mem8_ptr_t data, const m int width, height, actual_components; auto image = std::unique_ptr ( - stbi_load_from_memory(gif.GetPtr(), fileSize, &width, &height, &actual_components, 4), + stbi_load_from_memory(gif.GetPtr(), (s32)fileSize, &width, &height, &actual_components, 4), &::free ); if (!image) return CELL_GIFDEC_ERROR_STREAM_FORMAT; - const int bytesPerLine = dataCtrlParam->outputBytesPerLine; + const int bytesPerLine = (u32)dataCtrlParam->outputBytesPerLine; const char nComponents = 4; uint image_size = width * height * nComponents; diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp index 43fd50ca63..71afb2d8e6 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp @@ -93,7 +93,7 @@ int cellJpgDecReadHeader(u32 mainHandle, u32 subHandle, mem_ptr_tinfo; //Write the header to buffer - MemoryAllocator buffer(fileSize); + MemoryAllocator buffer((u32)fileSize); MemoryAllocator> pos, nread; switch(subHandle_data->src.srcSelect.ToBE()) @@ -104,7 +104,7 @@ int cellJpgDecReadHeader(u32 mainHandle, u32 subHandle, mem_ptr_toutParam; //Copy the JPG file to a buffer - MemoryAllocator jpg(fileSize); + MemoryAllocator jpg((u32)fileSize); MemoryAllocator pos, nread; switch(subHandle_data->src.srcSelect.ToBE()) @@ -173,7 +173,7 @@ int cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, mem8_ptr_t data, const m case se32(CELL_JPGDEC_FILE): cellFsLseek(fd, 0, CELL_SEEK_SET, pos.GetAddr()); - cellFsRead(fd, jpg.GetAddr(), jpg.GetSize(), nread); + cellFsRead(fd, jpg.GetAddr(), jpg.GetSize(), nread.GetAddr()); break; } @@ -181,7 +181,7 @@ int cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, mem8_ptr_t data, const m int width, height, actual_components; auto image = std::unique_ptr ( - stbi_load_from_memory(jpg.GetPtr(), fileSize, &width, &height, &actual_components, 4), + stbi_load_from_memory(jpg.GetPtr(), (s32)fileSize, &width, &height, &actual_components, 4), &::free ); @@ -189,7 +189,7 @@ int cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, mem8_ptr_t data, const m return CELL_JPGDEC_ERROR_STREAM_FORMAT; const bool flip = current_outParam.outputMode == CELL_JPGDEC_BOTTOM_TO_TOP; - const int bytesPerLine = dataCtrlParam->outputBytesPerLine; + const int bytesPerLine = (u32)dataCtrlParam->outputBytesPerLine; size_t image_size = width * height; switch((u32)current_outParam.outputColorSpace) @@ -274,7 +274,7 @@ int cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, mem8_ptr_t data, const m dataOutInfo->status = CELL_JPGDEC_DEC_STATUS_FINISH; if(dataCtrlParam->outputBytesPerLine) - dataOutInfo->outputLines = image_size / dataCtrlParam->outputBytesPerLine; + dataOutInfo->outputLines = (u32)(image_size / dataCtrlParam->outputBytesPerLine); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp index 17e19899d8..e7267d1359 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp @@ -122,7 +122,7 @@ int cellMsgDialogOpen2(u32 type, mem_list_ptr_t msgString, mem_func_ptr_toutParam; //Copy the PNG file to a buffer - MemoryAllocator png(fileSize); + MemoryAllocator png((u32)fileSize); MemoryAllocator pos, nread; switch(subHandle_data->src.srcSelect.ToBE()) @@ -217,13 +217,13 @@ int cellPngDecDecodeData(u32 mainHandle, u32 subHandle, mem8_ptr_t data, const m int width, height, actual_components; auto image = std::unique_ptr ( - stbi_load_from_memory(png.GetPtr(), fileSize, &width, &height, &actual_components, 4), + stbi_load_from_memory(png.GetPtr(), (s32)fileSize, &width, &height, &actual_components, 4), &::free ); if (!image) return CELL_PNGDEC_ERROR_STREAM_FORMAT; const bool flip = current_outParam.outputMode == CELL_PNGDEC_BOTTOM_TO_TOP; - const int bytesPerLine = dataCtrlParam->outputBytesPerLine; + const int bytesPerLine = (u32)dataCtrlParam->outputBytesPerLine; uint image_size = width * height; switch((u32)current_outParam.outputColorSpace) diff --git a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp index 2dd1db4040..bbd3797131 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp @@ -15,7 +15,7 @@ PICTURE_SIZE = (1.0f), UV_DELTA_PS = (1.f / 8.f), UV_DELTA_LB = (1.f / 6.f), XY_DELTA_LB = (1.f / 8.f), -PI = 3.1415926535897932384626433832795; +PI = 3.141592741f; void BuildupVertexBufferNR() { @@ -124,8 +124,8 @@ void BuildupVertexBufferUN(s32 srcIdx) float U_PS1 = U_CENTER + U_PS; float U2_FS0 = 0.0f; float V2_FS0 = 0.0f; - float U2_FS1 = s_rescInternalInstance->m_dstWidth; - float V2_FS1 = s_rescInternalInstance->m_dstHeight; + float U2_FS1 = (float)s_rescInternalInstance->m_dstWidth; + float V2_FS1 = (float)s_rescInternalInstance->m_dstHeight; mem_ptr_t vv(s_rescInternalInstance->m_vertexArrayEA); diff --git a/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp b/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp index fbb110e40b..cdecda0d8d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp @@ -225,7 +225,7 @@ int cellRtcTickAddMinutes(mem_ptr_t pTick0, mem_ptr_t cellRtc->Log("cellRtcTickAddMinutes(pTick0=0x%x, pTick1=0x%x, lAdd=%lld)", pTick0.GetAddr(), pTick1.GetAddr(), lAdd); rDateTime date = rDateTime((time_t)pTick1->tick); - rTimeSpan minutes = rTimeSpan(0, lAdd, 0, 0); + rTimeSpan minutes = rTimeSpan(0, lAdd, 0, 0); // ??? date.Add(minutes); pTick0->tick = date.GetTicks(); @@ -237,7 +237,7 @@ int cellRtcTickAddHours(mem_ptr_t pTick0, mem_ptr_t pT cellRtc->Log("cellRtcTickAddHours(pTick0=0x%x, pTick1=0x%x, iAdd=%d)", pTick0.GetAddr(), pTick1.GetAddr(), iAdd); rDateTime date = rDateTime((time_t)pTick1->tick); - rTimeSpan hours = rTimeSpan(iAdd, 0, 0, 0); + rTimeSpan hours = rTimeSpan(iAdd, 0, 0, 0); // ??? date.Add(hours); pTick0->tick = date.GetTicks(); @@ -249,7 +249,7 @@ int cellRtcTickAddDays(mem_ptr_t pTick0, mem_ptr_t pTi cellRtc->Log("cellRtcTickAddDays(pTick0=0x%x, pTick1=0x%x, iAdd=%d)", pTick0.GetAddr(), pTick1.GetAddr(), iAdd); rDateTime date = rDateTime((time_t)pTick1->tick); - rDateSpan days = rDateSpan(0, 0, 0, iAdd); + rDateSpan days = rDateSpan(0, 0, 0, iAdd); // ??? date.Add(days); pTick0->tick = date.GetTicks(); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp index d11100efea..ad4a67c6ac 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp @@ -14,7 +14,7 @@ extern u32 libsre; extern u32 libsre_rtoc; #endif -s32 cellSpursInitialize(mem_ptr_t spurs, s32 nSpus, s32 spuPriority, s32 ppuPriority, bool exitIfNoWork) +s64 cellSpursInitialize(mem_ptr_t spurs, s32 nSpus, s32 spuPriority, s32 ppuPriority, bool exitIfNoWork) { cellSpurs->Warning("cellSpursInitialize(spurs_addr=0x%x, nSpus=%d, spuPriority=%d, ppuPriority=%d, exitIfNoWork=%d)", spurs.GetAddr(), nSpus, spuPriority, ppuPriority, exitIfNoWork); @@ -28,7 +28,7 @@ s32 cellSpursInitialize(mem_ptr_t spurs, s32 nSpus, s32 spuPriority, #endif } -s32 cellSpursFinalize(mem_ptr_t spurs) +s64 cellSpursFinalize(mem_ptr_t spurs) { cellSpurs->Warning("cellSpursFinalize(spurs_addr=0x%x)", spurs.GetAddr()); @@ -41,7 +41,7 @@ s32 cellSpursFinalize(mem_ptr_t spurs) #endif } -s32 cellSpursInitializeWithAttribute(mem_ptr_t spurs, const mem_ptr_t attr) +s64 cellSpursInitializeWithAttribute(mem_ptr_t spurs, const mem_ptr_t attr) { cellSpurs->Warning("cellSpursInitializeWithAttribute(spurs_addr=0x%x, spurs_addr=0x%x)", spurs.GetAddr(), attr.GetAddr()); @@ -54,7 +54,7 @@ s32 cellSpursInitializeWithAttribute(mem_ptr_t spurs, const mem_ptr_t #endif } -s32 cellSpursInitializeWithAttribute2(mem_ptr_t spurs, const mem_ptr_t attr) +s64 cellSpursInitializeWithAttribute2(mem_ptr_t spurs, const mem_ptr_t attr) { cellSpurs->Warning("cellSpursInitializeWithAttribute2(spurs_addr=0x%x, spurs_addr=0x%x)", spurs.GetAddr(), attr.GetAddr()); @@ -67,7 +67,7 @@ s32 cellSpursInitializeWithAttribute2(mem_ptr_t spurs, const mem_ptr #endif } -s32 _cellSpursAttributeInitialize(mem_ptr_t attr, s32 nSpus, s32 spuPriority, s32 ppuPriority, bool exitIfNoWork) +s64 _cellSpursAttributeInitialize(mem_ptr_t attr, s32 nSpus, s32 spuPriority, s32 ppuPriority, bool exitIfNoWork) { cellSpurs->Warning("_cellSpursAttributeInitialize(attr_addr=0x%x, nSpus=%d, spuPriority=%d, ppuPriority=%d, exitIfNoWork=%d)", attr.GetAddr(), nSpus, spuPriority, ppuPriority, exitIfNoWork); @@ -81,7 +81,7 @@ s32 _cellSpursAttributeInitialize(mem_ptr_t attr, s32 nSpus, #endif } -s32 cellSpursAttributeSetMemoryContainerForSpuThread(mem_ptr_t attr, u32 container) +s64 cellSpursAttributeSetMemoryContainerForSpuThread(mem_ptr_t attr, u32 container) { cellSpurs->Warning("cellSpursAttributeSetMemoryContainerForSpuThread(attr_addr=0x%x, container=0x%x)", attr.GetAddr(), container); @@ -94,7 +94,7 @@ s32 cellSpursAttributeSetMemoryContainerForSpuThread(mem_ptr_t attr, const mem8_t prefix, u32 size) +s64 cellSpursAttributeSetNamePrefix(mem_ptr_t attr, const mem8_t prefix, u32 size) { cellSpurs->Warning("cellSpursAttributeSetNamePrefix(attr_addr=0x%x, prefix_addr=0x%x, size=0x%x)", attr.GetAddr(), prefix.GetAddr(), size); @@ -113,7 +113,7 @@ s32 cellSpursAttributeSetNamePrefix(mem_ptr_t attr, const me #endif } -s32 cellSpursAttributeEnableSpuPrintfIfAvailable(mem_ptr_t attr) +s64 cellSpursAttributeEnableSpuPrintfIfAvailable(mem_ptr_t attr) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursAttributeEnableSpuPrintfIfAvailable(attr_addr=0x%x)", attr.GetAddr()); @@ -124,7 +124,7 @@ s32 cellSpursAttributeEnableSpuPrintfIfAvailable(mem_ptr_t a #endif } -s32 cellSpursAttributeSetSpuThreadGroupType(mem_ptr_t attr, s32 type) +s64 cellSpursAttributeSetSpuThreadGroupType(mem_ptr_t attr, s32 type) { cellSpurs->Warning("cellSpursAttributeSetSpuThreadGroupType(attr_addr=0x%x, type=%d)", attr.GetAddr(), type); @@ -137,7 +137,7 @@ s32 cellSpursAttributeSetSpuThreadGroupType(mem_ptr_t attr, #endif } -s32 cellSpursAttributeEnableSystemWorkload(mem_ptr_t attr, mem8_ptr_t priority, u32 maxSpu, mem8_ptr_t isPreemptible) +s64 cellSpursAttributeEnableSystemWorkload(mem_ptr_t attr, mem8_ptr_t priority, u32 maxSpu, mem8_ptr_t isPreemptible) { cellSpurs->Warning("cellSpursAttributeEnableSystemWorkload(attr_addr=0x%x, priority_addr=0x%x, maxSpu=%d, isPreemptible_addr=0x%x)", attr.GetAddr(), priority.GetAddr(), maxSpu, isPreemptible.GetAddr()); @@ -157,7 +157,7 @@ s32 cellSpursAttributeEnableSystemWorkload(mem_ptr_t attr, m #endif } -s32 cellSpursGetSpuThreadGroupId(mem_ptr_t spurs, mem32_t group) +s64 cellSpursGetSpuThreadGroupId(mem_ptr_t spurs, mem32_t group) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursGetSpuThreadGroupId(spurs_addr=0x%x, group_addr=0x%x)", spurs.GetAddr(), group.GetAddr()); @@ -168,7 +168,7 @@ s32 cellSpursGetSpuThreadGroupId(mem_ptr_t spurs, mem32_t group) #endif } -s32 cellSpursGetNumSpuThread(mem_ptr_t spurs, mem32_t nThreads) +s64 cellSpursGetNumSpuThread(mem_ptr_t spurs, mem32_t nThreads) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursGetNumSpuThread(spurs_addr=0x%x, nThreads_addr=0x%x)", spurs.GetAddr(), nThreads.GetAddr()); @@ -179,7 +179,7 @@ s32 cellSpursGetNumSpuThread(mem_ptr_t spurs, mem32_t nThreads) #endif } -s32 cellSpursGetSpuThreadId(mem_ptr_t spurs, mem32_t thread, mem32_t nThreads) +s64 cellSpursGetSpuThreadId(mem_ptr_t spurs, mem32_t thread, mem32_t nThreads) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursGetSpuThreadId(spurs_addr=0x%x, thread_addr=0x%x, nThreads_addr=0x%x)", spurs.GetAddr(), thread.GetAddr(), nThreads.GetAddr()); @@ -190,7 +190,7 @@ s32 cellSpursGetSpuThreadId(mem_ptr_t spurs, mem32_t thread, mem32_t #endif } -s32 cellSpursSetMaxContention(mem_ptr_t spurs, u32 workloadId, u32 maxContention) +s64 cellSpursSetMaxContention(mem_ptr_t spurs, u32 workloadId, u32 maxContention) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursSetMaxContention(spurs_addr=0x%x, workloadId=%d, maxContention=%d)", spurs.GetAddr(), workloadId, maxContention); @@ -201,7 +201,7 @@ s32 cellSpursSetMaxContention(mem_ptr_t spurs, u32 workloadId, u32 ma #endif } -s32 cellSpursSetPriorities(mem_ptr_t spurs, u32 workloadId, const mem8_ptr_t priorities) +s64 cellSpursSetPriorities(mem_ptr_t spurs, u32 workloadId, const mem8_ptr_t priorities) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursSetPriorities(spurs_addr=0x%x, workloadId=%d, priorities_addr=0x%x)", spurs.GetAddr(), workloadId, priorities.GetAddr()); @@ -212,7 +212,7 @@ s32 cellSpursSetPriorities(mem_ptr_t spurs, u32 workloadId, const mem #endif } -s32 cellSpursSetPreemptionVictimHints(mem_ptr_t spurs, mem8_ptr_t isPreemptible) +s64 cellSpursSetPreemptionVictimHints(mem_ptr_t spurs, mem8_ptr_t isPreemptible) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursSetPreemptionVictimHints(spurs_addr=0x%x, isPreemptible_addr=0x%x)", spurs.GetAddr(), isPreemptible.GetAddr()); @@ -223,7 +223,7 @@ s32 cellSpursSetPreemptionVictimHints(mem_ptr_t spurs, mem8_ptr_t isP #endif } -s32 cellSpursAttachLv2EventQueue(mem_ptr_t spurs, u32 queue, mem8_t port, s32 isDynamic) +s64 cellSpursAttachLv2EventQueue(mem_ptr_t spurs, u32 queue, mem8_t port, s32 isDynamic) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursAttachLv2EventQueue(spurs_addr=0x%x, queue=%d, port_addr=0x%x, isDynamic=%d)", @@ -235,7 +235,7 @@ s32 cellSpursAttachLv2EventQueue(mem_ptr_t spurs, u32 queue, mem8_t p #endif } -s32 cellSpursDetachLv2EventQueue(mem_ptr_t spurs, u8 port) +s64 cellSpursDetachLv2EventQueue(mem_ptr_t spurs, u8 port) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursDetachLv2EventQueue(spurs_addr=0x%x, port=0x%x)", spurs.GetAddr(), port); @@ -246,7 +246,7 @@ s32 cellSpursDetachLv2EventQueue(mem_ptr_t spurs, u8 port) #endif } -s32 cellSpursEnableExceptionEventHandler(mem_ptr_t spurs, bool flag) +s64 cellSpursEnableExceptionEventHandler(mem_ptr_t spurs, bool flag) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursEnableExceptionEventHandler(spurs_addr=0x%x, flag=%d)", spurs.GetAddr(), flag); @@ -257,7 +257,7 @@ s32 cellSpursEnableExceptionEventHandler(mem_ptr_t spurs, bool flag) #endif } -s32 cellSpursSetGlobalExceptionEventHandler(mem_ptr_t spurs, u32 eaHandler_addr, u32 arg_addr) +s64 cellSpursSetGlobalExceptionEventHandler(mem_ptr_t spurs, u32 eaHandler_addr, u32 arg_addr) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursSetGlobalExceptionEventHandler(spurs_addr=0x%x, eaHandler_addr=0x%x, arg_addr=0x%x)", @@ -269,7 +269,7 @@ s32 cellSpursSetGlobalExceptionEventHandler(mem_ptr_t spurs, u32 eaHa #endif } -s32 cellSpursUnsetGlobalExceptionEventHandler(mem_ptr_t spurs) +s64 cellSpursUnsetGlobalExceptionEventHandler(mem_ptr_t spurs) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursUnsetGlobalExceptionEventHandler(spurs_addr=0x%x)", spurs.GetAddr()); @@ -280,7 +280,7 @@ s32 cellSpursUnsetGlobalExceptionEventHandler(mem_ptr_t spurs) #endif } -s32 cellSpursGetInfo(mem_ptr_t spurs, mem_ptr_t info) +s64 cellSpursGetInfo(mem_ptr_t spurs, mem_ptr_t info) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursGetInfo(spurs_addr=0x%x, info_addr=0x%x)", spurs.GetAddr(), info.GetAddr()); @@ -291,7 +291,7 @@ s32 cellSpursGetInfo(mem_ptr_t spurs, mem_ptr_t info) #endif } -s32 _cellSpursEventFlagInitialize(mem_ptr_t spurs, mem_ptr_t taskset, mem_ptr_t eventFlag, u32 flagClearMode, u32 flagDirection) +s64 _cellSpursEventFlagInitialize(mem_ptr_t spurs, mem_ptr_t taskset, mem_ptr_t eventFlag, u32 flagClearMode, u32 flagDirection) { #ifdef PRX_DEBUG cellSpurs->Warning("_cellSpursEventFlagInitialize(spurs_addr=0x%x, taskset_addr=0x%x, eventFlag_addr=0x%x, flagClearMode=%d, flagDirection=%d)", @@ -303,7 +303,7 @@ s32 _cellSpursEventFlagInitialize(mem_ptr_t spurs, mem_ptr_t eventFlag) +s64 cellSpursEventFlagAttachLv2EventQueue(mem_ptr_t eventFlag) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursEventFlagAttachLv2EventQueue(eventFlag_addr=0x%x)", eventFlag.GetAddr()); @@ -314,7 +314,7 @@ s32 cellSpursEventFlagAttachLv2EventQueue(mem_ptr_t eventFla #endif } -s32 cellSpursEventFlagDetachLv2EventQueue(mem_ptr_t eventFlag) +s64 cellSpursEventFlagDetachLv2EventQueue(mem_ptr_t eventFlag) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursEventFlagDetachLv2EventQueue(eventFlag_addr=0x%x)", eventFlag.GetAddr()); @@ -325,7 +325,7 @@ s32 cellSpursEventFlagDetachLv2EventQueue(mem_ptr_t eventFla #endif } -s32 cellSpursEventFlagWait(mem_ptr_t eventFlag, mem16_t mask, u32 mode) +s64 cellSpursEventFlagWait(mem_ptr_t eventFlag, mem16_t mask, u32 mode) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursEventFlagWait(eventFlag_addr=0x%x, mask_addr=0x%x, mode=%d)", eventFlag.GetAddr(), mask.GetAddr(), mode); @@ -336,7 +336,7 @@ s32 cellSpursEventFlagWait(mem_ptr_t eventFlag, mem16_t mask #endif } -s32 cellSpursEventFlagClear(mem_ptr_t eventFlag, u16 bits) +s64 cellSpursEventFlagClear(mem_ptr_t eventFlag, u16 bits) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursEventFlagClear(eventFlag_addr=0x%x, bits=0x%x)", eventFlag.GetAddr(), bits); @@ -347,7 +347,7 @@ s32 cellSpursEventFlagClear(mem_ptr_t eventFlag, u16 bits) #endif } -s32 cellSpursEventFlagSet(mem_ptr_t eventFlag, u16 bits) +s64 cellSpursEventFlagSet(mem_ptr_t eventFlag, u16 bits) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursEventFlagSet(eventFlag_addr=0x%x, bits=0x%x)", eventFlag.GetAddr(), bits); @@ -358,7 +358,7 @@ s32 cellSpursEventFlagSet(mem_ptr_t eventFlag, u16 bits) #endif } -s32 cellSpursEventFlagTryWait(mem_ptr_t eventFlag, mem16_t mask, u32 mode) +s64 cellSpursEventFlagTryWait(mem_ptr_t eventFlag, mem16_t mask, u32 mode) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursEventFlagTryWait(eventFlag_addr=0x%x, mask_addr=0x%x, mode=0x%x)", eventFlag.GetAddr(), mask.GetAddr(), mode); @@ -369,7 +369,7 @@ s32 cellSpursEventFlagTryWait(mem_ptr_t eventFlag, mem16_t m #endif } -s32 cellSpursEventFlagGetDirection(mem_ptr_t eventFlag, mem32_t direction) +s64 cellSpursEventFlagGetDirection(mem_ptr_t eventFlag, mem32_t direction) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursEventFlagGetDirection(eventFlag_addr=0x%x, direction_addr=0x%x)", eventFlag.GetAddr(), direction.GetAddr()); @@ -380,7 +380,7 @@ s32 cellSpursEventFlagGetDirection(mem_ptr_t eventFlag, mem3 #endif } -s32 cellSpursEventFlagGetClearMode(mem_ptr_t eventFlag, mem32_t clear_mode) +s64 cellSpursEventFlagGetClearMode(mem_ptr_t eventFlag, mem32_t clear_mode) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursEventFlagGetClearMode(eventFlag_addr=0x%x, clear_mode_addr=0x%x)", eventFlag.GetAddr(), clear_mode.GetAddr()); @@ -391,7 +391,7 @@ s32 cellSpursEventFlagGetClearMode(mem_ptr_t eventFlag, mem3 #endif } -s32 cellSpursEventFlagGetTasksetAddress(mem_ptr_t eventFlag, mem_ptr_t taskset) +s64 cellSpursEventFlagGetTasksetAddress(mem_ptr_t eventFlag, mem_ptr_t taskset) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursEventFlagGetTasksetAddress(eventFlag_addr=0x%x, taskset_addr=0x%x)", eventFlag.GetAddr(), taskset.GetAddr()); @@ -402,7 +402,7 @@ s32 cellSpursEventFlagGetTasksetAddress(mem_ptr_t eventFlag, #endif } -s32 _cellSpursLFQueueInitialize() +s64 _cellSpursLFQueueInitialize() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -413,7 +413,7 @@ s32 _cellSpursLFQueueInitialize() #endif } -s32 _cellSpursLFQueuePushBody() +s64 _cellSpursLFQueuePushBody() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -424,7 +424,7 @@ s32 _cellSpursLFQueuePushBody() #endif } -s32 cellSpursLFQueueDetachLv2EventQueue() +s64 cellSpursLFQueueDetachLv2EventQueue() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -435,7 +435,7 @@ s32 cellSpursLFQueueDetachLv2EventQueue() #endif } -s32 cellSpursLFQueueAttachLv2EventQueue() +s64 cellSpursLFQueueAttachLv2EventQueue() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -446,7 +446,7 @@ s32 cellSpursLFQueueAttachLv2EventQueue() #endif } -s32 _cellSpursLFQueuePopBody() +s64 _cellSpursLFQueuePopBody() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -457,7 +457,7 @@ s32 _cellSpursLFQueuePopBody() #endif } -s32 cellSpursLFQueueGetTasksetAddress() +s64 cellSpursLFQueueGetTasksetAddress() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -468,7 +468,7 @@ s32 cellSpursLFQueueGetTasksetAddress() #endif } -s32 _cellSpursQueueInitialize() +s64 _cellSpursQueueInitialize() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -479,7 +479,7 @@ s32 _cellSpursQueueInitialize() #endif } -s32 cellSpursQueuePopBody() +s64 cellSpursQueuePopBody() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -490,7 +490,7 @@ s32 cellSpursQueuePopBody() #endif } -s32 cellSpursQueuePushBody() +s64 cellSpursQueuePushBody() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -501,7 +501,7 @@ s32 cellSpursQueuePushBody() #endif } -s32 cellSpursQueueAttachLv2EventQueue() +s64 cellSpursQueueAttachLv2EventQueue() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -512,7 +512,7 @@ s32 cellSpursQueueAttachLv2EventQueue() #endif } -s32 cellSpursQueueDetachLv2EventQueue() +s64 cellSpursQueueDetachLv2EventQueue() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -523,7 +523,7 @@ s32 cellSpursQueueDetachLv2EventQueue() #endif } -s32 cellSpursQueueGetTasksetAddress() +s64 cellSpursQueueGetTasksetAddress() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -534,7 +534,7 @@ s32 cellSpursQueueGetTasksetAddress() #endif } -s32 cellSpursQueueClear() +s64 cellSpursQueueClear() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -545,7 +545,7 @@ s32 cellSpursQueueClear() #endif } -s32 cellSpursQueueDepth() +s64 cellSpursQueueDepth() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -556,7 +556,7 @@ s32 cellSpursQueueDepth() #endif } -s32 cellSpursQueueGetEntrySize() +s64 cellSpursQueueGetEntrySize() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -567,7 +567,7 @@ s32 cellSpursQueueGetEntrySize() #endif } -s32 cellSpursQueueSize() +s64 cellSpursQueueSize() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -578,7 +578,7 @@ s32 cellSpursQueueSize() #endif } -s32 cellSpursQueueGetDirection() +s64 cellSpursQueueGetDirection() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -589,7 +589,7 @@ s32 cellSpursQueueGetDirection() #endif } -s32 cellSpursCreateJobChainWithAttribute() +s64 cellSpursCreateJobChainWithAttribute() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -600,7 +600,7 @@ s32 cellSpursCreateJobChainWithAttribute() #endif } -s32 cellSpursCreateJobChain() +s64 cellSpursCreateJobChain() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -611,7 +611,7 @@ s32 cellSpursCreateJobChain() #endif } -s32 cellSpursJoinJobChain() +s64 cellSpursJoinJobChain() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -622,7 +622,7 @@ s32 cellSpursJoinJobChain() #endif } -s32 cellSpursKickJobChain() +s64 cellSpursKickJobChain() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -633,7 +633,7 @@ s32 cellSpursKickJobChain() #endif } -s32 _cellSpursJobChainAttributeInitialize() +s64 _cellSpursJobChainAttributeInitialize() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -644,7 +644,7 @@ s32 _cellSpursJobChainAttributeInitialize() #endif } -s32 cellSpursGetJobChainId() +s64 cellSpursGetJobChainId() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -655,7 +655,7 @@ s32 cellSpursGetJobChainId() #endif } -s32 cellSpursJobChainSetExceptionEventHandler() +s64 cellSpursJobChainSetExceptionEventHandler() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -666,7 +666,7 @@ s32 cellSpursJobChainSetExceptionEventHandler() #endif } -s32 cellSpursJobChainUnsetExceptionEventHandler() +s64 cellSpursJobChainUnsetExceptionEventHandler() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -677,7 +677,7 @@ s32 cellSpursJobChainUnsetExceptionEventHandler() #endif } -s32 cellSpursGetJobChainInfo() +s64 cellSpursGetJobChainInfo() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -688,7 +688,7 @@ s32 cellSpursGetJobChainInfo() #endif } -s32 cellSpursJobChainGetSpursAddress() +s64 cellSpursJobChainGetSpursAddress() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -699,7 +699,7 @@ s32 cellSpursJobChainGetSpursAddress() #endif } -s32 cellSpursCreateTasksetWithAttribute() +s64 cellSpursCreateTasksetWithAttribute() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -710,7 +710,7 @@ s32 cellSpursCreateTasksetWithAttribute() #endif } -s32 cellSpursCreateTaskset(mem_ptr_t spurs, mem_ptr_t taskset, u64 args, mem8_t priority, u32 maxContention) +s64 cellSpursCreateTaskset(mem_ptr_t spurs, mem_ptr_t taskset, u64 args, mem8_t priority, u32 maxContention) { cellSpurs->Warning("cellSpursCreateTaskset(spurs_addr=0x%x, taskset_addr=0x%x, args=0x%llx, priority_addr=0x%x, maxContention=%d)", spurs.GetAddr(), taskset.GetAddr(), args, priority.GetAddr(), maxContention); @@ -725,7 +725,7 @@ s32 cellSpursCreateTaskset(mem_ptr_t spurs, mem_ptr_t taskset) +s64 cellSpursJoinTaskset(mem_ptr_t taskset) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursJoinTaskset(taskset_addr=0x%x)", taskset.GetAddr()); @@ -736,7 +736,7 @@ s32 cellSpursJoinTaskset(mem_ptr_t taskset) #endif } -s32 cellSpursGetTasksetId(mem_ptr_t taskset, mem32_t workloadId) +s64 cellSpursGetTasksetId(mem_ptr_t taskset, mem32_t workloadId) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursGetTasksetId(taskset_addr=0x%x, workloadId_addr=0x%x)", taskset.GetAddr(), workloadId.GetAddr()); @@ -747,7 +747,7 @@ s32 cellSpursGetTasksetId(mem_ptr_t taskset, mem32_t workloadI #endif } -s32 cellSpursShutdownTaskset(mem_ptr_t taskset) +s64 cellSpursShutdownTaskset(mem_ptr_t taskset) { #ifdef PRX_DEBUG cellSpurs->Warning("cellSpursShutdownTaskset(taskset_addr=0x%x)", taskset.GetAddr()); @@ -758,7 +758,7 @@ s32 cellSpursShutdownTaskset(mem_ptr_t taskset) #endif } -s32 cellSpursCreateTask(mem_ptr_t taskset, mem32_t taskID, u32 elf_addr, u32 context_addr, u32 context_size, mem_ptr_t lsPattern, +s64 cellSpursCreateTask(mem_ptr_t taskset, mem32_t taskID, u32 elf_addr, u32 context_addr, u32 context_size, mem_ptr_t lsPattern, mem_ptr_t argument) { #ifdef PRX_DEBUG @@ -771,7 +771,7 @@ s32 cellSpursCreateTask(mem_ptr_t taskset, mem32_t taskID, u32 #endif } -s32 _cellSpursSendSignal(mem_ptr_t taskset, u32 taskID) +s64 _cellSpursSendSignal(mem_ptr_t taskset, u32 taskID) { #ifdef PRX_DEBUG cellSpurs->Warning("_cellSpursSendSignal(taskset_addr=0x%x, taskID=%d)", taskset.GetAddr(), taskID); @@ -782,7 +782,7 @@ s32 _cellSpursSendSignal(mem_ptr_t taskset, u32 taskID) #endif } -s32 cellSpursCreateTaskWithAttribute() +s64 cellSpursCreateTaskWithAttribute() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -793,7 +793,7 @@ s32 cellSpursCreateTaskWithAttribute() #endif } -s32 cellSpursTasksetAttributeSetName() +s64 cellSpursTasksetAttributeSetName() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -804,7 +804,7 @@ s32 cellSpursTasksetAttributeSetName() #endif } -s32 cellSpursTasksetAttributeSetTasksetSize() +s64 cellSpursTasksetAttributeSetTasksetSize() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -815,7 +815,7 @@ s32 cellSpursTasksetAttributeSetTasksetSize() #endif } -s32 cellSpursTasksetAttributeEnableClearLS() +s64 cellSpursTasksetAttributeEnableClearLS() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -826,7 +826,7 @@ s32 cellSpursTasksetAttributeEnableClearLS() #endif } -s32 _cellSpursTasksetAttribute2Initialize(mem_ptr_t attribute, u32 revision) +s64 _cellSpursTasksetAttribute2Initialize(mem_ptr_t attribute, u32 revision) { cellSpurs->Warning("_cellSpursTasksetAttribute2Initialize(attribute_addr=0x%x, revision=%d)", attribute.GetAddr(), revision); @@ -850,7 +850,7 @@ s32 _cellSpursTasksetAttribute2Initialize(mem_ptr_t #endif } -s32 cellSpursTaskExitCodeGet() +s64 cellSpursTaskExitCodeGet() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -861,7 +861,7 @@ s32 cellSpursTaskExitCodeGet() #endif } -s32 cellSpursTaskExitCodeInitialize() +s64 cellSpursTaskExitCodeInitialize() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -872,7 +872,7 @@ s32 cellSpursTaskExitCodeInitialize() #endif } -s32 cellSpursTaskExitCodeTryGet() +s64 cellSpursTaskExitCodeTryGet() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -883,7 +883,7 @@ s32 cellSpursTaskExitCodeTryGet() #endif } -s32 cellSpursTaskGetLoadableSegmentPattern() +s64 cellSpursTaskGetLoadableSegmentPattern() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -894,7 +894,7 @@ s32 cellSpursTaskGetLoadableSegmentPattern() #endif } -s32 cellSpursTaskGetReadOnlyAreaPattern() +s64 cellSpursTaskGetReadOnlyAreaPattern() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -905,7 +905,7 @@ s32 cellSpursTaskGetReadOnlyAreaPattern() #endif } -s32 cellSpursTaskGenerateLsPattern() +s64 cellSpursTaskGenerateLsPattern() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -916,7 +916,7 @@ s32 cellSpursTaskGenerateLsPattern() #endif } -s32 _cellSpursTaskAttributeInitialize() +s64 _cellSpursTaskAttributeInitialize() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -927,7 +927,7 @@ s32 _cellSpursTaskAttributeInitialize() #endif } -s32 cellSpursTaskAttributeSetExitCodeContainer() +s64 cellSpursTaskAttributeSetExitCodeContainer() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -938,7 +938,7 @@ s32 cellSpursTaskAttributeSetExitCodeContainer() #endif } -s32 _cellSpursTaskAttribute2Initialize(mem_ptr_t attribute, u32 revision) +s64 _cellSpursTaskAttribute2Initialize(mem_ptr_t attribute, u32 revision) { cellSpurs->Warning("_cellSpursTaskAttribute2Initialize(attribute_addr=0x%x, revision=%d)", attribute.GetAddr(), revision); @@ -965,7 +965,7 @@ s32 _cellSpursTaskAttribute2Initialize(mem_ptr_t attrib #endif } -s32 cellSpursTaskGetContextSaveAreaSize() +s64 cellSpursTaskGetContextSaveAreaSize() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -976,7 +976,7 @@ s32 cellSpursTaskGetContextSaveAreaSize() #endif } -s32 cellSpursCreateTaskset2() +s64 cellSpursCreateTaskset2() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -987,7 +987,7 @@ s32 cellSpursCreateTaskset2() #endif } -s32 cellSpursCreateTask2() +s64 cellSpursCreateTask2() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -998,7 +998,7 @@ s32 cellSpursCreateTask2() #endif } -s32 cellSpursJoinTask2() +s64 cellSpursJoinTask2() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1009,7 +1009,7 @@ s32 cellSpursJoinTask2() #endif } -s32 cellSpursTryJoinTask2() +s64 cellSpursTryJoinTask2() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1020,7 +1020,7 @@ s32 cellSpursTryJoinTask2() #endif } -s32 cellSpursDestroyTaskset2() +s64 cellSpursDestroyTaskset2() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1031,7 +1031,7 @@ s32 cellSpursDestroyTaskset2() #endif } -s32 cellSpursCreateTask2WithBinInfo() +s64 cellSpursCreateTask2WithBinInfo() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1042,7 +1042,7 @@ s32 cellSpursCreateTask2WithBinInfo() #endif } -s32 cellSpursTasksetSetExceptionEventHandler() +s64 cellSpursTasksetSetExceptionEventHandler() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1053,7 +1053,7 @@ s32 cellSpursTasksetSetExceptionEventHandler() #endif } -s32 cellSpursTasksetUnsetExceptionEventHandler() +s64 cellSpursTasksetUnsetExceptionEventHandler() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1064,7 +1064,7 @@ s32 cellSpursTasksetUnsetExceptionEventHandler() #endif } -s32 cellSpursLookUpTasksetAddress() +s64 cellSpursLookUpTasksetAddress() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1075,7 +1075,7 @@ s32 cellSpursLookUpTasksetAddress() #endif } -s32 cellSpursTasksetGetSpursAddress() +s64 cellSpursTasksetGetSpursAddress() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1086,7 +1086,7 @@ s32 cellSpursTasksetGetSpursAddress() #endif } -s32 cellSpursSetExceptionEventHandler() +s64 cellSpursSetExceptionEventHandler() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1097,7 +1097,7 @@ s32 cellSpursSetExceptionEventHandler() #endif } -s32 cellSpursUnsetExceptionEventHandler() +s64 cellSpursUnsetExceptionEventHandler() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1108,7 +1108,7 @@ s32 cellSpursUnsetExceptionEventHandler() #endif } -s32 cellSpursGetTasksetInfo() +s64 cellSpursGetTasksetInfo() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1119,7 +1119,7 @@ s32 cellSpursGetTasksetInfo() #endif } -s32 _cellSpursTasksetAttributeInitialize() +s64 _cellSpursTasksetAttributeInitialize() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1130,7 +1130,7 @@ s32 _cellSpursTasksetAttributeInitialize() #endif } -s32 cellSpursJobGuardInitialize() +s64 cellSpursJobGuardInitialize() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1141,7 +1141,7 @@ s32 cellSpursJobGuardInitialize() #endif } -s32 cellSpursJobChainAttributeSetName() +s64 cellSpursJobChainAttributeSetName() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1152,7 +1152,7 @@ s32 cellSpursJobChainAttributeSetName() #endif } -s32 cellSpursShutdownJobChain() +s64 cellSpursShutdownJobChain() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1163,7 +1163,7 @@ s32 cellSpursShutdownJobChain() #endif } -s32 cellSpursJobChainAttributeSetHaltOnError() +s64 cellSpursJobChainAttributeSetHaltOnError() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1174,7 +1174,7 @@ s32 cellSpursJobChainAttributeSetHaltOnError() #endif } -s32 cellSpursJobChainAttributeSetJobTypeMemoryCheck() +s64 cellSpursJobChainAttributeSetJobTypeMemoryCheck() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1185,7 +1185,7 @@ s32 cellSpursJobChainAttributeSetJobTypeMemoryCheck() #endif } -s32 cellSpursJobGuardNotify() +s64 cellSpursJobGuardNotify() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1196,7 +1196,7 @@ s32 cellSpursJobGuardNotify() #endif } -s32 cellSpursJobGuardReset() +s64 cellSpursJobGuardReset() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1207,7 +1207,7 @@ s32 cellSpursJobGuardReset() #endif } -s32 cellSpursRunJobChain() +s64 cellSpursRunJobChain() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1218,7 +1218,7 @@ s32 cellSpursRunJobChain() #endif } -s32 cellSpursJobChainGetError() +s64 cellSpursJobChainGetError() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1229,7 +1229,7 @@ s32 cellSpursJobChainGetError() #endif } -s32 cellSpursWorkloadAttributeSetName() +s64 cellSpursWorkloadAttributeSetName() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1240,7 +1240,7 @@ s32 cellSpursWorkloadAttributeSetName() #endif } -s32 cellSpursWorkloadAttributeSetShutdownCompletionEventHook() +s64 cellSpursWorkloadAttributeSetShutdownCompletionEventHook() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1251,7 +1251,7 @@ s32 cellSpursWorkloadAttributeSetShutdownCompletionEventHook() #endif } -s32 cellSpursAddWorkloadWithAttribute() +s64 cellSpursAddWorkloadWithAttribute() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1262,7 +1262,7 @@ s32 cellSpursAddWorkloadWithAttribute() #endif } -s32 cellSpursRemoveWorkload() +s64 cellSpursRemoveWorkload() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1273,7 +1273,7 @@ s32 cellSpursRemoveWorkload() #endif } -s32 cellSpursWaitForWorkloadShutdown() +s64 cellSpursWaitForWorkloadShutdown() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1284,7 +1284,7 @@ s32 cellSpursWaitForWorkloadShutdown() #endif } -s32 cellSpursAddWorkload() +s64 cellSpursAddWorkload() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1295,7 +1295,7 @@ s32 cellSpursAddWorkload() #endif } -s32 cellSpursWakeUp() +s64 cellSpursWakeUp() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1306,7 +1306,7 @@ s32 cellSpursWakeUp() #endif } -s32 cellSpursShutdownWorkload() +s64 cellSpursShutdownWorkload() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1317,7 +1317,7 @@ s32 cellSpursShutdownWorkload() #endif } -s32 _cellSpursWorkloadFlagReceiver() +s64 _cellSpursWorkloadFlagReceiver() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1328,7 +1328,7 @@ s32 _cellSpursWorkloadFlagReceiver() #endif } -s32 cellSpursGetWorkloadFlag() +s64 cellSpursGetWorkloadFlag() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1339,7 +1339,7 @@ s32 cellSpursGetWorkloadFlag() #endif } -s32 cellSpursReadyCountStore() +s64 cellSpursReadyCountStore() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1350,7 +1350,7 @@ s32 cellSpursReadyCountStore() #endif } -s32 _cellSpursWorkloadAttributeInitialize() +s64 _cellSpursWorkloadAttributeInitialize() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1361,7 +1361,7 @@ s32 _cellSpursWorkloadAttributeInitialize() #endif } -s32 cellSpursSendWorkloadSignal() +s64 cellSpursSendWorkloadSignal() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1372,7 +1372,7 @@ s32 cellSpursSendWorkloadSignal() #endif } -s32 cellSpursGetWorkloadData() +s64 cellSpursGetWorkloadData() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1383,7 +1383,7 @@ s32 cellSpursGetWorkloadData() #endif } -s32 cellSpursReadyCountAdd() +s64 cellSpursReadyCountAdd() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1394,7 +1394,7 @@ s32 cellSpursReadyCountAdd() #endif } -s32 cellSpursReadyCountCompareAndSwap() +s64 cellSpursReadyCountCompareAndSwap() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1405,7 +1405,7 @@ s32 cellSpursReadyCountCompareAndSwap() #endif } -s32 cellSpursReadyCountSwap() +s64 cellSpursReadyCountSwap() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1416,7 +1416,7 @@ s32 cellSpursReadyCountSwap() #endif } -s32 cellSpursRequestIdleSpu() +s64 cellSpursRequestIdleSpu() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1427,7 +1427,7 @@ s32 cellSpursRequestIdleSpu() #endif } -s32 cellSpursGetWorkloadInfo() +s64 cellSpursGetWorkloadInfo() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1438,7 +1438,7 @@ s32 cellSpursGetWorkloadInfo() #endif } -s32 cellSpursGetSpuGuid() +s64 cellSpursGetSpuGuid() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1449,7 +1449,7 @@ s32 cellSpursGetSpuGuid() #endif } -s32 _cellSpursWorkloadFlagReceiver2() +s64 _cellSpursWorkloadFlagReceiver2() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1460,7 +1460,7 @@ s32 _cellSpursWorkloadFlagReceiver2() #endif } -s32 cellSpursGetJobPipelineInfo() +s64 cellSpursGetJobPipelineInfo() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1471,7 +1471,7 @@ s32 cellSpursGetJobPipelineInfo() #endif } -s32 cellSpursJobSetMaxGrab() +s64 cellSpursJobSetMaxGrab() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1482,7 +1482,7 @@ s32 cellSpursJobSetMaxGrab() #endif } -s32 cellSpursJobHeaderSetJobbin2Param() +s64 cellSpursJobHeaderSetJobbin2Param() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1493,7 +1493,7 @@ s32 cellSpursJobHeaderSetJobbin2Param() #endif } -s32 cellSpursAddUrgentCommand() +s64 cellSpursAddUrgentCommand() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1504,7 +1504,7 @@ s32 cellSpursAddUrgentCommand() #endif } -s32 cellSpursAddUrgentCall() +s64 cellSpursAddUrgentCall() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1515,7 +1515,7 @@ s32 cellSpursAddUrgentCall() #endif } -s32 cellSpursBarrierInitialize() +s64 cellSpursBarrierInitialize() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1526,7 +1526,7 @@ s32 cellSpursBarrierInitialize() #endif } -s32 cellSpursBarrierGetTasksetAddress() +s64 cellSpursBarrierGetTasksetAddress() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1537,7 +1537,7 @@ s32 cellSpursBarrierGetTasksetAddress() #endif } -s32 _cellSpursSemaphoreInitialize() +s64 _cellSpursSemaphoreInitialize() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); @@ -1548,7 +1548,7 @@ s32 _cellSpursSemaphoreInitialize() #endif } -s32 cellSpursSemaphoreGetTasksetAddress() +s64 cellSpursSemaphoreGetTasksetAddress() { #ifdef PRX_DEBUG cellSpurs->Warning("%s()", __FUNCTION__); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpursJq.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpursJq.cpp index 9a74ec0904..95c27a9a9e 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpursJq.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpursJq.cpp @@ -764,7 +764,7 @@ void cellSpursJq_init() #ifdef PRX_DEBUG CallAfter([]() { - libspurs_jq = Memory.PRXMem.AllocAlign(sizeof(libspurs_jq_data), 4096); + libspurs_jq = (u32)Memory.PRXMem.AllocAlign(sizeof(libspurs_jq_data), 4096); memcpy(Memory + libspurs_jq, libspurs_jq_data, sizeof(libspurs_jq_data)); libspurs_jq_rtoc = libspurs_jq + 0x17E80; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp index b4ef823c47..a3c9b9cee5 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp @@ -1451,7 +1451,7 @@ s32 syncLFQueueCompletePushPointer(mem_ptr_t queue, s32 pointer if (exch) { assert(fpSendSignal); - return fpSendSignal((u64)queue->m_eaSignal, var6); + return fpSendSignal((u32)queue->m_eaSignal, var6); } } else @@ -1532,7 +1532,7 @@ s32 _cellSyncLFQueuePushBody(mem_ptr_t queue, u32 buffer_addr, else { #ifdef PRX_DEBUG - res = GetCurrentPPUThread().FastCall(libsre + 0x3050, libsre_rtoc, queue.GetAddr(), position_v.GetAddr(), isBlocking, 0); + res = (s32)GetCurrentPPUThread().FastCall(libsre + 0x3050, libsre_rtoc, queue.GetAddr(), position_v.GetAddr(), isBlocking, 0); position = position_v->ToLE(); #else res = syncLFQueueGetPushPointer2(queue, position, isBlocking, 0); @@ -1575,7 +1575,7 @@ s32 _cellSyncLFQueuePushBody(mem_ptr_t queue, u32 buffer_addr, else { #ifdef PRX_DEBUG - res = GetCurrentPPUThread().FastCall(libsre + 0x355C, libsre_rtoc, queue.GetAddr(), position, 0); + res = (s32)GetCurrentPPUThread().FastCall(libsre + 0x355C, libsre_rtoc, queue.GetAddr(), position, 0); #else res = syncLFQueueCompletePushPointer2(queue, position, nullptr); #endif @@ -1844,7 +1844,7 @@ s32 syncLFQueueCompletePopPointer(mem_ptr_t queue, s32 pointer, if (exch) { assert(fpSendSignal); - return fpSendSignal((u64)queue->m_eaSignal, var6); + return fpSendSignal((u32)queue->m_eaSignal, var6); } } else @@ -1923,7 +1923,7 @@ s32 _cellSyncLFQueuePopBody(mem_ptr_t queue, u32 buffer_addr, u else { #ifdef PRX_DEBUG - res = GetCurrentPPUThread().FastCall(libsre + 0x39AC, libsre_rtoc, queue.GetAddr(), position_v.GetAddr(), isBlocking, 0); + res = (s32)GetCurrentPPUThread().FastCall(libsre + 0x39AC, libsre_rtoc, queue.GetAddr(), position_v.GetAddr(), isBlocking, 0); position = position_v->ToLE(); #else res = syncLFQueueGetPopPointer2(queue, position, isBlocking, 0); @@ -1963,7 +1963,7 @@ s32 _cellSyncLFQueuePopBody(mem_ptr_t queue, u32 buffer_addr, u else { #ifdef PRX_DEBUG - res = GetCurrentPPUThread().FastCall(libsre + 0x3EB8, libsre_rtoc, queue.GetAddr(), position, 0, 0); + res = (s32)GetCurrentPPUThread().FastCall(libsre + 0x3EB8, libsre_rtoc, queue.GetAddr(), position, 0, 0); #else res = syncLFQueueCompletePopPointer2(queue, position, nullptr, 0); #endif @@ -2088,7 +2088,7 @@ s32 _cellSyncLFQueueGetSignalAddress(mem_ptr_t queue, mem32_t p return CELL_SYNC_ERROR_ALIGN; } - ppSignal = queue->m_eaSignal; + ppSignal = (u32)queue->m_eaSignal; return CELL_OK; } @@ -2206,7 +2206,7 @@ void cellSync_init() #ifdef PRX_DEBUG CallAfter([]() { - libsre = Memory.PRXMem.AllocAlign(sizeof(libsre_data), 4096); + libsre = (u32)Memory.PRXMem.AllocAlign(sizeof(libsre_data), 4096); memcpy(Memory + libsre, libsre_data, sizeof(libsre_data)); libsre_rtoc = libsre + 0x399B0; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp index fdfe773f65..700617edb5 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp @@ -15,7 +15,7 @@ u32 libsync2; u32 libsync2_rtoc; #endif -int _cellSync2MutexAttributeInitialize() +s64 _cellSync2MutexAttributeInitialize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -26,7 +26,7 @@ int _cellSync2MutexAttributeInitialize() #endif } -int cellSync2MutexEstimateBufferSize() +s64 cellSync2MutexEstimateBufferSize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -37,7 +37,7 @@ int cellSync2MutexEstimateBufferSize() #endif } -int cellSync2MutexInitialize() +s64 cellSync2MutexInitialize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -48,7 +48,7 @@ int cellSync2MutexInitialize() #endif } -int cellSync2MutexFinalize() +s64 cellSync2MutexFinalize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -59,7 +59,7 @@ int cellSync2MutexFinalize() #endif } -int cellSync2MutexLock() +s64 cellSync2MutexLock() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -70,7 +70,7 @@ int cellSync2MutexLock() #endif } -int cellSync2MutexTryLock() +s64 cellSync2MutexTryLock() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -81,7 +81,7 @@ int cellSync2MutexTryLock() #endif } -int cellSync2MutexUnlock() +s64 cellSync2MutexUnlock() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -92,7 +92,7 @@ int cellSync2MutexUnlock() #endif } -int _cellSync2CondAttributeInitialize() +s64 _cellSync2CondAttributeInitialize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -103,7 +103,7 @@ int _cellSync2CondAttributeInitialize() #endif } -int cellSync2CondEstimateBufferSize() +s64 cellSync2CondEstimateBufferSize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -114,7 +114,7 @@ int cellSync2CondEstimateBufferSize() #endif } -int cellSync2CondInitialize() +s64 cellSync2CondInitialize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -125,7 +125,7 @@ int cellSync2CondInitialize() #endif } -int cellSync2CondFinalize() +s64 cellSync2CondFinalize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -136,7 +136,7 @@ int cellSync2CondFinalize() #endif } -int cellSync2CondWait() +s64 cellSync2CondWait() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -147,7 +147,7 @@ int cellSync2CondWait() #endif } -int cellSync2CondSignal() +s64 cellSync2CondSignal() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -158,7 +158,7 @@ int cellSync2CondSignal() #endif } -int cellSync2CondSignalAll() +s64 cellSync2CondSignalAll() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -169,7 +169,7 @@ int cellSync2CondSignalAll() #endif } -int _cellSync2SemaphoreAttributeInitialize() +s64 _cellSync2SemaphoreAttributeInitialize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -180,7 +180,7 @@ int _cellSync2SemaphoreAttributeInitialize() #endif } -int cellSync2SemaphoreEstimateBufferSize() +s64 cellSync2SemaphoreEstimateBufferSize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -191,7 +191,7 @@ int cellSync2SemaphoreEstimateBufferSize() #endif } -int cellSync2SemaphoreInitialize() +s64 cellSync2SemaphoreInitialize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -202,7 +202,7 @@ int cellSync2SemaphoreInitialize() #endif } -int cellSync2SemaphoreFinalize() +s64 cellSync2SemaphoreFinalize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -213,7 +213,7 @@ int cellSync2SemaphoreFinalize() #endif } -int cellSync2SemaphoreAcquire() +s64 cellSync2SemaphoreAcquire() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -224,7 +224,7 @@ int cellSync2SemaphoreAcquire() #endif } -int cellSync2SemaphoreTryAcquire() +s64 cellSync2SemaphoreTryAcquire() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -235,7 +235,7 @@ int cellSync2SemaphoreTryAcquire() #endif } -int cellSync2SemaphoreRelease() +s64 cellSync2SemaphoreRelease() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -246,7 +246,7 @@ int cellSync2SemaphoreRelease() #endif } -int cellSync2SemaphoreGetCount() +s64 cellSync2SemaphoreGetCount() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -257,7 +257,7 @@ int cellSync2SemaphoreGetCount() #endif } -int _cellSync2QueueAttributeInitialize() +s64 _cellSync2QueueAttributeInitialize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -268,7 +268,7 @@ int _cellSync2QueueAttributeInitialize() #endif } -int cellSync2QueueEstimateBufferSize() +s64 cellSync2QueueEstimateBufferSize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -279,7 +279,7 @@ int cellSync2QueueEstimateBufferSize() #endif } -int cellSync2QueueInitialize() +s64 cellSync2QueueInitialize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -290,7 +290,7 @@ int cellSync2QueueInitialize() #endif } -int cellSync2QueueFinalize() +s64 cellSync2QueueFinalize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -301,7 +301,7 @@ int cellSync2QueueFinalize() #endif } -int cellSync2QueuePush() +s64 cellSync2QueuePush() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -312,7 +312,7 @@ int cellSync2QueuePush() #endif } -int cellSync2QueueTryPush() +s64 cellSync2QueueTryPush() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -323,7 +323,7 @@ int cellSync2QueueTryPush() #endif } -int cellSync2QueuePop() +s64 cellSync2QueuePop() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -334,7 +334,7 @@ int cellSync2QueuePop() #endif } -int cellSync2QueueTryPop() +s64 cellSync2QueueTryPop() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -345,7 +345,7 @@ int cellSync2QueueTryPop() #endif } -int cellSync2QueueGetSize() +s64 cellSync2QueueGetSize() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -356,7 +356,7 @@ int cellSync2QueueGetSize() #endif } -int cellSync2QueueGetDepth() +s64 cellSync2QueueGetDepth() { #ifdef PRX_DEBUG cellSync2->Warning("%s()", __FUNCTION__); @@ -408,7 +408,7 @@ void cellSync2_init() #ifdef PRX_DEBUG CallAfter([]() { - libsync2 = Memory.PRXMem.AllocAlign(sizeof(libsync2_data), 4096); + libsync2 = (u32)Memory.PRXMem.AllocAlign(sizeof(libsync2_data), 4096); memcpy(Memory + libsync2, libsync2_data, sizeof(libsync2_data)); libsync2_rtoc = libsync2 + 0xF280; @@ -427,7 +427,7 @@ void cellSync2_init() FIX_IMPORT(sysPrxForUser, sys_lwmutex_create , libsync2 + 0x62D0); FIX_IMPORT(sysPrxForUser, sys_ppu_thread_get_id , libsync2 + 0x62F0); FIX_IMPORT(sysPrxForUser, _sys_memset , libsync2 + 0x6310); - FIX_IMPORT(sysPrxForUser, _sys_printf , libsync2 + 0x6330); + FIX_IMPORT(sysPrxForUser, _sys_prs64f , libsync2 + 0x6330); fix_import(sysPrxForUser, 0x9FB6228E , libsync2 + 0x6350); FIX_IMPORT(sysPrxForUser, sys_lwmutex_destroy , libsync2 + 0x6370); FIX_IMPORT(sysPrxForUser, _sys_strncpy , libsync2 + 0x6390); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp index 978c7ce081..3b17cb5fb7 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp @@ -74,7 +74,7 @@ void addSaveDataEntry(std::vector& saveEntries, const std::string saveEntry.title = psf.GetString("TITLE"); saveEntry.subtitle = psf.GetString("SUB_TITLE"); saveEntry.details = psf.GetString("DETAIL"); - saveEntry.sizeKB = getSaveDataSize(saveDir)/1024; + saveEntry.sizeKB = (u32)(getSaveDataSize(saveDir) / 1024); saveEntry.st_atime_ = 0; // TODO saveEntry.st_mtime_ = 0; // TODO saveEntry.st_ctime_ = 0; // TODO @@ -209,7 +209,7 @@ void getSaveDataStat(SaveDataEntry entry, mem_ptr_t statGet } } - statGet->fileList.SetAddr(be_t::MakeFromLE(Memory.Alloc(sizeof(CellSaveDataFileStat)* fileEntries.size(), sizeof(CellSaveDataFileStat)))); + statGet->fileList.SetAddr(be_t::MakeFromLE((u32)Memory.Alloc(sizeof(CellSaveDataFileStat) * (u32)fileEntries.size(), sizeof(CellSaveDataFileStat)))); for (u32 i=0; ifileList[i], &fileEntries[i], sizeof(CellSaveDataFileStat)); } @@ -256,13 +256,13 @@ s32 modifySaveDataFiles(mem_func_ptr_t& funcFile, mem_ { case CELL_SAVEDATA_FILEOP_READ: file = Emu.GetVFS().OpenFile(filepath, vfsRead); - fileGet->excSize = file->Read(buf, std::min(fileSet->fileSize, fileSet->fileBufSize)); // TODO: This may fail for big files because of the dest pointer. + fileGet->excSize = (u32)file->Read(buf, (u32)std::min(fileSet->fileSize, fileSet->fileBufSize)); // TODO: This may fail for big files because of the dest pointer. break; case CELL_SAVEDATA_FILEOP_WRITE: Emu.GetVFS().CreateFile(filepath); file = Emu.GetVFS().OpenFile(filepath, vfsWrite); - fileGet->excSize = file->Write(buf, std::min(fileSet->fileSize, fileSet->fileBufSize)); // TODO: This may fail for big files because of the dest pointer. + fileGet->excSize = (u32)file->Write(buf, (u32)std::min(fileSet->fileSize, fileSet->fileBufSize)); // TODO: This may fail for big files because of the dest pointer. break; case CELL_SAVEDATA_FILEOP_DELETE: diff --git a/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp b/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp index 7bfb67aef1..b558b6b20d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp @@ -702,11 +702,11 @@ int cellVdecGetPicItem(u32 handle, mem32_t picItem_ptr) info->startAddr = 0x00000123; // invalid value (no address for picture) info->size = a128(av_image_get_buffer_size(vdec->ctx->pix_fmt, vdec->ctx->width, vdec->ctx->height, 1)); info->auNum = 1; - info->auPts[0].lower = vf.pts; + info->auPts[0].lower = (u32)vf.pts; info->auPts[0].upper = vf.pts >> 32; info->auPts[1].lower = 0xffffffff; info->auPts[1].upper = 0xffffffff; - info->auDts[0].lower = vf.dts; + info->auDts[0].lower = (u32)vf.dts; info->auDts[0].upper = vf.dts >> 32; info->auDts[1].lower = 0xffffffff; info->auDts[1].upper = 0xffffffff; diff --git a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp index da49b51552..f9e16dfa0b 100644 --- a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp +++ b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp @@ -162,7 +162,7 @@ int cellSSPlayerCreate(mem32_t handle, mem_ptr_t config) p.m_channels = config->channels; ssp.push_back(p); - handle = ssp.size() - 1; + handle = (u32)ssp.size() - 1; return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp index 9a0c1b5909..71b560cc93 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp @@ -404,7 +404,7 @@ int sceNpTrophyGetTrophyInfo(u32 context, u32 handle, s32 trophyId, mem_ptr_ttrophyId = trophyId; - data->unlocked = ctxt.tropusr->GetTrophyUnlockState(trophyId); + data->unlocked = ctxt.tropusr->GetTrophyUnlockState(trophyId) ? true : false; // ??? data->timestamp.tick = ctxt.tropusr->GetTrophyTimestamp(trophyId); } } diff --git a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp index 8a1586aa35..3779de5299 100644 --- a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp @@ -32,24 +32,24 @@ int _sys_heap_create_heap(const u32 heap_addr, const u32 align, const u32 size) return heap_id; } -int _sys_heap_malloc(const u32 heap_id, const u32 size) +u32 _sys_heap_malloc(const u32 heap_id, const u32 size) { sysPrxForUser->Warning("_sys_heap_malloc(heap_id=%d, size=0x%x)", heap_id, size); HeapInfo* heap; if(!sysPrxForUser->CheckId(heap_id, heap)) return CELL_ESRCH; - return Memory.Alloc(size, 1); + return (u32)Memory.Alloc(size, 1); } -int _sys_heap_memalign(u32 heap_id, u32 align, u32 size) +u32 _sys_heap_memalign(u32 heap_id, u32 align, u32 size) { sysPrxForUser->Warning("_sys_heap_memalign(heap_id=%d, align=0x%x, size=0x%x)", heap_id, align, size); HeapInfo* heap; if(!sysPrxForUser->CheckId(heap_id, heap)) return CELL_ESRCH; - return Memory.Alloc(size, align); + return (u32)Memory.Alloc(size, align); } void sys_initialize_tls() @@ -172,7 +172,7 @@ s32 _sys_memcmp(u32 addr1, u32 addr2, u32 size) return memcmp(Memory + addr1, Memory + addr2, size); } -s32 _sys_strlen(u32 addr) +s64 _sys_strlen(u32 addr) { sysPrxForUser->Log("_sys_strlen(addr=0x%x)", addr); @@ -251,7 +251,7 @@ s32 _sys_spu_printf_finalize() return CELL_OK; } -s32 _sys_spu_printf_attach_group(u32 arg) +s64 _sys_spu_printf_attach_group(u32 arg) { sysPrxForUser->Warning("_sys_spu_printf_attach_group(arg=0x%x)", arg); @@ -263,7 +263,7 @@ s32 _sys_spu_printf_attach_group(u32 arg) return GetCurrentPPUThread().FastCall(Memory.Read32(spu_printf_agcb), Memory.Read32(spu_printf_agcb + 4), arg); } -s32 _sys_spu_printf_detach_group(u32 arg) +s64 _sys_spu_printf_detach_group(u32 arg) { sysPrxForUser->Warning("_sys_spu_printf_detach_group(arg=0x%x)", arg); @@ -275,7 +275,7 @@ s32 _sys_spu_printf_detach_group(u32 arg) return GetCurrentPPUThread().FastCall(Memory.Read32(spu_printf_dgcb), Memory.Read32(spu_printf_dgcb + 4), arg); } -s32 _sys_spu_printf_attach_thread(u32 arg) +s64 _sys_spu_printf_attach_thread(u32 arg) { sysPrxForUser->Warning("_sys_spu_printf_attach_thread(arg=0x%x)", arg); @@ -287,7 +287,7 @@ s32 _sys_spu_printf_attach_thread(u32 arg) return GetCurrentPPUThread().FastCall(Memory.Read32(spu_printf_atcb), Memory.Read32(spu_printf_atcb + 4), arg); } -s32 _sys_spu_printf_detach_thread(u32 arg) +s64 _sys_spu_printf_detach_thread(u32 arg) { sysPrxForUser->Warning("_sys_spu_printf_detach_thread(arg=0x%x)", arg); diff --git a/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp b/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp index 3f943c843c..c403278ba2 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp @@ -66,7 +66,7 @@ int sdata_unpack(const std::string& packed_file, const std::string& unpacked_fil u32 blockSize = re32(*(u32*)&buffer[0x84]); u64 filesizeOutput = re64(*(u64*)&buffer[0x88]); u64 filesizeInput = packed_stream->GetSize(); - u32 blockCount = (filesizeOutput + blockSize-1) / blockSize; + u32 blockCount = (u32)((filesizeOutput + blockSize - 1) / blockSize); // SDATA file is compressed if (flags & 0x1) @@ -99,7 +99,7 @@ int sdata_unpack(const std::string& packed_file, const std::string& unpacked_fil packed_stream->Seek(packed_stream->Tell() + t1); if (!(blockCount-i-1)) - blockSize = filesizeOutput-i*blockSize; + blockSize = (u32)(filesizeOutput - i * blockSize); packed_stream->Read(buffer+256, blockSize); unpacked_stream->Write(buffer+256, blockSize); diff --git a/rpcs3/Emu/SysCalls/Modules/sys_net.cpp b/rpcs3/Emu/SysCalls/Modules/sys_net.cpp index 9f660fde7b..00a4eeec2a 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_net.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_net.cpp @@ -345,7 +345,7 @@ int socketselect() int sys_net_initialize_network_ex(mem_ptr_t param) { sys_net->Warning("sys_net_initialize_network_ex(param_addr=0x%x)", param.GetAddr()); - g_lastError.SetAddr(Memory.Alloc(4, 1)); + g_lastError.SetAddr((u32)Memory.Alloc(4, 1)); #ifdef _WIN32 WSADATA wsaData; WORD wVersionRequested = MAKEWORD(1,1); diff --git a/rpcs3/Emu/SysCalls/SysCalls.cpp b/rpcs3/Emu/SysCalls/SysCalls.cpp index 999f736df0..4476aa1e3e 100644 --- a/rpcs3/Emu/SysCalls/SysCalls.cpp +++ b/rpcs3/Emu/SysCalls/SysCalls.cpp @@ -916,7 +916,7 @@ struct SyscallTableCleaner_t void default_syscall() { declCPU(); - u32 code = CPU.GPR[11]; + u32 code = (u32)CPU.GPR[11]; //TODO: remove this switch(code) { diff --git a/rpcs3/Emu/SysCalls/lv2/sys_memory.cpp b/rpcs3/Emu/SysCalls/lv2/sys_memory.cpp index e27723d1e6..5091e41b31 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_memory.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_memory.cpp @@ -52,12 +52,12 @@ s32 sys_memory_allocate_from_container(u32 size, u32 cid, u32 flags, u32 alloc_a { case SYS_MEMORY_PAGE_SIZE_1M: if(size & 0xfffff) return CELL_EALIGN; - ct->addr = Memory.Alloc(size, 0x100000); + ct->addr = (u32)Memory.Alloc(size, 0x100000); break; case SYS_MEMORY_PAGE_SIZE_64K: if(size & 0xffff) return CELL_EALIGN; - ct->addr = Memory.Alloc(size, 0x10000); + ct->addr = (u32)Memory.Alloc(size, 0x10000); break; default: return CELL_EINVAL; @@ -113,7 +113,7 @@ s32 sys_memory_container_create(mem32_t cid, u32 yield_size) sys_memory.Warning("sys_memory_container_create(cid_addr=0x%x, yield_size=0x%x)", cid.GetAddr(), yield_size); yield_size &= ~0xfffff; //round down to 1 MB granularity - u64 addr = Memory.Alloc(yield_size, 0x100000); //1 MB alignment + u32 addr = (u32)Memory.Alloc(yield_size, 0x100000); //1 MB alignment if(!addr) return CELL_ENOMEM; diff --git a/rpcs3/Emu/SysCalls/lv2/sys_memory.h b/rpcs3/Emu/SysCalls/lv2/sys_memory.h index 522c3328fe..78a4f4b3bd 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_memory.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_memory.h @@ -35,7 +35,7 @@ struct MemoryContainerInfo u32 addr; u32 size; - MemoryContainerInfo(u64 addr, u32 size) + MemoryContainerInfo(u32 addr, u32 size) : addr(addr) , size(size) { diff --git a/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp b/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp index 3c580f1721..66b231e462 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_mmapper.cpp @@ -26,13 +26,13 @@ s32 sys_mmapper_allocate_address(u32 size, u64 flags, u32 alignment, u32 alloc_a case SYS_MEMORY_PAGE_SIZE_1M: if(AlignAddr(size, alignment) & 0xfffff) return CELL_EALIGN; - addr = Memory.Alloc(size, 0x100000); + addr = (u32)Memory.Alloc(size, 0x100000); break; case SYS_MEMORY_PAGE_SIZE_64K: if(AlignAddr(size, alignment) & 0xffff) return CELL_EALIGN; - addr = Memory.Alloc(size, 0x10000); + addr = (u32)Memory.Alloc(size, 0x10000); break; } @@ -64,13 +64,13 @@ s32 sys_mmapper_allocate_memory(u32 size, u64 flags, mem32_t mem_id) case SYS_MEMORY_PAGE_SIZE_1M: if(size & 0xfffff) return CELL_EALIGN; - addr = Memory.Alloc(size, 0x100000); + addr = (u32)Memory.Alloc(size, 0x100000); break; case SYS_MEMORY_PAGE_SIZE_64K: if(size & 0xffff) return CELL_EALIGN; - addr = Memory.Alloc(size, 0x10000); + addr = (u32)Memory.Alloc(size, 0x10000); break; default: @@ -102,13 +102,13 @@ s32 sys_mmapper_allocate_memory_from_container(u32 size, u32 cid, u64 flags, mem case SYS_MEMORY_PAGE_SIZE_1M: if(size & 0xfffff) return CELL_EALIGN; - ct->addr = Memory.Alloc(size, 0x100000); + ct->addr = (u32)Memory.Alloc(size, 0x100000); break; case SYS_MEMORY_PAGE_SIZE_64K: if(size & 0xffff) return CELL_EALIGN; - ct->addr = Memory.Alloc(size, 0x10000); + ct->addr = (u32)Memory.Alloc(size, 0x10000); break; default: diff --git a/rpcs3/Emu/SysCalls/lv2/sys_mmapper.h b/rpcs3/Emu/SysCalls/lv2/sys_mmapper.h index 6a7a71d0e0..677ea634d5 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_mmapper.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_mmapper.h @@ -5,11 +5,11 @@ struct mmapper_info { - u64 addr; + u32 addr; u32 size; - u32 flags; + u64 flags; - mmapper_info(u64 _addr, u32 _size, u32 _flags) + mmapper_info(u32 _addr, u32 _size, u64 _flags) : addr(_addr) , size(_size) , flags(_flags) diff --git a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp index d036beea57..875e96acf1 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp @@ -108,7 +108,7 @@ s32 sys_ppu_thread_get_priority(u64 thread_id, u32 prio_addr) CPUThread* thr = Emu.GetCPU().GetThread(thread_id); if(!thr) return CELL_ESRCH; - Memory.Write32(prio_addr, thr->GetPrio()); + Memory.Write32(prio_addr, (s32)thr->GetPrio()); return CELL_OK; } @@ -119,8 +119,8 @@ s32 sys_ppu_thread_get_stack_information(u32 info_addr) declCPU(); - Memory.Write32(info_addr, CPU.GetStackAddr()); - Memory.Write32(info_addr+4, CPU.GetStackSize()); + Memory.Write32(info_addr, (u32)CPU.GetStackAddr()); + Memory.Write32(info_addr + 4, CPU.GetStackSize()); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp b/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp index d315f41039..439160dd41 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp @@ -32,8 +32,8 @@ s32 sys_prx_load_module(u32 path_addr, u64 flags, mem_ptr_tsize = f.GetSize(); - prx->address = Memory.Alloc(prx->size, 4); + prx->size = (u32)f.GetSize(); + prx->address = (u32)Memory.Alloc(prx->size, 4); prx->path = path; // Load the PRX into memory diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 09d02891f1..cac8416bbc 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -344,7 +344,7 @@ void Emulator::Load() thread.AddArgv(m_elf_path); //thread.AddArgv("-emu"); - m_rsx_callback = Memory.MainMem.AllocAlign(4 * 4) + 4; + m_rsx_callback = (u32)Memory.MainMem.AllocAlign(4 * 4) + 4; Memory.Write32(m_rsx_callback - 4, m_rsx_callback); mem32_ptr_t callback_data(m_rsx_callback); @@ -352,7 +352,7 @@ void Emulator::Load() callback_data += SC(2); callback_data += BCLR(0x10 | 0x04, 0, 0, 0); - m_ppu_thr_exit = Memory.MainMem.AllocAlign(4 * 4); + m_ppu_thr_exit = (u32)Memory.MainMem.AllocAlign(4 * 4); mem32_ptr_t ppu_thr_exit_data(m_ppu_thr_exit); //ppu_thr_exit_data += ADDI(3, 0, 0); // why it kills return value (GPR[3]) ? @@ -360,7 +360,7 @@ void Emulator::Load() ppu_thr_exit_data += SC(2); ppu_thr_exit_data += BCLR(0x10 | 0x04, 0, 0, 0); - m_ppu_thr_stop = Memory.MainMem.AllocAlign(2 * 4); + m_ppu_thr_stop = (u32)Memory.MainMem.AllocAlign(2 * 4); mem32_ptr_t ppu_thr_stop_data(m_ppu_thr_stop); ppu_thr_stop_data += SC(4); @@ -494,8 +494,8 @@ void Emulator::SavePoints(const std::string& path) { std::ofstream f(path, std::ios::binary | std::ios::trunc); - u32 break_count = m_break_points.size(); - u32 marked_count = m_marked_points.size(); + u32 break_count = (u32)m_break_points.size(); + u32 marked_count = (u32)m_marked_points.size(); f << bpdb_version << break_count << marked_count; @@ -519,7 +519,7 @@ void Emulator::LoadPoints(const std::string& path) if (!f.is_open()) return; f.seekg(0, std::ios::end); - int length = f.tellg(); + int length = (int)f.tellg(); f.seekg(0, std::ios::beg); u32 break_count, marked_count; u16 version; diff --git a/rpcs3/Loader/ELF64.cpp b/rpcs3/Loader/ELF64.cpp index 117a0bdbc2..d983d64995 100644 --- a/rpcs3/Loader/ELF64.cpp +++ b/rpcs3/Loader/ELF64.cpp @@ -231,7 +231,7 @@ bool ELF64Loader::LoadEhdrInfo(s64 offset) return false; } - entry = ehdr.GetEntry(); + entry = (u32)ehdr.GetEntry(); if(entry == 0) { LOG_ERROR(LOADER, "elf64 error: entry is null!"); @@ -320,12 +320,12 @@ bool ELF64Loader::LoadPhdrData(u64 offset) if (phdr.p_vaddr < min_addr) { - min_addr = phdr.p_vaddr; + min_addr = (u32)phdr.p_vaddr; } if (phdr.p_vaddr + phdr.p_memsz > max_addr) { - max_addr = phdr.p_vaddr + phdr.p_memsz; + max_addr = (u32)(phdr.p_vaddr + phdr.p_memsz); } if (phdr.p_vaddr != phdr.p_paddr) @@ -334,7 +334,7 @@ bool ELF64Loader::LoadPhdrData(u64 offset) phdr.p_paddr, phdr.p_vaddr); } - if(!Memory.MainMem.IsInMyRange(offset + phdr.p_vaddr, phdr.p_memsz)) + if(!Memory.MainMem.IsInMyRange(offset + phdr.p_vaddr, (u32)phdr.p_memsz)) { #ifdef LOADER_DEBUG LOG_WARNING(LOADER, "Skipping..."); @@ -348,13 +348,15 @@ bool ELF64Loader::LoadPhdrData(u64 offset) case 0x00000001: //LOAD if(phdr.p_memsz) { - Memory.MainMem.AllocFixed(offset + phdr.p_vaddr, phdr.p_memsz); - - if(phdr.p_filesz) + if (!Memory.MainMem.AllocFixed(offset + phdr.p_vaddr, (u32)phdr.p_memsz)) + { + LOG_ERROR(LOADER, "%s(): AllocFixed(0x%llx, 0x%llx) failed", __FUNCTION__, offset + phdr.p_vaddr, phdr.p_memsz); + } + else if (phdr.p_filesz) { elf64_f.Seek(phdr.p_offset); elf64_f.Read(&Memory[offset + phdr.p_vaddr], phdr.p_filesz); - Emu.GetSFuncManager().StaticAnalyse(&Memory[offset + phdr.p_vaddr], phdr.p_filesz, phdr.p_vaddr); + Emu.GetSFuncManager().StaticAnalyse(&Memory[offset + phdr.p_vaddr], (u32)phdr.p_filesz, (u32)phdr.p_vaddr); } } break; @@ -460,13 +462,13 @@ bool ELF64Loader::LoadPhdrData(u64 offset) LOG_NOTICE(LOADER, "*** nid: 0x%x (0x%x)", nid, stub.s_nid + i*4); LOG_NOTICE(LOADER, "*** text: 0x%x (0x%x)", text, stub.s_text + i*4); #endif - Memory.Write32(stub.s_text + i*4, tbl + i*8); + Memory.Write32(stub.s_text + i*4, (u32)tbl + i*8); - mem32_ptr_t out_tbl(tbl + i*8); - out_tbl += dst + i*section; + mem32_ptr_t out_tbl((u32)tbl + i*8); + out_tbl += (u32)dst + i*section; out_tbl += Emu.GetModuleManager().GetFuncNumById(nid); - mem32_ptr_t out_dst(dst + i*section); + mem32_ptr_t out_dst((u32)dst + i*section); out_dst += OR(11, 2, 2, 0); out_dst += SC(2); out_dst += BCLR(0x10 | 0x04, 0, 0, 0); @@ -512,16 +514,16 @@ bool ELF64Loader::LoadShdrData(u64 offset) const u64 addr = shdr.sh_addr; const u64 size = shdr.sh_size; - if(size == 0 || !Memory.IsGoodAddr(offset + addr, size)) continue; + if(size == 0 || !Memory.IsGoodAddr(offset + addr, (u32)size)) continue; if(shdr.sh_addr && shdr.sh_addr < min_addr) { - min_addr = shdr.sh_addr; + min_addr = (u32)shdr.sh_addr; } if(shdr.sh_addr + shdr.sh_size > max_addr) { - max_addr = shdr.sh_addr + shdr.sh_size; + max_addr = (u32)(shdr.sh_addr + shdr.sh_size); } if((shdr.sh_type == SHT_RELA) || (shdr.sh_type == SHT_REL)) diff --git a/rpcs3/Loader/TROPUSR.cpp b/rpcs3/Loader/TROPUSR.cpp index 1464d9189c..e6a15fb59f 100644 --- a/rpcs3/Loader/TROPUSR.cpp +++ b/rpcs3/Loader/TROPUSR.cpp @@ -145,10 +145,10 @@ bool TROPUSRLoader::Generate(const std::string& filepath, const std::string& con } TROPUSREntry4 entry4 = { be_t::MakeFromBE(se32(4)), be_t::MakeFromBE(se32(sizeof(TROPUSREntry4) - 0x10)), - be_t::MakeFromLE(m_table4.size()), be_t::MakeFromBE(se32(0)), be_t::MakeFromLE(trophy_id), + be_t::MakeFromLE((u32)m_table4.size()), be_t::MakeFromBE(se32(0)), be_t::MakeFromLE(trophy_id), be_t::MakeFromLE(trophy_grade), be_t::MakeFromBE(se32(0xFFFFFFFF)) }; TROPUSREntry6 entry6 = { be_t::MakeFromBE(se32(6)), be_t::MakeFromBE(se32(sizeof(TROPUSREntry6) - 0x10)), - be_t::MakeFromLE(m_table6.size()), be_t::MakeFromBE(0), be_t::MakeFromLE(trophy_id) }; + be_t::MakeFromLE((u32)m_table6.size()), be_t::MakeFromBE(0), be_t::MakeFromLE(trophy_id) }; m_table4.push_back(entry4); m_table6.push_back(entry6); @@ -157,10 +157,10 @@ bool TROPUSRLoader::Generate(const std::string& filepath, const std::string& con u64 offset = sizeof(TROPUSRHeader) + 2 * sizeof(TROPUSRTableHeader); TROPUSRTableHeader table4header = { be_t::MakeFromBE(se32(4)), be_t::MakeFromBE(se32(sizeof(TROPUSREntry4)-0x10)), - be_t::MakeFromBE(se32(1)), be_t::MakeFromLE(m_table4.size()), be_t::MakeFromLE(offset) }; + be_t::MakeFromBE(se32(1)), be_t::MakeFromLE((u32)m_table4.size()), be_t::MakeFromLE(offset) }; offset += m_table4.size() * sizeof(TROPUSREntry4); TROPUSRTableHeader table6header = { be_t::MakeFromBE(se32(6)), be_t::MakeFromBE(se32(sizeof(TROPUSREntry6)-0x10)), - be_t::MakeFromBE(se32(1)), be_t::MakeFromLE(m_table6.size()), be_t::MakeFromLE(offset) }; + be_t::MakeFromBE(se32(1)), be_t::MakeFromLE((u32)m_table6.size()), be_t::MakeFromLE(offset) }; offset += m_table6.size() * sizeof(TROPUSREntry6); m_tableHeaders.clear(); @@ -169,7 +169,7 @@ bool TROPUSRLoader::Generate(const std::string& filepath, const std::string& con m_header.magic = 0x818F54AD; m_header.unk1 = 0x00010000; - m_header.tables_count = m_tableHeaders.size(); + m_header.tables_count = (u32)m_tableHeaders.size(); m_header.unk2 = 0; Save(filepath); @@ -178,7 +178,7 @@ bool TROPUSRLoader::Generate(const std::string& filepath, const std::string& con u32 TROPUSRLoader::GetTrophiesCount() { - return m_table6.size(); + return (u32)m_table6.size(); } u32 TROPUSRLoader::GetTrophyUnlockState(u32 id) @@ -189,9 +189,9 @@ u32 TROPUSRLoader::GetTrophyUnlockState(u32 id) return m_table6[id].trophy_state; // Let's assume the trophies are stored ordered } -u32 TROPUSRLoader::GetTrophyTimestamp(u32 id) +u64 TROPUSRLoader::GetTrophyTimestamp(u32 id) { - if (id >= m_table6.size()) + if (id >= m_table6.size()) LOG_WARNING(LOADER, "TROPUSRLoader::GetTrophyTimestamp: Invalid id=%d", id); // TODO: What timestamp does sceNpTrophyGetTrophyInfo want, timestamp1 or timestamp2? diff --git a/rpcs3/Loader/TROPUSR.h b/rpcs3/Loader/TROPUSR.h index bfdc0ff182..75c7660192 100644 --- a/rpcs3/Loader/TROPUSR.h +++ b/rpcs3/Loader/TROPUSR.h @@ -79,7 +79,7 @@ public: virtual u32 GetTrophiesCount(); virtual u32 GetTrophyUnlockState(u32 id); - virtual u32 GetTrophyTimestamp(u32 id); + virtual u64 GetTrophyTimestamp(u32 id); virtual bool UnlockTrophy(u32 id, u64 timestamp1, u64 timestamp2); }; diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index 14109af0e2..fdd281b601 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -42,14 +42,14 @@ typedef uint16_t u16; typedef uint32_t u32; typedef uint64_t u64; -static const u32 U32_MAX = 0xffffffff; +static const u32 U32_MAX = 0xffffffffu; typedef int8_t s8; typedef int16_t s16; typedef int32_t s32; typedef int64_t s64; -static const s32 S32_MIN = -0x80000000; +static const s32 S32_MIN = (s32)0x80000000u; static const s32 S32_MAX = 0x7fffffff; union u128