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

Cleanup

This commit is contained in:
scribam 2019-09-07 14:37:39 +02:00
parent c4ecfe3d9c
commit 49b7e0682b
80 changed files with 136 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/archive/7zArchive.cpp
View File

@ -57,8 +57,7 @@ ArchiveFile* SzArchive::OpenFile(const char* name)
u16 fname[512];
for (int i = 0; i < szarchive.NumFiles; i++)
{
unsigned isDir = SzArEx_IsDir(&szarchive, i);
if (isDir)
if (SzArEx_IsDir(&szarchive, i))
continue;
int len = SzArEx_GetFileNameUtf16(&szarchive, i, fname);

2
core/cfg/cfg.cpp
View File

@ -5,7 +5,7 @@
*/
#define _CRT_SECURE_NO_DEPRECATE (1)
#include <errno.h>
#include <cerrno>
#include "cfg.h"
#include "ini.h"

6
core/cfg/cl.cpp
View File

@ -5,9 +5,9 @@
Nothing too interesting here, really
*/
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include <cstdio>
#include <cctype>
#include <cstring>
#include "cfg/cfg.h"

12
core/cfg/ini.cpp
View File

@ -44,7 +44,7 @@ bool ConfigEntry::get_bool()
bool ConfigSection::has_entry(const std::string& name)
{
return (this->entries.count(name) == 1);
};
}
ConfigEntry* ConfigSection::get_entry(const std::string& name)
{
@ -53,13 +53,13 @@ ConfigEntry* ConfigSection::get_entry(const std::string& name)
return &this->entries[name];
}
return NULL;
};
}
void ConfigSection::set(const std::string& name, const std::string& value)
{
ConfigEntry new_entry = { value };
this->entries[name] = new_entry;
};
}
void ConfigSection::delete_entry(const std::string& name)
{
@ -78,7 +78,7 @@ ConfigSection* ConfigFile::add_section(const std::string& name, bool is_virtual)
}
this->sections.insert(std::make_pair(name, new_section));
return &this->sections[name];
};
}
bool ConfigFile::has_section(const std::string& name)
{
@ -113,7 +113,7 @@ ConfigSection* ConfigFile::get_section(const std::string& name, bool is_virtual)
}
}
return NULL;
};
}
ConfigEntry* ConfigFile::get_entry(const std::string& section_name, const std::string& entry_name)
{
@ -179,7 +179,7 @@ void ConfigFile::set(const std::string& section_name, const std::string& entry_n
section = this->add_section(section_name, is_virtual);
}
section->set(entry_name, value);
};
}
void ConfigFile::set_int(const std::string& section_name, const std::string& entry_name, int value, bool is_virtual)
{

2
core/dispframe.cpp
View File

@ -1,4 +1,4 @@
#include <signal.h>
#include <csignal>
#include "cfg/cfg.h"
#include "rend/TexCache.h"
#include "rend/rend.h"

2
core/hw/aica/aica.cpp
View File

@ -2,7 +2,7 @@
#include "aica_if.h"
#include "sgc_if.h"
#include "aica_mem.h"
#include <math.h>
#include <cmath>
#include "hw/holly/holly_intc.h"
#include "hw/holly/sb.h"

2
core/hw/aica/aica.h
View File

@ -1,7 +1,7 @@
#pragma once
#include "types.h"
#include "oslib/oslib.h"
#include "assert.h"
#include <cassert>
#define SCIEB_addr 0x289C
#define SCIPD_addr (0x289C+4)

5
core/hw/aica/aica_if.cpp
View File

@ -11,7 +11,7 @@
#include "hw/holly/holly_intc.h"
#include "hw/sh4/sh4_sched.h"
#include <time.h>
#include <ctime>
VArray2 aica_ram;
u32 VREG;//video reg =P
@ -75,9 +75,8 @@ void WriteMem_aica_rtc(u32 addr,u32 data,u32 sz)
rtc_EN=data&1;
return;
}
return;
}
u32 ReadMem_aica_reg(u32 addr,u32 sz)
{
addr&=0x7FFF;

3
core/hw/aica/dsp.cpp
View File

@ -109,9 +109,6 @@ void DecodeInst(u32 *IPtr,_INST *i)
const bool SUPPORT_NOFL=false;
#define assert verify
#pragma warning(disable:4311)
#define DYNBUF 0x10000

2
core/hw/aica/sgc_if.cpp
View File

@ -2,7 +2,7 @@
#include "dsp.h"
#include "aica_mem.h"
#include "hw/aica/aica_if.h"
#include <math.h>
#include <cmath>
#include <algorithm>
using namespace std;
#undef FAR

2
core/hw/arm7/arm7.cpp
View File

@ -2,8 +2,6 @@
#include "arm_mem.h"
#include "virt_arm.h"
#include <map>
#define arm_printf(...) DEBUG_LOG(AICA_ARM, __VA_ARGS__)
#define CPUReadMemoryQuick(addr) (*(u32*)&aica_ram[addr&ARAM_MASK])

2
core/hw/arm7/vbaARM.cpp
View File

@ -3,8 +3,6 @@
#include "types.h"
#include "arm7.h"
#include "arm_mem.h"
//called when plugin is used by emu (you should do first time init here)
s32 libARM_Init()

2
core/hw/flashrom/flashrom.h
View File

@ -3,7 +3,7 @@
*/
#pragma once
#include <math.h>
#include <cmath>
#include "types.h"
struct MemChip

14
core/hw/gdrom/gdrom_if.h
View File

@ -1,10 +1,5 @@
/*
** gdrom_if.h
*/
#ifndef __GDROM_IF_H__
#define __GDROM_IF_H__
#pragma once
#include "types.h"
#include "types.h"
//there were at least 4 gdrom implementations, ZGDROM, HLE, gdromv1 (never worked), gdromv2 (first release)
@ -12,12 +7,9 @@
//the code's history :)
#include "gdromv3.h"
void gdrom_reg_Init(void);
void gdrom_reg_Term(void);
void gdrom_reg_Init();
void gdrom_reg_Term();
void gdrom_reg_Reset(bool Manual);
u32 ReadMem_gdrom(u32 Addr, u32 sz);
void WriteMem_gdrom(u32 Addr, u32 data, u32 sz);
void NotifyEvent_gdrom(u32 info,void* param);
#endif //__GDROM_IF_H__

1
core/hw/holly/sb_mem.cpp
View File

@ -422,7 +422,6 @@ void DYNACALL WriteMem_area0(u32 addr,T data)
{
libExtDevice_WriteMem_A0_010(addr,data,sz);
}
return;
}
//Init/Res/Term

