Merge branch 'master' into feature/filesystem

configure

@@ -345,9 +345,6 @@ arm-riscos-aof)
 psp)
 	EXEEXT=".elf"
 	;;
-gp2x)
-	EXEEXT=""
-	;;
 *)
 	EXEEXT=""
 	;;
@@ -796,6 +793,8 @@ echo
 find_sdlconfig
 
 SRC="src"
+SRC_OS="$SRC/os"
+SRC_LIB="$SRC/lib"
 CORE="$SRC/emucore"
 COMMON="$SRC/common"
 TIA="$SRC/emucore/tia"
@@ -804,16 +803,16 @@ TV="$SRC/common/tv_filters"
 GUI="$SRC/gui"
 DBG="$SRC/debugger"
 DBGGUI="$SRC/debugger/gui"
-YACC="$SRC/yacc"
+YACC="$SRC/debugger/yacc"
 CHEAT="$SRC/cheat"
-LIBPNG="$SRC/libpng"
-LIBJPG="$SRC/nanojpeg"
-LIBJPGEXIF="$SRC/tinyexif"
-ZLIB="$SRC/zlib"
+LIBPNG="$SRC_LIB/libpng"
+LIBJPG="$SRC_LIB/nanojpeg"
+LIBJPGEXIF="$SRC_LIB/tinyexif"
+ZLIB="$SRC_LIB/zlib"
 SQLITE_REPO="$SRC/common/repository/sqlite"
-SQLITE_LIB="$SRC/sqlite"
-JSON="$SRC/json"
-HTTP_LIB="$SRC/httplib"
+SQLITE_LIB="$SRC_LIB/sqlite"
+JSON="$SRC_LIB/json"
+HTTP_LIB="$SRC_LIB/httplib"
 
 INCLUDES="-I$CORE -I$COMMON -I$TV -I$TIA -I$TIA_FRAME_MANAGER -I$JSON -I$SQLITE_REPO"
 
@@ -831,26 +830,26 @@ LD=$CXX
 case $_host_os in
 		unix)
 			DEFINES="$DEFINES -DBSPF_UNIX"
-			MODULES="$MODULES $SRC/unix"
-			INCLUDES="$INCLUDES -I$SRC/unix"
+			MODULES="$MODULES $SRC_OS/unix"
+			INCLUDES="$INCLUDES -I$SRC_OS/unix"
 			;;
 		darwin)
 			DEFINES="$DEFINES -DBSPF_UNIX -DMACOS_KEYS"
-			MODULES="$MODULES $SRC/unix"
-			INCLUDES="$INCLUDES -I$SRC/unix"
+			MODULES="$MODULES $SRC_OS/unix"
+			INCLUDES="$INCLUDES -I$SRC_OS/unix"
 			if test "$have_clang" == yes; then
 				CXXFLAGS="$CXXFLAGS -Wno-poison-system-directories"
 			fi
 			;;
     retron77)
       DEFINES="$DEFINES -DBSPF_UNIX -DRETRON77"
-      MODULES="$MODULES $SRC/unix $SRC/unix/r77"
-      INCLUDES="$INCLUDES -I$SRC/unix -I$SRC/unix/r77"
+      MODULES="$MODULES $SRC_OS/unix $SRC_OS/unix/r77"
+      INCLUDES="$INCLUDES -I$SRC_OS/unix -I$SRC_OS/unix/r77"
       ;;
 		win32)
 			DEFINES="$DEFINES -DBSPF_WINDOWS"
-			MODULES="$MODULES $SRC/windows"
-			INCLUDES="$INCLUDES -I$SRC/windows"
+			MODULES="$MODULES $SRC_OS/windows"
+			INCLUDES="$INCLUDES -I$SRC_OS/windows"
 			LIBS="$LIBS -lmingw32 -lwinmm"
 			;;
 		*)

src/common/JPGLibrary.cxx

@@ -111,7 +111,7 @@ void JPGLibrary::readMetaData(const string& filename, VariantList& metaData)
   std::ifstream in(filename, std::ifstream::binary);
 
   // parse image EXIF metadata
