Merge branch 'dev'

Author: dirkwhoffmann

Amiga/Amiga.cpp

@@ -534,6 +534,10 @@ Amiga::reset()
 void
 Amiga::_initialize()
 {
+    /*
+    ChangeRecorder<16> r;
+    r.test();
+    */
 }
 
 void
@@ -1009,9 +1013,10 @@ Amiga::runLoop()
                 cpu.recordInstruction();
             }
 
-            // Are we requestes to check for breakpoints?
+            // Are we requested to check for breakpoints?
             if (runLoopCtrl & RL_ENABLE_BREAKPOINTS) {
                 if (cpu.bpManager.shouldStop()) {
+                    inspect();
                     putMessage(MSG_BREAKPOINT_REACHED);
                     debug(RUNLOOP_DEBUG, "BREAKPOINT_REACHED\n");
                     break;

Amiga/Computer/Agnus/Agnus.cpp

@@ -210,7 +210,8 @@ Agnus::_inspect()
 {
     // Prevent external access to variable 'info'
     pthread_mutex_lock(&lock);
-    
+
+    info.bplcon0 = bplcon0;
     info.dmacon  = dmacon;
     info.diwstrt = diwstrt;
     info.diwstop = diwstop;
@@ -219,7 +220,7 @@ Agnus::_inspect()
 
     info.bpl1mod = bpl1mod;
     info.bpl2mod = bpl2mod;
-    info.numBpls = denise->enabledChannels();
+    info.bpu = bpu();
 
     info.dskpt   = dskpt;
     for (unsigned i = 0; i < 4; i++) info.audlc[i] = audlc[i];
@@ -250,10 +251,10 @@ Agnus::_dump()
     dumpBplEventTable();
 }
 
-DMAInfo
+AgnusInfo
 Agnus::getInfo()
 {
-    DMAInfo result;
+    AgnusInfo result;
 
     pthread_mutex_lock(&lock);
     result = info;
@@ -302,9 +303,9 @@ bool
 Agnus::inBplDmaLine(uint16_t dmacon, uint16_t bplcon0) {
 
     return
-    ddfVFlop                            // Outside VBLANK, inside DIW
-    && Denise::enabledChannels(bplcon0) // At least one bitplane enabled
-    && bplDMA(dmacon);                  // Bitplane DMA enabled
+    ddfVFlop            // Outside VBLANK, inside DIW
+    && bpu(bplcon0)     // At least one bitplane enabled
+    && bplDMA(dmacon);  // Bitplane DMA enabled
 }
 
 Cycle
@@ -575,7 +576,7 @@ Agnus::allocateBplSlots(uint16_t dmacon, uint16_t bplcon0, int first, int last)
 {
     assert(first >= 0 && last < HPOS_MAX);
 
-    int channels = Denise::enabledChannels(bplcon0);
+    int channels = bpu(bplcon0);
     bool hires = Denise::hires(bplcon0);
 
     // Set number of bitplanes to 0 if we are not in a bitplane DMA line
@@ -609,7 +610,7 @@ Agnus::switchBitplaneDmaOn()
     int16_t stop;
 
     bool hires = denise->hires();
-    int activeBitplanes = denise->enabledChannels();
+    int activeBitplanes = bpu();
 
     // Determine the range that is covered by fetch units
     if (hires) {
@@ -1502,6 +1503,20 @@ Agnus::setBPLCON0(uint16_t oldValue, uint16_t newValue)
     bplcon0 = newValue;
 }
 
+int
+Agnus::bpu(uint16_t v)
+{
+    // Extract the three BPU bits and check for hires mode
+    int bpu = (v >> 12) & 0b111;
+    bool hires = GET_BIT(v, 15);
+
+    if (hires) {
+        return bpu < 5 ? bpu : 0; // Disable all channels if value is invalid
+    } else {
+        return bpu < 7 ? bpu : 4; // Enable four channels if value is invalid
+    }
+}
+
 void
 Agnus::execute()
 {

Amiga/Computer/Agnus/Agnus.h

@@ -15,6 +15,7 @@
 #include "Blitter.h"
 #include "DmaDebugger.h"
 #include "Beam.h"
+#include "Event.h"
 
 // Bit plane indices
 #define PLANE1 0
@@ -51,7 +52,6 @@
 #define VPOS(x) ((x) >> 8)
 #define HPOS(x) ((x) & 0xFF)
 
-
 class Agnus : public HardwareComponent
 {
     // Quick-access references
@@ -63,7 +63,7 @@ class Agnus : public HardwareComponent
     class Paula *paula;
 
     // Information shown in the GUI inspector panel
-    DMAInfo info;
+    AgnusInfo info;
     EventInfo eventInfo;
 
 
@@ -366,6 +366,9 @@ class Agnus : public HardwareComponent
     // Registers
     //
 
+    // Ringbuffer for managing register change delays
+    ChangeRecorder<8> changeRecorder;
+
     // A copy of BPLCON0 (Denise has another copy)
     uint16_t bplcon0;
     uint16_t bplcon0New;
@@ -505,8 +508,7 @@ class Agnus : public HardwareComponent
         & hsyncActions
         & clock
         & frame
-        & pos.v
-        & pos.h
+        & pos
         & frameInfo.nr
         & frameInfo.interlaced
         & frameInfo.numLines
@@ -539,6 +541,7 @@ class Agnus : public HardwareComponent
         & dmaStopHires
         & dmaStrtLoresShift
 
+        & changeRecorder
         & bplcon0
         & bplcon0New
         & bplcon0AtDDFStrt
@@ -601,7 +604,7 @@ class Agnus : public HardwareComponent
 public:
 
     // Returns the latest recorded internal state
-    DMAInfo getInfo();
+    AgnusInfo getInfo();
     EventInfo getEventInfo();
     EventSlotInfo getEventSlotInfo(int nr);
 
@@ -612,10 +615,6 @@ class Agnus : public HardwareComponent
 
 public:
 
-    // Returns the current position of the video beam
-    // int16_t vpos() { return pos.v; }
-    // int16_t hpos() { return pos.h; }
-
     // Indicates if the current frame is a long or a short frame
     bool isLongFrame() { return frameInfo.numLines == 313; }
     bool isShortFrame() { return frameInfo.numLines == 312; }
@@ -849,6 +848,15 @@ class Agnus : public HardwareComponent
     void pokeBPLCON0(uint16_t value);
     void setBPLCON0(uint16_t oldValue, uint16_t newValue);
 
+    /* Returns the Agnus view of the BPU bits.
+     * The value determines the number of enabled DMA channels. It is computed
+     * out of the three BPU bits stored in BPLCON0, but not identical with them.
+     * The value differs if the BPU bits reflect an invalid bit pattern.
+     * Compare with Denise::bpu() which returns the Denise view of the BPU bits.
+     */
+    static int bpu(uint16_t v);
+    int bpu() { return bpu(bplcon0); }
+
     // BPLxPTL, BPLxPTH
     template <int x, PokeSource s> void pokeBPLxPTH(uint16_t value);
     template <int x, PokeSource s> void pokeBPLxPTL(uint16_t value);

Amiga/Computer/Agnus/AgnusTypes.h

@@ -145,6 +145,7 @@ DMADebuggerInfo;
 
 typedef struct
 {
+    uint16_t bplcon0;
     uint16_t dmacon;
     uint16_t diwstrt;
     uint16_t diwstop;
@@ -153,14 +154,14 @@ typedef struct
 
     int16_t bpl1mod;
     int16_t bpl2mod;
-    uint8_t  numBpls;
+    uint8_t bpu;
 
     uint32_t dskpt;
     uint32_t audlc[4];
     uint32_t bplpt[6];
     uint32_t sprpt[8];
 }
-DMAInfo;
+AgnusInfo;
 
 typedef struct
 {

Amiga/Computer/Agnus/Blitter.cpp

@@ -741,7 +741,6 @@ Blitter::terminate()
     bbusy = false;
 
     // Trigger the Blitter interrupt
-    // agnus->scheduleRel<IRQ_BLIT_SLOT>(0, IRQ_SET);
     paula->raiseIrq(INT_BLIT);
 
     // Clear the Blitter slot

Amiga/Computer/Agnus/EventHandler.cpp

@@ -60,6 +60,16 @@ Agnus::inspectEventSlot(EventSlot nr)
 
     switch ((EventSlot)nr) {
 
+        case REG_SLOT:
+            switch (slot[nr].id) {
+
+                case 0:             i->eventName = "none"; break;
+                case REG_CHANGE:    i->eventName = "REG_CHANGE"; break;
+                case REG_HSYNC:     i->eventName = "REG_HSYNC"; break;
+                default:            i->eventName = "*** INVALID ***"; break;
+            }
+            break;
+
         case AGN_SLOT:
             switch (slot[nr].id) {
 
@@ -354,6 +364,9 @@ Agnus::executeEventsUntil(Cycle cycle) {
     // Check primary slots
     //
 
+    if (isDue<REG_SLOT>(cycle)) {
+        serviceREGEvent();
+    }
     if (isDue<AGN_SLOT>(cycle)) {
         serviceAGNEvent();
     }
@@ -446,6 +459,14 @@ Agnus::serviceCIAEvent()
     }
 }
 
+void
+Agnus::serviceREGEvent()
+{
+    assert(checkTriggeredEvent(REG_SLOT));
+
+    // Schedule next event
+}
+
 void
 Agnus::serviceAGNEvent()
 {
@@ -760,6 +781,14 @@ Agnus::checkScheduledEvent(EventSlot s)
     }
 
     switch (s) {
+        case REG_SLOT:
+            if (!isRegEvent(id)) {
+                _dump();
+                panic("Invalid REG event ID.");
+                return false;
+            }
+            break;
+
         case AGN_SLOT:
             if (!isAgnEvent(id)) {
                 _dump();
@@ -826,6 +855,12 @@ Agnus::checkTriggeredEvent(EventSlot s)
 {
     switch (s) {
 
+        case REG_SLOT:
+            if (slot[s].id != REG_HSYNC) {
+                assert(pos.h == 0xE3); return false;
+            }
+            break;
+
         case AGN_SLOT:
             if (slot[s].id != AGN_ACTIONS) {
                 assert(false); return false;

Amiga/Computer/Agnus/EventHandler.h

@@ -229,6 +229,7 @@ void executeEventsUntil(Cycle cycle);
 
 // Event handlers for specific slots
 template <int nr> void serviceCIAEvent();
+void serviceREGEvent();
 void serviceAGNEvent();
 void serviceBPLEvent();
 void serviceDASEvent();

Amiga/Computer/Agnus/EventHandlerTypes.h

@@ -23,7 +23,8 @@
 typedef enum : long
 {
     // Primary slots
-    AGN_SLOT = 0,                   // Agnus
+    REG_SLOT = 0,                   // Register changes and HSYNC
+    AGN_SLOT,                       // Agnus (DEPRECATED, WILL BE REPLACED BY REG_SLOT)
     CIAA_SLOT,                      // CIA A execution
     CIAB_SLOT,                      // CIA B execution
     BPL_SLOT,                       // Bitplane DMA
@@ -53,6 +54,7 @@ static inline bool isSecondarySlot(long s) { return s > SEC_SLOT && s < SLOT_COU
 inline const char *slotName(EventSlot nr)
 {
     switch (nr) {
+        case REG_SLOT:  return "Registers";
         case AGN_SLOT:  return "Agnus";
         case CIAA_SLOT: return "CIA A";
         case CIAB_SLOT: return "CIA B";
@@ -85,6 +87,11 @@ typedef enum : long
     // Events in the primary event table
     //
 
+    // REG slot
+    REG_CHANGE = 1,
+    REG_HSYNC,
+    REG_EVENT_COUNT,
+
     // AGN slot
     AGN_ACTIONS = 1,
     AGN_EVENT_COUNT,
@@ -173,22 +180,8 @@ typedef enum : long
 
     // IRQ slots
     IRQ_CHECK = 1,
-    IRQ_SET, // DEPRECATED
-    IRQ_CLEAR, // DEPRECATED
     IRQ_EVENT_COUNT,
 
-    // REG slots
-    REG_DMACON = 1,
-    REG_DIWSTRT,
-    REG_DIWSTOP,
-    REG_BPLCON1,
-    REG_BPLCON2,
-    REG_BPL1MOD,
-    REG_BPL2MOD,
-    REG_BPLxPTH,
-    REG_BPLxPTL,
-    REG_EVENT_COUNT,
-
     // Keyboard
     KBD_SELFTEST = 1,
     KBD_SYNC,
@@ -226,6 +219,7 @@ typedef enum : long
 
 } EventID;
 
+static inline bool isRegEvent(EventID id) { return id < REG_EVENT_COUNT; }
 static inline bool isAgnEvent(EventID id) { return id < AGN_EVENT_COUNT; }
 static inline bool isCiaEvent(EventID id) { return id < CIA_EVENT_COUNT; }
 static inline bool isBplEvent(EventID id) { return id < BPL_EVENT_COUNT; }
@@ -332,17 +326,4 @@ typedef struct
 }
 EventInfo;
 
-struct Event
-{
-    // Indicates when the event is due.
-    Cycle triggerCycle;
-
-    // Identifier of the scheduled event.
-    EventID id;
-
-    // Optional data value
-    // Can be used to pass additional information to the event handler.
-    int64_t data;
-};
-
 #endif