Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix some type comparison warnings.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-11-27 22:30:48 -08:00
parent a69ddf840c
commit dd2e996838
7 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/Debugger/DisassemblyManager.cpp
View file

@ -959,7 +959,7 @@ void DisassemblyData::createLines()
break;
}
int len = strlen(buffer);
size_t len = strlen(buffer);
if (currentLine.size() != 0 && currentLine.size()+len >= maxChars)
{
DataEntry entry = {currentLine,currentPos-currentLineStart,lineCount++};

34
Core/Debugger/SymbolMap.cpp
View file

@ -228,8 +228,8 @@ SymbolType SymbolMap::GetSymbolType(u32 address) const
bool SymbolMap::GetSymbolInfo(SymbolInfo *info, u32 address, SymbolType symmask) const
{
u32 functionAddress = -1;
u32 dataAddress = -1;
u32 functionAddress = INVALID_ADDRESS;
u32 dataAddress = INVALID_ADDRESS;
if (symmask & ST_FUNCTION)
functionAddress = GetFunctionStart(address);
@ -237,9 +237,9 @@ bool SymbolMap::GetSymbolInfo(SymbolInfo *info, u32 address, SymbolType symmask)
if (symmask & ST_DATA)
dataAddress = GetDataStart(address);
if (functionAddress == -1 || dataAddress == -1)
if (functionAddress == INVALID_ADDRESS || dataAddress == INVALID_ADDRESS)
{
if (functionAddress != -1)
if (functionAddress != INVALID_ADDRESS)
{
if (info != NULL)
{
@ -251,7 +251,7 @@ bool SymbolMap::GetSymbolInfo(SymbolInfo *info, u32 address, SymbolType symmask)
return true;
}
if (dataAddress != -1)
if (dataAddress != INVALID_ADDRESS)
{
if (info != NULL)
{
@ -283,7 +283,7 @@ u32 SymbolMap::GetNextSymbolAddress(u32 address, SymbolType symmask)
const auto dataEntry = symmask & ST_DATA ? data.upper_bound(address) : data.end();
if (functionEntry == functions.end() && dataEntry == data.end())
return -1;
return INVALID_ADDRESS;
u32 funcAddress = (functionEntry != functions.end()) ? functionEntry->first : 0xFFFFFFFF;
u32 dataAddress = (dataEntry != data.end()) ? dataEntry->first : 0xFFFFFFFF;
@ -302,12 +302,12 @@ const char *SymbolMap::GetDescription(unsigned int address) const
const char* labelName = NULL;
u32 funcStart = GetFunctionStart(address);
if (funcStart != -1)
if (funcStart != INVALID_ADDRESS)
{
labelName = GetLabelName(funcStart);
} else {
u32 dataStart = GetDataStart(address);
if (dataStart != -1)
if (dataStart != INVALID_ADDRESS)
labelName = GetLabelName(dataStart);
}
@ -384,7 +384,7 @@ u32 SymbolMap::GetFunctionStart(u32 address) const
}
// otherwise there's no function that contains this address
return -1;
return INVALID_ADDRESS;
}
if (it != functions.begin())
@ -397,14 +397,14 @@ u32 SymbolMap::GetFunctionStart(u32 address) const
return start;
}
return -1;
return INVALID_ADDRESS;
}
u32 SymbolMap::GetFunctionSize(u32 startAddress) const
{
auto it = functions.find(startAddress);
if (it == functions.end())
return -1;
return INVALID_ADDRESS;
return it->second.size;
}
@ -412,12 +412,12 @@ u32 SymbolMap::GetFunctionSize(u32 startAddress) const
int SymbolMap::GetFunctionNum(u32 address) const
{
u32 start = GetFunctionStart(address);
if (start == -1)
return -1;
if (start == INVALID_ADDRESS)
return INVALID_ADDRESS;
auto it = functions.find(start);
if (it == functions.end())
return -1;
return INVALID_ADDRESS;
return it->second.index;
}
@ -548,7 +548,7 @@ u32 SymbolMap::GetDataStart(u32 address) const
}
// otherwise there's no data that contains this address
return -1;
return INVALID_ADDRESS;
}
if (it != data.begin())
@ -561,14 +561,14 @@ u32 SymbolMap::GetDataStart(u32 address) const
return start;
}
return -1;
return INVALID_ADDRESS;
}
u32 SymbolMap::GetDataSize(u32 startAddress) const
{
auto it = data.find(startAddress);
if (it == data.end())
return -1;
return INVALID_ADDRESS;
return it->second.size;
}

2
Core/Debugger/SymbolMap.h
View file

