"Internal CCK counter changed to 64-bit" didn't update counter variable to 64-bit.

diff --git a/debug.cpp b/debug.cpp
index f4b0a2d1659f29fac9eff12c97356f0ac52f96aa..d6e78f513280705587fbbe037342f7d4cee2d311 100644 (file)
--- a/debug.cpp
+++ b/debug.cpp
@@ -1907,7 +1907,7 @@ static void debug_draw_cycles(uae_u8 *buf, uae_u8 *genlock, int line, int width,
        dx = width - xplus * ((maxhpos + 1) & ~1) - 16;
 
        bool ended = false;
-       uae_u32 tick = dr->tick;
+       evt_t tick = dr->tick;
        uae_s8 intlev = 0;
        for (x = 0; x < NR_DMA_REC_COLS_MAX; x++) {
                uae_u32 c = debug_colors[0].l[0];
@@ -3066,7 +3066,7 @@ static struct dma_rec *find_dma_record(int hpos, int vpos, int toggle)
                                if ((dr->hpos == 2 || dr->hpos == hpos && hpos >= 2) && dr->vpos[dma_record_vpos_type] == vpos) {
                                        for (;;) {
                                                dr = &dma_record_data[idx];
-                                               int tick = dr->tick;
+                                               evt_t tick = dr->tick;
                                                if (dr->vpos[dma_record_vpos_type] == vpos && dr->frame == frame) {
                                                        if (dr->hpos == hpos) {
                                                                break;

diff --git a/events.cpp b/events.cpp
index 304d23cb944aea7d23e155d071a70167e2b6ba8f..c0154ffaaf955877b56245c894d699dda6f2c68e 100644 (file)
--- a/events.cpp
+++ b/events.cpp
@@ -26,7 +26,7 @@ extern int linear_hpos;
 void custom_trigger_start_fast(void);
 
 evt_t event_cycles, nextevent, currcycle;
-uae_u32 currcycle_cck;
+evt_t currcycle_cck;
 int is_syncline;
 static int syncline_cnt;
 frame_time_t is_syncline_end;

diff --git a/include/debug.h b/include/debug.h
index ff3d4564771e65d8d85bce74b1681525ef5ab48c..29a071952e65ad29a4c4c512d98988f68987cfbc 100644 (file)
--- a/include/debug.h
+++ b/include/debug.h
@@ -229,7 +229,7 @@ struct dma_rec
 {
        int hpos, vpos[2];
        int frame;
-       uae_u32 tick;
+       evt_t tick;
        int dhpos[2];
     uae_u16 reg;
     uae_u64 dat;

diff --git a/include/events.h b/include/events.h
index 8996e5f2520e1dd88fc2732c1987e1c2a3d20845..5edf0138f6de0d6d4174e04aa54aeba3458efed7 100644 (file)
--- a/include/events.h
+++ b/include/events.h
@@ -43,7 +43,7 @@ extern void clear_events(void);
 extern bool is_cycle_ce(uaecptr);
 
 extern evt_t currcycle, nextevent;
-extern uae_u32 currcycle_cck;
+extern evt_t currcycle_cck;
 extern int is_syncline;
 extern evt_t is_syncline_end;
 typedef void (*evfunc)(void);