ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Silence some compiler warnings.

This commit is contained in:
rogerman 2023-02-27 16:36:08 -08:00
parent cda8cb5686
commit 1daebcd670
4 changed files with 93 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
desmume/src/FIFO.cpp
View File

@ -1,7 +1,7 @@
/* /*
Copyright 2006 yopyop Copyright 2006 yopyop
Copyright 2007 shash Copyright 2007 shash
Copyright 2007-2022 DeSmuME team Copyright 2007-2023 DeSmuME team
This file is free software: you can redistribute it and/or modify This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -353,24 +353,24 @@ void DISP_FIFOsend(const T val)
case 1: case 1:
{ {
#ifndef MSB_FIRST #ifndef MSB_FIRST
HostWriteByte((u8 *)disp_fifo.buf, finalWriteAddress, val); HostWriteByte((u8 *)disp_fifo.buf, (u32)finalWriteAddress, val);
#else #else
switch (ADDROFFSET) switch (ADDROFFSET)
{ {
case 0: case 0:
HostWriteByte((u8 *)disp_fifo.buf, baseWriteAddress + 2, val); HostWriteByte((u8 *)disp_fifo.buf, (u32)baseWriteAddress + 2, val);
break; break;
case 1: case 1:
HostWriteByte((u8 *)disp_fifo.buf, baseWriteAddress + 3, val); HostWriteByte((u8 *)disp_fifo.buf, (u32)baseWriteAddress + 3, val);
break; break;
case 2: case 2:
HostWriteByte((u8 *)disp_fifo.buf, baseWriteAddress + 0, val); HostWriteByte((u8 *)disp_fifo.buf, (u32)baseWriteAddress + 0, val);
break; break;
case 3: case 3:
HostWriteByte((u8 *)disp_fifo.buf, baseWriteAddress + 1, val); HostWriteByte((u8 *)disp_fifo.buf, (u32)baseWriteAddress + 1, val);
break; break;
default: default:
@ -392,16 +392,16 @@ void DISP_FIFOsend(const T val)
case 2: case 2:
{ {
#ifndef MSB_FIRST #ifndef MSB_FIRST
HostWriteWord((u8 *)disp_fifo.buf, finalWriteAddress, val); HostWriteWord((u8 *)disp_fifo.buf, (u32)finalWriteAddress, val);
#else #else
switch (ADDROFFSET) switch (ADDROFFSET)
{ {
case 0: case 0:
HostWriteWord((u8 *)disp_fifo.buf, baseWriteAddress + 2, val); HostWriteWord((u8 *)disp_fifo.buf, (u32)baseWriteAddress + 2, val);
break; break;
case 2: case 2:
HostWriteWord((u8 *)disp_fifo.buf, baseWriteAddress + 0, val); HostWriteWord((u8 *)disp_fifo.buf, (u32)baseWriteAddress + 0, val);
break; break;
default: default:
@ -421,7 +421,7 @@ void DISP_FIFOsend(const T val)
} }
case 4: case 4:
HostWriteTwoWords((u8 *)disp_fifo.buf, finalWriteAddress, val); HostWriteTwoWords((u8 *)disp_fifo.buf, (u32)finalWriteAddress, val);
disp_fifo.tail++; disp_fifo.tail++;
break; break;

4
desmume/src/movie.h
View File

@ -1,5 +1,5 @@
/* /*
Copyright 2008-2018 DeSmuME team Copyright 2008-2023 DeSmuME team
This file is free software: you can redistribute it and/or modify This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -179,7 +179,7 @@ public:
int advancedTiming; int advancedTiming;
int jitBlockSize; int jitBlockSize;
int getNumRecords() { return records.size(); } int getNumRecords() { return (int)records.size(); }
class TDictionary : public std::map<std::string,std::string> class TDictionary : public std::map<std::string,std::string>
{ {

4
desmume/src/texcache.cpp
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2006 yopyop Copyright (C) 2006 yopyop
Copyright (C) 2006-2007 shash Copyright (C) 2006-2007 shash
Copyright (C) 2008-2022 DeSmuME team Copyright (C) 2008-2023 DeSmuME team
This file is free software: you can redistribute it and/or modify This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -1757,7 +1757,7 @@ void NDSTextureUnpackA5I3(const size_t srcSize, const u8 *__restrict srcData, co
template <TextureStoreUnpackFormat TEXCACHEFORMAT> template <TextureStoreUnpackFormat TEXCACHEFORMAT>
void NDSTextureUnpack4x4(const size_t srcSize, const u32 *__restrict srcData, const u16 *__restrict srcIndex, const u32 palAddress, const u32 sizeX, const u32 sizeY, u32 *__restrict dstBuffer) void NDSTextureUnpack4x4(const size_t srcSize, const u32 *__restrict srcData, const u16 *__restrict srcIndex, const u32 palAddress, const u32 sizeX, const u32 sizeY, u32 *__restrict dstBuffer)
{ {
const u32 limit = srcSize * sizeof(u32); const size_t limit = srcSize * sizeof(u32);
const u32 xTmpSize = sizeX >> 2; const u32 xTmpSize = sizeX >> 2;
const u32 yTmpSize = sizeY >> 2; const u32 yTmpSize = sizeY >> 2;

7
desmume/src/utils/datetime.h
View File

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2010 DeSmuME team Copyright (C) 2010-2023 DeSmuME team
This file is based on System.DateTime.cs and System.TimeSpan.cs from mono-2.6.7 This file is based on System.DateTime.cs and System.TimeSpan.cs from mono-2.6.7
@ -657,7 +657,6 @@ public:
DateTime AddMonths (int months) const DateTime AddMonths (int months) const
{ {
int day, month, year, maxday ; int day, month, year, maxday ;
DateTime temp;
day = get_Day(); day = get_Day();
month = get_Month() + (months % 12); month = get_Month() + (months % 12);
@ -677,7 +676,7 @@ public:
if (day > maxday) if (day > maxday)
day = maxday; day = maxday;
temp = (year, month, day); DateTime temp(year, month, day);
return temp.Add (get_TimeOfDay()); return temp.Add (get_TimeOfDay());
} }
@ -784,7 +783,7 @@ public:
std::string ToString() const std::string ToString() const
{ {
char tmp[32]; char tmp[32];
sprintf(tmp,"%04d-%s-%02d %02d:%02d:%02d:%03d",get_Year(),monthnames[get_Month()],get_Day(),get_Hour(),get_Minute(),get_Second(),get_Millisecond()); snprintf(tmp, sizeof(tmp), "%04d-%s-%02d %02d:%02d:%02d:%03d",get_Year(),monthnames[get_Month()],get_Day(),get_Hour(),get_Minute(),get_Second(),get_Millisecond());
return tmp; return tmp;
} }