Fix some printf size warnings, signed warnings.
This commit is contained in:
parent
e87276cbad
commit
a3f93ed203
8 changed files with 17 additions and 16 deletions
|
@ -68,7 +68,7 @@ void PGF::DoState(PointerWrap &p) {
|
||||||
void PGF::ReadPtr(const u8 *ptr, size_t dataSize) {
|
void PGF::ReadPtr(const u8 *ptr, size_t dataSize) {
|
||||||
const u8 *const startPtr = ptr;
|
const u8 *const startPtr = ptr;
|
||||||
|
|
||||||
INFO_LOG(HLE, "Reading %d bytes of PGF header", sizeof(header));
|
INFO_LOG(HLE, "Reading %d bytes of PGF header", (int)sizeof(header));
|
||||||
memcpy(&header, ptr, sizeof(header));
|
memcpy(&header, ptr, sizeof(header));
|
||||||
ptr += sizeof(header);
|
ptr += sizeof(header);
|
||||||
|
|
||||||
|
|
|
@ -158,7 +158,7 @@ private:
|
||||||
class LoadedFont {
|
class LoadedFont {
|
||||||
public:
|
public:
|
||||||
LoadedFont(Font *font, FontLib *fontLib, u32 handle)
|
LoadedFont(Font *font, FontLib *fontLib, u32 handle)
|
||||||
: font_(font), fontLib_(fontLib), handle_(handle) {}
|
: fontLib_(fontLib), font_(font), handle_(handle) {}
|
||||||
|
|
||||||
Font *GetFont() { return font_; }
|
Font *GetFont() { return font_; }
|
||||||
FontLib *GetFontLib() { return fontLib_; }
|
FontLib *GetFontLib() { return fontLib_; }
|
||||||
|
@ -501,7 +501,7 @@ u32 sceFontOpen(u32 libHandle, u32 index, u32 mode, u32 errorCodePtr) {
|
||||||
}
|
}
|
||||||
|
|
||||||
FontLib *fontLib = GetFontLib(libHandle);
|
FontLib *fontLib = GetFontLib(libHandle);
|
||||||
if (index < 0 || index >= internalFonts.size()) {
|
if (index >= internalFonts.size()) {
|
||||||
Memory::Write_U32(ERROR_FONT_INVALID_PARAMETER, errorCodePtr);
|
Memory::Write_U32(ERROR_FONT_INVALID_PARAMETER, errorCodePtr);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -270,7 +270,7 @@ u32 sceIoAssign(u32 alias_addr, u32 physical_addr, u32 filesystem_addr, int mode
|
||||||
perm = "IOASSIGN_RDONLY";
|
perm = "IOASSIGN_RDONLY";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
perm = "unhandled " + mode;
|
perm = "unhandled";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
DEBUG_LOG(HLE, "sceIoAssign(%s, %s, %s, %s, %08x, %i)", alias.c_str(), physical_dev.c_str(), filesystem_dev.c_str(), perm.c_str(), arg_addr, argSize);
|
DEBUG_LOG(HLE, "sceIoAssign(%s, %s, %s, %s, %08x, %i)", alias.c_str(), physical_dev.c_str(), filesystem_dev.c_str(), perm.c_str(), arg_addr, argSize);
|
||||||
|
|
|
@ -253,7 +253,7 @@ u32 sceKernelGetVTimerTime(u32 uid, u32 timeClockAddr) {
|
||||||
VTimer *vt = kernelObjects.Get<VTimer>(uid, error);
|
VTimer *vt = kernelObjects.Get<VTimer>(uid, error);
|
||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
WARN_LOG(HLE, "%08x=sceKernelGetVTimerTime(%08x, %08x)", uid, timeClockAddr);
|
WARN_LOG(HLE, "%08x=sceKernelGetVTimerTime(%08x, %08x)", error, uid, timeClockAddr);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -290,7 +290,7 @@ u32 sceKernelSetVTimerTime(u32 uid, u32 timeClockAddr) {
|
||||||
VTimer *vt = kernelObjects.Get<VTimer>(uid, error);
|
VTimer *vt = kernelObjects.Get<VTimer>(uid, error);
|
||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
WARN_LOG(HLE, "%08x=sceKernelSetVTimerTime(%08x, %08x)", uid, timeClockAddr);
|
WARN_LOG(HLE, "%08x=sceKernelSetVTimerTime(%08x, %08x)", error, uid, timeClockAddr);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -307,7 +307,7 @@ u32 sceKernelSetVTimerTimeWide(u32 uid, u64 timeClock) {
|
||||||
VTimer *vt = kernelObjects.Get<VTimer>(uid, error);
|
VTimer *vt = kernelObjects.Get<VTimer>(uid, error);
|
||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
WARN_LOG(HLE, "%08x=sceKernelSetVTimerTimeWide(%08x, %llu)", uid, timeClock);
|
WARN_LOG(HLE, "%08x=sceKernelSetVTimerTimeWide(%08x, %llu)", error, uid, timeClock);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -369,7 +369,7 @@ u32 sceKernelSetVTimerHandler(u32 uid, u32 scheduleAddr, u32 handlerFuncAddr, u3
|
||||||
VTimer *vt = kernelObjects.Get<VTimer>(uid, error);
|
VTimer *vt = kernelObjects.Get<VTimer>(uid, error);
|
||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
WARN_LOG(HLE, "%08x=sceKernelSetVTimerHandler(%08x, %08x, %08x, %08x)", uid, scheduleAddr, handlerFuncAddr, commonAddr);
|
WARN_LOG(HLE, "%08x=sceKernelSetVTimerHandler(%08x, %08x, %08x, %08x)", error, uid, scheduleAddr, handlerFuncAddr, commonAddr);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -389,7 +389,7 @@ u32 sceKernelSetVTimerHandlerWide(u32 uid, u64 schedule, u32 handlerFuncAddr, u3
|
||||||
VTimer *vt = kernelObjects.Get<VTimer>(uid, error);
|
VTimer *vt = kernelObjects.Get<VTimer>(uid, error);
|
||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
WARN_LOG(HLE, "%08x=sceKernelSetVTimerHandlerWide(%08x, %llu, %08x, %08x)", uid, schedule, handlerFuncAddr, commonAddr);
|
WARN_LOG(HLE, "%08x=sceKernelSetVTimerHandlerWide(%08x, %llu, %08x, %08x)", error, uid, schedule, handlerFuncAddr, commonAddr);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -417,7 +417,7 @@ u32 sceKernelReferVTimerStatus(u32 uid, u32 statusAddr) {
|
||||||
VTimer *vt = kernelObjects.Get<VTimer>(uid, error);
|
VTimer *vt = kernelObjects.Get<VTimer>(uid, error);
|
||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
WARN_LOG(HLE, "%08x=sceKernelReferVTimerStatus(%08x, %08x)", uid, statusAddr);
|
WARN_LOG(HLE, "%08x=sceKernelReferVTimerStatus(%08x, %08x)", error, uid, statusAddr);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -236,9 +236,9 @@ u32 sceUmdRegisterUMDCallBack(u32 cbId)
|
||||||
return retVal;
|
return retVal;
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 sceUmdUnRegisterUMDCallBack(u32 cbId)
|
int sceUmdUnRegisterUMDCallBack(int cbId)
|
||||||
{
|
{
|
||||||
u32 retVal;
|
int retVal;
|
||||||
|
|
||||||
if (cbId != driveCBId)
|
if (cbId != driveCBId)
|
||||||
retVal = PSP_ERROR_UMD_INVALID_PARAM;
|
retVal = PSP_ERROR_UMD_INVALID_PARAM;
|
||||||
|
@ -387,7 +387,7 @@ const HLEFunction sceUmdUser[] =
|
||||||
{0x20628E6F,&WrapU_V<sceUmdGetErrorStat>,"sceUmdGetErrorStat"},
|
{0x20628E6F,&WrapU_V<sceUmdGetErrorStat>,"sceUmdGetErrorStat"},
|
||||||
{0x340B7686,WrapU_U<sceUmdGetDiscInfo>,"sceUmdGetDiscInfo"},
|
{0x340B7686,WrapU_U<sceUmdGetDiscInfo>,"sceUmdGetDiscInfo"},
|
||||||
{0xAEE7404D,&WrapU_U<sceUmdRegisterUMDCallBack>,"sceUmdRegisterUMDCallBack"},
|
{0xAEE7404D,&WrapU_U<sceUmdRegisterUMDCallBack>,"sceUmdRegisterUMDCallBack"},
|
||||||
{0xBD2BDE07,&WrapU_U<sceUmdUnRegisterUMDCallBack>,"sceUmdUnRegisterUMDCallBack"},
|
{0xBD2BDE07,&WrapI_I<sceUmdUnRegisterUMDCallBack>,"sceUmdUnRegisterUMDCallBack"},
|
||||||
{0x87533940,WrapU_V<sceUmdReplaceProhibit>,"sceUmdReplaceProhibit"},
|
{0x87533940,WrapU_V<sceUmdReplaceProhibit>,"sceUmdReplaceProhibit"},
|
||||||
{0x87533940,WrapU_V<sceUmdReplacePermit>,"sceUmdReplacePermit"},
|
{0x87533940,WrapU_V<sceUmdReplacePermit>,"sceUmdReplacePermit"},
|
||||||
};
|
};
|
||||||
|
|
|
@ -926,6 +926,7 @@ namespace MIPSInt
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
_dbg_assert_msg_(CPU,0,"Trying to interpret instruction that can't be interpreted");
|
_dbg_assert_msg_(CPU,0,"Trying to interpret instruction that can't be interpreted");
|
||||||
|
oz = V_Single;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
ApplyPrefixD((float*)d,oz);
|
ApplyPrefixD((float*)d,oz);
|
||||||
|
|
|
@ -100,7 +100,7 @@ static void EndVertexDataAndDraw(int prim) {
|
||||||
static u32 __PPGeDoAlloc(u32 &size, bool fromTop, const char *name) {
|
static u32 __PPGeDoAlloc(u32 &size, bool fromTop, const char *name) {
|
||||||
u32 ptr = kernelMemory.Alloc(size, fromTop, name);
|
u32 ptr = kernelMemory.Alloc(size, fromTop, name);
|
||||||
// Didn't get it.
|
// Didn't get it.
|
||||||
if (ptr == -1)
|
if (ptr == (u32)-1)
|
||||||
return 0;
|
return 0;
|
||||||
return ptr;
|
return ptr;
|
||||||
}
|
}
|
||||||
|
|
|
@ -444,7 +444,7 @@ void CreditsScreen::update(InputState &input_state) {
|
||||||
frames_++;
|
frames_++;
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *credits[] =
|
const static char *credits[] =
|
||||||
{
|
{
|
||||||
"PPSSPP",
|
"PPSSPP",
|
||||||
"",
|
"",
|
||||||
|
@ -509,7 +509,7 @@ void CreditsScreen::render() {
|
||||||
// TODO: This is kinda ugly, done on every frame...
|
// TODO: This is kinda ugly, done on every frame...
|
||||||
char temp[256];
|
char temp[256];
|
||||||
snprintf(temp, 256, "PPSSPP %s", PPSSPP_GIT_VERSION);
|
snprintf(temp, 256, "PPSSPP %s", PPSSPP_GIT_VERSION);
|
||||||
credits[0] = temp;
|
credits[0] = (const char *)temp;
|
||||||
|
|
||||||
UIShader_Prepare();
|
UIShader_Prepare();
|
||||||
UIBegin();
|
UIBegin();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue