Merge branch 'cart-eff-grizzards'

Author: sa666666

Changes.txt

@@ -12,19 +12,23 @@
                               Release History
 ===========================================================================
 
-7.x to 8.0 (xxx x, 202x)
+7.0 to 8.0 (mmm dd, 2026)
 
-  * Ported Stella to SDL3 
+  * Ported Stella to SDL3.
 
-  * Added option for switching Stella's theme in sync with OS
+  * Added support for 'EFF' bankswitching (Bruce-Robert Pocock), as well
+    as auto-detection of this format.
 
-7.0 to 7.1 (xxx x, 202x)
+  * Added option for switching Stella's theme in sync with OS.
 
-  * Enhanced PAL-60 detection, searches for signature (e.g. PAL60) in ROM
+  * Enhanced PAL-60 detection, searches for signature (e.g. PAL60) in ROM.
 
-  * Enhanced VSYNC emulation, considers VBLANK now too
+  * Enhanced VSYNC emulation, considers VBLANK now too.
+
+  * Added developer option for disabling PlusROM support.
+
+-Have fun!
 
-  * Added developer option for disabling PlusROM support
 
 6.7.1 to 7.0 (October 5, 2024)
 
@@ -83,8 +87,6 @@
   * Codebase now uses C++20 features, which means a minimum of gcc-11
     or clang-10 for Linux/Mac, and Visual Studio 2022 for Windows.
 
--Have fun!
-
 
 6.7 to 6.7.1 (January 15, 2024)
 

docs/index.html

@@ -5118,8 +5118,9 @@ <h3><a name="EmulationProps"><b>Emulation Properties</b></a></h3>
         <tr><td>E0 </td><td>8K Parker Bros </td><td>.E0 </td></tr>
         <tr><td>E7 </td><td>8-16K M Network </td><td>.E7 .E78, .E78K</td></tr>
         <tr><td>EF </td><td>64K Homestar Runner </td><td>.EF </td></tr>
+        <tr><td>EFF </td><td>64K+2Kee/Grizzards</td><td>.EFF </td></tr>
         <tr><td>EFSC </td><td>64K Homestar Runner + RAM</td><td>.EFS, .EFSC </td></tr>
-		<tr><td>ELF </td><td>Mattress Monkeys, ARM based</td><td>.ELF </td></tr>
+		    <tr><td>ELF </td><td>Mattress Monkeys, ARM based</td><td>.ELF </td></tr>
         <tr><td>F0 </td><td>Dynacom Megaboy </td><td>.F0 </td></tr>
         <tr><td>F4 </td><td>32K Atari </td><td>.F4 </td></tr>
         <tr><td>F4SC </td><td>32K Atari + RAM </td><td>.F4S, .F4SC </td></tr>
@@ -5131,8 +5132,8 @@ <h3><a name="EmulationProps"><b>Emulation Properties</b></a></h3>
         <tr><td>FA2 </td><td>CBS RAM Plus 24/28K </td><td>.FA2 </td></tr>
         <tr><td>FC </td><td>Amiga Power Play Aracde 16/32K </td><td>.FC </td></tr>
         <tr><td>FE </td><td>8K Activision (aka SCABS)</td><td>.FE </td></tr>
-		<tr><td>GL &#178;</td><td>4 or 6K GameLine Master Module</td><td>.GL </td></tr>
-		<tr><td>JANE </td><td>16K Coleco (Tarzan) </td><td>.JAN, .JANE </td></tr>
+		    <tr><td>GL &#178;</td><td>4 or 6K GameLine Master Module</td><td>.GL </td></tr>
+		    <tr><td>JANE </td><td>16K Coleco (Tarzan) </td><td>.JAN, .JANE </td></tr>
         <tr><td>MDM </td><td>Menu Driven Megacart </td><td>.MDM </td></tr>
         <tr><td>MVC </td><td>Movie Cart</td><td>.MVC </td></tr>
         <tr><td>SB </td><td>128-256K SUPERbanking </td><td>.SB </td></tr>

src/debugger/gui/CartEFFWidget.cxx