4
core/hw/maple/maple_devs.cpp
View File

@ -8,8 +8,8 @@
#include "hw/naomi/naomi_cart.h"
#include "hw/pvr/spg.h"
#include "input/gamepad.h"
#include <math.h>
#include <time.h>
#include <cmath>
#include <ctime>
#include <zlib.h>
#include <xxhash.h>

2
core/hw/maple/maple_if.cpp
View File

@ -1,5 +1,5 @@
#include "types.h"
#include <string.h>
#include <cstring>
#include "maple_if.h"
#include "maple_cfg.h"

2
core/hw/mem/vmem32.cpp
View File

@ -30,7 +30,7 @@
#include <sys/stat.h> /* For mode constants */
#include <fcntl.h> /* For O_* constants */
#include <unistd.h>
#include <errno.h>
#include <cerrno>
#ifdef __ANDROID__
#include <linux/ashmem.h>
#endif

4
core/hw/modem/dns.cpp
View File

@ -22,8 +22,8 @@
#if !defined(_MSC_VER) && (BUILD_COMPILER!=COMPILER_CLANG || !defined(WIN32))
#include <stdio.h>
#include <errno.h>
#include <cstdio>
#include <cerrno>
#include "net_platform.h"

2
core/hw/modem/net_platform.h
View File

@ -10,7 +10,7 @@
#include <netdb.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <cerrno>
#include <sys/select.h>
#else
#include <ws2tcpip.h>

2
core/hw/naomi/decrypt.cpp
View File

@ -3,7 +3,7 @@
/* Borrowed from yabause */
/* Based on mame 315-5881_crypt.cpp and stvprot.cpp */
#include <stdlib.h>
#include <cstdlib>
#include "naomi_cart.h"
typedef struct sbox_s {

4
core/hw/naomi/naomi_cart.cpp
View File

@ -46,7 +46,7 @@ bool bios_loaded = false;
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <cerrno>
#endif
fd_t* RomCacheMap = NULL;
@ -586,8 +586,6 @@ void naomi_cart_LoadRom(const char* file)
CurrentCartridge = new DecryptedCartridge(RomPtr, RomSize);
strcpy(naomi_game_id, CurrentCartridge->GetGameId().c_str());
NOTICE_LOG(NAOMI, "NAOMI GAME ID [%s]", naomi_game_id);
return;
}
void naomi_cart_Close()

6
core/hw/pvr/drkPvr.h
View File

@ -5,9 +5,9 @@
//bleh stupid windoze header
#include "types.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <cstdlib>
#include <cstdio>
#include <cstring>
#include "helper_classes.h"

4
core/hw/pvr/spg.h
View File

@ -10,9 +10,5 @@ void spg_Reset(bool Manual);
//need to replace 511 with correct value
//#define Line_Cycles (Frame_Cycles/511)
void spgUpdatePvr(u32 cycles);
bool spg_Init();
void spg_Term();
void spg_Reset(bool Manual);
void CalculateSync();
void read_lightgun_position(int x, int y);

4
core/hw/sh4/dyna/driver.cpp
View File

@ -14,8 +14,8 @@
#include "hw/aica/aica_if.h"
#include "hw/gdrom/gdrom_if.h"
#include <time.h>
#include <float.h>
#include <ctime>
#include <cfloat>
#include "blockmanager.h"
#include "ngen.h"

4
core/hw/sh4/dyna/ssa.h
View File

@ -18,11 +18,11 @@
You should have received a copy of the GNU General Public License
along with reicast. If not, see <https://www.gnu.org/licenses/>.
*/
#include <stdio.h>
#include <cstdio>
#include <set>
#include <map>
#include <deque>
#include <math.h>
#include <cmath>
#include "types.h"
#include "decoder.h"
#include "hw/sh4/modules/mmu.h"

4
core/hw/sh4/interpr/sh4_fpu.cpp
View File

