Merge pull request #5076 from unknownbrackets/warnings

Fix some warnings

Core/HLE/sceAtrac.cpp

@@ -105,7 +105,7 @@ struct AtracLoopInfo {
 struct Atrac {
 	Atrac() : atracID(-1), data_buf(0), decodePos(0), decodeEnd(0), atracChannels(0), atracOutputChannels(2),
 		atracBitrate(64), atracBytesPerFrame(0), atracBufSize(0),
-		currentSample(0), endSample(0), firstSampleoffset(0), loopinfoNum(0), loopNum(0), codecType(0), failedDecode(false) {
+		currentSample(0), endSample(0), firstSampleoffset(0), loopinfoNum(0), loopNum(0), failedDecode(false), codecType(0) {
 		memset(&first, 0, sizeof(first));
 		memset(&second, 0, sizeof(second));
 #ifdef USE_FFMPEG

Core/HLE/sceMpeg.cpp

@@ -1378,7 +1378,7 @@ u32 sceMpegAtracDecode(u32 mpeg, u32 auAddr, u32 bufferAddr, int init)
 // YCbCr -> RGB color space conversion
 u32 sceMpegAvcCsc(u32 mpeg, u32 sourceAddr, u32 rangeAddr, int frameWidth, u32 destAddr)
 {
-	if (!Memory::IsValidAddress(sourceAddr) || !Memory::IsValidAddress(rangeAddr) && !Memory::IsValidAddress(destAddr)) {
+	if (!Memory::IsValidAddress(sourceAddr) || !Memory::IsValidAddress(rangeAddr) || !Memory::IsValidAddress(destAddr)) {
 		ERROR_LOG(ME, "sceMpegAvcCsc(%08x, %08x, %08x, %i, %08x): invalid addresses", mpeg, sourceAddr, rangeAddr, frameWidth, destAddr);
 		return -1;
 	}

Core/HW/SasAudio.cpp

@@ -728,12 +728,12 @@ ADSREnvelope::ADSREnvelope()
 		sustainType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_INCREASE),
 		sustainLevel(0x100),
 		releaseType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_DECREASE),
+		rate_(0),
+		type_(0),
+		invDuration_(0),
 		state_(STATE_OFF),
 		steps_(0),
-		height_(0),
+		height_(0) {
-		type_(0),
-		rate_(0),
-		invDuration_(0) {
 }
 
 void ADSREnvelope::WalkCurve(int type) {

Core/MIPS/JitCommon/JitState.h

@@ -52,10 +52,10 @@ namespace MIPSComp {
 		};
 
 		JitState()
-			: prefixSFlag(PREFIX_UNKNOWN),
+			: startDefaultPrefix(true),
+			prefixSFlag(PREFIX_UNKNOWN),
 			prefixTFlag(PREFIX_UNKNOWN),
-			prefixDFlag(PREFIX_UNKNOWN),
+			prefixDFlag(PREFIX_UNKNOWN) {}
-			startDefaultPrefix(true) {}
 
 		u32 compilerPC;
 		u32 blockStart;

GPU/Common/TextureDecoder.cpp

@@ -69,6 +69,8 @@ static u32 QuickTexHashBasic(const void *checkp, u32 size) {
 		"add %1, %1, %2\n"
 		"mov r6, #0\n"
 
+		".align 2\n"
+
 		// If we have zero sized input, we'll return garbage.  Oh well, shouldn't happen.
 		"QuickTexHashBasic_next:\n"
 		"ldmia %2!, {r2-r5}\n"
@@ -79,6 +81,8 @@ static u32 QuickTexHashBasic(const void *checkp, u32 size) {
 		"eor r6, r6, r5\n"
 		"blo QuickTexHashBasic_next\n"
 
+		".align 2\n"
+
 		"QuickTexHashBasic_done:\n"
 		"mov %0, r6\n"
 

GPU/GLES/Framebuffer.cpp

@@ -297,11 +297,11 @@ FramebufferManager::FramebufferManager() :
 	postShaderProgram_(0),
 	plainColorLoc_(-1),
 	timeLoc_(-1),
-	postShaderAtOutputResolution_(false),
-	resized_(false),
 	textureCache_(0),
 	shaderManager_(0),
-	usePostShader_(false)
+	usePostShader_(false),
+	postShaderAtOutputResolution_(false),
+	resized_(false)
 #ifndef USING_GLES2
 	,
 	pixelBufObj_(0),

GPU/GLES/TransformPipeline.cpp

@@ -123,8 +123,8 @@ TransformDrawEngine::TransformDrawEngine()
 		framebufferManager_(0),
 		numDrawCalls(0),
 		vertexCountInDrawCalls(0),
-		uvScale(0),
+		decodeCounter_(0),
-		decodeCounter_(0) {
+		uvScale(0) {
 	decimationCounter_ = VERTEXCACHE_DECIMATION_INTERVAL;
 	// Allocate nicely aligned memory. Maybe graphics drivers will
 	// appreciate it.

UI/GameInfoCache.h

@@ -45,8 +45,9 @@ enum GameRegion {
 class GameInfo {
 public:
 	GameInfo()
-		: fileType(FILETYPE_UNKNOWN), paramSFOLoaded(false), iconTexture(NULL), pic0Texture(NULL), pic1Texture(NULL),
+		: disc_total(0), disc_number(0), region(-1), fileType(FILETYPE_UNKNOWN), paramSFOLoaded(false),
-			wantBG(false), gameSize(0), saveDataSize(0), installDataSize(0), disc_total(0), disc_number(0), region(-1) {}
+		  iconTexture(NULL), pic0Texture(NULL), pic1Texture(NULL), wantBG(false),
+		  gameSize(0), saveDataSize(0), installDataSize(0) {}
 
 	bool DeleteGame();  // Better be sure what you're doing when calling this.
 	bool DeleteAllSaveData();

UI/Store.cpp

@@ -15,7 +15,7 @@ const std::string storeBaseUrl = "http://store.ppsspp.org/";
 class ProductItemView : public UI::Choice {
 public:
 	ProductItemView(const StoreEntry &entry, UI::LayoutParams *layoutParams = 0)
-		: entry_(entry), UI::Choice(entry.name, layoutParams) {}
+		: UI::Choice(entry.name, layoutParams), entry_(entry) {}
 
 	virtual void GetContentDimensions(const UIContext &dc, float &w, float &h) const {
 		w = 300;