Replaced GuardsWrapper by GuardList

dirkwhoffmann · Aug 7, 2024 · 991b2d1 · 991b2d1
1 parent 39fe450
commit 991b2d1
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 245 deletions.
diff --git a/Emulator/Components/Agnus/Copper/CopperDebugger.cpp b/Emulator/Components/Agnus/Copper/CopperDebugger.cpp
@@ -15,12 +15,22 @@
 
 namespace vamiga {
 
+CopperBreakpoints::CopperBreakpoints(Copper& ref) : GuardList(ref.emulator), copper(ref)
+{
+
+}
+
 void
 CopperBreakpoints::setNeedsCheck(bool value)
 {
     copper.checkForBreakpoints = value;
 }
 
+CopperWatchpoints::CopperWatchpoints(Copper& ref) : GuardList(ref.emulator), copper(ref)
+{
+
+}
+
 void
 CopperWatchpoints::setNeedsCheck(bool value)
 {
@@ -40,7 +50,7 @@ CopperDebugger::_dump(Category category, std::ostream& os) const
 {
     using namespace util;
 
-    auto print = [&](const string &name, const GuardsWrapper &guards) {
+    auto print = [&](const string &name, const MoiraGuardList &guards) {
 
         for (int i = 0; i < guards.elements(); i++) {
 

diff --git a/Emulator/Components/Agnus/Copper/CopperDebugger.h b/Emulator/Components/Agnus/Copper/CopperDebugger.h
@@ -22,23 +22,23 @@ struct CopperList {
     u32 end;
 };
 
-class CopperBreakpoints : public moira::Guards {
+class CopperBreakpoints : public GuardList {
 
     class Copper &copper;
 
 public:
 
-    CopperBreakpoints(Copper& ref) : copper(ref) { }
+    CopperBreakpoints(Copper& ref);
     void setNeedsCheck(bool value) override;
 };
 
-class CopperWatchpoints : public moira::Guards {
+class CopperWatchpoints : public GuardList {
 
     class Copper &copper;
 
 public:
 
-    CopperWatchpoints(Copper& ref) : copper(ref) { }
+    CopperWatchpoints(Copper& ref);
     void setNeedsCheck(bool value) override;
 };
 
@@ -71,13 +71,8 @@ class CopperDebugger: public SubComponent {
 public:
 
     // Breakpoint and watchpoints
-    CopperBreakpoints cbreakpoints = CopperBreakpoints(copper);
-    CopperWatchpoints cwatchpoints = CopperWatchpoints(copper);
-
-public:
-
-    GuardsWrapper breakpoints = GuardsWrapper(emulator, cbreakpoints);
-    GuardsWrapper watchpoints = GuardsWrapper(emulator, cwatchpoints);
+    CopperBreakpoints breakpoints = CopperBreakpoints(copper);
+    CopperWatchpoints watchpoints = CopperWatchpoints(copper);
 
 
     //

diff --git a/Emulator/Components/Amiga.cpp b/Emulator/Components/Amiga.cpp
@@ -670,7 +670,7 @@ Amiga::computeFrame()
             // Did we reach a Copper breakpoint?
             if (flags & RL::COPPERBP_REACHED) {
                 clearFlag(RL::COPPERBP_REACHED);
-                auto addr = u8(agnus.copper.debugger.cbreakpoints.hit->addr);
+                auto addr = u8(agnus.copper.debugger.breakpoints.hit()->addr);
                 msgQueue.put(MSG_COPPERBP_REACHED, CpuMsg { addr, 0 });
                 throw StateChangeException(STATE_PAUSED);
                 break;
@@ -679,7 +679,7 @@ Amiga::computeFrame()
             // Did we reach a Copper watchpoint?
             if (flags & RL::COPPERWP_REACHED) {
                 clearFlag(RL::COPPERWP_REACHED);
-                auto addr = u8(agnus.copper.debugger.cwatchpoints.hit->addr);
+                auto addr = u8(agnus.copper.debugger.watchpoints.hit()->addr);
                 msgQueue.put(MSG_COPPERWP_REACHED, CpuMsg { addr, 0 });
                 throw StateChangeException(STATE_PAUSED);
                 break;

diff --git a/Emulator/Components/CPU/CMakeLists.txt b/Emulator/Components/CPU/CMakeLists.txt
@@ -3,7 +3,6 @@ target_include_directories(vAmigaCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_sources(vAmigaCore PRIVATE
 
 CPU.cpp
-CPUDebugger.cpp
 
 )
 

diff --git a/Emulator/Components/CPU/CPU.cpp b/Emulator/Components/CPU/CPU.cpp
@@ -440,7 +440,7 @@ CPU::cacheInfo(CPUInfo &info) const
 void
 CPU::_dump(Category category, std::ostream& os) const
 {
-    auto print = [&](const string &name, const GuardsWrapper &guards) {
+    auto print = [&](const string &name, const MoiraGuardList &guards) {
 
         for (int i = 0; i < guards.elements(); i++) {
 
@@ -807,7 +807,7 @@ CPU::processCommand(const Cmd &cmd)
 {
     isize nr = isize(cmd.value);
     u32 addr = u32(cmd.value);
-    auto guards = (GuardsWrapper *)cmd.sender;
+    auto guards = (MoiraGuardList *)cmd.sender;
 
     switch (cmd.type) {
 

diff --git a/Emulator/Components/CPU/CPU.h b/Emulator/Components/CPU/CPU.h
@@ -10,7 +10,6 @@
 #pragma once
 
 #include "CPUTypes.h"
-#include "CPUDebugger.h"
 #include "SubComponent.h"
 #include "CmdQueue.h"
 #include "GuardList.h"
@@ -45,9 +44,9 @@ class CPU : public moira::Moira, public Inspectable<CPUInfo>
 public:
 
     // Breakpoints, Watchpoints, Catchpoints
-    GuardsWrapper breakpoints = GuardsWrapper(emulator, debugger.breakpoints);
-    GuardsWrapper watchpoints = GuardsWrapper(emulator, debugger.watchpoints);
-    GuardsWrapper catchpoints = GuardsWrapper(emulator, debugger.catchpoints);
+    MoiraGuardList breakpoints = MoiraGuardList(emulator, debugger.breakpoints);
+    MoiraGuardList watchpoints = MoiraGuardList(emulator, debugger.watchpoints);
+    MoiraGuardList catchpoints = MoiraGuardList(emulator, debugger.catchpoints);
 
     // Sub-cycle counter (overclocking)
     i64 debt;

diff --git a/Emulator/Components/CPU/CPUDebugger.cpp b/Emulator/Components/CPU/CPUDebugger.cpp
diff --git a/Emulator/Components/CPU/CPUDebugger.h b/Emulator/Components/CPU/CPUDebugger.h
diff --git a/Emulator/VAmiga.cpp b/Emulator/VAmiga.cpp
@@ -10,7 +10,7 @@
 #include "config.h"
 #include "VAmiga.h"
 #include "Emulator.h"
-// #include "GuardList.h"
+#include "GuardList.h"
 
 namespace vamiga {
 

diff --git a/Emulator/VAmiga.h b/Emulator/VAmiga.h
@@ -281,7 +281,7 @@ class GuardsAPI : public API {
 
     friend class VAmiga;
 
-    class GuardsWrapper *guards = nullptr;
+    class MoiraGuardList *guards = nullptr;
 
 public:
-Original file line number
+Diff line change
@@ Expand Up @@
     target_sources(vAmigaCore PRIVATE
     CPU.cpp
-    CPUDebugger.cpp
     )
@@ Expand Down @@