@ -1,6 +1,6 @@
#include "types.h"
#include <math.h>
#include <float.h>
#include <cmath>
#include <cfloat>
#include "sh4_opcodes.h"

1
core/hw/sh4/interpr/sh4_opcodes.cpp
View File

@ -15,7 +15,6 @@
#include "../sh4_core.h"
#include "../modules/ccn.h"
#include "../sh4_interrupts.h"
#include "../modules/tmu.h"
#include "hw/gdrom/gdrom_if.h"
#include "hw/sh4/sh4_opcode.h"

1
core/hw/sh4/modules/tmu.cpp
View File

@ -4,7 +4,6 @@
#include "types.h"
#include "../sh4_sched.h"
#include "tmu.h"
#include "hw/sh4/sh4_interrupts.h"
#include "hw/sh4/sh4_mmr.h"

3
core/hw/sh4/modules/tmu.h
View File

@ -1,3 +0,0 @@
#pragma once
#include "types.h"

4
core/hw/sh4/sh4_mem.cpp
View File

@ -19,10 +19,6 @@
//main system mem
VArray2 mem_b;
void _vmem_init();
void _vmem_reset();
void _vmem_term();
//MEM MAPPINNGG
//AREA 1

7
core/imgread/ImgReader.h
View File

@ -1,7 +1,6 @@
#pragma once
#include "types.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <cstdio>
#include <cstdlib>
#include <cstring>

4
core/imgread/chd.cpp
View File

@ -24,8 +24,8 @@ struct CHDDisc : Disc
~CHDDisc()
{
if (hunk_mem)
delete [] hunk_mem;
delete[] hunk_mem;
if (chd)
chd_close(chd);
}

4
core/imgread/common.cpp
View File

@ -269,9 +269,7 @@ bool DiscSwap(u32 fileflags)
void TermDrive()
{
if (disc != NULL)
delete disc;
delete disc;
disc = NULL;
}

2
core/imgread/common.h
View File

@ -139,7 +139,7 @@ struct Track
else
return false;
}
void Destroy() { if (file) delete file; file=0; }
void Destroy() { delete file; file=0; }
};
struct Disc

4
core/imgread/gdi.cpp
View File

@ -164,7 +164,3 @@ Disc* gdi_parse(const char* file)
}
return 0;
}
void iso_term()
{
}

2
core/input/gamepad_device.cpp
View File

@ -17,7 +17,7 @@
along with reicast. If not, see <https://www.gnu.org/licenses/>.
*/
#include <algorithm>
#include <limits.h>
#include <climits>
#include "gamepad_device.h"
#include "rend/gui.h"
#include "oslib/oslib.h"

2
core/input/mapping.h
View File

@ -18,7 +18,7 @@
*/
#pragma once
#include <map>
#include <stdio.h>
#include <cstdio>
#include "types.h"
#include "gamepad.h"

4
core/linux-dist/dispmanx.cpp
View File

@ -1,6 +1,6 @@
#if defined(SUPPORT_DISPMANX)
#include "linux-dist/dispmanx.h"
#include "linux-dist/main.h"
#include "dispmanx.h"
#include "main.h"
#include <bcm_host.h>
#include <EGL/egl.h>

2
core/linux-dist/joystick.cpp
View File

@ -1,7 +1,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
#include "linux-dist/joystick.h"
#include "joystick.h"
#if defined(USE_JOYSTICK)
#include <linux/joystick.h>

2
core/linux-dist/joystick.h
View File

@ -1,5 +1,5 @@
#include "types.h"
#include "linux-dist/main.h"
#include "main.h"
#pragma once
#define JOYSTICK_DEVICE_STRING "/dev/input/js%d"

24
core/linux-dist/main.cpp
View File

@ -6,8 +6,8 @@
#include <termios.h>
#include <fcntl.h>
#include <semaphore.h>
#include <stdarg.h>
#include <signal.h>
#include <cstdarg>
#include <csignal>
#include <sys/param.h>
#include <sys/time.h>
#include "hw/sh4/dyna/blockmanager.h"
@ -15,11 +15,11 @@
#include <unistd.h>
#if defined(SUPPORT_DISPMANX)
#include "linux-dist/dispmanx.h"
#include "dispmanx.h"
#endif
#if defined(SUPPORT_X11)
#include "linux-dist/x11.h"
#include "x11.h"
#endif
#if defined(USE_SDL)
@ -31,11 +31,11 @@
#endif
#if defined(USE_EVDEV)
#include "linux-dist/evdev.h"
#include "evdev.h"
#endif
#if defined(USE_JOYSTICK)
#include "linux-dist/joystick.h"
#include "joystick.h"
#endif
#ifdef TARGET_PANDORA
@ -284,12 +284,12 @@ std::vector<string> find_system_config_dirs()
string s = (string)getenv("XDG_CONFIG_DIRS");
string::size_type pos = 0;
string::size_type n = s.find(":", pos);
string::size_type n = s.find(':', pos);
while(n != std::string::npos)
{
dirs.push_back(s.substr(pos, n-pos) + "/reicast");
pos = n + 1;
n = s.find(":", pos);
n = s.find(':', pos);
}
// Separator not found
dirs.push_back(s.substr(pos) + "/reicast");
@ -310,12 +310,12 @@ std::vector<string> find_system_data_dirs()
string s = (string)getenv("XDG_DATA_DIRS");
string::size_type pos = 0;
string::size_type n = s.find(":", pos);
string::size_type n = s.find(':', pos);
while(n != std::string::npos)
{
dirs.push_back(s.substr(pos, n-pos) + "/reicast");
pos = n + 1;
n = s.find(":", pos);
n = s.find(':', pos);
}
// Separator not found
dirs.push_back(s.substr(pos) + "/reicast");
@ -341,12 +341,12 @@ int main(int argc, wchar* argv[])
set_user_data_dir(find_user_data_dir());
std::vector<string> dirs;
dirs = find_system_config_dirs();
for(unsigned int i = 0; i < dirs.size(); i++)
for (std::size_t i = 0; i < dirs.size(); i++)
{
add_system_data_dir(dirs[i]);
}
dirs = find_system_data_dirs();
for(unsigned int i = 0; i < dirs.size(); i++)
for (std::size_t i = 0; i < dirs.size(); i++)
{
add_system_data_dir(dirs[i]);
}

