Fix some warnings generated by clang.

This commit is contained in:
Unknown W. Brackets 2013-02-24 10:23:31 -08:00
parent 8ea497d59a
commit 64c42ffaf2
12 changed files with 14 additions and 24 deletions

View file

@ -471,6 +471,8 @@ void AdvanceQuick()
globalTimer += cyclesExecuted;
currentMIPS->downcount = slicelength;
ProcessFifoWaitEvents();
if (!first)
{
// WARN_LOG(CPU, "WARNING - no events in queue. Setting currentMIPS->downcount to 10000");
@ -478,8 +480,6 @@ void AdvanceQuick()
}
else
{
ProcessFifoWaitEvents();
slicelength = (int)(first->time - globalTimer);
if (slicelength > MAX_SLICE_LENGTH)
slicelength = MAX_SLICE_LENGTH;

View file

@ -203,7 +203,6 @@ void ISOFileSystem::ReadDirectory(u32 startsector, u32 dirsize, TreeEntry *root)
bool isFile = (dir.flags & 2) ? false : true;
bool relative;
int fnLength = dir.identifierLength;
TreeEntry *e = new TreeEntry();
if (dir.identifierLength == 1 && (dir.firstIdChar == '\x00' || dir.firstIdChar == '.'))

View file

@ -64,7 +64,7 @@ void HLEInit()
void HLEDoState(PointerWrap &p)
{
Syscall sc = {0};
Syscall sc = {""};
p.Do(unresolvedSyscalls, sc);
p.Do(exportedCalls, sc);
p.DoMarker("HLE");

View file

@ -395,10 +395,11 @@ u32 sceAtracGetStreamDataInfo(int atracID, u32 writeAddr, u32 writableBytesAddr,
Atrac *atrac = getAtrac(atracID);
if (!atrac) {
//return -1;
} else {
Memory::Write_U32(atrac->first.addr, writeAddr);
Memory::Write_U32(atrac->first.writableBytes, writableBytesAddr);
Memory::Write_U32(atrac->first.fileoffset, readOffsetAddr);
}
Memory::Write_U32(atrac->first.addr, writeAddr);
Memory::Write_U32(atrac->first.writableBytes, writableBytesAddr);
Memory::Write_U32(atrac->first.fileoffset, readOffsetAddr);
return 0;
}

View file

@ -2805,7 +2805,7 @@ std::vector<DebugThreadInfo> GetThreadsInfo()
DebugThreadInfo info;
info.id = *iter;
strncpy(info.name,t->GetName(),KERNELOBJECT_MAX_NAME_LENGTH);
info.name[KERNELOBJECT_MAX_NAME_LENGTH+1] = 0;
info.name[KERNELOBJECT_MAX_NAME_LENGTH] = 0;
info.status = t->nt.status;
info.entrypoint = t->nt.entrypoint;
if(*iter == currentThread)

View file

@ -833,7 +833,7 @@ int sceMpegAvcDecodeYCbCr(u32 mpeg, u32 auAddr, u32 bufferAddr, u32 initAddr)
{
MpegContext *ctx = getMpegCtx(mpeg);
if (!ctx) {
WARN_LOG(HLE, "sceMpegAvcDecodeYCbCr(%08x, %08x, %d, %08x, %08x): bad mpeg handle", mpeg, auAddr, bufferAddr, initAddr);
WARN_LOG(HLE, "sceMpegAvcDecodeYCbCr(%08x, %08x, %08x, %08x): bad mpeg handle", mpeg, auAddr, bufferAddr, initAddr);
return 0;
}

View file

@ -128,7 +128,6 @@ int sceUmdActivate(u32 unknown, const char *name)
if (unknown < 1 || unknown > 2)
return PSP_ERROR_UMD_INVALID_PARAM;
bool changed = umdActivated == 0;
__KernelUmdActivate();
if (unknown == 1)
@ -152,7 +151,6 @@ int sceUmdDeactivate(u32 unknown, const char *name)
if (unknown > 18)
return PSP_ERROR_UMD_INVALID_PARAM;
bool changed = umdActivated != 0;
__KernelUmdDeactivate();
if (unknown == 1)

View file

@ -38,7 +38,7 @@ static const int allocationOrder[] =
#endif
};
GPRRegCache::GPRRegCache() : emit(0), mips(0) {
GPRRegCache::GPRRegCache() : mips(0), emit(0) {
memset(regs, 0, sizeof(regs));
memset(xregs, 0, sizeof(xregs));
}

View file

@ -23,7 +23,7 @@
u32 FPURegCache::tempValues[NUM_TEMPS];
FPURegCache::FPURegCache() : emit(0), mips(0) {
FPURegCache::FPURegCache() : mips(0), emit(0) {
memset(regs, 0, sizeof(regs));
memset(xregs, 0, sizeof(xregs));
vregs = regs + 32;

View file

@ -677,7 +677,6 @@ void TextureCache::SetTexture() {
}
bool hasClut = formatUsesClut[format];
const u8 *texptr = Memory::GetPointer(texaddr);
u64 cachekey = texaddr;
u32 clutformat, clutaddr;
@ -1150,14 +1149,8 @@ bool TextureCache::DecodeTexture(u8* output, GPUgstate state)
}
u32 clutformat = gstate.clutformat & 3;
u32 clutaddr = GetClutAddr(clutformat == GE_CMODE_32BIT_ABGR8888 ? 4 : 2);
const u8 *texptr = Memory::GetPointer(texaddr);
u32 texhash = texptr ? MiniHash((const u32*)texptr) : 0;
u64 cachekey = texaddr ^ texhash;
if (formatUsesClut[format])
cachekey |= (u64) clutaddr << 32;
int bufw = gstate.texbufwidth[0] & 0x3ff;

View file

@ -660,10 +660,6 @@ void TransformDrawEngine::SoftwareTransformAndDraw(
numTrans = vertexCount;
drawIndexed = true;
} else {
// Temporary storage for RECTANGLES emulation
float v2[3] = {0};
float uv2[2] = {0};
numTrans = 0;
drawBuffer = transformedExpanded;
TransformedVertex *trans = &transformedExpanded[0];

View file

@ -64,6 +64,9 @@ void InitGfxState()
case GPU_GLES:
gpu = new GLES_GPU();
break;
case GPU_SOFTWARE:
gpu = new NullGPU();
break;
}
}