Added reset button to toolbar

Amiga/Amiga.cpp

@@ -491,6 +491,14 @@ Amiga::configureFifoBuffering(bool value)
     configure(VA_FIFO_BUFFERING, value);
 }
 
+void
+Amiga::reset()
+{
+    suspend();
+    HardwareComponent::reset();
+    resume();
+}
+
 void
 Amiga::_initialize()
 {
@@ -513,24 +521,6 @@ Amiga::_powerOn()
 
     // For debugging, we start in debug mode and set a breakpoint
     debugMode = true;
-
-    // cpu.bpManager.setBreakpointAt(0xFC570E); // Blitter
-    // cpu.bpManager.setBreakpointAt(0xFE8A6E); // All Blitter stuff done
-    // cpu.bpManager.setBreakpointAt(0xFEA1D8); // DSKPT
-    // cpu.bpManager.setBreakpointAt(0xFEA212); //
-    // cpu.bpManager.setBreakpointAt(0xfeaa22);
-    // cpu.bpManager.setBreakpointAt(0xfe85a6);  // After MFM decoding with Blitter
-    // cpu.bpManager.setBreakpointAt(0x05005A);
-    // cpu.bpManager.setBreakpointAt(0xFD8186); //
-    // cpu.bpManager.setBreakpointAt(0xFD8192); //
-
-    // cpu.bpManager.setBreakpointAt(0xFF5A60); // Copy(Init) slow ram stuff
-
-    // cpu.bpManager.setBreakpointAt(0xFF4D68); // Jumps to init routine
-    // cpu.bpManager.setBreakpointAt(0xFD465C); // Start of video init
-    // cpu.bpManager.setBreakpointAt(0xFD466C); // Audio init
-
-    // cpu.bpManager.setBreakpointAt(0xFD7952); // Bitplane init
 
     // cpu.bpManager.setBreakpointAt(0xFD7962); // AROS ERROR
     // cpu.bpManager.setBreakpointAt(0xF890C6); //
@@ -611,8 +601,12 @@ Amiga::_reset()
 
     RESET_SNAPSHOT_ITEMS
 
+    masterClock = 0;
+    makeActiveInstance();
+    m68k_init();
+    m68k_pulse_reset();
+
     amiga->putMessage(MSG_RESET);
-    ping();
 }
 
 void

Amiga/Amiga.h