6
core/linux-dist/x11.cpp
View File

@ -12,8 +12,8 @@
#include "types.h"
#include "cfg/cfg.h"
#include "linux-dist/x11.h"
#include "linux-dist/main.h"
#include "x11.h"
#include "main.h"
#include "rend/gui.h"
#include "input/gamepad.h"
@ -85,7 +85,7 @@ void* x11_vis;
extern bool dump_frame_switch;
void dc_exit(void);
void dc_exit();
enum
{

4
core/linux/common.cpp
View File

@ -11,8 +11,8 @@
#include <termios.h>
#include <fcntl.h>
#include <semaphore.h>
#include <stdarg.h>
#include <signal.h>
#include <cstdarg>
#include <csignal>
#include <sys/param.h>
#include <sys/time.h>
#if defined(__linux__) && !defined(__ANDROID__)

21
core/linux/nixprof/nixprof.cpp
View File

@ -3,21 +3,16 @@
#if FEAT_HAS_NIXPROF
#include "cfg/cfg.h"
#include <inttypes.h>
#include <cinttypes>
#include <stdio.h>
#include <stdlib.h>
#include <pthread.h>
#include <unistd.h>
#include <cstdio>
#include <cstdlib>
#include <pthread.h>
#include <unistd.h>
#include <sys/types.h>
#include <stdio.h>
#include <memory.h>
#include <signal.h>
#include <csignal>
//#include <sys/ucontext.h>
#include <stdio.h>
#include <signal.h>
//#include <execinfo.h>
#include <sys/syscall.h>
#include <sys/stat.h>
@ -27,8 +22,7 @@
//#include <curses.h>
#include <fcntl.h>
#include <semaphore.h>
#include <stdarg.h>
#include <signal.h>
#include <cstdarg>
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/time.h>
@ -44,9 +38,8 @@
@brief Getting the callstack under Android
@author Peter Holtwick
*/
#include <unwind.h>
#include <stdio.h>
#include <string.h>
#include <unwind.h>
#include <cstring>
static int tick_count=0;
static pthread_t proft;

2
core/linux/posix_vmem.cpp
View File

@ -7,7 +7,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
#include <cerrno>
#include <unistd.h>
#include "hw/mem/_vmem.h"

3
core/linux/typedefs.h
View File

@ -1,3 +0,0 @@
//linux types
#include <stdint.h>
#include <cstddef>

2
core/log/StringUtil.h
View File

@ -1,7 +1,7 @@
#include <locale>
#ifdef _WIN32
#include <Windows.h>
#include <windows.h>
constexpr u32 CODEPAGE_SHIFT_JIS = 932;
constexpr u32 CODEPAGE_WINDOWS_1252 = 1252;
#else

4
core/nullDC.cpp
View File

@ -988,10 +988,10 @@ static void cleanup_serialize(void *data)
static string get_savestate_file_path()
{
string state_file = cfgLoadStr("config", "image", "noname.chd");
size_t lastindex = state_file.find_last_of("/");
size_t lastindex = state_file.find_last_of('/');
if (lastindex != -1)
state_file = state_file.substr(lastindex + 1);
lastindex = state_file.find_last_of(".");
lastindex = state_file.find_last_of('.');
if (lastindex != -1)
state_file = state_file.substr(0, lastindex);
state_file = state_file + ".state";

8
core/oslib/audiobackend_alsa.cpp
View File

@ -1,4 +1,4 @@
#include "oslib/audiostream.h"
#include "audiostream.h"
#if USE_ALSA
#include <alsa/asoundlib.h>
#include "cfg/cfg.h"
@ -18,7 +18,7 @@ static void alsa_init()
string device = cfgLoadStr("alsa", "device", "");
int rc = -1;
if (device == "" || device == "auto")
if (device.empty() || device == "auto")
{
INFO_LOG(AUDIO, "ALSA: trying to determine audio device");
@ -188,7 +188,7 @@ std::vector<std::string> alsa_get_devicelist()
return result;
// special value to automatically detect on initialization
result.push_back("auto");
result.emplace_back("auto");
char** n = hints;
while (*n != NULL)
@ -214,7 +214,7 @@ std::vector<std::string> alsa_get_devicelist()
}
*/
result.push_back(name);
result.emplace_back(name);
}
}

