More int comparison sign mismatch compiler warning fixes.

thor2016 · thor2016 · commit 7c3c3caf932c · 2023-01-28T20:24:17.000-05:00
diff --git a/src/boards/121.cpp b/src/boards/121.cpp
@@ -48,7 +48,7 @@ static void M121CW(uint32 A, uint8 V) {
 	if (PRGsize[0] == CHRsize[0]) {	// A9713 multigame extension hack!
 		setchr1(A, V | ((EXPREGS[3] & 0x80) << 1));
 	} else {
-		if ((A & 0x1000) == ((MMC3_cmd & 0x80) << 5))
+		if ((A & 0x1000) == static_cast<uint32>((MMC3_cmd & 0x80) << 5))
 			setchr1(A, V | 0x100);
 		else
 			setchr1(A, V);
diff --git a/src/boards/187.cpp b/src/boards/187.cpp
@@ -22,7 +22,7 @@
 #include "mmc3.h"
 
 static void M187CW(uint32 A, uint8 V) {
-	if ((A & 0x1000) == ((MMC3_cmd & 0x80) << 5))
+	if ((A & 0x1000) == static_cast<uint32>((MMC3_cmd & 0x80) << 5))
 		setchr1(A, V | 0x100);
 	else
 		setchr1(A, V);
diff --git a/src/cheat.cpp b/src/cheat.cpp
@@ -644,7 +644,7 @@ int FCEUI_ToggleCheat(uint32 which)
 
 int FCEUI_GlobalToggleCheat(int global_enabled)
 {
-	int _numsubcheats = numsubcheats;
+	unsigned int _numsubcheats = numsubcheats;
 	globalCheatDisabled = !global_enabled;
 	RebuildSubCheats();
 	return _numsubcheats != numsubcheats;
diff --git a/src/debug.cpp b/src/debug.cpp
@@ -642,7 +642,8 @@ uint16 StackNextIgnorePC = 0xFFFF;
 
 ///fires a breakpoint
 static void breakpoint(uint8 *opcode, uint16 A, int size) {
-	int i, j, romAddrPC;
+	int i, romAddrPC;
+	unsigned int j;
 	uint8 brk_type;
 	uint8 stackop=0;
 	uint8 stackopstartaddr=0,stackopendaddr=0;
@@ -783,7 +784,7 @@ static void breakpoint(uint8 *opcode, uint16 A, int size) {
 					{
 						if (watchpoint[i].flags & BT_R)
 						{
-							if ( (watchpoint[i].flags & WP_X) && (watchpoint[i].address == romAddrPC) )
+							if ( (watchpoint[i].flags & WP_X) && (watchpoint[i].address == static_cast<unsigned int>(romAddrPC)) )
 							{
 								BREAKHIT(i);
 							}
@@ -840,7 +841,7 @@ static void breakpoint(uint8 *opcode, uint16 A, int size) {
 							// Pushes to stack
 							if (watchpoint[i].flags & WP_W)
 							{
-								for (j = (X.S|0x0100); j < (StackAddrBackup|0x0100); j++)
+								for (j = (X.S|0x0100); j < (static_cast<unsigned int>(StackAddrBackup)|0x0100); j++)
 								{
 									if (watchpoint[i].endaddress)
 									{
diff --git a/src/drivers/Qt/TasEditor/greenzone.cpp b/src/drivers/Qt/TasEditor/greenzone.cpp
@@ -420,7 +420,7 @@ bool GREENZONE::load(EMUFILE *is, unsigned int offset)
 	// read LagLog
 	lagLog.load(is);
 	// read size
-	if (read32le(&size, is) && size <= currMovieData.getNumRecords())
+	if (read32le(&size, is) && size <= static_cast<unsigned int>(currMovieData.getNumRecords()))
 	{
 		greenzoneSize = size;
 		savestates.resize(greenzoneSize);
diff --git a/src/fceu.cpp b/src/fceu.cpp
@@ -744,7 +744,7 @@ void FCEUI_Emulate(uint8 **pXBuf, int32 **SoundBuf, int32 *SoundBufSize, int ski
 		{
 			EmulationPaused = EMULATIONPAUSED_FA;
 		}
-		if (frameAdvance_Delay_count < frameAdvanceDelayScaled)
+		if ( static_cast<unsigned int>(frameAdvance_Delay_count) < frameAdvanceDelayScaled)
 		{
 			frameAdvance_Delay_count++;
 		}
diff --git a/src/ines.cpp b/src/ines.cpp
@@ -394,7 +394,7 @@ static void CheckHInfo(uint64 partialmd5) {
 	int32 tofix = 0, x, mask;
 
 	MasterRomInfo = NULL;
-	for (int i = 0; i < ARRAY_SIZE(sMasterRomInfo); i++) {
+	for (size_t i = 0; i < ARRAY_SIZE(sMasterRomInfo); i++) {
 		const TMasterRomInfo& info = sMasterRomInfo[i];
 		if (info.md5lower != partialmd5)
 			continue;
@@ -403,7 +403,7 @@ static void CheckHInfo(uint64 partialmd5) {
 		if (!info.params) break;
 
 		std::vector<std::string> toks = tokenize_str(info.params, ",");
-		for (int j = 0; j < (int)toks.size(); j++) {
+		for (size_t j = 0; j < toks.size(); j++) {
 			std::vector<std::string> parts = tokenize_str(toks[j], "=");
 			MasterRomInfoParams[parts[0]] = parts[1];
 		}
@@ -978,7 +978,7 @@ int iNESLoad(const char *name, FCEUFILE *fp, int OverwriteVidMode) {
 		FCEU_printf("\n");
 	}
 
-	for (int mappertest = 0; mappertest < (sizeof bmap / sizeof bmap[0]) - 1; mappertest++) {
+	for (size_t mappertest = 0; mappertest < (sizeof bmap / sizeof bmap[0]) - 1; mappertest++) {
 		if (bmap[mappertest].number == MapperNo) {
 			mappername = bmap[mappertest].name;
 			break;
diff --git a/src/input.cpp b/src/input.cpp
@@ -989,12 +989,12 @@ struct EMUCMDTABLE FCEUI_CommandTable[]=
 
 #define NUM_EMU_CMDS		(sizeof(FCEUI_CommandTable)/sizeof(FCEUI_CommandTable[0]))
 
-static int execcmd, i;
+static int execcmd;
 
 void FCEUI_HandleEmuCommands(TestCommandState* testfn)
 {
 	bool taseditor = FCEUMOV_Mode(MOVIEMODE_TASEDITOR);
-	for(i=0; i<NUM_EMU_CMDS; ++i)
+	for(size_t i=0; i<NUM_EMU_CMDS; ++i)
 	{
 		int new_state;
 		int old_state = FCEUI_CommandTable[i].state;
@@ -1418,7 +1418,7 @@ static void TaseditorCommand(void)
 **/
 EMUCMDTABLE* GetEmuCommandById(int cmd)
 {
-	for (i = 0; i<NUM_EMU_CMDS; ++i)
+	for (size_t i = 0; i<NUM_EMU_CMDS; ++i)
 	{
 		if (FCEUI_CommandTable[i].cmd == cmd)
 			return &FCEUI_CommandTable[i];
diff --git a/src/lua-engine.cpp b/src/lua-engine.cpp
@@ -746,7 +746,7 @@ static int emu_addgamegenie(lua_State *L) {
 
 	while (FCEUI_GetCheat(i,NULL,&Caddr,&Cval,&Ccompare,NULL,&Ctype)) {
 
-		if ((GGaddr == Caddr) && (GGval == Cval) && (GGcomp == Ccompare) && (Ctype == 1)) {
+		if ((static_cast<uint32>(GGaddr) == Caddr) && (GGval == static_cast<int>(Cval)) && (GGcomp == Ccompare) && (Ctype == 1)) {
 			// Already Added, so consider it a success
 			lua_pushboolean(L, true);
 			return 1;
@@ -789,7 +789,7 @@ static int emu_delgamegenie(lua_State *L) {
 
 	while (FCEUI_GetCheat(i,&Cname,&Caddr,&Cval,&Ccompare,NULL,&Ctype)) {
 
-		if ((Cname == msg) && (GGaddr == Caddr) && (GGval == Cval) && (GGcomp == Ccompare) && (Ctype == 1)) {
+		if ((Cname == msg) && (static_cast<uint32>(GGaddr) == Caddr) && (GGval == static_cast<int>(Cval)) && (GGcomp == Ccompare) && (Ctype == 1)) {
 			// Delete cheat code
 			if (FCEUI_DelCheat(i)) {
 				lua_pushboolean(L, true);
@@ -1997,7 +1997,7 @@ static int memory_getregister(lua_State *L)
 {
 	const char* qualifiedRegisterName = luaL_checkstring(L,1);
 	lua_settop(L,0);
-	for(int cpu = 0; cpu < sizeof(cpuToRegisterMaps)/sizeof(*cpuToRegisterMaps); cpu++)
+	for(size_t cpu = 0; cpu < sizeof(cpuToRegisterMaps)/sizeof(*cpuToRegisterMaps); cpu++)
 	{
 		cpuToRegisterMap ctrm = cpuToRegisterMaps[cpu];
 		int cpuNameLen = strlen(ctrm.cpuName);
@@ -2031,7 +2031,7 @@ static int memory_setregister(lua_State *L)
 	const char* qualifiedRegisterName = luaL_checkstring(L,1);
 	unsigned long value = (unsigned long)(luaL_checkinteger(L,2));
 	lua_settop(L,0);
-	for(int cpu = 0; cpu < sizeof(cpuToRegisterMaps)/sizeof(*cpuToRegisterMaps); cpu++)
+	for(size_t cpu = 0; cpu < sizeof(cpuToRegisterMaps)/sizeof(*cpuToRegisterMaps); cpu++)
 	{
 		cpuToRegisterMap ctrm = cpuToRegisterMaps[cpu];
 		int cpuNameLen = strlen(ctrm.cpuName);
@@ -2247,7 +2247,7 @@ static void CallRegisteredLuaMemHook_LuaMatch(unsigned int address, int size, un
 #endif
 				lua_settop(L, 0);
 				lua_getfield(L, LUA_REGISTRYINDEX, luaMemHookTypeStrings[hookType]);
-				for(int i = address; i != address+size; i++)
+				for(unsigned int i = address; i != address+size; i++)
 				{
 					lua_rawgeti(L, -1, i);
 					if (lua_isfunction(L, -1))
@@ -3854,7 +3854,7 @@ static inline bool str2colour(uint32 *colour, lua_State *L, const char *str) {
 			*colour = ((rand()*255/RAND_MAX) << 8) | ((rand()*255/RAND_MAX) << 16) | ((rand()*255/RAND_MAX) << 24) | 0xFF;
 			return true;
 		}
-		for(int i = 0; i < sizeof(s_colorMapping)/sizeof(*s_colorMapping); i++) {
+		for(size_t i = 0; i < sizeof(s_colorMapping)/sizeof(*s_colorMapping); i++) {
 			if(!stricmp(str,s_colorMapping[i].name)) {
 				*colour = s_colorMapping[i].value;
 				return true;
diff --git a/src/movie.cpp b/src/movie.cpp
@@ -693,7 +693,7 @@ bool LoadFM2(MovieData& movieData, EMUFILE* fp, int size, bool stopAfterHeader)
 		{
 			LoadFM2_binarychunk(movieData, fp, size);
 			return true;
-		} else if (isnewline && movieData.loadFrameCount == movieData.records.size())
+		} else if (isnewline && static_cast<size_t>(movieData.loadFrameCount) == movieData.records.size())
 			// exit prematurely if loaded the specified amound of records
 			return true;
 		switch(state)
@@ -994,7 +994,7 @@ bool MovieData::loadSaveramFrom(std::vector<uint8>* buf)
 			return false;
 		}
 
-		if(currCartInfo->SaveGameLen[i] != len)
+		if(currCartInfo->SaveGameLen[i] != static_cast<unsigned int>(len))
 		{
 			FCEU_PrintError("movie battery load mismatch 3");
 			return false;
@@ -1267,7 +1267,7 @@ void FCEUMOV_AddInputState()
 		}
 
 		//if we are on the last frame, then pause the emulator if the player requested it
-		if (currFrameCounter == currMovieData.records.size()-1)
+		if ( static_cast<size_t>(currFrameCounter) == currMovieData.records.size()-1)
 		{
 			if(FCEUD_PauseAfterPlayback())
 			{
diff --git a/src/movie.h b/src/movie.h
@@ -214,7 +214,7 @@ class MovieData
 	//whether microphone is enabled
 	bool microphone;
 
-	int getNumRecords() { return (int)records.size(); }
+	int getNumRecords() { return static_cast<int>( records.size() ); }
 
 	int RAMInitOption, RAMInitSeed;
 

Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,7 @@ int FCEUI_ToggleCheat(uint32 which)`
`644`	`644`
`645`	`645`	`int FCEUI_GlobalToggleCheat(int global_enabled)`
`646`	`646`	`{`
`647`		`- int _numsubcheats = numsubcheats;`
	`647`	`+ unsigned int _numsubcheats = numsubcheats;`
`648`	`648`	`globalCheatDisabled = !global_enabled;`
`649`	`649`	`RebuildSubCheats();`
`650`	`650`	`return _numsubcheats != numsubcheats;`
Original file line number	Diff line number	Diff line change
`@@ -642,7 +642,8 @@ uint16 StackNextIgnorePC = 0xFFFF;`
`642`	`642`
`643`	`643`	`///fires a breakpoint`
`644`	`644`	`static void breakpoint(uint8 *opcode, uint16 A, int size) {`
`645`		`- int i, j, romAddrPC;`
	`645`	`+ int i, romAddrPC;`
	`646`	`+ unsigned int j;`
`646`	`647`	`uint8 brk_type;`
`647`	`648`	`uint8 stackop=0;`
`648`	`649`	`uint8 stackopstartaddr=0,stackopendaddr=0;`
`@@ -783,7 +784,7 @@ static void breakpoint(uint8 *opcode, uint16 A, int size) {`
`783`	`784`	`{`
`784`	`785`	`if (watchpoint[i].flags & BT_R)`
`785`	`786`	`{`
`786`		`- if ( (watchpoint[i].flags & WP_X) && (watchpoint[i].address == romAddrPC) )`
	`787`	`+ if ( (watchpoint[i].flags & WP_X) && (watchpoint[i].address == static_cast<unsigned int>(romAddrPC)) )`
`787`	`788`	`{`
`788`	`789`	`BREAKHIT(i);`
`789`	`790`	`}`
`@@ -840,7 +841,7 @@ static void breakpoint(uint8 *opcode, uint16 A, int size) {`
`840`	`841`	`// Pushes to stack`
`841`	`842`	`if (watchpoint[i].flags & WP_W)`
`842`	`843`	`{`
`843`		`- for (j = (X.S\|0x0100); j < (StackAddrBackup\|0x0100); j++)`
	`844`	`+ for (j = (X.S\|0x0100); j < (static_cast<unsigned int>(StackAddrBackup)\|0x0100); j++)`
`844`	`845`	`{`
`845`	`846`	`if (watchpoint[i].endaddress)`
`846`	`847`	`{`
Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ bool GREENZONE::load(EMUFILE *is, unsigned int offset)`
`420`	`420`	`// read LagLog`
`421`	`421`	`lagLog.load(is);`
`422`	`422`	`// read size`
`423`		`- if (read32le(&size, is) && size <= currMovieData.getNumRecords())`
	`423`	`+ if (read32le(&size, is) && size <= static_cast<unsigned int>(currMovieData.getNumRecords()))`
`424`	`424`	`{`
`425`	`425`	`greenzoneSize = size;`
`426`	`426`	`savestates.resize(greenzoneSize);`
Original file line number	Diff line number	Diff line change
`@@ -744,7 +744,7 @@ void FCEUI_Emulate(uint8 pXBuf, int32 SoundBuf, int32 *SoundBufSize, int ski`
`744`	`744`	`{`
`745`	`745`	`EmulationPaused = EMULATIONPAUSED_FA;`
`746`	`746`	`}`
`747`		`- if (frameAdvance_Delay_count < frameAdvanceDelayScaled)`
	`747`	`+ if ( static_cast<unsigned int>(frameAdvance_Delay_count) < frameAdvanceDelayScaled)`
`748`	`748`	`{`
`749`	`749`	`frameAdvance_Delay_count++;`
`750`	`750`	`}`
Original file line number	Diff line number	Diff line change
`@@ -989,12 +989,12 @@ struct EMUCMDTABLE FCEUI_CommandTable[]=`
`989`	`989`
`990`	`990`	`#define NUM_EMU_CMDS (sizeof(FCEUI_CommandTable)/sizeof(FCEUI_CommandTable[0]))`
`991`	`991`
`992`		`-static int execcmd, i;`
	`992`	`+static int execcmd;`
`993`	`993`
`994`	`994`	`void FCEUI_HandleEmuCommands(TestCommandState* testfn)`
`995`	`995`	`{`
`996`	`996`	`bool taseditor = FCEUMOV_Mode(MOVIEMODE_TASEDITOR);`
`997`		`- for(i=0; i<NUM_EMU_CMDS; ++i)`
	`997`	`+ for(size_t i=0; i<NUM_EMU_CMDS; ++i)`
`998`	`998`	`{`
`999`	`999`	`int new_state;`
`1000`	`1000`	`int old_state = FCEUI_CommandTable[i].state;`
`@@ -1418,7 +1418,7 @@ static void TaseditorCommand(void)`
`1418`	`1418`	`**/`
`1419`	`1419`	`EMUCMDTABLE* GetEmuCommandById(int cmd)`
`1420`	`1420`	`{`
`1421`		`- for (i = 0; i<NUM_EMU_CMDS; ++i)`
	`1421`	`+ for (size_t i = 0; i<NUM_EMU_CMDS; ++i)`
`1422`	`1422`	`{`
`1423`	`1423`	`if (FCEUI_CommandTable[i].cmd == cmd)`
`1424`	`1424`	`return &FCEUI_CommandTable[i];`
Original file line number	Diff line number	Diff line change
`@@ -693,7 +693,7 @@ bool LoadFM2(MovieData& movieData, EMUFILE* fp, int size, bool stopAfterHeader)`
`693`	`693`	`{`
`694`	`694`	`LoadFM2_binarychunk(movieData, fp, size);`
`695`	`695`	`return true;`
`696`		`- } else if (isnewline && movieData.loadFrameCount == movieData.records.size())`
	`696`	`+ } else if (isnewline && static_cast<size_t>(movieData.loadFrameCount) == movieData.records.size())`
`697`	`697`	`// exit prematurely if loaded the specified amound of records`
`698`	`698`	`return true;`
`699`	`699`	`switch(state)`
`@@ -994,7 +994,7 @@ bool MovieData::loadSaveramFrom(std::vector<uint8>* buf)`
`994`	`994`	`return false;`
`995`	`995`	`}`
`996`	`996`
`997`		`- if(currCartInfo->SaveGameLen[i] != len)`
	`997`	`+ if(currCartInfo->SaveGameLen[i] != static_cast<unsigned int>(len))`
`998`	`998`	`{`
`999`	`999`	`FCEU_PrintError("movie battery load mismatch 3");`
`1000`	`1000`	`return false;`
`@@ -1267,7 +1267,7 @@ void FCEUMOV_AddInputState()`
`1267`	`1267`	`}`
`1268`	`1268`
`1269`	`1269`	`//if we are on the last frame, then pause the emulator if the player requested it`
`1270`		`- if (currFrameCounter == currMovieData.records.size()-1)`
	`1270`	`+ if ( static_cast<size_t>(currFrameCounter) == currMovieData.records.size()-1)`
`1271`	`1271`	`{`
`1272`	`1272`	`if(FCEUD_PauseAfterPlayback())`
`1273`	`1273`	`{`