@@ -0,0 +1,39 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll
+//  SS  SS   tt           ll   ll
+//  SS     tttttt  eeee   ll   ll   aaaa
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2026 by Bradford W. Mott, Stephen Anthony
+// and the Stella Team
+//
+// See the file "License.txt" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//============================================================================
+
+#include "CartEFF.hxx"
+#include "CartEFFWidget.hxx"
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+CartridgeEFFWidget::CartridgeEFFWidget(
+      GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
+      int x, int y, int w, int h, CartridgeEFF& cart)
+  : CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
+{
+  initialize();
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+string CartridgeEFFWidget::description()
+{
+  ostringstream info;
+
+  info << "64k AtariAge EFF cartridge, 16 4k banks + 2k flash\n"
+       << CartridgeEnhancedWidget::description();
+
+  return info.str();
+}

src/debugger/gui/CartEFFWidget.hxx

@@ -0,0 +1,48 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll
+//  SS  SS   tt           ll   ll
+//  SS     tttttt  eeee   ll   ll   aaaa
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2026 by Bradford W. Mott, Stephen Anthony
+// and the Stella Team
+//
+// See the file "License.txt" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//============================================================================
+
+#ifndef CARTRIDGEEFF_WIDGET_HXX
+#define CARTRIDGEEFF_WIDGET_HXX
+
+class CartridgeEFF;
+
+#include "CartEnhancedWidget.hxx"
+
+class CartridgeEFFWidget : public CartridgeEnhancedWidget
+{
+  public:
+    CartridgeEFFWidget(GuiObject* boss, const GUI::Font& lfont,
+                       const GUI::Font& nfont,
+                       int x, int y, int w, int h,
+                       CartridgeEFF& cart);
+    ~CartridgeEFFWidget() override = default;
+
+  private:
+    string manufacturer() override { return "Fred Quimby/AtariAge"; }
+
+    string description() override;
+
+  private:
+    // Following constructors and assignment operators not supported
+    CartridgeEFFWidget() = delete;
+    CartridgeEFFWidget(const CartridgeEFFWidget&) = delete;
+    CartridgeEFFWidget(CartridgeEFFWidget&&) = delete;
+    CartridgeEFFWidget& operator=(const CartridgeEFFWidget&) = delete;
+    CartridgeEFFWidget& operator=(CartridgeEFFWidget&&) = delete;
+};
+
+#endif

src/debugger/gui/module.mk

@@ -38,6 +38,7 @@ MODULE_OBJS := \
         src/debugger/gui/CartE7Widget.o \
         src/debugger/gui/CartEFSCWidget.o \
         src/debugger/gui/CartEFWidget.o \
+        src/debugger/gui/CartEFFWidget.o \
         src/debugger/gui/CartF0Widget.o \
         src/debugger/gui/CartF4SCWidget.o \
         src/debugger/gui/CartF4Widget.o \

src/emucore/Bankswitch.cxx

@@ -108,6 +108,7 @@ Bankswitch::BSList = {{
   { "E0"      , "E0 (8K Parker Bros)"         },
   { "E7"      , "E7 (8-16K M Network)"        },
   { "EF"      , "EF (64K H. Runner)"          },
+  { "EFF"     , "EFF (64K+2Kee/Grizzards)"    },
   { "EFSC"    , "EFSC (64K H. Runner + RAM)"  },
   { "ELF"     , "ELF (ARM bus stuffing)"      },
   { "F0"      , "F0 (Dynacom Megaboy)"        },
@@ -175,6 +176,7 @@ Bankswitch::Sizes = {{
   {    8_KB,   8_KB }, // _E0
   {    8_KB,  16_KB }, // _E7
   {   64_KB,  64_KB }, // _EF
+  {   64_KB,  64_KB }, // _EFF
   {   64_KB,  64_KB }, // _EFSC
   {   Bankswitch::any_KB,  Bankswitch::any_KB }, // _ELF
   {   64_KB,  64_KB }, // _F0
@@ -266,6 +268,7 @@ Bankswitch::ExtensionMap Bankswitch::ourExtensions = {
   { "E78"   , Bankswitch::Type::_E7     },
   { "E78K"  , Bankswitch::Type::_E7     },
   { "EF"    , Bankswitch::Type::_EF     },
+  { "EFF"   , Bankswitch::Type::_EFF    },
   { "EFS"   , Bankswitch::Type::_EFSC   },
   { "EFSC"  , Bankswitch::Type::_EFSC   },
   { "ELF"   , Bankswitch::Type::_ELF    },
@@ -335,6 +338,7 @@ Bankswitch::NameToTypeMap Bankswitch::ourNameToTypes = {
   { "E0"      , Bankswitch::Type::_E0     },
   { "E7"      , Bankswitch::Type::_E7     },
   { "EF"      , Bankswitch::Type::_EF     },
+  { "EFF"     , Bankswitch::Type::_EFF    },
   { "EFSC"    , Bankswitch::Type::_EFSC   },
   { "ELF"     , Bankswitch::Type::_ELF    },
   { "F0"      , Bankswitch::Type::_F0     },

src/emucore/Bankswitch.hxx

@@ -42,10 +42,10 @@ class Bankswitch
       _32IN1, _64IN1, _128IN1, _2K,    _3E,   _3EX,  _3EP,  _3F,
       _4A50,  _4K,    _4KSC,   _AR,    _BF,   _BFSC, _BUS,  _CDF,
       _CM,    _CTY,   _CV,     _DF,    _DFSC, _DPC,  _DPCP, _E0,
-      _E7,    _EF,    _EFSC,   _ELF,   _F0,    _F4,  _F4SC, _F6,  
-      _F6SC,  _F8,    _F8SC,   _FA,    _FA2,   _FC,  _FE,   _GL,   
-      _JANE,  _MDM,   _MVC,    _SB,    _TVBOY, _UA,  _UASW, _WD,   
-      _WDSW,  _WF8,   _X07,
+      _E7,    _EF,    _EFF,    _EFSC,  _ELF,  _F0,   _F4,   _F4SC, 
+      _F6,    _F6SC,  _F8,     _F8SC,  _FA,   _FA2,  _FC,   _FE,
+      _GL,    _JANE,  _MDM,   _MVC,    _SB,   _TVBOY,_UA,   _UASW,
+      _WD,    _WDSW,  _WF8,   _X07,
     #ifdef CUSTOM_ARM
       _CUSTOM,
     #endif

src/emucore/CartCreator.cxx

@@ -44,6 +44,7 @@
 #include "CartE7.hxx"
 #include "CartEF.hxx"
 #include "CartEFSC.hxx"
+#include "CartEFF.hxx"
 #include "CartF0.hxx"
 #include "CartF4.hxx"
 #include "CartF4SC.hxx"
@@ -262,6 +263,7 @@ CartCreator::createFromImage(const ByteBuffer& image, size_t size,
     case _E0:   return make_unique<CartridgeE0>(image, size, md5, settings);
     case _E7:   return make_unique<CartridgeE7>(image, size, md5, settings);
     case _EF:   return make_unique<CartridgeEF>(image, size, md5, settings);
+    case _EFF:  return make_unique<CartridgeEFF>(image, size, md5, settings);
     case _EFSC: return make_unique<CartridgeEFSC>(image, size, md5, settings);
     case _F0:   return make_unique<CartridgeF0>(image, size, md5, settings);
     case _F4:   return make_unique<CartridgeF4>(image, size, md5, settings);

src/emucore/CartDetector.cxx

@@ -178,7 +178,9 @@ Bankswitch::Type CartDetector::autodetectType(const ByteBuffer& image, size_t si
   }
   else if(size == 64_KB)
   {
-    if (isProbablyCDF(image, size))
+    if(isProbablyEFF(image, size, type))
+      ; // type has been set directly in the function
+    else if (isProbablyCDF(image, size))
       type = Bankswitch::Type::_CDF;
     else if(isProbably3EX(image, size))
       type = Bankswitch::Type::_3EX;
@@ -679,6 +681,43 @@ bool CartDetector::isProbablyEF(const ByteBuffer& image, size_t size,
   return false;
 }
 
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+bool CartDetector::isProbablyEFF(const ByteBuffer& image, size_t size,
+                                Bankswitch::Type& type)
+{
+  static constexpr uInt8 effb[] = { 'E', 'F', 'F', 'B' };
+  if(searchForBytes(image.get()+size-8, 8, effb, 4))
+    {
+      type = Bankswitch::Type::_EFF;
+      return true;
+    }
+
+  // Otherwise,  EF  cart  bankswitching  switches  banks  by  accessing
+  // addresses 0xFE0 to 0xFEF, usually with  a NOP, as well as the 0xFF0
+  // to 0xFF3  for save-to-cart  and read from  0xFF4 (for  the EEPROM).
+  // Unlike EF, we require to find all three.
+  bool isEFF = true;
+  static constexpr uInt8 signature[4][3] = {
+    { 0x0C, 0xE0, 0xFF },  // NOP $FFE0
+    { 0x0C, 0xF0, 0x1F },  // NOP $1FF0
+    { 0xAD, 0xF4, 0x1F }   // LDA $1FF4
+  };
+  for(const auto* const sig: signature)
+    {
+      if(!searchForBytes(image, size, sig, 3))
+        {
+          isEFF = false;
+          break;
+        }
+    }
+
+  if (isEFF) {
+    type = Bankswitch::Type::_EFF;
+  }
+  return isEFF;
+}
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 bool CartDetector::isProbablyFA2(const ByteBuffer& image, size_t)
 {

src/emucore/CartDetector.hxx

@@ -177,15 +177,21 @@ class CartDetector
     static bool isProbablyE7(const ByteBuffer& image, size_t size);
 
     /**
-    Returns true if the image is probably a E78K bankswitching cartridge
+      Returns true if the image is probably a E78K bankswitching cartridge
     */
     static bool isProbablyE78K(const ByteBuffer& image, size_t size);
 
     /**
-      Returns true if the image is probably an EF/EFSC bankswitching cartridge
+      Returns true (and sets “type”) if the image is probably an EF/EFSC bankswitching cartridge
     */
     static bool isProbablyEF(const ByteBuffer& image, size_t size, Bankswitch::Type& type);
 
+    /**
+       Returns true (and sets “type”) if the image is probably an EFF (Grizzards)
+       bankswitching+eeprom cartridge
+     */
+    static bool isProbablyEFF(const ByteBuffer& image, size_t size, Bankswitch::Type& type);
+
     /**
       Returns true if the image is probably an F6 bankswitching cartridge
     */