2
core/oslib/audiobackend_coreaudio.cpp
View File

@ -12,7 +12,7 @@
It does work on my macmini though
*/
#include "oslib/audiostream.h"
#include "audiostream.h"
#if HOST_OS == OS_DARWIN
#include <atomic>

2
core/oslib/audiobackend_directsound.cpp
View File

@ -1,4 +1,4 @@
#include "oslib/audiostream.h"
#include "audiostream.h"
#ifdef _WIN32
#include "oslib.h"
#include <initguid.h>

2
core/oslib/audiobackend_libao.cpp
View File

@ -1,4 +1,4 @@
#include "oslib/audiostream.h"
#include "audiostream.h"
#ifdef USE_LIBAO
#include <ao/ao.h>

2
core/oslib/audiobackend_omx.cpp
View File

@ -1,4 +1,4 @@
#include "oslib/audiostream.h"
#include "audiostream.h"
#if USE_OMX
#include <IL/OMX_Broadcom.h>

2
core/oslib/audiobackend_oss.cpp
View File

@ -1,4 +1,4 @@
#include "oslib/audiostream.h"
#include "audiostream.h"
#ifdef USE_OSS
#include <sys/ioctl.h>
#include <sys/fcntl.h>

2
core/oslib/audiobackend_pulseaudio.cpp
View File

@ -1,4 +1,4 @@
#include "oslib/audiostream.h"
#include "audiostream.h"
#ifdef USE_PULSEAUDIO
#include <sys/ioctl.h>
#include <sys/fcntl.h>

2
core/oslib/audiobackend_sdl2.cpp
View File

@ -2,7 +2,7 @@
#if defined(USE_SDL_AUDIO)
#include <SDL2/SDL.h>
#include "oslib/audiostream.h"
#include "audiostream.h"
#include "stdclass.h"
static SDL_AudioDeviceID audiodev;

6
core/oslib/audiostream.cpp
View File

