Merge branch 'v2.0'

Author: dirkwhoffmann

Emulator/Agnus/Agnus.cpp

@@ -60,24 +60,21 @@ Agnus::_reset(bool hard)
     if (insEvent) scheduleRel <SLOT_INS> (0, insEvent);
 }
 
-AgnusConfig
-Agnus::getDefaultConfig()
+void
+Agnus::resetConfig()
 {
-    AgnusConfig defaults;
+    assert(isPoweredOff());
+    auto &defaults = amiga.properties;
 
-    defaults.revision = AGNUS_ECS_1MB;
-    defaults.slowRamMirror = true;
+    std::vector <Option> options = {
 
-    return defaults;
-}
+        OPT_AGNUS_REVISION,
+        OPT_SLOW_RAM_MIRROR
+    };
 
-void
-Agnus::resetConfig()
-{
-    auto defaults = getDefaultConfig();
-    
-    setConfigItem(OPT_AGNUS_REVISION, defaults.revision);
-    setConfigItem(OPT_SLOW_RAM_MIRROR, defaults.slowRamMirror);
+    for (auto &option : options) {
+        setConfigItem(option, defaults.get(option));
+    }
 }
 
 i64

Emulator/Agnus/Agnus.h

@@ -294,7 +294,6 @@ class Agnus : public SubComponent {
 
 public:
 
-    static AgnusConfig getDefaultConfig();
     const AgnusConfig &getConfig() const { return config; }
     void resetConfig() override;
 

Emulator/Agnus/Blitter/Blitter.cpp

@@ -9,7 +9,7 @@
 
 #include "config.h"
 #include "Blitter.h"
-#include "Agnus.h"
+#include "Amiga.h"
 #include "Checksum.h"
 #include "IOUtils.h"
 #include "Thread.h"
@@ -69,22 +69,20 @@ Blitter::_run()
     }
 }
 
-BlitterConfig
-Blitter::getDefaultConfig()
-{
-    BlitterConfig defaults;
-    
-    defaults.accuracy = 2;
-
-    return defaults;
-}
-
 void
 Blitter::resetConfig()
 {
-    auto defaults = getDefaultConfig();
-    
-    setConfigItem(OPT_BLITTER_ACCURACY, defaults.accuracy);
+    assert(isPoweredOff());
+    auto &defaults = amiga.properties;
+
+    std::vector <Option> options = {
+        
+        OPT_BLITTER_ACCURACY
+    };
+
+    for (auto &option : options) {
+        setConfigItem(option, defaults.get(option));
+    }
 }
 
 i64

Emulator/Agnus/Blitter/Blitter.h

@@ -285,7 +285,6 @@ class Blitter : public SubComponent
 
 public:
 
-    static BlitterConfig getDefaultConfig();
     const BlitterConfig &getConfig() const { return config; }
     void resetConfig() override;
 

Emulator/Agnus/DmaDebugger/DmaDebugger.cpp

@@ -9,58 +9,39 @@
 
 #include "config.h"
 #include "DmaDebugger.h"
-#include "Agnus.h"
-#include "Denise.h"
-#include "MsgQueue.h"
-#include "PixelEngine.h"
+#include "Amiga.h"
 
 DmaDebugger::DmaDebugger(Amiga &ref) : SubComponent(ref)
 {
 }
 
