From 2c68aa81c65a9fdcfc32405cb6074914ea35cebf Mon Sep 17 00:00:00 2001 From: goyuken Date: Tue, 13 May 2014 02:51:20 +0000 Subject: [PATCH] gambatte: fix a few msvcisms and other warnings --- libgambatte/src/mem/memptrs.cpp | 4 ++++ libgambatte/src/memory.cpp | 4 ++-- libgambatte/src/newstate.cpp | 7 +++---- libgambatte/src/newstate.h | 2 +- libgambatte/src/video.cpp | 2 +- output/dll/libgambatte.dll | Bin 151040 -> 151040 bytes 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libgambatte/src/mem/memptrs.cpp b/libgambatte/src/mem/memptrs.cpp index 84c58e9de1..6e8b2fe644 100644 --- a/libgambatte/src/mem/memptrs.cpp +++ b/libgambatte/src/mem/memptrs.cpp @@ -148,19 +148,23 @@ void MemPtrs::disconnectOamDmaAreas() { SYNCFUNC(MemPtrs) { + /* int memchunk_len_old = memchunk_len; int memchunk_saveoffs_old = memchunk_saveoffs; int memchunk_savelen_old = memchunk_savelen; + */ NSS(memchunk_len); NSS(memchunk_saveoffs); NSS(memchunk_savelen); + /* if (isReader) { if (memchunk_len != memchunk_len_old || memchunk_saveoffs != memchunk_saveoffs_old || memchunk_savelen != memchunk_savelen_old) __debugbreak(); } + */ PSS(memchunk_ + memchunk_saveoffs, memchunk_savelen); diff --git a/libgambatte/src/memory.cpp b/libgambatte/src/memory.cpp index abef5d6878..1424f6c9f7 100644 --- a/libgambatte/src/memory.cpp +++ b/libgambatte/src/memory.cpp @@ -26,10 +26,10 @@ namespace gambatte { Memory::Memory(const Interrupter &interrupter_in) -: getInput(0), - readCallback(0), +: readCallback(0), writeCallback(0), execCallback(0), + getInput(0), divLastUpdate(0), lastOamDmaUpdate(DISABLED_TIME), display(ioamhram, 0, VideoInterruptRequester(&intreq)), diff --git a/libgambatte/src/newstate.cpp b/libgambatte/src/newstate.cpp index dcfb5af1ff..ee4065324b 100644 --- a/libgambatte/src/newstate.cpp +++ b/libgambatte/src/newstate.cpp @@ -17,14 +17,13 @@ void NewStateDummy::Load(void *ptr, size_t size, const char *name) } NewStateExternalBuffer::NewStateExternalBuffer(char *buffer, long maxlength) - :buffer(buffer), maxlength(maxlength), length(0) + :buffer(buffer), length(0), maxlength(maxlength) { } void NewStateExternalBuffer::Save(const void *ptr, size_t size, const char *name) { - const char *src = static_cast(ptr); - if (maxlength - length >= size) + if (maxlength - length >= (long)size) { std::memcpy(buffer + length, ptr, size); } @@ -34,7 +33,7 @@ void NewStateExternalBuffer::Save(const void *ptr, size_t size, const char *name void NewStateExternalBuffer::Load(void *ptr, size_t size, const char *name) { char *dst = static_cast(ptr); - if (maxlength - length >= size) + if (maxlength - length >= (long)size) { std::memcpy(dst, buffer + length, size); } diff --git a/libgambatte/src/newstate.h b/libgambatte/src/newstate.h index 8cf2deca33..5d5e17eeb5 100644 --- a/libgambatte/src/newstate.h +++ b/libgambatte/src/newstate.h @@ -81,7 +81,7 @@ public: #define EES(x,d) else if (isReader) (x) = (d); if (!isReader) ns->Save(&_ttmp, sizeof(_ttmp), #x); } while (0) #define RSS(x,b) do { if (isReader)\ -{ ptrdiff_t _ttmp; ns->Load(&_ttmp, sizeof(_ttmp), #x); (x) = (_ttmp == 0xdeadbeef ? 0 : (b) + _ttmp); }\ +{ ptrdiff_t _ttmp; ns->Load(&_ttmp, sizeof(_ttmp), #x); (x) = (_ttmp == (ptrdiff_t)0xdeadbeef ? 0 : (b) + _ttmp); }\ else\ { ptrdiff_t _ttmp = (x) == 0 ? 0xdeadbeef : (x) - (b); ns->Save(&_ttmp, sizeof(_ttmp), #x); } } while (0) diff --git a/libgambatte/src/video.cpp b/libgambatte/src/video.cpp index e13a5acb25..ace0705c7a 100644 --- a/libgambatte/src/video.cpp +++ b/libgambatte/src/video.cpp @@ -708,7 +708,7 @@ inline void LCD::event() { case LY_COUNT: ppu.doLyCountEvent(); eventTimes_.set(ppu.lyCounter().time()); - if (scanlinecallback && ppu.lyCounter().ly() == scanlinecallbacksl) + if (scanlinecallback && ppu.lyCounter().ly() == (unsigned)scanlinecallbacksl) scanlinecallback(); break; } diff --git a/output/dll/libgambatte.dll b/output/dll/libgambatte.dll index f9e2cf48cf43d1238e5cbecf1b10a61b774ef940..5afa60c03ebc8b32756e2f03701fbc7850509f80 100644 GIT binary patch delta 5918 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 RTz9N?_vLsxHgGW;{C_dBd?f$? delta 5988 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