@ -1,6 +1,6 @@
#include <limits.h>
#include <climits>
#include "cfg/cfg.h"
#include "oslib/oslib.h"
#include "oslib.h"
#include "audiostream.h"
struct SoundFrame { s16 l;s16 r; };
@ -82,7 +82,7 @@ bool RegisterAudioBackend(audiobackend_t *backend)
return true;
}
audiobackend_t* GetAudioBackend(std::string slug)
audiobackend_t* GetAudioBackend(const std::string& slug)
{
if (slug == "none")
{

2
core/oslib/audiostream.h
View File

@ -53,4 +53,4 @@ extern void TermAudio();
u32 GetAudioBackendCount();
void SortAudioBackends();
audiobackend_t* GetAudioBackend(int num);
audiobackend_t* GetAudioBackend(std::string slug);
audiobackend_t* GetAudioBackend(const std::string& slug);

11
core/reios/gdrom_hle.cpp
View File

@ -4,7 +4,7 @@
Bits and pieces from redream (https://github.com/inolen/redream)
*/
#include <stdio.h>
#include <cstdio>
#include "types.h"
#include "hw/sh4/sh4_mem.h"
#include "hw/sh4/sh4_sched.h"
@ -16,6 +16,11 @@
#include "hw/holly/holly_intc.h"
#include "reios.h"
#ifdef _MSC_VER
#undef min
#include <algorithm>
#endif
#define SWAP32(a) ((((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff))
#define debugf(...) DEBUG_LOG(REIOS, __VA_ARGS__)
@ -93,7 +98,7 @@ static void read_sectors_to(u32 addr, u32 sector, u32 count)
{
libGDR_ReadSector((u8 *)temp, sector, 1, sizeof(temp));
for (int i = 0; i < ARRAY_SIZE(temp); i++)
for (std::size_t i = 0; i < ARRAY_SIZE(temp); i++)
{
if (virtual_addr)
WriteMem32(addr, temp[i]);
@ -394,7 +399,7 @@ static void GD_HLE_Command(u32 cc)
// coded to 0x02 on boot
ver[len - 1] = 0x02;
for (int i = 0; i < len; i++)
for (u32 i = 0; i < len; i++)
WriteMem8(dest++, ver[i]);
}
break;

6
core/reios/gdrom_hle.h
View File

@ -45,9 +45,9 @@
#define MISC_SETVECTOR 0x01
#define CTOC_LBA(n) (n)
#define CTOC_ADR(n) (n<<24)
#define CTOC_CTRL(n) (n<<28)
#define CTOC_TRACK(n) (n<<16)
#define CTOC_ADR(n) ((n)<<24)
#define CTOC_CTRL(n) ((n)<<28)
#define CTOC_TRACK(n) ((n)<<16)
void gdrom_hle_op();

12
core/reios/reios.cpp
View File

@ -183,11 +183,11 @@ static void reios_sys_system() {
u8 data[24] = {0};
// read system_id from 0x0001a056
for (int i = 0; i < 8; i++)
for (u32 i = 0; i < 8; i++)
data[i] = flashrom->Read8(0x1a056 + i);
// read system_props from 0x0001a000
for (int i = 0; i < 5; i++)
for (u32 i = 0; i < 5; i++)
data[8 + i] = flashrom->Read8(0x1a000 + i);
// system settings
@ -294,7 +294,7 @@ static void reios_sys_flashrom() {
u32 size = r[6];
debugf("reios_sys_flashrom: FLASHROM_READ offs %x dest %08x size %x", offset, dest, size);
for (int i = 0; i < size; i++)
for (u32 i = 0; i < size; i++)
WriteMem8(dest++, flashrom->Read8(offset + i));
r[0] = size;
@ -318,7 +318,7 @@ static void reios_sys_flashrom() {
debugf("reios_sys_flashrom: FLASHROM_WRITE offs %x src %08x size %x", offs, src, size);
for (int i = 0; i < size; i++)
for (u32 i = 0; i < size; i++)
flashrom->data[offs + i] &= ReadMem8(src + i);
r[0] = size;
@ -610,7 +610,7 @@ static void reios_boot()
//Infinite loop for arm !
WriteMem32(0x80800000, 0xEAFFFFFE);
if (settings.reios.ElfFile.size()) {
if (!settings.reios.ElfFile.empty()) {
if (!reios_loadElf(settings.reios.ElfFile)) {
msgboxf("Failed to open %s", MBX_ICONERROR, settings.reios.ElfFile.c_str());
}
@ -654,7 +654,7 @@ static void reios_boot()
static std::map<u32, hook_fp*> hooks;
static std::map<hook_fp*, u32> hooks_rev;
#define SYSCALL_ADDR_MAP(addr) ((addr & 0x1FFFFFFF) | 0x80000000)
#define SYSCALL_ADDR_MAP(addr) (((addr) & 0x1FFFFFFF) | 0x80000000)
static void register_hook(u32 pc, hook_fp* fn) {
hooks[SYSCALL_ADDR_MAP(pc)] = fn;

2
core/rend/gl4/abuffer.cpp
View File

@ -4,7 +4,7 @@
* Created on: May 26, 2018
* Author: raph
*/
#include <math.h>
#include <cmath>
#include "gl4.h"
#include "rend/gles/glcache.h"

6
core/rend/gl4/gldraw.cpp
View File

@ -1,4 +1,4 @@
#include <math.h>
#include <cmath>
#include "gl4.h"
#include "rend/gles/glcache.h"
#include "rend/rend.h"
@ -347,7 +347,7 @@ static void DrawModVols(int first, int count)
glcache.DepthMask(GL_FALSE);
glcache.DepthFunc(Zfunction[4]);
if(0)
if(false)
{
//simply draw the volumes -- for debugging
SetCull(0);
@ -467,7 +467,7 @@ void gl4DrawStrips(GLuint output_fbo, int width, int height)
glcache.Disable(GL_BLEND);
glProvokingVertex(GL_LAST_VERTEX_CONVENTION);
RenderPass previous_pass = {0};
RenderPass previous_pass = {};
int render_pass_count = pvrrc.render_passes.used();
for (int render_pass = 0; render_pass < render_pass_count; render_pass++)

2
core/rend/gl4/gles.cpp
View File

@ -1,4 +1,4 @@
#include <math.h>
#include <cmath>
#include "gl4.h"
#include "rend/gles/glcache.h"
#include "rend/TexCache.h"

2
core/rend/gles/CustomTexture.cpp
View File

@ -79,7 +79,7 @@ void CustomTexture::LoaderThread()
std::string CustomTexture::GetGameId()
{
std::string game_id(ip_meta.product_number, sizeof(ip_meta.product_number));
const size_t str_end = game_id.find_last_not_of(" ");
const size_t str_end = game_id.find_last_not_of(' ');
if (str_end == std::string::npos)
return "";
game_id = game_id.substr(0, str_end + 1);

2
core/rend/gles/gldraw.cpp
View File

@ -1089,7 +1089,7 @@ void DrawStrips()
//We use sampler 0
glActiveTexture(GL_TEXTURE0);
RenderPass previous_pass = {0};
RenderPass previous_pass = {};
for (int render_pass = 0; render_pass < pvrrc.render_passes.used(); render_pass++) {
const RenderPass& current_pass = pvrrc.render_passes.head()[render_pass];

2
core/rend/gles/gles.cpp
View File

@ -1,4 +1,4 @@
#include <math.h>
#include <cmath>
#include "glcache.h"
#include "rend/TexCache.h"
#include "cfg/cfg.h"

4
core/rend/gles/gltex.cpp
View File

@ -464,8 +464,8 @@ bool TextureCacheData::Delete()
if (lock_block)
libCore_vramlock_Unlock_block(lock_block);
lock_block=0;
if (custom_image_data != NULL)
delete [] custom_image_data;
delete[] custom_image_data;
return true;
}

4
core/rend/gui.cpp
View File

@ -17,7 +17,7 @@
along with reicast. If not, see <https://www.gnu.org/licenses/>.
*/
#include <algorithm>
#include <math.h>
#include <cmath>
#include <dirent.h>
#include <sys/stat.h>
@ -1388,7 +1388,7 @@ static void add_game_directory(const std::string& path, std::vector<GameMedia>&
}
else
{
std::string::size_type dotpos = name.find_last_of(".");
std::string::size_type dotpos = name.find_last_of('.');
if (dotpos == std::string::npos || dotpos == name.size() - 1)
continue;
std::string extension = name.substr(dotpos);

2
core/rend/gui_util.cpp
View File

@ -20,7 +20,7 @@
#include <string>
#include <vector>
#include <algorithm>
#include <stdlib.h>
#include <cstdlib>
#ifdef _MSC_VER
#include <io.h>
#define access _access

1
core/sdl/sdl.cpp
View File

@ -1,6 +1,5 @@
#if defined(USE_SDL)
#include <map>
#include "types.h"
#include "cfg/cfg.h"
#include "linux-dist/main.h"

8
core/stdclass.cpp
View File

@ -1,4 +1,4 @@
#include <string.h>
#include <cstring>
#include <vector>
#include <sys/types.h>
#include <sys/stat.h>
@ -113,7 +113,7 @@ string get_readonly_data_path(const string& filename)
string get_game_save_prefix()
{
string save_file = cfgLoadStr("config", "image", "");
size_t lastindex = save_file.find_last_of("/");
size_t lastindex = save_file.find_last_of('/');
#ifdef _WIN32
size_t lastindex2 = save_file.find_last_of("\\");
lastindex = max(lastindex, lastindex2);
@ -126,7 +126,7 @@ string get_game_save_prefix()
string get_game_basename()
{
string game_dir = cfgLoadStr("config", "image", "");
size_t lastindex = game_dir.find_last_of(".");
size_t lastindex = game_dir.find_last_of('.');
if (lastindex != -1)
game_dir = game_dir.substr(0, lastindex);
return game_dir;
@ -135,7 +135,7 @@ string get_game_basename()
string get_game_dir()
{
string game_dir = cfgLoadStr("config", "image", "");
size_t lastindex = game_dir.find_last_of("/");
size_t lastindex = game_dir.find_last_of('/');
#ifdef _WIN32
size_t lastindex2 = game_dir.find_last_of("\\");
lastindex = max(lastindex, lastindex2);

4
core/stdclass.h
View File

@ -1,8 +1,8 @@
#pragma once
#include "types.h"
#include <stdlib.h>
#include <cstdlib>
#include <vector>
#include <string.h>
#include <cstring>
#ifndef _WIN32
#include <pthread.h>

8
core/types.h
View File

@ -67,8 +67,8 @@
#pragma warning( disable : 4100)
#endif
#include <stdint.h>
#include <stddef.h>
#include <cstdint>
#include <cstddef>
//basic types
typedef int8_t s8;
@ -237,8 +237,8 @@ void libCore_CDDA_Sector(s16* sector);
//includes from CRT
#include <stdlib.h>
#include <stdio.h>
#include <cstdlib>
#include <cstdio>
#if HOST_OS == OS_DARWIN
int darw_printf(const wchar* Text,...);

2
core/windows/win_vmem.cpp
View File

@ -111,7 +111,7 @@ void vmem_platform_reset_mem(void *ptr, unsigned size_bytes) {
// Allocates a bunch of memory (page aligned and page-sized)
void vmem_platform_ondemand_page(void *address, unsigned size_bytes) {
verify(VirtualAlloc(address, size_bytes, MEM_COMMIT, PAGE_READWRITE));
verify(VirtualAlloc(address, size_bytes, MEM_COMMIT, PAGE_READWRITE) != NULL);
}
/// Creates mappings to the underlying file including mirroring sections

4
shell/apple/emulator-ios/reicast-ios.xcodeproj/project.pbxproj
View File

@ -263,7 +263,6 @@
84967C8E1B8F492C005F1140 /* pngwutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pngwutil.c; sourceTree = "<group>"; };
8497BCBC1A41A0E900EFB9ED /* common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = common.cpp; sourceTree = "<group>"; };
8497BCBD1A41A0E900EFB9ED /* nixprof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nixprof.cpp; path = nixprof/nixprof.cpp; sourceTree = "<group>"; };
8497BCBE1A41A0E900EFB9ED /* typedefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = typedefs.h; sourceTree = "<group>"; };
8497BCCD1A41BFD800EFB9ED /* coreio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coreio.cpp; sourceTree = "<group>"; };
8497BCCE1A41BFD800EFB9ED /* coreio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coreio.h; sourceTree = "<group>"; };
849C0D601B072C07008BAAA4 /* context.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = context.cpp; sourceTree = "<group>"; };
@ -553,7 +552,6 @@
9C7A3A4418C806DF0070BB5F /* rtc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rtc.cpp; sourceTree = "<group>"; };
9C7A3A4518C806DF0070BB5F /* serial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = serial.cpp; sourceTree = "<group>"; };
9C7A3A4618C806DF0070BB5F /* tmu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tmu.cpp; sourceTree = "<group>"; };
9C7A3A4718C806DF0070BB5F /* tmu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tmu.h; sourceTree = "<group>"; };
9C7A3A4818C806DF0070BB5F /* ubc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ubc.cpp; sourceTree = "<group>"; };
9C7A3A4918C806DF0070BB5F /* sh4_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sh4_core.h; sourceTree = "<group>"; };
9C7A3A4A18C806DF0070BB5F /* sh4_core_regs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sh4_core_regs.cpp; sourceTree = "<group>"; };
@ -659,7 +657,6 @@
849C0D611B072C07008BAAA4 /* context.h */,
8497BCBC1A41A0E900EFB9ED /* common.cpp */,
8497BCBD1A41A0E900EFB9ED /* nixprof.cpp */,
8497BCBE1A41A0E900EFB9ED /* typedefs.h */,
);
path = linux;
sourceTree = "<group>";
@ -1298,7 +1295,6 @@
9C7A3A4418C806DF0070BB5F /* rtc.cpp */,
9C7A3A4518C806DF0070BB5F /* serial.cpp */,
9C7A3A4618C806DF0070BB5F /* tmu.cpp */,
9C7A3A4718C806DF0070BB5F /* tmu.h */,
9C7A3A4818C806DF0070BB5F /* ubc.cpp */,
);
path = modules;

4
shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj
View File

@ -551,7 +551,6 @@
84B7BE2C1B72720100F9733F /* rtc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rtc.cpp; sourceTree = "<group>"; };
84B7BE2D1B72720100F9733F /* serial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = serial.cpp; sourceTree = "<group>"; };
84B7BE2E1B72720100F9733F /* tmu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tmu.cpp; sourceTree = "<group>"; };
84B7BE2F1B72720100F9733F /* tmu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tmu.h; sourceTree = "<group>"; };
84B7BE301B72720100F9733F /* ubc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ubc.cpp; sourceTree = "<group>"; };
84B7BE311B72720100F9733F /* sh4_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sh4_core.h; sourceTree = "<group>"; };
84B7BE321B72720100F9733F /* sh4_core_regs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sh4_core_regs.cpp; sourceTree = "<group>"; };
@ -597,7 +596,6 @@
84B7BE661B72720100F9733F /* context.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = context.cpp; sourceTree = "<group>"; };
84B7BE671B72720100F9733F /* context.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = context.h; sourceTree = "<group>"; };
84B7BE691B72720100F9733F /* nixprof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nixprof.cpp; sourceTree = "<group>"; };
84B7BE6A1B72720100F9733F /* typedefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = typedefs.h; sourceTree = "<group>"; };
84B7BE6E1B72720200F9733F /* nullDC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nullDC.cpp; path = ../../../core/nullDC.cpp; sourceTree = "<group>"; };
84B7BE701B72720200F9733F /* audiobackend_alsa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audiobackend_alsa.cpp; sourceTree = "<group>"; };
84B7BE711B72720200F9733F /* audiobackend_alsa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audiobackend_alsa.h; sourceTree = "<group>"; };
@ -1502,7 +1500,6 @@
84B7BE2C1B72720100F9733F /* rtc.cpp */,
84B7BE2D1B72720100F9733F /* serial.cpp */,
84B7BE2E1B72720100F9733F /* tmu.cpp */,
84B7BE2F1B72720100F9733F /* tmu.h */,
84B7BE301B72720100F9733F /* ubc.cpp */,
);
path = modules;
@ -1596,7 +1593,6 @@
84B7BE671B72720100F9733F /* context.h */,
84B7BE681B72720100F9733F /* nixprof */,
AEF2564722886A2E00348550 /* posix_vmem.cpp */,
84B7BE6A1B72720100F9733F /* typedefs.h */,
);
name = linux;
path = ../../../core/linux;

11
shell/reicast.vcxproj
View File

@ -472,7 +472,6 @@
<ClInclude Include="..\core\hw\sh4\modules\mmu.h" />
<ClInclude Include="..\core\hw\sh4\modules\mmu_impl.h" />
<ClInclude Include="..\core\hw\sh4\modules\modules.h" />
<ClInclude Include="..\core\hw\sh4\modules\tmu.h" />
<ClInclude Include="..\core\hw\sh4\sh4_if.h" />
<ClInclude Include="..\core\hw\sh4\sh4_interrupts.h" />
<ClInclude Include="..\core\hw\sh4\sh4_mmr.h" />
@ -503,16 +502,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Slow|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Debug|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="..\core\linux\typedefs.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Slow|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Slow|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Fast|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Fast|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="..\core\oslib\audiobackend_directsound.h" />
<ClInclude Include="..\core\oslib\audiostream.h" />
<ClInclude Include="..\core\oslib\oslib.h" />

6
shell/reicast.vcxproj.filters
View File

@ -1004,9 +1004,6 @@
<ClInclude Include="..\core\hw\sh4\modules\mmu.h">
<Filter>hw\sh4\modules</Filter>
</ClInclude>
<ClInclude Include="..\core\hw\sh4\modules\tmu.h">
<Filter>hw\sh4\modules</Filter>
</ClInclude>
<ClInclude Include="..\core\hw\sh4\dyna\blockmanager.h">
<Filter>hw\sh4\dyna</Filter>
</ClInclude>
@ -1067,9 +1064,6 @@
<ClInclude Include="..\core\deps\libelf\elf32.h">
<Filter>deps\libelf</Filter>
</ClInclude>
<ClInclude Include="..\core\linux\typedefs.h">
<Filter>linux</Filter>
</ClInclude>
<ClInclude Include="..\core\deps\chdpsr\cdipsr.h">
<Filter>deps\chdpsr</Filter>
</ClInclude>