@@ -295,6 +295,8 @@ class Amiga : public HardwareComponent {
     // Methods from HardwareComponent
     //
 
+    void reset() override;
+
 private:
 
     void _initialize() override;

Amiga/Computer/Agnus/Agnus.cpp

@@ -159,13 +159,19 @@ Agnus::_initialize()
 void
 Agnus::_powerOn()
 {
+}
+
+void Agnus::_reset()
+{
+    RESET_SNAPSHOT_ITEMS
+
     // Start with a long frame
     lof = 1;
     frameInfo.numLines = 313;
 
     // Initialize lookup tables
     clearDMAEventTable();
-    
+
     // Clear the event table
     for (unsigned i = 0; i < SLOT_COUNT; i++) {
         slot[i].triggerCycle = NEVER;

Amiga/Computer/Agnus/Agnus.h

@@ -509,7 +509,7 @@ class Agnus : public HardwareComponent
 
     void _initialize() override;
     void _powerOn() override;
-    void _reset() override { RESET_SNAPSHOT_ITEMS }
+    void _reset() override;
     void _inspect() override;
     void _dump() override;
     size_t _size() override { COMPUTE_SNAPSHOT_SIZE }

Amiga/Computer/Agnus/Blitter.cpp

@@ -48,6 +48,13 @@ Blitter::_initialize()
 void
 Blitter::_powerOn()
 {
+}
+
+ void
+Blitter::_reset()
+{
+    RESET_SNAPSHOT_ITEMS
+
     copycount = 0;
     linecount = 0;
 }

Amiga/Computer/Agnus/Blitter.h

@@ -196,7 +196,7 @@ class Blitter : public HardwareComponent {
 
     void _initialize() override;
     void _powerOn() override;
-    void _reset() override { RESET_SNAPSHOT_ITEMS }
+    void _reset() override;
     void _inspect() override; 
     void _dump() override;
     size_t _size() override { COMPUTE_SNAPSHOT_SIZE }

Amiga/Computer/CIA/CIA.cpp

@@ -34,22 +34,28 @@ CIA::_initialize()
 void
 CIA::_powerOn()
 {
-	CNT = true;
-	INT = 1;
+
+}
+
+void
+CIA::_reset()
+{
+    RESET_SNAPSHOT_ITEMS
+
+    CNT = true;
+    INT = 1;
 
     counterA = 0xFFFF;
     counterB = 0xFFFF;
-	latchA = 0xFFFF;
-	latchB = 0xFFFF;
-
-    // PA = 0xFF;
-    // PB = 0xFF;
+    latchA = 0xFFFF;
+    latchB = 0xFFFF;
+
     updatePA();
     updatePB();
-    
+
     CRA = 0x4; // seen in SAE
     CRB = 0x4; // seen in SAE
-    
+
     // The OVL bit influences the memory layout. Hence, we need to update it.
     amiga->mem.updateMemSrcTable();
 }

Amiga/Computer/CIA/CIA.h

@@ -322,7 +322,7 @@ class CIA : public HardwareComponent {
 
     void _initialize() override;
     void _powerOn() override;
-    void _reset() override { RESET_SNAPSHOT_ITEMS }
+    void _reset() override;
     void _inspect() override;
     void _dump() override;
     size_t _size() override { COMPUTE_SNAPSHOT_SIZE }

Amiga/Computer/CPU/CPU.cpp

@@ -99,6 +99,12 @@ CPU::~CPU()
 void
 CPU::_powerOn()
 {
+}
+
+void
+CPU::_reset()
+{
+    RESET_SNAPSHOT_ITEMS
     clearTraceBuffer();
 }
 

Amiga/Computer/CPU/CPU.h

@@ -90,7 +90,7 @@ class CPU : public HardwareComponent {
     private:
 
     void _powerOn() override;
-    void _reset() override { RESET_SNAPSHOT_ITEMS }
+    void _reset() override;
     void _inspect() override; 
     void _dump() override;
     size_t _size() override;

Amiga/Computer/Denise/Denise.cpp

@@ -35,6 +35,13 @@ Denise::_initialize()
 void
 Denise::_powerOn()
 {
+}
+
+void
+Denise::_reset()
+{
+    RESET_SNAPSHOT_ITEMS
+
     memset(bBuffer, 0, sizeof(bBuffer));
     memset(iBuffer, 0, sizeof(iBuffer));
     memset(zBuffer, 0, sizeof(zBuffer));

Amiga/Computer/Denise/Denise.h

@@ -322,7 +322,7 @@ class Denise : public HardwareComponent {
 
     void _initialize() override;
     void _powerOn() override;
-    void _reset() override { RESET_SNAPSHOT_ITEMS }
+    void _reset() override;
     void _inspect() override;
     void _dump() override;
     size_t _size() override { COMPUTE_SNAPSHOT_SIZE }

Amiga/Computer/Denise/PixelEngine.cpp

@@ -54,14 +54,7 @@ PixelEngine::_initialize()
 void
 PixelEngine::_powerOn()
 {
-    // Initialize frame buffers
-    workingLongFrame = &longFrame[0];
-    workingShortFrame = &shortFrame[0];
-    stableLongFrame = &longFrame[1];
-    stableShortFrame = &shortFrame[1];
-    frameBuffer = &longFrame[0];
-
-    // Create a recognizable debug pattern
+    // Initialize frame buffers with a checkerboard debug pattern
     for (unsigned line = 0; line < VPIXELS; line++) {
         for (unsigned i = 0; i < HPIXELS; i++) {
 
@@ -71,6 +64,19 @@ PixelEngine::_powerOn()
             shortFrame[0].data[pos] = shortFrame[1].data[pos] = col;
         }
     }
+}
+
+void
+PixelEngine::_reset()
+{
+    RESET_SNAPSHOT_ITEMS
+
+    // Initialize frame buffers
+    workingLongFrame = &longFrame[0];
+    workingShortFrame = &shortFrame[0];
+    stableLongFrame = &longFrame[1];
+    stableShortFrame = &shortFrame[1];
+    frameBuffer = &longFrame[0];
 
     updateRGBA();
 }

Amiga/Computer/Denise/PixelEngine.h

@@ -129,7 +129,7 @@ class PixelEngine : public HardwareComponent {
 
     void _initialize() override;
     void _powerOn() override;
-    void _reset() override { RESET_SNAPSHOT_ITEMS }
+    void _reset() override;
     size_t _size() override { COMPUTE_SNAPSHOT_SIZE }
     size_t _load(uint8_t *buffer) override { LOAD_SNAPSHOT_ITEMS }
     size_t _save(uint8_t *buffer) override { SAVE_SNAPSHOT_ITEMS }

Amiga/Computer/Memory.cpp

@@ -64,6 +64,15 @@ Memory::_powerOn()
     updateMemSrcTable();
 }
 
+void
+Memory::_reset()
+{
+    RESET_SNAPSHOT_ITEMS
+
+    // Set up the memory lookup table
+    updateMemSrcTable();
+}
+
 void
 Memory::_dump()
 {

Amiga/Computer/Memory.h

@@ -213,7 +213,7 @@ class Memory : public HardwareComponent {
 
     void _initialize() override;
     void _powerOn() override;
-    void _reset() override { RESET_SNAPSHOT_ITEMS }
+    void _reset() override;
     void _dump() override;
 
     size_t _size() override;

Amiga/Computer/Paula/AudioUnit.cpp

@@ -27,13 +27,6 @@ AudioUnit::AudioUnit()
 void
 AudioUnit::_powerOn()
 {
-    clearRingbuffer();
-
-    bufferUnderflows = 0;
-    bufferOverflows = 0;
-
-    volume = 100000;
-    targetVolume = 100000;
 }
 
 void
@@ -74,6 +67,20 @@ AudioUnit::_pause()
     clearRingbuffer();
 }
 
+void
+AudioUnit::_reset()
+{
+   RESET_SNAPSHOT_ITEMS
+
+    clearRingbuffer();
+
+    bufferUnderflows = 0;
+    bufferOverflows = 0;
+
+    volume = 100000;
+    targetVolume = 100000;
+}
+
 void
 AudioUnit::enableDMA(int nr)
 {

Amiga/Computer/Paula/AudioUnit.h

@@ -175,7 +175,7 @@ class AudioUnit : public HardwareComponent {
     void _powerOn() override;
     void _run() override;
     void _pause() override;
-    void _reset() override { RESET_SNAPSHOT_ITEMS }
+    void _reset() override;
     void _inspect() override;
     void _dump() override;
     size_t _size() override { COMPUTE_SNAPSHOT_SIZE }

Amiga/Computer/Paula/DiskController.cpp

@@ -30,7 +30,15 @@ DiskController::_initialize()
 void
 DiskController::_powerOn()
 {
-    prb = 0xFF; 
+
+}
+
+void
+DiskController::_reset()
+{
+    RESET_SNAPSHOT_ITEMS
+
+    prb = 0xFF;
     selected = -1;
     dsksync = 0x4489;
 }

Amiga/Computer/Paula/DiskController.h

@@ -153,7 +153,7 @@ class DiskController : public HardwareComponent {
 
     void _initialize() override;
     void _powerOn() override;
-    void _reset() override { RESET_SNAPSHOT_ITEMS }
+    void _reset() override;
     void _ping() override;
     void _inspect() override;
     void _dump() override;

Amiga/Computer/Paula/UART.cpp

@@ -25,6 +25,13 @@ UART::_initialize()
 void
 UART::_powerOn()
 {
+
+}
+
+void
+UART::_reset()
+{
+    RESET_SNAPSHOT_ITEMS
     outBit = 1;
 }
 

Amiga/Computer/Paula/UART.h

@@ -87,7 +87,7 @@ class UART : public HardwareComponent {
 
     void _initialize() override;
     void _powerOn() override;
-    void _reset() override { RESET_SNAPSHOT_ITEMS }
+    void _reset() override;
     void _inspect() override;
     void _dump() override;
     size_t _size() override { COMPUTE_SNAPSHOT_SIZE }

Amiga/Peripherals/Joystick.cpp

@@ -26,6 +26,14 @@ Joystick::_initialize()
 void
 Joystick::_powerOn()
 {
+
+}
+
+void
+Joystick::_reset()
+{
+    RESET_SNAPSHOT_ITEMS
+
     button = false;
     axisX = 0;
     axisY = 0;

Amiga/Peripherals/Joystick.h

@@ -77,7 +77,7 @@ class Joystick : public HardwareComponent {
 
     void _initialize() override;
     void _powerOn() override;
-    void _reset() override { RESET_SNAPSHOT_ITEMS }
+    void _reset() override;
     void _dump() override;
     size_t _size() override { COMPUTE_SNAPSHOT_SIZE }
     size_t _load(uint8_t *buffer) override { LOAD_SNAPSHOT_ITEMS }