Merge branch 'dev'

Conflicts:
	.github/workflows/cmake-mingw.yml
	.github/workflows/cmake-ubuntu.yml
	.github/workflows/cmake.yml

Author: dirkwhoffmann

.github/workflows/cmake-mingw.yml

@@ -49,4 +49,3 @@ jobs:
 #    - name: Test
 #      working-directory: ${{github.workspace}}/build
 #      run: ctest --verbose -C ${{env.BUILD_TYPE}}
-    

.github/workflows/cmake-ubuntu.yml .github/workflows/cmake-ubuntu.yml~HEAD.github/workflows/cmake-ubuntu.yml renamed to .github/workflows/cmake-ubuntu.yml~HEAD

@@ -0,0 +1,30 @@
+name: CMake-Ubuntu
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '40 5 * * *'
+    
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Configure CMake
+      working-directory: ./Emulator
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+    - name: Build
+      working-directory: ./Emulator
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      run: ctest --verbose -C ${{env.BUILD_TYPE}}
+      

.github/workflows/cmake-ubuntu.yml~dev

@@ -15,7 +15,7 @@ namespace vamiga {
 
 Agnus::Agnus(Amiga& ref) : SubComponent(ref)
 {    
-    subComponents = std::vector<AmigaComponent *> {
+    subComponents = std::vector<CoreComponent *> {
 
         &sequencer,
         &copper,
@@ -151,9 +151,6 @@ Agnus::setVideoFormat(VideoFormat newFormat)
     // Clear frame buffers
     denise.pixelEngine.clearAll();
 
-    // Let the audio engine know about the speed change
-    paula.muxer.adjustSpeed();
-
     // Inform the GUI
     msgQueue.put(MSG_VIDEO_FORMAT, newFormat);
 }

Emulator/Agnus/Agnus.cpp

@@ -208,7 +208,7 @@ class Agnus : public SubComponent {
 
 
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
 
 private:
@@ -218,7 +218,7 @@ class Agnus : public SubComponent {
 
 
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
 private:
@@ -341,8 +341,8 @@ class Agnus : public SubComponent {
 
 public:
 
-    AgnusInfo getInfo() const { return AmigaComponent::getInfo(info); }
-    EventInfo getEventInfo() const { return AmigaComponent::getInfo(eventInfo); }
+    AgnusInfo getInfo() const { return CoreComponent::getInfo(info); }
+    EventInfo getEventInfo() const { return CoreComponent::getInfo(eventInfo); }
     EventSlotInfo getSlotInfo(isize nr) const;
     const AgnusStats &getStats() { return stats; }
 
@@ -673,14 +673,6 @@ class Agnus : public SubComponent {
         scheduleAbs<s>(clock + cycle, id, data);
     }
 
-    /*
-     template<EventSlot s> void schedulePos(Beam target, EventID id, i64 data) {
-
-     assert(target.v > pos.v || (target.v == pos.v && target.h >= pos.h));
-     scheduleRel<s>(DMA_CYCLES(pos.diff(target.v, target.h)), id, data);
-     }
-     */
-
     template<EventSlot s> void schedulePos(isize vpos, isize hpos, EventID id) {
 
         assert(vpos > pos.v || (vpos == pos.v && hpos >= pos.h));
@@ -697,12 +689,6 @@ class Agnus : public SubComponent {
         rescheduleAbs<s>(clock + cycle);
     }
 
-    /*
-     template<EventSlot s> void reschedulePos(Beam pos) {
-     rescheduleAbs<s>(beamToCycle(pos));
-     }
-     */
-
     template<EventSlot s> void reschedulePos(i16 vpos, i16 hpos) {
 
         assert(vpos > pos.v || (vpos == pos.v && hpos >= pos.h));

Emulator/Agnus/Agnus.h

@@ -646,13 +646,15 @@ Agnus::_dump(Category category, std::ostream& os) const
     }
 
     if (category == Category::Events) {
+
+        inspect();
 
         os << std::left << std::setw(10) << "Slot";
         os << std::left << std::setw(14) << "Event";
         os << std::left << std::setw(18) << "Trigger position";
         os << std::left << std::setw(16) << "Trigger cycle" << std::endl;
 
-        for (isize i = 0; i < 23; i++) {
+        for (isize i = 0; i < SLOT_COUNT; i++) {
 
             EventSlotInfo &info = slotInfo[i];
 
@@ -762,7 +764,7 @@ Agnus::inspectSlot(EventSlot nr) const
     info.hpos = beam.h;
     info.frameRel = long(beam.frame - pos.frame);
 
-    info.eventName = agnus.eventName((EventSlot)nr, id[nr]);
+    info.eventName = eventName((EventSlot)nr, id[nr]);
 }
 
 EventSlotInfo

Emulator/Agnus/AgnusInfo.cpp

@@ -384,12 +384,14 @@ enum_i8(EventID)
     INS_EVENT_COUNT
 };
 
+/*
 static inline bool isRegEvent(EventID id) { return id < REG_EVENT_COUNT; }
 static inline bool isCiaEvent(EventID id) { return id < CIA_EVENT_COUNT; }
 static inline bool isBplEvent(EventID id) { return id < BPL_EVENT_COUNT; }
 static inline bool isDasEvent(EventID id) { return id < DAS_EVENT_COUNT; }
 static inline bool isCopEvent(EventID id) { return id < COP_EVENT_COUNT; }
 static inline bool isBltEvent(EventID id) { return id < BLT_EVENT_COUNT; }
+*/
 
 static inline bool isBplxEvent(EventID id, int x)
 {

Emulator/Agnus/AgnusTypes.h

@@ -44,7 +44,7 @@ Blitter::Blitter(Amiga& ref) : SubComponent(ref)
 void
 Blitter::_initialize()
 {
-    AmigaComponent::_initialize();
+    CoreComponent::_initialize();
 
     initFastBlitter();
     initSlowBlitter();

Emulator/Agnus/Blitter/Blitter.cpp

@@ -191,7 +191,7 @@ class Blitter : public SubComponent
 
 
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
 
 private:
@@ -201,7 +201,7 @@ class Blitter : public SubComponent
 
 
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
 private:
@@ -301,7 +301,7 @@ class Blitter : public SubComponent
 
 public:
 
-    BlitterInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    BlitterInfo getInfo() const { return CoreComponent::getInfo(info); }
 
 
     //

Emulator/Agnus/Blitter/Blitter.h

@@ -19,7 +19,7 @@ namespace vamiga {
 
 Copper::Copper(Amiga& ref) : SubComponent(ref)
 {
-    subComponents = std::vector<AmigaComponent *> {
+    subComponents = std::vector<CoreComponent *> {
 
         &debugger
     };