From 4f5729dd59bb3db74f889feeb673b22a3f2c3059 Mon Sep 17 00:00:00 2001 From: comex Date: Fri, 30 Aug 2013 00:35:36 -0400 Subject: [PATCH] MSVC warnings. --- Source/Core/Common/Src/StringUtil.cpp | 17 ++++++++--------- Source/Core/Core/Src/ActionReplay.cpp | 2 +- Source/Core/Core/Src/DSP/DSPEmitter.cpp | 2 +- Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp | 8 ++++---- .../Core/Core/Src/FifoPlayer/FifoRecorder.cpp | 4 ++-- Source/Core/Core/Src/HW/Memmap.cpp | 2 +- Source/Core/Core/Src/HW/Memmap.h | 2 +- Source/Core/DiscIO/Src/WbfsBlob.cpp | 4 ++-- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index 3c0c01b25f..5d8a26446d 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -164,12 +164,11 @@ bool TryParse(const std::string &str, u32 *const output) if (errno == ERANGE) return false; - if (ULONG_MAX > UINT_MAX) { - // Note: The typecasts avoid GCC warnings when long is 32 bits wide. - if (value >= static_cast(0x100000000ull) - && value <= static_cast(0xFFFFFFFF00000000ull)) - return false; - } +#if ULONG_MAX > UINT_MAX + if (value >= 0x100000000ull + && value <= 0xFFFFFFFF00000000ull) + return false; +#endif *output = static_cast(value); return true; @@ -270,7 +269,7 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st { while(1) { - const int pos = result.find(src); + size_t pos = result.find(src); if (pos == -1) break; result.replace(pos, src.size(), dest); } @@ -317,7 +316,7 @@ std::string UriDecode(const std::string & sSrc) // for future extension" const unsigned char * pSrc = (const unsigned char *)sSrc.c_str(); - const int SRC_LEN = sSrc.length(); + const size_t SRC_LEN = sSrc.length(); const unsigned char * const SRC_END = pSrc + SRC_LEN; const unsigned char * const SRC_LAST_DEC = SRC_END - 2; // last decodable '%' @@ -379,7 +378,7 @@ std::string UriEncode(const std::string & sSrc) { const char DEC2HEX[16 + 1] = "0123456789ABCDEF"; const unsigned char * pSrc = (const unsigned char *)sSrc.c_str(); - const int SRC_LEN = sSrc.length(); + const size_t SRC_LEN = sSrc.length(); unsigned char * const pStart = new unsigned char[SRC_LEN * 3]; unsigned char * pEnd = pStart; const unsigned char * const SRC_END = pSrc + SRC_LEN; diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp index 7c1742a1cb..1ca57979e4 100644 --- a/Source/Core/Core/Src/ActionReplay.cpp +++ b/Source/Core/Core/Src/ActionReplay.cpp @@ -878,7 +878,7 @@ bool ConditionalCode(const ARAddr addr, const u32 data, int* const pSkipCount) // Skip lines until a "00000000 40000000" line is reached case CONDTIONAL_ALL_LINES: case CONDTIONAL_ALL_LINES_UNTIL: - *pSkipCount = -addr.subtype; + *pSkipCount = -(int) addr.subtype; break; default: diff --git a/Source/Core/Core/Src/DSP/DSPEmitter.cpp b/Source/Core/Core/Src/DSP/DSPEmitter.cpp index 704a170bfc..a63d17628b 100644 --- a/Source/Core/Core/Src/DSP/DSPEmitter.cpp +++ b/Source/Core/Core/Src/DSP/DSPEmitter.cpp @@ -342,7 +342,7 @@ void DSPEmitter::Compile(u16 start_addr) if (!unresolvedJumps[i].empty()) { // Check if there were any blocks waiting for this block to be linkable - unsigned int size = unresolvedJumps[i].size(); + size_t size = unresolvedJumps[i].size(); unresolvedJumps[i].remove(start_addr); if (unresolvedJumps[i].size() < size) { diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp index 1a693ede34..386c32d8bc 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp @@ -932,12 +932,12 @@ void DSPJitRegCache::writeReg(int dreg, OpArg arg) { switch(regs[dreg].size) { - case 2: emitter.MOV(16, reg, Imm16(arg.offset)); break; - case 4: emitter.MOV(32, reg, Imm32(arg.offset)); break; + case 2: emitter.MOV(16, reg, Imm16((u16) arg.offset)); break; + case 4: emitter.MOV(32, reg, Imm32((u32) arg.offset)); break; #ifdef _M_X64 case 8: - if ((s32)arg.offset == (s64)arg.offset) - emitter.MOV(64, reg, Imm32(arg.offset)); + if ((u32) arg.offset == arg.offset) + emitter.MOV(64, reg, Imm32((u32) arg.offset)); else emitter.MOV(64, reg, Imm64(arg.offset)); break; diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp b/Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp index 5f3861fd66..26fb661162 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoRecorder.cpp @@ -75,14 +75,14 @@ void FifoRecorder::WriteGPCommand(u8 *data, u32 size) m_RecordAnalyzer.AnalyzeGPCommand(data); // Copy data to buffer - u32 currentSize = m_FifoData.size(); + size_t currentSize = m_FifoData.size(); m_FifoData.resize(currentSize + size); memcpy(&m_FifoData[currentSize], data, size); } if (m_FrameEnded && m_FifoData.size() > 0) { - u32 dataSize = m_FifoData.size(); + size_t dataSize = m_FifoData.size(); m_CurrentFrame.fifoDataSize = dataSize; m_CurrentFrame.fifoData = new u8[dataSize]; memcpy(m_CurrentFrame.fifoData, &m_FifoData[0], dataSize); diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp index 96f2945391..82b984fdb2 100644 --- a/Source/Core/Core/Src/HW/Memmap.cpp +++ b/Source/Core/Core/Src/HW/Memmap.cpp @@ -410,7 +410,7 @@ u32 Read_Instruction(const u32 em_address) return inst.hex; } -void WriteBigEData(const u8 *_pData, const u32 _Address, const u32 _iSize) +void WriteBigEData(const u8 *_pData, const u32 _Address, const size_t _iSize) { memcpy(GetPointer(_Address), _pData, _iSize); } diff --git a/Source/Core/Core/Src/HW/Memmap.h b/Source/Core/Core/Src/HW/Memmap.h index a4cef35cf6..fe05539ae2 100644 --- a/Source/Core/Core/Src/HW/Memmap.h +++ b/Source/Core/Core/Src/HW/Memmap.h @@ -160,7 +160,7 @@ void Write_U64_Swap(const u64 _Data, const u32 _Address); void WriteHW_U32(const u32 _Data, const u32 _Address); void GetString(std::string& _string, const u32 _Address); -void WriteBigEData(const u8 *_pData, const u32 _Address, const u32 size); +void WriteBigEData(const u8 *_pData, const u32 _Address, const size_t size); void ReadBigEData(u8 *_pDest, const u32 _Address, const u32 size); u8* GetPointer(const u32 _Address); void DMA_LCToMemory(const u32 _iMemAddr, const u32 _iCacheAddr, const u32 _iNumBlocks); diff --git a/Source/Core/DiscIO/Src/WbfsBlob.cpp b/Source/Core/DiscIO/Src/WbfsBlob.cpp index 3983bd5ff6..f1d5a2b76a 100644 --- a/Source/Core/DiscIO/Src/WbfsBlob.cpp +++ b/Source/Core/DiscIO/Src/WbfsBlob.cpp @@ -81,7 +81,7 @@ bool WbfsFileReader::ReadHeader() hd_sector_count = Common::swap32(hd_sector_count); m_files[0]->file.ReadBytes(&hd_sector_shift, 1); - hd_sector_size = 1 << hd_sector_shift; + hd_sector_size = 1ull << hd_sector_shift; if(m_size != hd_sector_count * hd_sector_size) { @@ -91,7 +91,7 @@ bool WbfsFileReader::ReadHeader() // Read wbfs cluster info m_files[0]->file.ReadBytes(&wbfs_sector_shift, 1); - wbfs_sector_size = 1 << wbfs_sector_shift; + wbfs_sector_size = 1ull << wbfs_sector_shift; wbfs_sector_count = m_size / wbfs_sector_size; if(wbfs_sector_size < wii_sector_size)