From e61caf069b18a7c560c9855246a8de5740e1dbdd Mon Sep 17 00:00:00 2001
From: Stephen Anthony <sa666666@gmail.com>
Date: Sat, 9 Mar 2019 19:40:45 -0330
Subject: [PATCH] Fix warnings under gcc and clang, both in normal compilation
 and R77 mode.

---
 src/emucore/ProfilingRunner.cxx |  2 +-
 src/emucore/Thumbulator.cxx     | 15 ++++++++++-----
 src/emucore/Thumbulator.hxx     |  1 -
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/emucore/ProfilingRunner.cxx b/src/emucore/ProfilingRunner.cxx
index ebd379a0e..e30d46ac2 100644
--- a/src/emucore/ProfilingRunner.cxx
+++ b/src/emucore/ProfilingRunner.cxx
@@ -143,7 +143,7 @@ bool ProfilingRunner::runOne(const ProfilingRun run)
   for(int i = 0; i < 60; ++i) tia.update();
 
   FrameLayout frameLayout = frameLayoutDetector.detectedLayout();
-  ConsoleTiming consoleTiming;
+  ConsoleTiming consoleTiming = ConsoleTiming::ntsc;
 
   switch (frameLayout) {
     case FrameLayout::ntsc:
diff --git a/src/emucore/Thumbulator.cxx b/src/emucore/Thumbulator.cxx
index e34170382..9f7b9855e 100644
--- a/src/emucore/Thumbulator.cxx
+++ b/src/emucore/Thumbulator.cxx
@@ -1201,6 +1201,9 @@ int Thumbulator::execute()
       statusMsg << "bkpt 0x" << Base::HEX2 << rb << endl;
       return 1;
     }
+#else
+    case Op::bkpt:
+      break;
 #endif
 
     //BL/BLX(1)
@@ -1566,6 +1569,9 @@ int Thumbulator::execute()
       DO_DISS(statusMsg << "cps TODO" << endl);
       return 1;
     }
+#else
+    case Op::cps:
+      break;
 #endif
 
     //CPY copy high register
@@ -2202,6 +2208,9 @@ int Thumbulator::execute()
       statusMsg << "setend not implemented" << endl;
       return 1;
     }
+#else
+    case Op::setend:
+      break;
 #endif
 
     //STMIA
@@ -2490,10 +2499,8 @@ int Thumbulator::execute()
       return 0;
     }
 
-#ifndef UNSAFE_OPTIMIZATIONS
     case Op::invalid:
       break;
-#endif
   }
 
 #ifndef UNSAFE_OPTIMIZATIONS
@@ -2536,13 +2543,11 @@ int Thumbulator::reset()
   // fxq: don't care about below so much (maybe to guess timing???)
 #ifndef UNSAFE_OPTIMIZATIONS
   instructions = 0;
+  statusMsg.str("");
 #endif
 #ifndef NO_THUMB_STATS
   fetches = reads = writes = 0;
 #endif
-#ifndef UNSAFE_OPTIMIZATIONS
-  statusMsg.str("");
-#endif
 
   return 0;
 }
diff --git a/src/emucore/Thumbulator.hxx b/src/emucore/Thumbulator.hxx
index 37a72094e..d36e1d683 100644
--- a/src/emucore/Thumbulator.hxx
+++ b/src/emucore/Thumbulator.hxx
@@ -30,7 +30,6 @@ class Cartridge;
 #include "bspf.hxx"
 #include "Console.hxx"
 
-//#define RETRON77
 #ifdef RETRON77
   #define UNSAFE_OPTIMIZATIONS
   #define NO_THUMB_STATS