This is vAmiga 3.2

dirkwhoffmann · Jan 16, 2025 · 1d9a7c8 · 1d9a7c8
1 parent b47f848
commit 1d9a7c8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/Emulator/Components/Agnus/Agnus.cpp b/Emulator/Components/Agnus/Agnus.cpp
@@ -667,7 +667,7 @@ Agnus::updateSpriteDMA()
 void
 Agnus::eolHandler()
 {
-    assert(pos.h == HPOS_CNT_PAL || pos.h == HPOS_CNT_NTSC);
+    assert(pos.h == PAL::HPOS_CNT || pos.h == NTSC::HPOS_CNT);
 
     // Pass control to the DMA debugger
     dmaDebugger.eolHandler();

diff --git a/Emulator/Components/Agnus/AgnusEvents.cpp b/Emulator/Components/Agnus/AgnusEvents.cpp
@@ -97,7 +97,7 @@ Agnus::scheduleFirstBplEvent()
 void
 Agnus::scheduleNextBplEvent(isize hpos)
 {
-    assert(hpos >= 0 && hpos < HPOS_CNT_NTSC);
+    assert(hpos >= 0 && hpos < HPOS_CNT);
 
     u8 next = sequencer.nextBplEvent[hpos];
     scheduleRel<SLOT_BPL>(DMA_CYCLES(next - pos.h), sequencer.bplEvent[next]);
@@ -106,7 +106,7 @@ Agnus::scheduleNextBplEvent(isize hpos)
 void
 Agnus::scheduleBplEventForCycle(isize hpos)
 {
-    assert(hpos >= pos.h && hpos < HPOS_CNT_NTSC);
+    assert(hpos >= pos.h && hpos < HPOS_CNT);
 
     if (sequencer.bplEvent[hpos] != EVENT_NONE) {
         scheduleRel<SLOT_BPL>(DMA_CYCLES(hpos - pos.h), sequencer.bplEvent[hpos]);
@@ -188,8 +188,8 @@ Agnus::scheduleStrobe2Event()
 void
 Agnus::serviceREGEvent(Cycle until)
 {
-    assert(pos.type != PAL || pos.h <= HPOS_CNT_PAL);
-    assert(pos.type == PAL || pos.h <= HPOS_CNT_NTSC);
+    assert(pos.type != FORMAT_PAL || pos.h <= PAL::HPOS_CNT);
+    assert(pos.type != FORMAT_NTSC || pos.h <= NTSC::HPOS_CNT);
 
     if (syncEvent) {
 
@@ -734,7 +734,7 @@ Agnus::serviceDASEvent(EventID id)
 
         case DAS_EOL:
 
-            assert(pos.h == HPOS_MAX_PAL || pos.h == HPOS_MAX_NTSC);
+            assert(pos.h == PAL::HPOS_MAX || pos.h == NTSC::HPOS_MAX);
 
             if (pos.h == PAL::HPOS_MAX && pos.lol) {
 

diff --git a/Emulator/Components/Agnus/Blitter/SlowBlitter.cpp b/Emulator/Components/Agnus/Blitter/SlowBlitter.cpp
@@ -1270,7 +1270,7 @@ Blitter::fakeExec()
     if constexpr ((bool)(instr & (FETCH | WRITE_D))) {
 
         // Record some fake data to make the DMA debugger happy
-        assert(agnus.pos.h < HPOS_CNT_NTSC);
+        assert(agnus.pos.h < HPOS_CNT);
         agnus.busData[agnus.pos.h] = 0x8888;
     }
 
@@ -1477,7 +1477,7 @@ Blitter::fakeExecLine()
     if constexpr ((bool)(instr & (FETCH | BUS | WRITE_D))) {
 
         // Record some fake data to make the DMA debugger happy
-        assert(agnus.pos.h < HPOS_CNT_NTSC);
+        assert(agnus.pos.h < HPOS_CNT);
         agnus.busData[agnus.pos.h] = 0x8888;
     }
 

diff --git a/Emulator/Components/Agnus/Sequencer/SequencerBpl.cpp b/Emulator/Components/Agnus/Sequencer/SequencerBpl.cpp
@@ -165,7 +165,7 @@ Sequencer::computeBplEventsSlow(const SigRecorder &sr, DDFState &state)
         auto signal = sigRecorder.elements[i];
         isize trigger = (isize)sigRecorder.keys[i];
 
-        assert(trigger <= HPOS_CNT_NTSC);
+        assert(trigger <= HPOS_CNT);
 
         // Emulate the display logic up to the next signal change
         computeBplEvents <ecs> (cycle, trigger, state);

diff --git a/Emulator/config.h b/Emulator/config.h
@@ -15,8 +15,8 @@
 
 // Version number
 static constexpr int VER_MAJOR      = 3;
-static constexpr int VER_MINOR      = 1;
-static constexpr int VER_SUBMINOR   = 1;
+static constexpr int VER_MINOR      = 2;
+static constexpr int VER_SUBMINOR   = 0;
 static constexpr int VER_BETA       = 0;
 
 // Snapshot version number

diff --git a/vAmiga.xcodeproj/project.pbxproj b/vAmiga.xcodeproj/project.pbxproj
@@ -2972,7 +2972,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 250108;
+				CURRENT_PROJECT_VERSION = 250116;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = NO;
@@ -2994,7 +2994,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.5;
-				MARKETING_VERSION = 3.1.1;
+				MARKETING_VERSION = 3.2;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
 				PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3024,7 +3024,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 250108;
+				CURRENT_PROJECT_VERSION = 250116;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = NO;
@@ -3044,7 +3044,7 @@
 				);
 				LLVM_LTO = YES_THIN;
 				MACOSX_DEPLOYMENT_TARGET = 13.5;
-				MARKETING_VERSION = 3.1.1;
+				MARKETING_VERSION = 3.2;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
 				PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
 				PRODUCT_NAME = "$(TARGET_NAME)";