-  TinyEXIF::EXIFInfo imageEXIF(in);
+  const TinyEXIF::EXIFInfo imageEXIF(in);
   if(imageEXIF.Fields)
   {
     // For now we only read the image description

src/common/ZipHandler.cxx

@@ -273,7 +273,6 @@ void ZipHandler::ZipFile::close()
 void ZipHandler::ZipFile::readEcd()
 {
   uInt64 buflen = 1024;
-  ByteBuffer buffer;
 
   // We may need multiple tries
   while(buflen < 65536)
@@ -285,7 +284,7 @@ void ZipHandler::ZipFile::readEcd()
       buflen = myLength;
 
     // Allocate buffer
-    buffer = make_unique<uInt8[]>(buflen + 1);
+    ByteBuffer buffer = make_unique<uInt8[]>(buflen + 1);
     if(buffer == nullptr)
       throw runtime_error(errorMessage(ZipError::OUT_OF_MEMORY));
 

src/debugger/yacc/YaccParser.hxx

@@ -15,8 +15,8 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef PARSER_HXX
-#define PARSER_HXX
+#ifndef YACC_PARSER_HXX
+#define YACC_PARSER_HXX
 
 #include "Expression.hxx"
 #include "CartDebug.hxx"

src/debugger/yacc/module.mk

@@ -1,11 +1,10 @@
-MODULE := src/unix
+MODULE := src/debugger/yacc
 
 MODULE_OBJS := \
-	src/unix/OSystemUNIX.o \
-	src/unix/SerialPortUNIX.o
+	src/debugger/yacc/YaccParser.o
 
 MODULE_DIRS += \
-	src/unix
+	src/debugger/yacc
 
 # Include common rules
 include $(srcdir)/common.rules

src/emucore/DefProps.hxx

@@ -1979,7 +1979,7 @@ static constexpr BSPF::array2D<const char*, DEF_PROPS_SIZE, 29> DefProps = {{
   { "87662815bc4f3c3c86071dc994e3f30e", "Intellivision Productions - M Network, Patricia Lewis Du Long, Stephen Tatsumi", "", "Swordfight (1983) (Intellivision)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
   { "876a953daae0e946620cf05ed41989f4", "Retroactive", "", "Qb (V2.08) (PAL) (2001) (Retroactive)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" },
   { "877a5397f3f205bf6750398c98f33de1", "Erik Eid", "", "Euchre (Beta) (PAL) (12-09-2002) (Erik Eid)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
-  { "8786c1e56ef221d946c64f6b65b697e9", "20th Century Fox Video Games, David Lubar", "11015", "AKA Space Adventure", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
+  { "8786c1e56ef221d946c64f6b65b697e9", "20th Century Fox Video Games - Sirius Software, David Lubar", "11015", "Flash Gordon (1983) (20th Century Fox Video Games - Sirius Software, David Lubar)", "AKA Space Adventure", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
   { "8786f229b974c393222874f73a9f3206", "Activision, Larry Miller - Ariola", "EAX-021, EAX-021-04I - 711 021-720", "Spider Fighter (1983) (Activision) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
   { "8786f4609a66fbea2cd9aa48ca7aa11c", "Goliath", "5", "Open Sesame (1983) (Goliath) (PAL)", "AKA Open, Sesame!", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" },
   { "87b460df21b7bbcfc57b1c082c6794b0", "Dennis Debro", "", "Climber 5 (20-03-2003) (Dennis Debro)", "", "Homebrew", "", "", "", "", "https://atariage.com/store/index.php?l=product_detail&p=261", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },

src/emucore/stella.pro

@@ -12385,9 +12385,10 @@
 ""
 
 "Cart.MD5" "8786c1e56ef221d946c64f6b65b697e9"
-"Cart.Manufacturer" "20th Century Fox Video Games, David Lubar"
+"Cart.Manufacturer" "20th Century Fox Video Games - Sirius Software, David Lubar"
 "Cart.ModelNo" "11015"
-"Cart.Name" "AKA Space Adventure"
+"Cart.Name" "Flash Gordon (1983) (20th Century Fox Video Games - Sirius Software, David Lubar)" 
+"Cart.Note" "AKA Space Adventure"
 ""
 
 "Cart.MD5" "8786f229b974c393222874f73a9f3206"

src/gui/RomImageWidget.cxx

@@ -48,6 +48,13 @@ void RomImageWidget::setProperties(const FSNode& node, const Properties properti
   // Decide whether the information should be shown immediately
   if(instance().eventHandler().state() == EventHandlerState::LAUNCHER)
     parseProperties(node, full);
+  else
+  {
+#ifdef DEBUGGER_SUPPORT
+    cerr << "RomImageWidget::setProperties: else!" << endl;
+    Logger::debug("RomImageWidget::setProperties: else!");
+#endif
+  }
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -60,6 +67,13 @@ void RomImageWidget::clearProperties()
   // Decide whether the information should be shown immediately
   if(instance().eventHandler().state() == EventHandlerState::LAUNCHER)
     setDirty();
+  else
+  {
+#ifdef DEBUGGER_SUPPORT
+    cerr << "RomImageWidget::clearProperties: else!" << endl;
+    Logger::debug("RomImageWidget::clearProperties: else!");
+#endif
+  }
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -136,7 +150,7 @@ void RomImageWidget::parseProperties(const FSNode& node, bool full)
   }
   else
   {
-    const string& oldFileName = myImageList.size() ? myImageList[0].getPath() : EmptyString;
+    const string oldFileName = myImageList.size() ? myImageList[0].getPath() : EmptyString;
 
     // Try to find all snapshots by property and ROM file name
     myImageList.clear();
@@ -146,6 +160,8 @@ void RomImageWidget::parseProperties(const FSNode& node, bool full)
     // property *and* ROM name are found (TODO: fix that!)
     if(myImageList.size() && myImageList[0].getPath() != oldFileName)
       loadImage(myImageList[0].getPath());
+    else
+      setDirty(); // update the counter display
   }
 #else
   mySurfaceIsValid = false;

src/lib/libpng/module.mk

@@ -0,0 +1,24 @@
+MODULE := src/lib/libpng
+
+MODULE_OBJS := \
+	src/lib/libpng/png.o \
+	src/lib/libpng/pngerror.o \
+	src/lib/libpng/pngget.o \
+	src/lib/libpng/pngmem.o \
+	src/lib/libpng/pngpread.o \
+	src/lib/libpng/pngread.o \
+	src/lib/libpng/pngrio.o \
+	src/lib/libpng/pngrtran.o \
+	src/lib/libpng/pngrutil.o \
+	src/lib/libpng/pngset.o \
+	src/lib/libpng/pngtrans.o \
+	src/lib/libpng/pngwio.o \
+	src/lib/libpng/pngwrite.o \
+	src/lib/libpng/pngwtran.o \
+	src/lib/libpng/pngwutil.o
+
+MODULE_DIRS += \
+	src/lib/libpng
+
+# Include common rules
+include $(srcdir)/common.rules

src/lib/sqlite/module.mk

@@ -1,10 +1,10 @@
-MODULE := src/sqlite
+MODULE := src/lib/sqlite
 
 MODULE_OBJS := \
-	src/sqlite/sqlite3.o
+	src/lib/sqlite/sqlite3.o
 
 MODULE_DIRS += \
-	src/sqlite
+	src/lib/sqlite
 
 # Include common rules
 include $(srcdir)/common.rules

src/lib/tinyexif/module.mk

@@ -1,10 +1,10 @@
-MODULE := src/tinyexif
+MODULE := src/lib/tinyexif
 
 MODULE_OBJS := \
-	src/tinyexif/tinyexif.o
+	src/lib/tinyexif/tinyexif.o
 
 MODULE_DIRS += \
-	src/tinyexif
+	src/lib/tinyexif
 
 # Include common rules
 include $(srcdir)/common.rules

src/lib/zlib/module.mk

@@ -0,0 +1,24 @@
+MODULE := src/lib/zlib
+
+MODULE_OBJS := \
+	src/lib/zlib/adler32.o \
+	src/lib/zlib/compress.o \
+	src/lib/zlib/crc32.o \
+	src/lib/zlib/gzclose.o \
+	src/lib/zlib/gzlib.o \
+	src/lib/zlib/gzread.o \
+	src/lib/zlib/gzwrite.o \
+	src/lib/zlib/uncompr.o \
+	src/lib/zlib/deflate.o \
+	src/lib/zlib/trees.o \
+	src/lib/zlib/zutil.o \
+	src/lib/zlib/inflate.o \
+	src/lib/zlib/infback.o \
+	src/lib/zlib/inftrees.o \
+	src/lib/zlib/inffast.o
+
+MODULE_DIRS += \
+	src/lib/zlib
+
+# Include common rules
+include $(srcdir)/common.rules

src/libpng/module.mk

@@ -1,24 +0,0 @@
-MODULE := src/libpng
-
-MODULE_OBJS := \
-	src/libpng/png.o \
-	src/libpng/pngerror.o \
-	src/libpng/pngget.o \
-	src/libpng/pngmem.o \
-	src/libpng/pngpread.o \
-	src/libpng/pngread.o \
-	src/libpng/pngrio.o \
-	src/libpng/pngrtran.o \
-	src/libpng/pngrutil.o \
-	src/libpng/pngset.o \
-	src/libpng/pngtrans.o \
-	src/libpng/pngwio.o \
-	src/libpng/pngwrite.o \
-	src/libpng/pngwtran.o \
-	src/libpng/pngwutil.o
-
-MODULE_DIRS += \
-	src/libpng
-
-# Include common rules 
-include $(srcdir)/common.rules

src/os/libretro/Makefile

@@ -538,7 +538,7 @@ else
    CXXFLAGS += -D__WIN32__
 endif
 
-CORE_DIR := ..
+CORE_DIR := ../..
 
 ifeq ($(DEBUG), 1)
    ifneq (,$(findstring msvc,$(platform)))
@@ -580,7 +580,7 @@ else ifneq (,$(findstring msvc,$(platform)))
    CODE_DEFINES =
 else
    WARNINGS_DEFINES = -Wall -W -Wno-unused-parameter
-   CODE_DEFINES = 
+   CODE_DEFINES =
 endif
 
 CXXFLAGS += $(CODE_DEFINES) $(WARNINGS_DEFINES) $(fpic)

src/os/libretro/Makefile.common

@@ -1,14 +1,14 @@
 LIBRETRO_COMM_DIR = $(CORE_DIR)/../libretro-common
-INCFLAGS := -I. -I$(CORE_DIR) -I$(CORE_DIR)/libretro -I$(CORE_DIR)/emucore -I$(CORE_DIR)/emucore/tia -I$(CORE_DIR)/common -I$(CORE_DIR)/common/audio -I$(CORE_DIR)/common/tv_filters -I$(CORE_DIR)/common/repository/sqlite -I$(CORE_DIR)/json -I$(CORE_DIR)/httplib -I$(CORE_DIR)/sqlite
+INCFLAGS := -I. -I$(CORE_DIR) -I$(CORE_DIR)/os/libretro -I$(CORE_DIR)/emucore -I$(CORE_DIR)/emucore/tia -I$(CORE_DIR)/common -I$(CORE_DIR)/common/audio -I$(CORE_DIR)/common/tv_filters -I$(CORE_DIR)/common/repository/sqlite -I$(CORE_DIR)/lib/json -I$(CORE_DIR)/lib/httplib -I$(CORE_DIR)/lib/sqlite
 
 ifneq (,$(findstring msvc2003,$(platform)))
 INCFLAGS += -I$(LIBRETRO_COMM_DIR)/include/compat/msvc
 endif
 
 SOURCES_CXX := \
-	$(CORE_DIR)/libretro/libretro.cxx \
-	$(CORE_DIR)/libretro/FSNodeLIBRETRO.cxx \
-	$(CORE_DIR)/libretro/StellaLIBRETRO.cxx \
+	$(CORE_DIR)/os/libretro/libretro.cxx \
+	$(CORE_DIR)/os/libretro/FSNodeLIBRETRO.cxx \
+	$(CORE_DIR)/os/libretro/StellaLIBRETRO.cxx \
 	$(CORE_DIR)/common/AudioQueue.cxx \
 	$(CORE_DIR)/common/AudioSettings.cxx \
 	$(CORE_DIR)/common/Base.cxx \