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

Fix warnings under gcc and clang, both in normal compilation and R77 mode.

This commit is contained in:
Stephen Anthony 2019-03-09 19:40:45 -03:30
parent 14567207ff
commit e61caf069b
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emucore/ProfilingRunner.cxx
View File

@ -143,7 +143,7 @@ bool ProfilingRunner::runOne(const ProfilingRun run)
for(int i = 0; i < 60; ++i) tia.update(); for(int i = 0; i < 60; ++i) tia.update();
FrameLayout frameLayout = frameLayoutDetector.detectedLayout(); FrameLayout frameLayout = frameLayoutDetector.detectedLayout();
ConsoleTiming consoleTiming; ConsoleTiming consoleTiming = ConsoleTiming::ntsc;
switch (frameLayout) { switch (frameLayout) {
case FrameLayout::ntsc: case FrameLayout::ntsc:

15
src/emucore/Thumbulator.cxx
View File

@ -1201,6 +1201,9 @@ int Thumbulator::execute()
statusMsg << "bkpt 0x" << Base::HEX2 << rb << endl; statusMsg << "bkpt 0x" << Base::HEX2 << rb << endl;
return 1; return 1;
} }
#else
case Op::bkpt:
break;
#endif #endif
//BL/BLX(1) //BL/BLX(1)
@ -1566,6 +1569,9 @@ int Thumbulator::execute()
DO_DISS(statusMsg << "cps TODO" << endl); DO_DISS(statusMsg << "cps TODO" << endl);
return 1; return 1;
} }
#else
case Op::cps:
break;
#endif #endif
//CPY copy high register //CPY copy high register
@ -2202,6 +2208,9 @@ int Thumbulator::execute()
statusMsg << "setend not implemented" << endl; statusMsg << "setend not implemented" << endl;
return 1; return 1;
} }
#else
case Op::setend:
break;
#endif #endif
//STMIA //STMIA
@ -2490,10 +2499,8 @@ int Thumbulator::execute()
return 0; return 0;
} }
#ifndef UNSAFE_OPTIMIZATIONS
case Op::invalid: case Op::invalid:
break; break;
#endif
} }
#ifndef UNSAFE_OPTIMIZATIONS #ifndef UNSAFE_OPTIMIZATIONS
@ -2536,13 +2543,11 @@ int Thumbulator::reset()
// fxq: don't care about below so much (maybe to guess timing???) // fxq: don't care about below so much (maybe to guess timing???)
#ifndef UNSAFE_OPTIMIZATIONS #ifndef UNSAFE_OPTIMIZATIONS
instructions = 0; instructions = 0;
statusMsg.str("");
#endif #endif
#ifndef NO_THUMB_STATS #ifndef NO_THUMB_STATS
fetches = reads = writes = 0; fetches = reads = writes = 0;
#endif #endif
#ifndef UNSAFE_OPTIMIZATIONS
statusMsg.str("");
#endif
return 0; return 0;
} }

1
src/emucore/Thumbulator.hxx
View File

@ -30,7 +30,6 @@ class Cartridge;
#include "bspf.hxx" #include "bspf.hxx"
#include "Console.hxx" #include "Console.hxx"
//#define RETRON77
#ifdef RETRON77 #ifdef RETRON77
#define UNSAFE_OPTIMIZATIONS #define UNSAFE_OPTIMIZATIONS
#define NO_THUMB_STATS #define NO_THUMB_STATS