preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-26 16:54:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4666 from unknownbrackets/warnings

Browse Source 
Minor warning fixes
This commit is contained in:
Henrik Rydgård
2013-12-01 11:39:27 -08:00
parent 8af036eb1f df73b8a2a6
commit 7bdca82dca
12 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -155,7 +155,7 @@ if(NOT MSVC)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -parallel -fopenmp")
endif()
if(NOT APPLE)
if (NOT CMAKE_C_COMPILER_ID STREQUAL "Intel")
if (NOT CMAKE_C_COMPILER_ID STREQUAL "Intel" AND NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
add_definitions(-Wno-psabi)
endif()
add_definitions(-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1)
Core/Debugger/DisassemblyManager.cpp
+1 -1
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++};
Core/Debugger/SymbolMap.cpp
+21 -17
View File
@@ -119,6 +119,10 @@ bool SymbolMap::LoadSymbolMap(const char *filename)
if (name[0] != 0)
AddLabel(name,vaddress);
break;
case ST_NONE:
case ST_ALL:
// Shouldn't be possible.
break;
}
}
}
@@ -228,8 +232,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 +241,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 +255,7 @@ bool SymbolMap::GetSymbolInfo(SymbolInfo *info, u32 address, SymbolType symmask)
return true;
}
if (dataAddress != -1)
if (dataAddress != INVALID_ADDRESS)
{
if (info != NULL)
{
@@ -283,7 +287,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 +306,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 +388,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 +401,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 +416,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 +552,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 +565,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;
}
Core/Debugger/SymbolMap.h
+2
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();
Core/HLE/proAdhoc.cpp
+5 -5
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
Core/HLE/sceNetAdhoc.cpp
+2 -2
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
Core/MIPS/MIPS.cpp
+1 -1
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);
}
Core/MIPS/MIPSDisVFPU.cpp
+1 -1
View File
@@ -532,7 +532,7 @@ namespace MIPSDis
int vs = _VS;
int imm = (int)((op >> 16) & 0xFF);
const char *name = MIPSGetName(op);
sprintf(out, "%s%s\t%s, %s", name, VSuff(op), VN(vd, sz), VN(vs, sz), imm);
sprintf(out, "%s%s\t%s, %s, %d", name, VSuff(op), VN(vd, sz), VN(vs, sz), imm);
}
void Dis_Vf2h(MIPSOpcode op, char *out)
GPU/Common/TextureDecoder.cpp
+2 -6
View File
@@ -24,12 +24,10 @@
#ifdef _M_SSE
#include <xmmintrin.h>
#endif
static u32 QuickTexHashSSE2(const void *checkp, u32 size) {
u32 check = 0;
#ifdef _M_SSE
if (((intptr_t)checkp & 0xf) == 0 && (size & 0x3f) == 0) {
__m128i cursor = _mm_set1_epi32(0);
__m128i cursor2 = _mm_set_epi16(0x0001U, 0x0083U, 0x4309U, 0x4d9bU, 0xb651U, 0x4b73U, 0x9bd9U, 0xc00bU);
@@ -50,9 +48,6 @@ static u32 QuickTexHashSSE2(const void *checkp, u32 size) {
cursor = _mm_add_epi32(cursor, _mm_srli_si128(cursor, 4));
check = _mm_cvtsi128_si32(cursor);
} else {
#else
{
#endif
const u32 *p = (const u32 *)checkp;
for (u32 i = 0; i < size / 8; ++i) {
check += *p++;
@@ -62,6 +57,7 @@ static u32 QuickTexHashSSE2(const void *checkp, u32 size) {
return check;
}
#endif
static u32 QuickTexHashBasic(const void *checkp, u32 size) {
#if defined(ARM) && defined(__GNUC__)
@@ -112,7 +108,7 @@ void SetupQuickTexHash() {
#ifdef ARMV7
if (cpu_info.bNEON)
DoQuickTexHash = &QuickTexHashNEON;
#else
#elif _M_SSE
if (cpu_info.bSSE2)
DoQuickTexHash = &QuickTexHashSSE2;
#endif
GPU/GLES/SoftwareTransform.cpp
+1 -1
View File
@@ -597,7 +597,7 @@ void TransformDrawEngine::SoftwareTransformAndDraw(
drawBuffer = transformedExpanded;
TransformedVertex *trans = &transformedExpanded[0];
TransformedVertex saved;
u32 stencilValue;
u32 stencilValue = 0;
for (int i = 0; i < vertexCount; i += 2) {
int index = ((const u16*)inds)[i];
saved = transformed[index];
UI/MainScreen.cpp
+2 -2
View File
@@ -189,9 +189,9 @@ void GameButton::Draw(UIContext &dc) {
char discNumInfo[8];
if (ginfo->disc_total > 1)
sprintf(discNumInfo, "-DISC%d",ginfo->disc_number);
sprintf(discNumInfo, "-DISC%d", ginfo->disc_number);
else
sprintf(discNumInfo, "");
strcpy(discNumInfo, "");
dc.Draw()->Flush();
dc.RebindTexture();
Windows/Debugger/Debugger_Disasm.cpp
+1 -1
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);