-DmaDebuggerConfig
-DmaDebugger::getDefaultConfig()
-{
-    DmaDebuggerConfig defaults;
-
-    defaults.enabled = false;
-    defaults.displayMode = DMA_DISPLAY_MODE_FG_LAYER;
-    defaults.opacity = 50;
-
-    defaults.visualize[DMA_CHANNEL_CPU] = false;
-    defaults.visualize[DMA_CHANNEL_REFRESH] = true;
-    defaults.visualize[DMA_CHANNEL_DISK] = true;
-    defaults.visualize[DMA_CHANNEL_AUDIO] = true;
-    defaults.visualize[DMA_CHANNEL_BITPLANE] = true;
-    defaults.visualize[DMA_CHANNEL_SPRITE] = true;
-    defaults.visualize[DMA_CHANNEL_COPPER] = true;
-    defaults.visualize[DMA_CHANNEL_BLITTER] = true;
-
-    defaults.debugColor[DMA_CHANNEL_CPU] = 0xFFFFFF00;
-    defaults.debugColor[DMA_CHANNEL_REFRESH] = 0xFF000000;
-    defaults.debugColor[DMA_CHANNEL_DISK] = 0x00FF0000;
-    defaults.debugColor[DMA_CHANNEL_AUDIO] = 0xFF00FF00;
-    defaults.debugColor[DMA_CHANNEL_BITPLANE] = 0x00FFFF00;
-    defaults.debugColor[DMA_CHANNEL_SPRITE] = 0x0088FF00;
-    defaults.debugColor[DMA_CHANNEL_COPPER] = 0xFFFF0000;
-    defaults.debugColor[DMA_CHANNEL_BLITTER] = 0xFFCC0000;
-    
-    return defaults;
-}
-
 void
 DmaDebugger::resetConfig()
 {
-    auto defaults = getDefaultConfig();
-    
-    setConfigItem(OPT_DMA_DEBUG_ENABLE, defaults.enabled);
-    setConfigItem(OPT_DMA_DEBUG_MODE, defaults.displayMode);
-    setConfigItem(OPT_DMA_DEBUG_OPACITY, defaults.opacity);
+    assert(isPoweredOff());
+    auto &defaults = amiga.properties;
+
+    std::vector <Option> options = {
+        
+        OPT_DMA_DEBUG_ENABLE,
+        OPT_DMA_DEBUG_MODE,
+        OPT_DMA_DEBUG_OPACITY
+    };
 
-    for (isize i = 0; DmaChannelEnum::isValid(i); i++) {
+    for (auto &option : options) {
+        setConfigItem(option, defaults.get(option));
+    }
+    
+    std::vector <Option> moreOptions = {
+        
+        OPT_DMA_DEBUG_CHANNEL,
+        OPT_DMA_DEBUG_COLOR
+    };
 
-        setConfigItem(OPT_DMA_DEBUG_ENABLE, i, defaults.visualize[i]);
-        setConfigItem(OPT_DMA_DEBUG_COLOR, i, defaults.debugColor[i]);
+    for (auto &option : moreOptions) {
+        for (isize i = 0; DmaChannelEnum::isValid(i); i++) {
+            setConfigItem(option, i, defaults.get(option, i));
+        }
     }
 }
 
@@ -85,8 +66,8 @@ DmaDebugger::getConfigItem(Option option, long id) const
 
     switch (option) {
 
-        case OPT_DMA_DEBUG_ENABLE: return config.visualize[id];
-        case OPT_DMA_DEBUG_COLOR:  return config.debugColor[id];
+        case OPT_DMA_DEBUG_CHANNEL: return config.visualize[id];
+        case OPT_DMA_DEBUG_COLOR:   return config.debugColor[id];
 
         default:
             fatalError;
@@ -132,7 +113,7 @@ DmaDebugger::setConfigItem(Option option, long id, i64 value)
 
     switch (option) {
 
-        case OPT_DMA_DEBUG_ENABLE:
+        case OPT_DMA_DEBUG_CHANNEL:
 
             config.visualize[channel] = value;
 

Emulator/Agnus/DmaDebugger/DmaDebugger.h

@@ -59,7 +59,6 @@ class DmaDebugger : public SubComponent {
 
 public:
 
-    static DmaDebuggerConfig getDefaultConfig();
     const DmaDebuggerConfig &getConfig() const { return config; }
     void resetConfig() override;
 

Emulator/Agnus/DmaDebugger/DmaDebuggerTypes.h

@@ -60,9 +60,9 @@ typedef DMA_CHANNEL DmaChannel;
 #ifdef __cplusplus
 struct DmaChannelEnum : util::Reflection<DmaChannelEnum, DmaChannel>
 {
-    static long minVal() { return 0; }
-    static long maxVal() { return DMA_CHANNEL_COUNT - 1; }
-    static bool isValid(auto val) { return val >= minVal() && val <= maxVal(); }
+    static constexpr long minVal = 0;
+    static constexpr long maxVal = DMA_CHANNEL_COUNT - 1;
+    static bool isValid(auto val) { return val >= minVal && val <= maxVal; }
 
     static const char *prefix() { return "DMA_CHANNEL"; }
     static const char *key(DmaDisplayMode value)

Emulator/Amiga.cpp

@@ -23,6 +23,8 @@ static_assert(sizeof(u16) == 2, "u16 size mismatch");
 static_assert(sizeof(u32) == 4, "u32 size mismatch");
 static_assert(sizeof(u64) == 8, "u64 size mismatch");
 
+Properties Amiga::properties;
+
 string
 Amiga::version()
 {
@@ -288,7 +290,7 @@ Amiga::getConfigItem(Option option, long id) const
 {
     switch (option) {
 
-        case OPT_DMA_DEBUG_ENABLE:
+        case OPT_DMA_DEBUG_CHANNEL:
         case OPT_DMA_DEBUG_COLOR:
 
             return agnus.dmaDebugger.getConfigItem(option, id);
@@ -588,7 +590,7 @@ Amiga::configure(Option option, long id, i64 value)
 
     switch (option) {
 
-        case OPT_DMA_DEBUG_ENABLE:
+        case OPT_DMA_DEBUG_CHANNEL:
         case OPT_DMA_DEBUG_COLOR:
 
             agnus.dmaDebugger.setConfigItem(option, id, value);
@@ -819,6 +821,11 @@ Amiga::_dump(Category category, std::ostream& os) const
         os << tab("Debug mode");
         os << bol(inDebugMode()) << std::endl;
     }
+    
+    if (category == Category::Defaults) {
+        
+        properties.dump(category, os);
+    }
 }
 
 void

Emulator/Amiga.h

@@ -23,6 +23,7 @@
 #include "MsgQueue.h"
 #include "OSDebugger.h"
 #include "Paula.h"
+#include "Properties.h"
 #include "RegressionTester.h"
 #include "RemoteManager.h"
 #include "RetroShell.h"
@@ -41,7 +42,7 @@
  * amiga.paula.
  */
 class Amiga : public Thread {
-
+    
     /* Result of the latest inspection. In order to update the GUI inspector
      * panels, the emulator schedules events in the inspector slot (SLOT_INS in
      * the secondary table) on a periodic basis. Inside the event handler, the
@@ -56,7 +57,10 @@ class Amiga : public Thread {
     //
 
 public:
-    
+
+    // User settings
+    static Properties properties;
+
     // Core components
     CPU cpu = CPU(*this);
     CIAA ciaA = CIAA(*this);

Emulator/Base/AmigaComponent.cpp

@@ -14,9 +14,17 @@
 
 void
 AmigaComponent::initialize()
-{    
-    for (AmigaComponent *c : subComponents) { c->initialize(); }
-    _initialize();
+{
+    try {
+        
+        for (AmigaComponent *c : subComponents) { c->initialize(); }
+        _initialize();
+        
+    } catch (std::exception &e) {
+
+        warn("Failed to initialize: %s\n", e.what());
+        fatalError;
+    }
 }
 
 void