diff --git a/Core/Debugger/DisassemblyManager.cpp b/Core/Debugger/DisassemblyManager.cpp index 2dd0def532..2b75d5dbce 100644 --- a/Core/Debugger/DisassemblyManager.cpp +++ b/Core/Debugger/DisassemblyManager.cpp @@ -168,7 +168,7 @@ void DisassemblyManager::analyze(u32 address, u32 size = 1024) u32 next = symbolMap.GetNextSymbolAddress(address,ST_ALL); - if ((next % 4) && next != -1) + if ((next % 4) && next != (u32)-1) { u32 alignedNext = next & ~3; @@ -205,6 +205,8 @@ void DisassemblyManager::analyze(u32 address, u32 size = 1024) address = info.address+info.size; } break; + default: + break; } } @@ -524,6 +526,8 @@ void DisassemblyFunction::load() case LINE_UP: branchTargets.insert(lines[i].first); break; + default: + break; } } @@ -625,6 +629,8 @@ void DisassemblyFunction::load() case MEMTYPE_VQUAD: dataSize = 16; break; + default: + return; } macro->setMacroMemory(MIPSGetName(next),immediate,rt,dataSize); @@ -968,6 +974,8 @@ void DisassemblyData::createLines() pos += 4; } break; + default: + break; } size_t len = strlen(buffer); diff --git a/Core/FileSystems/BlockDevices.cpp b/Core/FileSystems/BlockDevices.cpp index e20c2a0ba5..a3484066ca 100644 --- a/Core/FileSystems/BlockDevices.cpp +++ b/Core/FileSystems/BlockDevices.cpp @@ -351,7 +351,7 @@ bool NPDRMDemoBlockDevice::ReadBlock(int blockNumber, u8 *outPtr) currentBlock = block*blockLBAs; if(table[block].unk_1c!=0){ - if(block==(numBlocks-1)) + if((u32)block==(numBlocks-1)) return true; // demos make by fake_np else return false; @@ -366,7 +366,7 @@ bool NPDRMDemoBlockDevice::ReadBlock(int blockNumber, u8 *outPtr) readSize = fread(readBuf, 1, table[block].size, f); if(readSize != (size_t)table[block].size){ - if(block==(numBlocks-1)) + if((u32)block==(numBlocks-1)) return true; else return false; diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp index 78b9a9c271..b6b15d02e0 100644 --- a/Core/HLE/sceFont.cpp +++ b/Core/HLE/sceFont.cpp @@ -259,7 +259,7 @@ public: } LoadedFont(Font *font, FontOpenMode mode, u32 fontLibID, u32 handle) - : fontLibID_(fontLibID), font_(font), handle_(handle), open_(true), mode_(mode) {} + : fontLibID_(fontLibID), font_(font), handle_(handle), mode_(mode), open_(true) {} ~LoadedFont() { switch (mode_) { diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 123e79af6f..96643fb443 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -62,7 +62,7 @@ bool SimpleAudio::GetAudioCodecID(int audioType) { } SimpleAudio::SimpleAudio(int audioType, int sample_rate, int channels) -: ctxPtr(0xFFFFFFFF), audioType(audioType), sample_rate_(sample_rate), channels_(channels), codec_(0), codecCtx_(0), swrCtx_(0), outSamples(0), srcPos(0), wanted_resample_freq(44100), extradata_(0) { +: ctxPtr(0xFFFFFFFF), audioType(audioType), sample_rate_(sample_rate), channels_(channels), outSamples(0), srcPos(0), wanted_resample_freq(44100), codec_(0), codecCtx_(0), swrCtx_(0), extradata_(0) { Init(); } @@ -404,17 +404,17 @@ int AuCtx::AuCheckStreamDataNeeded() u32 AuCtx::AuNotifyAddStreamData(int size) { realReadSize = size; - int diffszie = realReadSize - askedReadSize; + int diffsize = realReadSize - askedReadSize; // Notify the real read size - if (diffszie != 0){ - readPos += diffszie; - AuBufAvailable += diffszie; + if (diffsize != 0){ + readPos += diffsize; + AuBufAvailable += diffsize; } // append AuBuf into sourcebuff sourcebuff.append((const char*)Memory::GetPointer(AuBuf), size); - if (readPos >= endPos && LoopNum != 0){ + if (readPos >= (int)endPos && LoopNum != 0){ // if we need loop, reset readPos readPos = startPos; // reset LoopNum diff --git a/Qt/Debugger/debugger_displaylist.cpp b/Qt/Debugger/debugger_displaylist.cpp index 609beffb5a..ac2df3405d 100644 --- a/Qt/Debugger/debugger_displaylist.cpp +++ b/Qt/Debugger/debugger_displaylist.cpp @@ -112,9 +112,9 @@ void Debugger_DisplayList::ShowDLCode() FillDisplayListCmd(data, startPc,0, listState); - u32 curTexAddr; - u32 curVtxAddr; - u32 curIdxAddr; + u32 curTexAddr = 0; + u32 curVtxAddr = 0; + u32 curIdxAddr = 0; for(std::map::iterator it = data.begin(); it != data.end(); it++) { diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro index 502f8369cd..1b8aa21207 100644 --- a/Qt/PPSSPP.pro +++ b/Qt/PPSSPP.pro @@ -80,7 +80,7 @@ SOURCES += $$P/UI/*Screen.cpp \ arm:android: SOURCES += $$P/android/jni/ArmEmitterTest.cpp HEADERS += $$P/UI/*.h -INCLUDEPATH += $$P $$P/Common $$P/native $$P/native/ext +INCLUDEPATH += $$P $$P/Common $$P/native $$P/native/ext $$P/native/ext/glew mobile_platform: RESOURCES += $$P/Qt/assets.qrc else { diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp index 9e7c904264..33abf2d016 100644 --- a/UI/BackgroundAudio.cpp +++ b/UI/BackgroundAudio.cpp @@ -15,11 +15,11 @@ class AT3PlusReader { public: AT3PlusReader(const std::string &data) : data_(data), - raw_offset_(0), file_((const uint8_t *)&data[0], (int32_t)data.size()), raw_data_(0), raw_data_size_(0), + raw_offset_(0), buffer_(0), decoder_(0) { @@ -123,7 +123,7 @@ public: bool Read(short *buffer, int len) { if (!raw_data_) return false; - while (bgQueue.size() < len * 2) { + while (bgQueue.size() < (size_t)(len * 2)) { int outBytes; decoder_->Decode(raw_data_ + raw_offset_, raw_bytes_per_frame_, (uint8_t *)buffer_, &outBytes); if (!outBytes) @@ -205,4 +205,5 @@ int MixBackgroundAudio(short *buffer, int size) { memset(buffer, 0, size * 2 * sizeof(s16)); } return 0; -} \ No newline at end of file +} + diff --git a/UI/MainScreen.h b/UI/MainScreen.h index 76ed9ee00c..d49bf6e519 100644 --- a/UI/MainScreen.h +++ b/UI/MainScreen.h @@ -69,8 +69,8 @@ private: std::string prevHighlightedGamePath_; float highlightProgress_; float prevHighlightProgress_; - bool lockBackgroundAudio_; bool backFromStore_; + bool lockBackgroundAudio_; bool lastVertical_; bool UseVerticalLayout() const; diff --git a/native b/native index 84df417a01..d1cccf2c26 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 84df417a01c425c64cd7d5dfe44a598a72c94611 +Subproject commit d1cccf2c26193740c7ce6836dab3afc7a6a5a118