@ -86,6 +86,8 @@ public:
u32 GetDataStart(u32 address) const;
u32 GetDataSize(u32 startAddress) const;
DataType GetDataType(u32 startAddress) const;
static const u32 INVALID_ADDRESS = (u32)-1;
private:
void AssignFunctionIndices();

10
Core/HLE/proAdhoc.cpp
View file

@ -289,7 +289,7 @@ int friendFinder(){
// BSSID Packet
if(rx[0] == OPCODE_CONNECT_BSSID) {
// Enough Data available
if(rxpos >= sizeof(SceNetAdhocctlConnectBSSIDPacketS2C)) {
if(rxpos >= (int)sizeof(SceNetAdhocctlConnectBSSIDPacketS2C)) {
// Cast Packet
SceNetAdhocctlConnectBSSIDPacketS2C * packet = (SceNetAdhocctlConnectBSSIDPacketS2C *)rx;
// Update BSSID
@ -310,7 +310,7 @@ int friendFinder(){
// Chat Packet
else if(rx[0] == OPCODE_CHAT) {
// Enough Data available
if(rxpos >= sizeof(SceNetAdhocctlChatPacketS2C)) {
if(rxpos >= (int)sizeof(SceNetAdhocctlChatPacketS2C)) {
// Cast Packet
SceNetAdhocctlChatPacketS2C * packet = (SceNetAdhocctlChatPacketS2C *)rx;
@ -331,7 +331,7 @@ int friendFinder(){
// Connect Packet
else if(rx[0] == OPCODE_CONNECT) {
// Enough Data available
if(rxpos >= sizeof(SceNetAdhocctlConnectPacketS2C)) {
if(rxpos >= (int)sizeof(SceNetAdhocctlConnectPacketS2C)) {
// Log Incoming Peer
INFO_LOG(SCENET,"Incoming Peer Data...");
@ -359,7 +359,7 @@ int friendFinder(){
// Disconnect Packet
else if(rx[0] == OPCODE_DISCONNECT) {
// Enough Data available
if(rxpos >= sizeof(SceNetAdhocctlDisconnectPacketS2C)) {
if(rxpos >= (int)sizeof(SceNetAdhocctlDisconnectPacketS2C)) {
// Log Incoming Peer Delete Request
INFO_LOG(SCENET,"FriendFinder: Incoming Peer Data Delete Request...");
@ -387,7 +387,7 @@ int friendFinder(){
// Scan Packet
else if(rx[0] == OPCODE_SCAN) {
// Enough Data available
if(rxpos >= sizeof(SceNetAdhocctlScanPacketS2C)) {
if(rxpos >= (int)sizeof(SceNetAdhocctlScanPacketS2C)) {
// Log Incoming Network Information
INFO_LOG(SCENET,"Incoming Group Information...");
// Cast Packet

4
Core/HLE/sceNetAdhoc.cpp
View file

@ -852,7 +852,7 @@ int sceNetAdhocctlTerm() {
}
// Free sttuf here
closesocket(metasocket);
metasocket = INVALID_SOCKET;
metasocket = (int)INVALID_SOCKET;
#ifdef _MSC_VER
WSACleanup();
#endif
@ -1091,7 +1091,7 @@ int sceNetAdhocPtpOpen(const char *srcmac, int sport, const char *dstmac, int dp
// Valid Arguments
if(bufsize > 0 && rexmt_int > 0 && rexmt_cnt > 0) {
// Create Infrastructure Socket
int tcpsocket = INVALID_SOCKET;
int tcpsocket = (int)INVALID_SOCKET;
tcpsocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
// Valid Socket produced

2
Core/MIPS/MIPS.cpp
View file

@ -151,7 +151,7 @@ MIPSState::MIPSState()
0x6, 0x26, 0x46, 0x66,
0x7, 0x27, 0x47, 0x67,
};
for (int i = 0; i < ARRAY_SIZE(firstThirtyTwo); i++) {
for (int i = 0; i < (int)ARRAY_SIZE(firstThirtyTwo); i++) {
if (voffset[firstThirtyTwo[i]] != i) {
ERROR_LOG(CPU, "Wrong voffset order! %i: %i should have been %i", firstThirtyTwo[i], voffset[firstThirtyTwo[i]], i);
}

2
Windows/Debugger/Debugger_Disasm.cpp
View file

@ -186,7 +186,7 @@ void CDisasm::stepInto()
}
}
for (int i = 0; i < (newAddress-currentPc)/4; i++)
for (u32 i = 0; i < (newAddress-currentPc)/4; i++)
{
Core_DoSingleStep();
Sleep(1);